From 3c44e268548d91b703abc96b0002aed8abcc9668 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Mon, 17 Nov 2014 09:33:03 -0500 Subject: [PATCH] ACTIVEMQ6-3 renaming directories from activemq6 to activemq https://issues.apache.org/jira/browse/ACTIVEMQ6-3 We are renaming packages from activemq6 to activemq as that's more generic and version independent On this first commit I'm just renaming the directories otherwise the history would be lost. The next commit will rename the text on the directories. If I squash these two commits git will make us delete / add again. --- .../pom.xml | 0 .../org/apache/activemq}/cli/banner.txt | 0 .../activemq}/cli/ConfigurationException.java | 0 .../org/apache/activemq}/cli/HornetQ.java | 0 .../apache/activemq}/cli/commands/Action.java | 0 .../activemq}/cli/commands/ActionContext.java | 0 .../activemq}/cli/commands/HelpAction.java | 0 .../apache/activemq}/cli/commands/Run.java | 0 .../apache/activemq}/cli/commands/Stop.java | 0 .../activemq}/factory/BrokerFactory.java | 0 .../factory/BrokerFactoryHandler.java | 0 .../apache/activemq}/factory/CoreFactory.java | 0 .../activemq}/factory/CoreFactoryHandler.java | 0 .../factory/FileCoreFactoryHandler.java | 0 .../factory/FileJmsFactoryHandler.java | 0 .../apache/activemq}/factory/JmsFactory.java | 0 .../activemq}/factory/JmsFactoryHandler.java | 0 .../factory/SecurityManagerFactory.java | 0 .../factory/XmlBrokerFactoryHandler.java | 0 .../bootstrap/HornetQBootstrapBundle.java | 0 .../bootstrap/HornetQBootstrapLogger.java | 0 .../org/apache/activemq}/broker/core/file | 0 .../org/apache/activemq}/broker/jms/file | 0 .../services/org/apache/activemq}/broker/xml | 0 .../pom.xml | 0 .../core/HornetQAddressExistsException.java | 0 .../api/core/HornetQAddressFullException.java | 0 .../HornetQAlreadyReplicatingException.java | 0 .../activemq}/api/core/HornetQBuffer.java | 0 .../activemq}/api/core/HornetQBuffers.java | 0 .../core/HornetQClusterSecurityException.java | 0 .../HornetQConnectionTimedOutException.java | 0 .../core/HornetQDisconnectedException.java | 0 .../api/core/HornetQDuplicateIdException.java | 0 .../HornetQDuplicateMetaDataException.java | 0 .../activemq}/api/core/HornetQException.java | 0 .../api/core/HornetQExceptionType.java | 0 .../api/core/HornetQIOErrorException.java | 0 .../core/HornetQIllegalStateException.java | 0 ...netQIncompatibleClientServerException.java | 0 ...etQInterceptorRejectedPacketException.java | 0 .../core/HornetQInternalErrorException.java | 0 .../api/core/HornetQInterruptedException.java | 0 ...rnetQInvalidFilterExpressionException.java | 0 ...netQInvalidTransientQueueUseException.java | 0 .../core/HornetQLargeMessageException.java | 0 ...rnetQLargeMessageInterruptedException.java | 0 .../api/core/HornetQNativeIOError.java | 0 .../HornetQNonExistentQueueException.java | 0 .../core/HornetQNotConnectedException.java | 0 .../core/HornetQObjectClosedException.java | 0 .../HornetQPropertyConversionException.java | 0 .../api/core/HornetQQueueExistsException.java | 0 .../api/core/HornetQSecurityException.java | 0 .../core/HornetQSessionCreationException.java | 0 ...etQTransactionOutcomeUnknownException.java | 0 ...HornetQTransactionRolledBackException.java | 0 .../api/core/HornetQUnBlockedException.java | 0 .../HornetQUnsupportedPacketException.java | 0 .../org/apache/activemq}/api/core/Pair.java | 0 .../activemq}/api/core/SimpleString.java | 0 .../buffers/impl/ChannelBufferWrapper.java | 0 .../core/server/HornetQComponent.java | 62 +- .../org/apache/activemq}/utils/Base64.java | 0 .../org/apache/activemq}/utils/ByteUtil.java | 0 .../activemq}/utils/ClassloadingUtil.java | 0 .../activemq}/utils/ConcurrentHashSet.java | 0 .../apache/activemq}/utils/ConcurrentSet.java | 0 .../apache/activemq}/utils/DataConstants.java | 0 .../utils/DefaultSensitiveStringCodec.java | 0 .../apache/activemq}/utils/FactoryFinder.java | 0 .../activemq}/utils/HornetQThreadFactory.java | 0 .../activemq}/utils/HornetQUtilBundle.java | 0 .../activemq}/utils/HornetQUtilLogger.java | 0 .../activemq}/utils/PasswordMaskingUtil.java | 0 .../activemq}/utils/ReferenceCounter.java | 0 .../activemq}/utils/ReferenceCounterUtil.java | 0 .../apache/activemq}/utils/ReusableLatch.java | 0 .../activemq}/utils/SensitiveDataCodec.java | 0 .../activemq}/utils/TypedProperties.java | 0 .../org/apache/activemq}/utils/UTF8Util.java | 0 .../java/org/apache/activemq}/utils/UUID.java | 0 .../apache/activemq}/utils/UUIDGenerator.java | 0 .../org/apache/activemq}/utils/UUIDTimer.java | 0 .../apache/activemq}/utils/ByteUtilTest.java | 0 .../org/apache/activemq}/utils/PairTest.java | 0 .../activemq}/utils/ReferenceCounterTest.java | 0 .../pom.xml | 0 .../activemq}/api/core/BroadcastEndpoint.java | 0 .../api/core/BroadcastEndpointFactory.java | 0 ...BroadcastEndpointFactoryConfiguration.java | 0 .../api/core/BroadcastGroupConfiguration.java | 0 .../api/core/DiscoveryGroupConfiguration.java | 0 ...GroupConfigurationCompatibilityHelper.java | 0 .../activemq}/api/core/FilterConstants.java | 0 .../activemq}/api/core/Interceptor.java | 0 .../JGroupsBroadcastGroupConfiguration.java | 0 .../apache/activemq}/api/core/Message.java | 0 .../api/core/TransportConfiguration.java | 0 .../core/TransportConfigurationHelper.java | 0 .../core/UDPBroadcastGroupConfiguration.java | 0 .../api/core/client/ClientConsumer.java | 0 .../api/core/client/ClientMessage.java | 0 .../api/core/client/ClientProducer.java | 0 .../api/core/client/ClientRequestor.java | 0 .../api/core/client/ClientSession.java | 0 .../api/core/client/ClientSessionFactory.java | 0 .../core/client/ClusterTopologyListener.java | 0 .../core/client/FailoverEventListener.java | 0 .../api/core/client/FailoverEventType.java | 0 .../api/core/client/HornetQClient.java | 0 .../api/core/client/MessageHandler.java | 0 .../client/SendAcknowledgementHandler.java | 0 .../api/core/client/ServerLocator.java | 0 .../core/client/SessionFailureListener.java | 0 .../api/core/client/TopologyMember.java | 0 .../ConnectionLoadBalancingPolicy.java | 0 ...tElementConnectionLoadBalancingPolicy.java | 0 .../RandomConnectionLoadBalancingPolicy.java | 0 ...omStickyConnectionLoadBalancingPolicy.java | 0 ...undRobinConnectionLoadBalancingPolicy.java | 0 .../core/client/loadbalance/package-info.java | 0 .../api/core/client/package-info.java | 0 .../api/core/management/AcceptorControl.java | 0 .../api/core/management/AddressControl.java | 0 .../core/management/AddressSettingsInfo.java | 0 .../api/core/management/BridgeControl.java | 0 .../management/BroadcastGroupControl.java | 0 .../management/ClusterConnectionControl.java | 0 .../core/management/CoreNotificationType.java | 0 .../api/core/management/DayCounterInfo.java | 0 .../api/core/management/DivertControl.java | 0 .../management/HornetQComponentControl.java | 0 .../core/management/HornetQServerControl.java | 0 .../api/core/management/ManagementHelper.java | 0 .../api/core/management/NotificationType.java | 0 .../core/management/ObjectNameBuilder.java | 0 .../api/core/management/Operation.java | 0 .../api/core/management/Parameter.java | 0 .../api/core/management/QueueControl.java | 0 .../api/core/management/ResourceNames.java | 0 .../api/core/management/RoleInfo.java | 0 .../api/core/management/package-info.java | 0 .../activemq}/api/core/package-info.java | 0 .../impl/ResetLimitWrappedHornetQBuffer.java | 0 .../core/client/HornetQClientLogger.java | 0 .../client/HornetQClientMessageBundle.java | 0 .../core/client/impl/AddressQueryImpl.java | 0 .../impl/AfterConnectInternalListener.java | 0 .../core/client/impl/ClientConsumerImpl.java | 0 .../client/impl/ClientConsumerInternal.java | 0 .../client/impl/ClientLargeMessageImpl.java | 0 .../impl/ClientLargeMessageInternal.java | 0 .../core/client/impl/ClientMessageImpl.java | 0 .../client/impl/ClientMessageInternal.java | 0 .../impl/ClientProducerCreditManager.java | 0 .../impl/ClientProducerCreditManagerImpl.java | 0 .../client/impl/ClientProducerCredits.java | 0 .../impl/ClientProducerCreditsImpl.java | 0 .../core/client/impl/ClientProducerImpl.java | 0 .../client/impl/ClientProducerInternal.java | 0 .../client/impl/ClientSessionFactoryImpl.java | 0 .../impl/ClientSessionFactoryInternal.java | 0 .../core/client/impl/ClientSessionImpl.java | 0 .../client/impl/ClientSessionInternal.java | 0 .../CompressedLargeMessageControllerImpl.java | 0 .../core/client/impl/DelegatingSession.java | 0 .../core/client/impl/HornetQXAResource.java | 0 .../client/impl/LargeMessageController.java | 0 .../impl/LargeMessageControllerImpl.java | 0 .../core/client/impl/QueueQueryImpl.java | 0 .../core/client/impl/ServerLocatorImpl.java | 0 .../client/impl/ServerLocatorInternal.java | 0 .../activemq}/core/client/impl/Topology.java | 0 .../core/client/impl/TopologyMemberImpl.java | 0 .../core/cluster/DiscoveryEntry.java | 0 .../core/cluster/DiscoveryGroup.java | 0 .../core/cluster/DiscoveryListener.java | 0 .../core/exception/HornetQXAException.java | 0 .../activemq}/core/message/BodyEncoder.java | 0 .../core/message/impl/MessageImpl.java | 0 .../core/message/impl/MessageInternal.java | 0 .../core/protocol/ClientPacketDecoder.java | 0 .../activemq}/core/protocol/core/Channel.java | 0 .../core/protocol/core/ChannelHandler.java | 0 .../core/CommandConfirmationHandler.java | 0 .../protocol/core/CoreRemotingConnection.java | 0 .../activemq}/core/protocol/core/Packet.java | 0 .../core/protocol/core/impl/ChannelImpl.java | 0 .../impl/HornetQClientProtocolManager.java | 0 .../HornetQClientProtocolManagerFactory.java | 0 .../core/impl/HornetQConsumerContext.java | 0 .../core/impl/HornetQSessionContext.java | 0 .../protocol/core/impl/PacketDecoder.java | 0 .../core/protocol/core/impl/PacketImpl.java | 0 .../core/impl/RemotingConnectionImpl.java | 0 .../impl/wireformat/CheckFailoverMessage.java | 0 .../wireformat/CheckFailoverReplyMessage.java | 0 .../ClusterTopologyChangeMessage.java | 0 .../ClusterTopologyChangeMessage_V2.java | 0 .../ClusterTopologyChangeMessage_V3.java | 0 .../impl/wireformat/CreateQueueMessage.java | 0 .../impl/wireformat/CreateSessionMessage.java | 0 .../CreateSessionResponseMessage.java | 0 .../wireformat/CreateSharedQueueMessage.java | 0 .../wireformat/DisconnectConsumerMessage.java | 0 .../impl/wireformat/DisconnectMessage.java | 0 .../impl/wireformat/DisconnectMessage_V2.java | 0 .../wireformat/HornetQExceptionMessage.java | 0 .../core/impl/wireformat/MessagePacket.java | 0 .../impl/wireformat/NullResponseMessage.java | 0 .../wireformat/PacketsConfirmedMessage.java | 0 .../protocol/core/impl/wireformat/Ping.java | 0 .../wireformat/ReattachSessionMessage.java | 0 .../ReattachSessionResponseMessage.java | 0 .../core/impl/wireformat/RollbackMessage.java | 0 .../wireformat/SessionAcknowledgeMessage.java | 0 .../wireformat/SessionAddMetaDataMessage.java | 0 .../SessionAddMetaDataMessageV2.java | 0 .../SessionBindingQueryMessage.java | 0 .../SessionBindingQueryResponseMessage.java | 0 .../impl/wireformat/SessionCloseMessage.java | 0 .../impl/wireformat/SessionCommitMessage.java | 0 .../SessionConsumerCloseMessage.java | 0 .../SessionConsumerFlowCreditMessage.java | 0 .../SessionContinuationMessage.java | 0 .../SessionCreateConsumerMessage.java | 0 .../wireformat/SessionDeleteQueueMessage.java | 0 .../impl/wireformat/SessionExpireMessage.java | 0 .../SessionForceConsumerDelivery.java | 0 .../SessionIndividualAcknowledgeMessage.java | 0 .../SessionProducerCreditsFailMessage.java | 0 .../SessionProducerCreditsMessage.java | 0 .../wireformat/SessionQueueQueryMessage.java | 0 .../SessionQueueQueryResponseMessage.java | 0 .../SessionReceiveClientLargeMessage.java | 0 .../SessionReceiveContinuationMessage.java | 0 .../SessionReceiveLargeMessage.java | 0 .../wireformat/SessionReceiveMessage.java | 0 .../SessionRequestProducerCreditsMessage.java | 0 .../SessionSendContinuationMessage.java | 0 .../wireformat/SessionSendLargeMessage.java | 0 .../impl/wireformat/SessionSendMessage.java | 0 .../SessionUniqueAddMetaDataMessage.java | 0 .../SessionXAAfterFailedMessage.java | 0 .../wireformat/SessionXACommitMessage.java | 0 .../impl/wireformat/SessionXAEndMessage.java | 0 .../wireformat/SessionXAForgetMessage.java | 0 ...essionXAGetInDoubtXidsResponseMessage.java | 0 .../SessionXAGetTimeoutResponseMessage.java | 0 .../impl/wireformat/SessionXAJoinMessage.java | 0 .../wireformat/SessionXAPrepareMessage.java | 0 .../wireformat/SessionXAResponseMessage.java | 0 .../wireformat/SessionXAResumeMessage.java | 0 .../wireformat/SessionXARollbackMessage.java | 0 .../SessionXASetTimeoutMessage.java | 0 .../SessionXASetTimeoutResponseMessage.java | 0 .../wireformat/SessionXAStartMessage.java | 0 ...ubscribeClusterTopologyUpdatesMessage.java | 0 ...scribeClusterTopologyUpdatesMessageV2.java | 0 .../core/remoting/CloseListener.java | 0 .../core/remoting/FailureListener.java | 0 .../impl/TransportConfigurationUtil.java | 0 .../impl/netty/HornetQAMQPFrameDecoder.java | 0 .../impl/netty/HornetQChannelHandler.java | 0 .../impl/netty/HornetQFrameDecoder2.java | 0 .../remoting/impl/netty/NettyConnection.java | 0 .../remoting/impl/netty/NettyConnector.java | 0 .../impl/netty/NettyConnectorFactory.java | 0 .../netty/PartialPooledByteBufAllocator.java | 0 .../impl/netty/SharedNioEventLoopGroup.java | 0 .../impl/netty/TransportConstants.java | 0 .../core/remoting/impl/ssl/SSLSupport.java | 0 .../activemq}/core/remoting/package-info.java | 0 .../core/security/HornetQPrincipal.java | 0 .../apache/activemq}/core/security/Role.java | 0 .../core/server/QueueQueryResult.java | 0 .../core/server/management/Notification.java | 0 .../management/NotificationListener.java | 0 .../management/NotificationService.java | 0 .../impl/AddressFullMessagePolicy.java | 0 .../core/transaction/impl/XidImpl.java | 0 .../activemq}/core/version/Version.java | 0 .../core/version/impl/VersionImpl.java | 0 .../activemq}/reader/BytesMessageUtil.java | 0 .../activemq}/reader/MapMessageUtil.java | 0 .../apache/activemq}/reader/MessageUtil.java | 0 .../activemq}/reader/StreamMessageUtil.java | 0 .../activemq}/reader/TextMessageUtil.java | 0 .../apache/activemq}/reader/package-info.java | 0 .../protocol/AbstractRemotingConnection.java | 0 .../spi/core/protocol/ConnectionEntry.java | 0 .../spi/core/protocol/RemotingConnection.java | 0 .../spi/core/remoting/AbstractConnector.java | 0 .../spi/core/remoting/BufferDecoder.java | 0 .../spi/core/remoting/BufferHandler.java | 0 .../core/remoting/ClientProtocolManager.java | 0 .../ClientProtocolManagerFactory.java | 0 .../spi/core/remoting/Connection.java | 0 .../remoting/ConnectionLifeCycleListener.java | 0 .../spi/core/remoting/Connector.java | 0 .../spi/core/remoting/ConnectorFactory.java | 0 .../spi/core/remoting/ConsumerContext.java | 0 .../spi/core/remoting/ReadyListener.java | 0 .../spi/core/remoting/SessionContext.java | 0 .../remoting/TopologyResponseHandler.java | 0 .../spi/core/remoting/package-info.java | 0 .../apache/activemq}/utils/BufferHelper.java | 0 .../activemq}/utils/ConfigurationHelper.java | 0 .../utils/ConfirmationWindowWarning.java | 0 .../activemq}/utils/DeflaterReader.java | 0 .../activemq}/utils/ExecutorFactory.java | 0 .../apache/activemq}/utils/FutureLatch.java | 0 .../utils/HornetQBufferInputStream.java | 0 .../apache/activemq}/utils/IDGenerator.java | 0 .../activemq}/utils/InflaterReader.java | 0 .../activemq}/utils/InflaterWriter.java | 0 .../org/apache/activemq}/utils/JNDIUtil.java | 0 .../apache/activemq}/utils/LinkedList.java | 0 .../activemq}/utils/LinkedListImpl.java | 0 .../activemq}/utils/LinkedListIterator.java | 0 .../apache/activemq}/utils/MemorySize.java | 0 .../ObjectInputStreamWithClassLoader.java | 0 .../utils/OrderedExecutorFactory.java | 0 .../activemq}/utils/PriorityLinkedList.java | 76 +- .../utils/PriorityLinkedListImpl.java | 554 +- .../org/apache/activemq}/utils/Random.java | 0 .../activemq}/utils/SecurityFormatter.java | 146 +- .../activemq}/utils/SimpleIDGenerator.java | 0 .../activemq}/utils/SizeFormatterUtil.java | 0 .../activemq}/utils/SoftValueHashMap.java | 0 .../utils/TimeAndCounterIDGenerator.java | 0 .../activemq}/utils/TokenBucketLimiter.java | 0 .../utils/TokenBucketLimiterImpl.java | 0 .../apache/activemq}/utils/VersionLoader.java | 0 .../org/apache/activemq}/utils/XMLUtil.java | 0 .../activemq}/utils/XidCodecSupport.java | 0 .../activemq}/utils/json/JSONArray.java | 0 .../activemq}/utils/json/JSONException.java | 0 .../activemq}/utils/json/JSONObject.java | 0 .../activemq}/utils/json/JSONString.java | 0 .../activemq}/utils/json/JSONTokener.java | 0 .../apache/activemq}/utils/package-info.java | 0 .../resources/HornetQDefaultConfiguration.txt | 0 .../main/resources/hornetq-version.properties | 0 .../src/main/resources/hqDefaults.xsl | 0 .../activemq}/tests/CoreUnitTestCase.java | 0 .../activemq}/tests/util/RandomUtil.java | 0 .../activemq}/tests/util/SilentTestCase.java | 0 .../activemq}/util/CompressionUtilTest.java | 0 .../activemq}/util/ConcurrentHashSetTest.java | 0 .../util/TimeAndCounterIDGeneratorTest.java | 0 .../util/TypedPropertiesConversionTest.java | 0 .../activemq}/util/TypedPropertiesTest.java | 0 .../apache/activemq}/util/XMLUtilTest.java | 0 {activemq6-dto => activemq-dto}/pom.xml | 0 .../activemq}/dto/BasicSecurityDTO.java | 0 .../org/apache/activemq}/dto/BrokerDTO.java | 0 .../org/apache/activemq}/dto/CoreDTO.java | 0 .../java/org/apache/activemq}/dto/JmsDTO.java | 0 .../org/apache/activemq}/dto/NamingDTO.java | 0 .../org/apache/activemq}/dto/SecurityDTO.java | 0 .../org/apache/activemq}/dto/XmlUtil.java | 0 .../apache/activemq}/dto/package-info.java | 0 .../org/apache/activemq}/dto/jaxb.index | 0 .../pom.xml | 0 .../activemq}/api/jms/HornetQJMSClient.java | 0 .../api/jms/HornetQJMSConstants.java | 0 .../activemq}/api/jms/JMSFactoryType.java | 0 .../management/ConnectionFactoryControl.java | 0 .../jms/management/DestinationControl.java | 0 .../api/jms/management/JMSConnectionInfo.java | 0 .../api/jms/management/JMSConsumerInfo.java | 0 .../jms/management/JMSManagementHelper.java | 0 .../api/jms/management/JMSQueueControl.java | 0 .../api/jms/management/JMSServerControl.java | 0 .../api/jms/management/JMSSessionInfo.java | 0 .../api/jms/management/SubscriptionInfo.java | 0 .../api/jms/management/TopicControl.java | 0 .../api/jms/management/package-info.java | 0 .../activemq}/api/jms/package-info.java | 0 .../jms/client/HornetQBytesMessage.java | 0 .../jms/client/HornetQConnection.java | 0 .../jms/client/HornetQConnectionFactory.java | 0 .../client/HornetQConnectionForContext.java | 0 .../HornetQConnectionForContextImpl.java | 0 .../jms/client/HornetQConnectionMetaData.java | 0 .../jms/client/HornetQDestination.java | 0 .../jms/client/HornetQJMSClientBundle.java | 0 .../jms/client/HornetQJMSClientLogger.java | 0 .../client/HornetQJMSConnectionFactory.java | 0 .../jms/client/HornetQJMSConsumer.java | 0 .../jms/client/HornetQJMSContext.java | 0 .../jms/client/HornetQJMSProducer.java | 0 .../jms/client/HornetQMapMessage.java | 0 .../activemq}/jms/client/HornetQMessage.java | 0 .../jms/client/HornetQMessageConsumer.java | 0 .../jms/client/HornetQMessageProducer.java | 0 .../jms/client/HornetQObjectMessage.java | 0 .../activemq}/jms/client/HornetQQueue.java | 0 .../jms/client/HornetQQueueBrowser.java | 0 .../client/HornetQQueueConnectionFactory.java | 0 .../activemq}/jms/client/HornetQSession.java | 0 .../jms/client/HornetQStreamMessage.java | 0 .../jms/client/HornetQTemporaryQueue.java | 0 .../jms/client/HornetQTemporaryTopic.java | 0 .../jms/client/HornetQTextMessage.java | 0 .../activemq}/jms/client/HornetQTopic.java | 0 .../client/HornetQTopicConnectionFactory.java | 0 .../jms/client/HornetQXAConnection.java | 0 .../client/HornetQXAConnectionFactory.java | 0 .../jms/client/HornetQXAJMSContext.java | 0 .../HornetQXAQueueConnectionFactory.java | 0 .../jms/client/HornetQXASession.java | 0 .../HornetQXATopicConnectionFactory.java | 0 .../jms/client/JMSExceptionHelper.java | 0 .../jms/client/JMSMessageListenerWrapper.java | 0 .../jms/client/JmsExceptionUtils.java | 0 .../jms/client/SelectorTranslator.java | 0 .../jms/client/ThreadAwareContext.java | 0 .../activemq}/jms/client/package-info.java | 0 .../ConnectionFactoryObjectFactory.java | 0 .../DestinationObjectFactory.java | 0 .../SerializableObjectRefAddr.java | 0 .../pom.xml | 0 .../jms/bridge/ConnectionFactoryFactory.java | 50 +- .../jms/bridge/DestinationFactory.java | 0 .../jms/bridge/HornetQJMSBridgeLogger.java | 0 .../activemq}/jms/bridge/JMSBridge.java | 228 +- .../jms/bridge/JMSBridgeControl.java | 0 .../jms/bridge/QualityOfServiceMode.java | 0 .../jms/bridge/impl/JMSBridgeControlImpl.java | 0 .../jms/bridge/impl/JMSBridgeImpl.java | 4876 ++++++++--------- .../impl/JNDIConnectionFactoryFactory.java | 80 +- .../bridge/impl/JNDIDestinationFactory.java | 0 .../jms/bridge/impl/JNDIFactorySupport.java | 0 .../impl/JMSConnectionFactoryControlImpl.java | 0 .../management/impl/JMSQueueControlImpl.java | 0 .../management/impl/JMSServerControlImpl.java | 0 .../management/impl/JMSTopicControlImpl.java | 0 .../jms/persistence/JMSStorageManager.java | 0 .../config/PersistedConnectionFactory.java | 0 .../config/PersistedDestination.java | 0 .../jms/persistence/config/PersistedJNDI.java | 0 .../jms/persistence/config/PersistedType.java | 0 .../journal/JMSJournalStorageManagerImpl.java | 0 .../nullpm/NullJMSStorageManagerImpl.java | 0 .../jms/server/HornetQJMSServerBundle.java | 0 .../jms/server/HornetQJMSServerLogger.java | 0 .../jms/server/JMSServerConfigParser.java | 0 .../jms/server/JMSServerManager.java | 0 .../ConnectionFactoryConfiguration.java | 0 .../jms/server/config/JMSConfiguration.java | 0 .../server/config/JMSQueueConfiguration.java | 0 .../jms/server/config/TopicConfiguration.java | 0 .../ConnectionFactoryConfigurationImpl.java | 0 .../config/impl/JMSConfigurationImpl.java | 0 .../impl/JMSQueueConfigurationImpl.java | 0 .../config/impl/TopicConfigurationImpl.java | 0 ...TransportConfigurationEncodingSupport.java | 0 .../jms/server/embedded/EmbeddedJMS.java | 0 .../impl/JMSServerConfigParserImpl.java | 0 .../jms/server/impl/JMSServerDeployer.java | 0 .../jms/server/impl/JMSServerManagerImpl.java | 0 .../server/impl/StandaloneNamingServer.java | 0 .../management/JMSManagementService.java | 0 .../management/JMSNotificationType.java | 0 .../impl/JMSManagementServiceImpl.java | 0 .../recovery/HornetQRecoveryRegistry.java | 0 .../server/recovery/HornetQRegistryBase.java | 0 .../recovery/HornetQXAResourceRecovery.java | 0 .../recovery/HornetQXAResourceWrapper.java | 0 .../server/recovery/RecoveryDiscovery.java | 0 .../jms/server/recovery/XARecoveryConfig.java | 0 .../jms/server/recovery/package-info.java | 0 .../jms/transaction/JMSTransactionDetail.java | 0 .../src/main/resources/schema/hornetq-jms.xsd | 0 .../pom.xml | 0 .../activemq}/core/asyncio/AIOCallback.java | 0 .../core/asyncio/AsynchronousFile.java | 0 .../core/asyncio/BufferCallback.java | 0 .../core/asyncio/IOExceptionListener.java | 0 .../asyncio/impl/AsynchronousFileImpl.java | 0 .../core/asyncio/impl/HornetQFileLock.java | 0 .../core/journal/EncodingSupport.java | 0 .../activemq}/core/journal/IOAsyncTask.java | 0 .../activemq}/core/journal/IOCompletion.java | 0 .../core/journal/IOCriticalErrorListener.java | 0 .../activemq}/core/journal/Journal.java | 0 .../core/journal/JournalLoadInformation.java | 0 .../core/journal/LoaderCallback.java | 0 .../core/journal/PreparedTransactionInfo.java | 0 .../activemq}/core/journal/RecordInfo.java | 0 .../core/journal/SequentialFile.java | 0 .../core/journal/SequentialFileFactory.java | 0 .../core/journal/TestableJournal.java | 0 .../journal/TransactionFailureCallback.java | 0 .../core/journal/impl/AIOSequentialFile.java | 0 .../impl/AIOSequentialFileFactory.java | 0 .../impl/AbstractJournalUpdateTask.java | 0 .../journal/impl/AbstractSequentialFile.java | 0 .../impl/AbstractSequentialFileFactory.java | 0 .../core/journal/impl/CompactJournal.java | 0 .../core/journal/impl/DummyCallback.java | 0 .../core/journal/impl/ExportJournal.java | 0 .../core/journal/impl/FileWrapperJournal.java | 0 .../core/journal/impl/ImportJournal.java | 0 .../core/journal/impl/JournalBase.java | 0 .../core/journal/impl/JournalCompactor.java | 0 .../core/journal/impl/JournalConstants.java | 0 .../core/journal/impl/JournalFile.java | 0 .../core/journal/impl/JournalFileImpl.java | 0 .../journal/impl/JournalFilesRepository.java | 0 .../core/journal/impl/JournalImpl.java | 0 .../journal/impl/JournalReaderCallback.java | 0 .../impl/JournalReaderCallbackAbstract.java | 0 .../core/journal/impl/JournalRecord.java | 0 .../journal/impl/JournalRecordProvider.java | 0 .../core/journal/impl/JournalTransaction.java | 0 .../core/journal/impl/NIOSequentialFile.java | 0 .../impl/NIOSequentialFileFactory.java | 0 .../core/journal/impl/Reclaimer.java | 0 .../journal/impl/SimpleWaitIOCallback.java | 0 .../core/journal/impl/SyncIOCompletion.java | 0 .../core/journal/impl/SyncSpeedTest.java | 0 .../core/journal/impl/TimedBuffer.java | 0 .../journal/impl/TimedBufferObserver.java | 0 .../journal/impl/TransactionCallback.java | 0 .../impl/dataformat/ByteArrayEncoding.java | 0 .../impl/dataformat/JournalAddRecord.java | 0 .../impl/dataformat/JournalAddRecordTX.java | 0 .../dataformat/JournalCompleteRecordTX.java | 0 .../impl/dataformat/JournalDeleteRecord.java | 0 .../dataformat/JournalDeleteRecordTX.java | 0 .../dataformat/JournalInternalRecord.java | 0 .../dataformat/JournalRollbackRecordTX.java | 0 .../journal/HornetQJournalBundle.java | 0 .../journal/HornetQJournalLogger.java | 0 .../asyncio/LibaioDependencyCheckTest.java | 0 {activemq6-native => activemq-native}/README | 0 .../compile-native.sh | 0 {activemq6-native => activemq-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 .../apache/activemq}/core/libaio/Native.java | 0 .../activemq-amqp-protocol}/pom.xml | 0 .../HornetQProtonRemotingConnection.java | 0 .../proton/ProtonProtocolManager.java | 0 .../proton/ProtonProtocolManagerFactory.java | 0 .../proton/converter/HornetQJMSVendor.java | 0 .../converter/ProtonMessageConverter.java | 0 .../converter/jms/ServerJMSBytesMessage.java | 0 .../converter/jms/ServerJMSMapMessage.java | 0 .../converter/jms/ServerJMSMessage.java | 0 .../converter/jms/ServerJMSStreamMessage.java | 0 .../converter/jms/ServerJMSTextMessage.java | 0 .../proton/converter/jms/package-info.java | 0 .../plug/HornetQProtonConnectionCallback.java | 0 .../ProtonSessionIntegrationCallback.java | 0 .../protocol/proton/plug/package-info.java | 0 .../proton/sasl/HornetQPlainSASL.java | 0 ...q.spi.core.protocol.ProtocolManagerFactory | 0 .../core/protocol/proton/TestConversions.java | 0 .../activemq-openwire-protocol}/pom.xml | 0 .../protocol/openwire/AMQConnectorImpl.java | 0 .../protocol/openwire/AMQTransactionImpl.java | 0 .../core/protocol/openwire/BrokerState.java | 0 .../protocol/openwire/DataInputWrapper.java | 0 .../openwire/NotEnoughBytesException.java | 0 .../protocol/openwire/OpenWireConnection.java | 0 .../openwire/OpenWireMessageConverter.java | 0 .../openwire/OpenWireProtocolManager.java | 0 .../OpenWireProtocolManagerFactory.java | 0 .../core/protocol/openwire/OpenWireUtil.java | 0 .../core/protocol/openwire/SendingResult.java | 0 .../amq/AMQAbstractDeadLetterStrategy.java | 0 .../amq/AMQBrokerStoppedException.java | 0 .../openwire/amq/AMQConnectionContext.java | 0 .../protocol/openwire/amq/AMQConnector.java | 0 .../openwire/amq/AMQConnectorStatistics.java | 0 .../protocol/openwire/amq/AMQConsumer.java | 0 .../amq/AMQConsumerBrokerExchange.java | 0 .../openwire/amq/AMQDeadLetterStrategy.java | 0 .../protocol/openwire/amq/AMQDestination.java | 0 .../amq/AMQDestinationStatistics.java | 0 ...MQMapTransportConnectionStateRegister.java | 0 .../amq/AMQMessageAuthorizationPolicy.java | 0 .../openwire/amq/AMQMessageStore.java | 0 .../openwire/amq/AMQPersistenceAdapter.java | 0 .../protocol/openwire/amq/AMQProducer.java | 0 .../amq/AMQProducerBrokerExchange.java | 0 .../openwire/amq/AMQSecurityContext.java | 0 .../openwire/amq/AMQServerConsumer.java | 0 .../openwire/amq/AMQServerSession.java | 0 .../openwire/amq/AMQServerSessionFactory.java | 0 .../protocol/openwire/amq/AMQSession.java | 0 .../amq/AMQSharedDeadLetterStrategy.java | 0 ...ingleTransportConnectionStateRegister.java | 0 .../openwire/amq/AMQSlowConsumerStrategy.java | 0 .../openwire/amq/AMQSubscription.java | 0 .../openwire/amq/AMQSubscriptionRecovery.java | 0 .../protocol/openwire/amq/AMQTransaction.java | 0 .../openwire/amq/AMQTransactionFactory.java | 0 .../amq/AMQTransportConnectionState.java | 0 .../AMQTransportConnectionStateRegister.java | 0 .../openwire/amq/BrowserListener.java | 0 .../protocol/openwire/amq/MessageInfo.java | 0 ...q.spi.core.protocol.ProtocolManagerFactory | 0 .../activemq-proton-plug}/pom.xml | 0 .../plug/AMQPClientConnectionContext.java | 0 .../plug/AMQPClientReceiverContext.java | 0 .../proton/plug/AMQPClientSenderContext.java | 0 .../proton/plug/AMQPClientSessionContext.java | 0 .../proton/plug/AMQPConnectionCallback.java | 0 .../proton/plug/AMQPConnectionContext.java | 0 .../plug/AMQPConnectionContextFactory.java | 0 .../plug/AMQPServerConnectionContext.java | 0 .../org/proton/plug/AMQPSessionCallback.java | 0 .../org/proton/plug/AMQPSessionContext.java | 0 .../main/java/org/proton/plug/ClientSASL.java | 0 .../main/java/org/proton/plug/SASLResult.java | 0 .../main/java/org/proton/plug/ServerSASL.java | 0 .../context/AbstractConnectionContext.java | 0 .../context/AbstractProtonContextSender.java | 0 .../AbstractProtonReceiverContext.java | 0 .../context/AbstractProtonSessionContext.java | 0 .../plug/context/ProtonDeliveryHandler.java | 0 .../plug/context/ProtonInitializable.java | 0 .../proton/plug/context/ProtonPlugSender.java | 0 .../context/ProtonTransactionHandler.java | 0 .../client/ProtonClientConnectionContext.java | 0 .../ProtonClientConnectionContextFactory.java | 0 .../context/client/ProtonClientContext.java | 0 .../client/ProtonClientReceiverContext.java | 0 .../client/ProtonClientSessionContext.java | 0 .../server/ProtonServerConnectionContext.java | 0 .../ProtonServerConnectionContextFactory.java | 0 .../server/ProtonServerReceiverContext.java | 0 .../server/ProtonServerSenderContext.java | 0 .../server/ProtonServerSessionContext.java | 0 .../plug/exceptions/HornetQAMQPException.java | 0 .../HornetQAMQPIllegalStateException.java | 0 .../HornetQAMQPInternalErrorException.java | 0 .../HornetQAMQPInvalidFieldException.java | 0 .../HornetQAMQPNotImplementedException.java | 0 .../HornetQAMQPTimeoutException.java | 0 .../org/proton/plug/handler/EventHandler.java | 0 .../java/org/proton/plug/handler/Events.java | 0 .../proton/plug/handler/ProtonHandler.java | 0 .../handler/impl/DefaultEventHandler.java | 0 .../plug/handler/impl/ProtonHandlerImpl.java | 0 .../HornetQAMQPProtocolMessageBundle.java | 0 .../proton/plug/sasl/AnonymousServerSASL.java | 0 .../org/proton/plug/sasl/ClientSASLPlain.java | 0 .../org/proton/plug/sasl/PlainSASLResult.java | 0 .../org/proton/plug/sasl/ServerSASLPlain.java | 0 .../java/org/proton/plug/util/ByteUtil.java | 0 .../java/org/proton/plug/util/CodecCache.java | 0 .../proton/plug/util/CreditsSemaphore.java | 0 .../java/org/proton/plug/util/DebugInfo.java | 0 .../org/proton/plug/util/DeliveryUtil.java | 0 .../org/proton/plug/util/FutureRunnable.java | 0 .../org/proton/plug/util/NettyWritable.java | 0 .../proton/plug/util/ProtonServerMessage.java | 0 .../org/proton/plug/util/ReusableLatch.java | 0 .../org/proton/plug/test/AbstractJMSTest.java | 0 .../java/org/proton/plug/test/Constants.java | 0 .../java/org/proton/plug/test/ProtonTest.java | 0 .../plug/test/invm/InVMTestConnector.java | 0 .../proton/plug/test/invm/ProtonINVMSPI.java | 0 .../test/minimalclient/AMQPClientSPI.java | 0 .../plug/test/minimalclient/Connector.java | 0 .../minimalclient/SimpleAMQPConnector.java | 0 .../plug/test/minimalserver/DumbServer.java | 0 .../minimalserver/MinimalConnectionSPI.java | 0 .../test/minimalserver/MinimalServer.java | 0 .../test/minimalserver/MinimalSessionSPI.java | 0 .../SimpleServerThreadFactory.java | 0 .../proton/plug/test/sasl/PlainSASLTest.java | 0 .../plug/test/util/CreditsSemaphoreTest.java | 0 .../plug/test/util/ReusableLatchTest.java | 0 .../test/util/SimpleServerAbstractTest.java | 0 .../activemq-stomp-protocol}/pom.xml | 0 .../protocol/stomp/FrameEventListener.java | 0 .../protocol/stomp/HornetQStompException.java | 0 .../stomp/HornetQStompProtocolLogger.java | 0 .../HornetQStompProtocolMessageBundle.java | 0 .../core/protocol/stomp/SimpleBytes.java | 0 .../activemq}/core/protocol/stomp/Stomp.java | 0 .../core/protocol/stomp/StompCommands.java | 0 .../core/protocol/stomp/StompConnection.java | 0 .../core/protocol/stomp/StompDecoder.java | 0 .../core/protocol/stomp/StompFrame.java | 0 .../protocol/stomp/StompProtocolManager.java | 0 .../stomp/StompProtocolManagerFactory.java | 0 .../core/protocol/stomp/StompSession.java | 0 .../protocol/stomp/StompSubscription.java | 0 .../core/protocol/stomp/StompUtils.java | 0 .../core/protocol/stomp/StompVersions.java | 0 .../stomp/VersionedStompFrameHandler.java | 0 .../stomp/v10/StompFrameHandlerV10.java | 0 .../protocol/stomp/v10/StompFrameV10.java | 0 .../stomp/v11/StompFrameHandlerV11.java | 0 .../protocol/stomp/v11/StompFrameV11.java | 0 .../stomp/v12/StompFrameHandlerV12.java | 0 .../protocol/stomp/v12/StompFrameV12.java | 0 ...q.spi.core.protocol.ProtocolManagerFactory | 0 .../pom.xml | 0 {activemq6-ra => activemq-ra}/pom.xml | 0 .../ra/ConnectionFactoryProperties.java | 0 .../apache/activemq}/ra/HornetQRABundle.java | 0 .../activemq}/ra/HornetQRABytesMessage.java | 0 .../ra/HornetQRAConnectionFactory.java | 0 .../ra/HornetQRAConnectionFactoryImpl.java | 0 .../ra/HornetQRAConnectionManager.java | 0 .../ra/HornetQRAConnectionMetaData.java | 0 .../ra/HornetQRAConnectionRequestInfo.java | 0 .../activemq}/ra/HornetQRACredential.java | 0 .../activemq}/ra/HornetQRAJMSContext.java | 0 .../ra/HornetQRALocalTransaction.java | 0 .../apache/activemq}/ra/HornetQRALogger.java | 0 .../activemq}/ra/HornetQRAMCFProperties.java | 0 .../ra/HornetQRAManagedConnection.java | 0 .../ra/HornetQRAManagedConnectionFactory.java | 0 .../activemq}/ra/HornetQRAMapMessage.java | 0 .../apache/activemq}/ra/HornetQRAMessage.java | 0 .../ra/HornetQRAMessageConsumer.java | 0 .../ra/HornetQRAMessageListener.java | 0 .../ra/HornetQRAMessageProducer.java | 0 .../activemq}/ra/HornetQRAMetaData.java | 0 .../activemq}/ra/HornetQRAObjectMessage.java | 0 .../activemq}/ra/HornetQRAProperties.java | 0 .../activemq}/ra/HornetQRAQueueReceiver.java | 0 .../activemq}/ra/HornetQRAQueueSender.java | 0 .../apache/activemq}/ra/HornetQRAService.java | 0 .../apache/activemq}/ra/HornetQRASession.java | 0 .../activemq}/ra/HornetQRASessionFactory.java | 0 .../ra/HornetQRASessionFactoryImpl.java | 0 .../activemq}/ra/HornetQRAStreamMessage.java | 0 .../activemq}/ra/HornetQRATextMessage.java | 0 .../activemq}/ra/HornetQRATopicPublisher.java | 0 .../ra/HornetQRATopicSubscriber.java | 0 .../activemq}/ra/HornetQRAXAJMSContext.java | 0 .../activemq}/ra/HornetQRAXAResource.java | 0 .../apache/activemq}/ra/HornetQRaUtils.java | 0 .../activemq}/ra/HornetQResourceAdapter.java | 0 .../ra/HornetQXAResourceWrapper.java | 0 .../ra/inflow/HornetQActivation.java | 0 .../ra/inflow/HornetQActivationSpec.java | 0 .../ra/inflow/HornetQMessageHandler.java | 0 .../java/org/apache/activemq}/ra/package.html | 0 .../ra/recovery/RecoveryManager.java | 0 {activemq6-rest => activemq-rest}/pom.xml | 0 .../activemq}/rest/HornetQRestBundle.java | 0 .../activemq}/rest/HornetQRestLogger.java | 0 .../org/apache/activemq}/rest/Hornetq.java | 0 .../activemq}/rest/HttpHeaderProperty.java | 0 .../java/org/apache/activemq}/rest/Jms.java | 0 .../rest/MessageServiceConfiguration.java | 0 .../activemq}/rest/MessageServiceManager.java | 0 .../activemq}/rest/UnknownMediaType.java | 0 .../activemq}/rest/UnmarshalException.java | 0 .../rest/integration/EmbeddedRestHornetQ.java | 0 .../integration/EmbeddedRestHornetQJMS.java | 0 .../integration/HornetqBootstrapListener.java | 0 .../RestMessagingBootstrapListener.java | 0 .../ServletContextBindingRegistry.java | 0 .../rest/queue/AcknowledgedQueueConsumer.java | 0 .../activemq}/rest/queue/Acknowledgement.java | 0 .../rest/queue/ConsumedHttpMessage.java | 0 .../activemq}/rest/queue/ConsumedMessage.java | 0 .../rest/queue/ConsumedObjectMessage.java | 0 .../rest/queue/ConsumersResource.java | 0 .../rest/queue/DestinationResource.java | 0 .../rest/queue/DestinationServiceManager.java | 0 .../rest/queue/DestinationSettings.java | 0 .../activemq}/rest/queue/PostMessage.java | 0 .../rest/queue/PostMessageDupsOk.java | 0 .../rest/queue/PostMessageNoDups.java | 0 .../activemq}/rest/queue/QueueConsumer.java | 0 .../activemq}/rest/queue/QueueDeployment.java | 0 .../rest/queue/QueueDestinationsResource.java | 0 .../activemq}/rest/queue/QueueResource.java | 0 .../rest/queue/QueueServiceManager.java | 0 .../rest/queue/push/FilePushStore.java | 0 .../rest/queue/push/HornetQPushStrategy.java | 0 .../rest/queue/push/PushConsumer.java | 0 .../push/PushConsumerMessageHandler.java | 0 .../rest/queue/push/PushConsumerResource.java | 0 .../activemq}/rest/queue/push/PushStore.java | 0 .../rest/queue/push/PushStrategy.java | 0 .../rest/queue/push/UriStrategy.java | 0 .../rest/queue/push/UriTemplateStrategy.java | 0 .../rest/queue/push/xml/Authentication.java | 0 .../queue/push/xml/AuthenticationType.java | 0 .../rest/queue/push/xml/BasicAuth.java | 0 .../rest/queue/push/xml/DigestAuth.java | 0 .../rest/queue/push/xml/PushRegistration.java | 0 .../rest/queue/push/xml/XmlHttpHeader.java | 0 .../rest/queue/push/xml/XmlLink.java | 0 .../AcknowledgedSubscriptionResource.java | 0 .../rest/topic/FileTopicPushStore.java | 0 .../rest/topic/PushSubscription.java | 0 .../rest/topic/PushSubscriptionsResource.java | 0 .../rest/topic/PushTopicRegistration.java | 0 .../activemq}/rest/topic/Subscription.java | 0 .../rest/topic/SubscriptionResource.java | 0 .../rest/topic/SubscriptionsResource.java | 0 .../activemq}/rest/topic/TopicDeployment.java | 0 .../rest/topic/TopicDestinationsResource.java | 0 .../activemq}/rest/topic/TopicPushStore.java | 0 .../activemq}/rest/topic/TopicResource.java | 0 .../rest/topic/TopicServiceManager.java | 0 .../apache/activemq}/rest/util/Constants.java | 0 .../rest/util/CustomHeaderLinkStrategy.java | 0 .../rest/util/HttpMessageHelper.java | 0 .../rest/util/LinkHeaderLinkStrategy.java | 0 .../activemq}/rest/util/LinkStrategy.java | 0 .../activemq}/rest/util/TimeoutTask.java | 0 .../main/resources/schema/hornetq-rest.xsd | 0 .../activemq}/rest/test/AutoAckQueueTest.java | 0 .../activemq}/rest/test/AutoAckTopicTest.java | 0 .../rest/test/ClientAckQueueTest.java | 0 .../rest/test/ClientAckTopicTest.java | 0 .../rest/test/CreateDestinationTest.java | 0 .../activemq}/rest/test/DupQueueTest.java | 0 .../apache/activemq}/rest/test/Embedded.java | 0 .../activemq}/rest/test/EmbeddedTest.java | 0 .../rest/test/FindDestinationTest.java | 0 .../apache/activemq}/rest/test/JMSTest.java | 0 .../activemq}/rest/test/MessageTestBase.java | 0 .../test/PersistentPushQueueConsumerTest.java | 0 .../test/PersistentPushTopicConsumerTest.java | 0 .../rest/test/PushQueueConsumerTest.java | 0 .../rest/test/PushTopicConsumerTest.java | 0 .../activemq}/rest/test/RawAckTest.java | 0 .../rest/test/RepostingQueueTest.java | 0 .../rest/test/RepostingTopicTest.java | 0 .../rest/test/RoundtripTimeTest.java | 0 .../activemq}/rest/test/SelectorTest.java | 0 .../activemq}/rest/test/SessionTest.java | 0 .../activemq}/rest/test/TransformTest.java | 0 .../org/apache/activemq}/rest/test/Util.java | 0 .../apache/activemq}/rest/test/XmlTest.java | 0 .../test/resources/hornetq-configuration.xml | 0 .../src/test/resources/hornetq-jms.xml | 0 .../src/test/resources/hornetq-rest.xml | 0 .../src/test/resources/hornetq-users.xml | 0 .../pom.xml | 0 .../apache/activemq}/selector/LRUCache.java | 0 .../activemq}/selector/SelectorParser.java | 0 .../selector/filter/ArithmeticExpression.java | 0 .../selector/filter/BinaryExpression.java | 0 .../selector/filter/BooleanExpression.java | 0 .../selector/filter/ComparisonExpression.java | 0 .../selector/filter/ConstantExpression.java | 0 .../activemq}/selector/filter/Expression.java | 0 .../selector/filter/FilterException.java | 0 .../activemq}/selector/filter/Filterable.java | 0 .../selector/filter/LogicExpression.java | 0 .../selector/filter/PropertyExpression.java | 0 .../selector/filter/UnaryExpression.java | 0 .../selector/filter/XPathExpression.java | 0 .../selector/filter/XQueryExpression.java | 0 .../selector/filter/XalanXPathEvaluator.java | 0 .../activemq}/selector/filter/package.html | 0 .../src/main/javacc/HyphenatedParser.jj | 0 .../src/main/javacc/StrictParser.jj | 0 .../selector/SelectorParserTest.java | 0 .../activemq}/selector/SelectorTest.java | 0 {activemq6-server => activemq-server}/pom.xml | 0 .../core/management/MessageCounterInfo.java | 0 .../activemq}/core/config/BackupStrategy.java | 0 .../core/config/BridgeConfiguration.java | 0 .../ClusterConnectionConfiguration.java | 0 .../activemq}/core/config/Configuration.java | 0 .../core/config/ConfigurationUtils.java | 0 .../config/ConnectorServiceConfiguration.java | 0 .../core/config/CoreQueueConfiguration.java | 0 .../core/config/DivertConfiguration.java | 0 .../core/config/HAPolicyConfiguration.java | 0 .../core/config/ScaleDownConfiguration.java | 0 .../ha/ColocatedPolicyConfiguration.java | 0 .../ha/LiveOnlyPolicyConfiguration.java | 0 .../config/ha/ReplicaPolicyConfiguration.java | 0 .../ha/ReplicatedPolicyConfiguration.java | 0 .../SharedStoreMasterPolicyConfiguration.java | 0 .../SharedStoreSlavePolicyConfiguration.java | 0 .../core/config/impl/ConfigurationImpl.java | 0 .../core/config/impl/FileConfiguration.java | 0 .../core/config/impl/Validators.java | 0 .../activemq}/core/deployers/Deployer.java | 0 .../core/deployers/DeploymentManager.java | 0 .../impl/AddressSettingsDeployer.java | 0 .../impl/BasicUserCredentialsDeployer.java | 0 .../impl/FileConfigurationParser.java | 0 .../deployers/impl/FileDeploymentManager.java | 0 .../core/deployers/impl/QueueDeployer.java | 0 .../core/deployers/impl/SecurityDeployer.java | 0 .../core/deployers/impl/XmlDeployer.java | 0 .../apache/activemq}/core/filter/Filter.java | 0 .../core/filter/impl/FilterImpl.java | 0 .../core/management/impl/AbstractControl.java | 0 .../management/impl/AcceptorControlImpl.java | 0 .../management/impl/AddressControlImpl.java | 0 .../management/impl/BridgeControlImpl.java | 0 .../impl/BroadcastGroupControlImpl.java | 0 .../impl/ClusterConnectionControlImpl.java | 0 .../management/impl/DivertControlImpl.java | 0 .../impl/HornetQServerControlImpl.java | 0 .../core/management/impl/MBeanInfoHelper.java | 0 .../management/impl/QueueControlImpl.java | 0 .../core/messagecounter/MessageCounter.java | 0 .../messagecounter/MessageCounterManager.java | 0 .../impl/MessageCounterHelper.java | 0 .../impl/MessageCounterManagerImpl.java | 460 +- .../core/paging/PageTransactionInfo.java | 0 .../activemq}/core/paging/PagedMessage.java | 0 .../activemq}/core/paging/PagingManager.java | 0 .../activemq}/core/paging/PagingStore.java | 0 .../core/paging/PagingStoreFactory.java | 0 .../core/paging/cursor/LivePageCache.java | 0 .../core/paging/cursor/PageCache.java | 0 .../paging/cursor/PageCursorProvider.java | 0 .../core/paging/cursor/PagePosition.java | 0 .../core/paging/cursor/PageSubscription.java | 0 .../cursor/PageSubscriptionCounter.java | 0 .../core/paging/cursor/PagedReference.java | 0 .../paging/cursor/PagedReferenceImpl.java | 0 .../paging/cursor/impl/LivePageCacheImpl.java | 0 .../paging/cursor/impl/PageCacheImpl.java | 0 .../cursor/impl/PageCursorProviderImpl.java | 0 .../paging/cursor/impl/PagePositionImpl.java | 0 .../impl/PageSubscriptionCounterImpl.java | 0 .../cursor/impl/PageSubscriptionImpl.java | 0 .../activemq}/core/paging/impl/Page.java | 0 .../core/paging/impl/PageSyncTimer.java | 0 .../paging/impl/PageTransactionInfoImpl.java | 0 .../core/paging/impl/PagedMessageImpl.java | 0 .../core/paging/impl/PagingManagerImpl.java | 0 .../paging/impl/PagingStoreFactoryNIO.java | 0 .../core/paging/impl/PagingStoreImpl.java | 0 .../core/persistence/GroupingInfo.java | 0 .../core/persistence/OperationContext.java | 0 .../core/persistence/QueueBindingInfo.java | 0 .../core/persistence/StorageManager.java | 0 .../config/PersistedAddressSetting.java | 0 .../persistence/config/PersistedRoles.java | 0 .../persistence/impl/PageCountPending.java | 0 .../impl/journal/AddMessageRecord.java | 0 .../impl/journal/BatchingIDGenerator.java | 0 .../impl/journal/DescribeJournal.java | 0 .../impl/journal/JournalRecordIds.java | 0 .../impl/journal/JournalStorageManager.java | 0 .../impl/journal/LargeServerMessageImpl.java | 0 .../journal/LargeServerMessageInSync.java | 0 .../impl/journal/OperationContextImpl.java | 0 .../nullpm/NullStorageLargeServerMessage.java | 0 .../impl/nullpm/NullStorageManager.java | 0 .../activemq}/core/postoffice/Address.java | 0 .../core/postoffice/AddressManager.java | 0 .../activemq}/core/postoffice/Binding.java | 0 .../core/postoffice/BindingType.java | 0 .../activemq}/core/postoffice/Bindings.java | 0 .../core/postoffice/BindingsFactory.java | 0 .../core/postoffice/DuplicateIDCache.java | 0 .../activemq}/core/postoffice/PostOffice.java | 0 .../core/postoffice/QueueBinding.java | 0 .../activemq}/core/postoffice/QueueInfo.java | 0 .../core/postoffice/impl/AddressImpl.java | 0 .../core/postoffice/impl/BindingsImpl.java | 0 .../core/postoffice/impl/DivertBinding.java | 0 .../postoffice/impl/DuplicateIDCacheImpl.java | 0 .../postoffice/impl/LocalQueueBinding.java | 0 .../core/postoffice/impl/PostOfficeImpl.java | 0 .../postoffice/impl/SimpleAddressManager.java | 0 .../impl/WildcardAddressManager.java | 0 .../core/protocol/ProtocolHandler.java | 0 .../core/protocol/ServerPacketDecoder.java | 0 .../core/ServerSessionPacketHandler.java | 0 .../core/impl/CoreProtocolManager.java | 0 .../core/impl/CoreProtocolManagerFactory.java | 0 .../core/impl/CoreSessionCallback.java | 0 .../core/impl/HornetQPacketHandler.java | 0 .../wireformat/BackupRegistrationMessage.java | 0 .../BackupReplicationStartFailedMessage.java | 0 .../impl/wireformat/BackupRequestMessage.java | 0 .../wireformat/BackupResponseMessage.java | 0 .../wireformat/ClusterConnectMessage.java | 0 .../ClusterConnectReplyMessage.java | 0 .../impl/wireformat/NodeAnnounceMessage.java | 0 .../impl/wireformat/QuorumVoteMessage.java | 0 .../wireformat/QuorumVoteReplyMessage.java | 0 .../wireformat/ReplicationAddMessage.java | 0 .../wireformat/ReplicationAddTXMessage.java | 0 .../wireformat/ReplicationCommitMessage.java | 0 .../wireformat/ReplicationDeleteMessage.java | 0 .../ReplicationDeleteTXMessage.java | 0 .../ReplicationLargeMessageBeginMessage.java | 0 .../ReplicationLargeMessageEndMessage.java | 0 .../ReplicationLargeMessageWriteMessage.java | 0 .../ReplicationLiveIsStoppingMessage.java | 0 .../ReplicationPageEventMessage.java | 0 .../ReplicationPageWriteMessage.java | 0 .../wireformat/ReplicationPrepareMessage.java | 0 .../ReplicationResponseMessage.java | 0 .../ReplicationStartSyncMessage.java | 0 .../ReplicationSyncFileMessage.java | 0 .../wireformat/ScaleDownAnnounceMessage.java | 0 .../stomp/WebSocketServerHandler.java | 0 .../core/registry/JndiBindingRegistry.java | 0 .../core/registry/MapBindingRegistry.java | 0 .../core/remoting/impl/invm/InVMAcceptor.java | 0 .../impl/invm/InVMAcceptorFactory.java | 0 .../remoting/impl/invm/InVMConnection.java | 0 .../remoting/impl/invm/InVMConnector.java | 0 .../impl/invm/InVMConnectorFactory.java | 0 .../core/remoting/impl/invm/InVMRegistry.java | 0 .../impl/invm/TransportConstants.java | 0 .../impl/netty/ConnectionCreator.java | 0 .../impl/netty/HttpAcceptorHandler.java | 0 .../impl/netty/HttpKeepAliveRunnable.java | 0 .../remoting/impl/netty/NettyAcceptor.java | 0 .../impl/netty/NettyAcceptorFactory.java | 0 .../impl/netty/NettyServerConnection.java | 0 .../core/remoting/server/RemotingService.java | 0 .../server/impl/RemotingServiceImpl.java | 0 .../core/replication/ReplicatedJournal.java | 0 .../replication/ReplicatedLargeMessage.java | 0 .../core/replication/ReplicationEndpoint.java | 0 .../core/replication/ReplicationManager.java | 0 .../activemq}/core/security/CheckType.java | 0 .../core/security/SecurityStore.java | 0 .../core/security/impl/SecurityStoreImpl.java | 0 .../core/server/ActivateCallback.java | 0 .../core/server/ActivationParams.java | 0 .../activemq}/core/server/Bindable.java | 0 .../core/server/BindingQueryResult.java | 0 .../core/server/ConnectorService.java | 0 .../core/server/ConnectorServiceFactory.java | 0 .../activemq}/core/server/Consumer.java | 0 .../apache/activemq}/core/server/Divert.java | 0 .../activemq}/core/server/HandleStatus.java | 0 .../core/server/HornetQMessageBundle.java | 0 .../activemq}/core/server/HornetQServer.java | 0 .../core/server/HornetQServerLogger.java | 0 .../activemq}/core/server/HornetQServers.java | 0 .../activemq}/core/server/JournalType.java | 0 .../core/server/LargeServerMessage.java | 0 .../core/server/LiveNodeLocator.java | 0 .../activemq}/core/server/MemoryManager.java | 0 .../core/server/MessageReference.java | 0 .../activemq}/core/server/NodeManager.java | 0 .../apache/activemq}/core/server/Queue.java | 0 .../activemq}/core/server/QueueFactory.java | 0 .../core/server/RouteContextList.java | 0 .../activemq}/core/server/RoutingContext.java | 0 .../core/server/ScheduledDeliveryHandler.java | 0 .../activemq}/core/server/ServerConsumer.java | 0 .../activemq}/core/server/ServerMessage.java | 0 .../activemq}/core/server/ServerSession.java | 0 .../core/server/ServerSessionFactory.java | 0 .../core/server/TransientQueueManager.java | 0 .../core/server/cluster/BackupManager.java | 0 .../activemq}/core/server/cluster/Bridge.java | 0 .../core/server/cluster/BroadcastGroup.java | 0 .../cluster/ClusterConfigurationUtil.java | 0 .../server/cluster/ClusterConnection.java | 0 .../core/server/cluster/ClusterControl.java | 0 .../server/cluster/ClusterController.java | 0 .../core/server/cluster/ClusterManager.java | 0 ...rnetQServerSideProtocolManagerFactory.java | 0 .../server/cluster/MessageFlowRecord.java | 0 .../server/cluster/RemoteQueueBinding.java | 0 .../core/server/cluster/Transformer.java | 0 .../core/server/cluster/ha/BackupPolicy.java | 0 .../server/cluster/ha/ColocatedHAManager.java | 0 .../server/cluster/ha/ColocatedPolicy.java | 0 .../core/server/cluster/ha/HAManager.java | 0 .../core/server/cluster/ha/HAPolicy.java | 0 .../server/cluster/ha/LiveOnlyPolicy.java | 0 .../core/server/cluster/ha/ReplicaPolicy.java | 0 .../server/cluster/ha/ReplicatedPolicy.java | 0 .../server/cluster/ha/ScaleDownPolicy.java | 0 .../cluster/ha/SharedStoreMasterPolicy.java | 0 .../cluster/ha/SharedStoreSlavePolicy.java | 0 .../cluster/ha/StandaloneHAManager.java | 0 .../core/server/cluster/impl/BridgeImpl.java | 0 .../cluster/impl/BroadcastGroupImpl.java | 0 .../cluster/impl/ClusterConnectionBridge.java | 0 .../cluster/impl/ClusterConnectionImpl.java | 0 .../server/cluster/impl/Redistributor.java | 0 .../cluster/impl/RemoteQueueBindingImpl.java | 0 .../server/cluster/qourum/BooleanVote.java | 0 .../core/server/cluster/qourum/Quorum.java | 0 .../server/cluster/qourum/QuorumManager.java | 0 .../server/cluster/qourum/QuorumVote.java | 0 .../cluster/qourum/QuorumVoteHandler.java | 0 .../qourum/QuorumVoteServerConnect.java | 0 .../qourum/SharedNothingBackupQuorum.java | 0 .../core/server/cluster/qourum/Vote.java | 0 .../core/server/embedded/EmbeddedHornetQ.java | 0 .../core/server/group/GroupingHandler.java | 0 .../core/server/group/UnproposalListener.java | 0 .../core/server/group/impl/GroupBinding.java | 0 .../group/impl/GroupHandlingAbstract.java | 0 .../impl/GroupingHandlerConfiguration.java | 0 .../group/impl/LocalGroupingHandler.java | 0 .../core/server/group/impl/Proposal.java | 0 .../group/impl/RemoteGroupingHandler.java | 0 .../core/server/group/impl/Response.java | 0 .../server/impl/AIOFileLockNodeManager.java | 0 .../core/server/impl/Activation.java | 0 .../AnyLiveNodeLocatorForReplication.java | 0 .../impl/AnyLiveNodeLocatorForScaleDown.java | 0 .../impl/BackupRecoveryJournalLoader.java | 0 .../server/impl/BackupTopologyListener.java | 0 .../core/server/impl/ColocatedActivation.java | 0 .../core/server/impl/ConnectorsService.java | 0 .../core/server/impl/DivertImpl.java | 0 .../core/server/impl/FileLockNodeManager.java | 0 .../core/server/impl/HornetQServerImpl.java | 0 .../core/server/impl/InVMNodeManager.java | 0 .../core/server/impl/JournalLoader.java | 0 .../core/server/impl/LastValueQueue.java | 0 .../core/server/impl/LiveActivation.java | 0 .../core/server/impl/LiveOnlyActivation.java | 0 .../server/impl/MessageReferenceImpl.java | 0 .../NamedLiveNodeLocatorForReplication.java | 0 .../NamedLiveNodeLocatorForScaleDown.java | 0 .../server/impl/NamedNodeIdNodeLocator.java | 0 .../server/impl/PostOfficeJournalLoader.java | 0 .../core/server/impl/QueueFactoryImpl.java | 0 .../activemq}/core/server/impl/QueueImpl.java | 0 .../core/server/impl/RefsOperation.java | 0 .../core/server/impl/ReplicationError.java | 0 .../core/server/impl/RoutingContextImpl.java | 0 .../core/server/impl/ScaleDownHandler.java | 0 .../impl/ScheduledDeliveryHandlerImpl.java | 0 .../core/server/impl/ServerConsumerImpl.java | 0 .../core/server/impl/ServerInfo.java | 0 .../core/server/impl/ServerMessageImpl.java | 0 .../core/server/impl/ServerSessionImpl.java | 0 .../core/server/impl/ServiceRegistry.java | 0 .../impl/SharedNothingBackupActivation.java | 0 .../impl/SharedNothingLiveActivation.java | 0 .../impl/SharedStoreBackupActivation.java | 0 .../impl/SharedStoreLiveActivation.java | 0 .../impl/TransientQueueManagerImpl.java | 0 .../server/management/ManagementService.java | 0 .../impl/ManagementServiceImpl.java | 0 .../core/settings/HierarchicalRepository.java | 0 .../HierarchicalRepositoryChangeListener.java | 0 .../activemq}/core/settings/Mergeable.java | 0 .../core/settings/impl/AddressSettings.java | 0 .../impl/HierarchicalObjectRepository.java | 0 .../activemq}/core/settings/impl/Match.java | 0 .../settings/impl/SlowConsumerPolicy.java | 0 .../core/transaction/ResourceManager.java | 0 .../core/transaction/Transaction.java | 0 .../core/transaction/TransactionDetail.java | 0 .../core/transaction/TransactionFactory.java | 0 .../transaction/TransactionOperation.java | 0 .../TransactionOperationAbstract.java | 0 .../TransactionPropertyIndexes.java | 0 .../impl/BindingsTransactionImpl.java | 0 .../impl/CoreTransactionDetail.java | 0 .../transaction/impl/ResourceManagerImpl.java | 0 .../transaction/impl/TransactionImpl.java | 0 .../spi/core/naming/BindingRegistry.java | 0 .../spi/core/protocol/MessageConverter.java | 0 .../spi/core/protocol/ProtocolManager.java | 0 .../core/protocol/ProtocolManagerFactory.java | 0 .../spi/core/protocol/SessionCallback.java | 0 .../activemq}/spi/core/remoting/Acceptor.java | 0 .../spi/core/remoting/AcceptorFactory.java | 0 .../ServerConnectionLifeCycleListener.java | 0 .../core/security/HornetQSecurityManager.java | 0 .../security/HornetQSecurityManagerImpl.java | 0 .../core/security/JAASSecurityManager.java | 0 .../spi/core/security/package-info.java | 0 .../activemq}/utils/XMLConfigurationUtil.java | 0 .../apache/activemq}/security/basic-security | 0 .../schema/hornetq-configuration.xsd | 0 .../main/resources/schema/hornetq-users.xsd | 0 .../config/impl/ConfigurationImplTest.java | 0 .../impl/DefaultsFileConfigurationTest.java | 0 .../impl/FileConfigurationParserTest.java | 0 .../config/impl/FileConfigurationTest.java | 0 .../impl/HAPolicyConfigurationTest.java | 0 .../core/config/impl/ValidatorsTest.java | 0 .../WrongRoleFileConfigurationParserTest.java | 0 .../core/filter/impl/FilterTest.java | 0 .../core/list/PriorityLinkedListTest.java | 0 .../message/impl/MessagePropertyTest.java | 0 .../activemq}/core/security/RoleTest.java | 0 .../group/impl/ClusteredResetMockTest.java | 0 .../core/server/impl/EmbeddedServerTest.java | 0 .../impl/ScheduledDeliveryHandlerTest.java | 0 .../core/settings/AddressSettingsTest.java | 0 .../core/settings/RepositoryTest.java | 0 .../core/version/impl/VersionImplTest.java | 0 .../tests/logging/AssertionLoggerHandler.java | 0 .../tests/util/ColocatedHornetQServer.java | 0 .../util/CountDownSessionFailureListener.java | 0 .../tests/util/InVMNodeManagerServer.java | 0 .../activemq}/tests/util/ServiceTestBase.java | 0 .../tests/util/SimpleStringTest.java | 0 .../tests/util/SingleServerTestBase.java | 0 .../activemq}/tests/util/UnitTestCase.java | 0 .../resources/ConfigurationTest-defaults.xml | 0 .../ConfigurationTest-full-config.xml | 0 .../resources/InvalidConfigurationTest0.xml | 0 .../resources/InvalidConfigurationTest1.xml | 0 .../resources/InvalidConfigurationTest2.xml | 0 .../resources/InvalidConfigurationTest3.xml | 0 .../resources/InvalidConfigurationTest4.xml | 0 .../resources/InvalidConfigurationTest5.xml | 0 .../resources/colocated-hapolicy-config.xml | 0 .../resources/colocated-hapolicy-config2.xml | 0 .../divertRoutingNameNotRequired.xml | 0 .../resources/live-only-hapolicy-config.xml | 0 .../resources/live-only-hapolicy-config2.xml | 0 .../resources/live-only-hapolicy-config3.xml | 0 .../resources/live-only-hapolicy-config4.xml | 0 .../resources/live-only-hapolicy-config5.xml | 0 .../src/test/resources/logging.properties | 0 .../resources/replica-hapolicy-config.xml | 0 .../resources/replica-hapolicy-config2.xml | 0 .../resources/replica-hapolicy-config3.xml | 0 .../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 .../HornetQFileConfigurationService.java | 0 .../HornetQFileConfigurationServiceMBean.java | 0 .../service/HornetQJMSStarterService.java | 0 .../HornetQJMSStarterServiceMBean.java | 0 .../service/HornetQServiceBundle.java | 0 .../service/HornetQServiceLogger.java | 0 .../service/HornetQStarterService.java | 0 .../service/HornetQStarterServiceMBean.java | 0 .../JBossASSecurityManagerService.java | 0 .../JBossASSecurityManagerServiceMBean.java | 0 {activemq6-tools => activemq-tools}/pom.xml | 0 .../org/apache/activemq}/tools/DataTool.java | 0 .../activemq}/tools/HornetQToolsLogger.java | 0 .../java/org/apache/activemq}/tools/Main.java | 0 .../org/apache/activemq}/tools/PrintData.java | 0 .../apache/activemq}/tools/PrintPages.java | 0 .../apache/activemq}/tools/TransferQueue.java | 0 .../activemq}/tools/XmlDataConstants.java | 0 .../activemq}/tools/XmlDataExporter.java | 0 .../activemq}/tools/XmlDataImporter.java | 0 distribution/{activemq6 => activemq}/pom.xml | 0 .../src/main/assembly/dep.xml | 0 .../src/main/resources/bin/hornetq | 0 .../src/main/resources/bin/hornetq-service | 0 .../src/main/resources/bin/hornetq.cmd | 0 .../src/main/resources/bin/run.bat | 0 .../src/main/resources/bin/run.sh | 0 .../src/main/resources/bin/stop.bat | 0 .../src/main/resources/bin/stop.sh | 0 .../resources/config/clustered/bootstrap.xml | 0 .../clustered/hornetq-configuration.xml | 0 .../config/clustered/hornetq-jms.xml | 0 .../config/clustered/hornetq-users.xml | 0 .../config/clustered/jndi.properties | 0 .../main/resources/config/logging.properties | 0 .../config/non-clustered/bootstrap.xml | 0 .../non-clustered/hornetq-configuration.xml | 0 .../config/non-clustered/hornetq-jms.xml | 0 .../config/non-clustered/hornetq-users.xml | 0 .../config/non-clustered/jndi.properties | 0 .../resources/config/replicated/bootstrap.xml | 0 .../replicated/hornetq-configuration.xml | 0 .../config/replicated/hornetq-jms.xml | 0 .../config/replicated/hornetq-users.xml | 0 .../config/replicated/jndi.properties | 0 .../config/shared-store/bootstrap.xml | 0 .../shared-store/hornetq-configuration.xml | 0 .../config/shared-store/hornetq-jms.xml | 0 .../config/shared-store/hornetq-users.xml | 0 .../config/shared-store/jndi.properties | 0 .../src/main/resources/licenses/LGPL.txt | 0 .../src/main/resources/licenses/LICENSE.txt | 0 .../resources/licenses/LICENSE_twitter4j.txt | 0 .../src/main/resources/licenses/base64.txt | 0 .../src/main/resources/licenses/json.txt | 0 .../core/example/EmbeddedRemoteExample.java | 0 .../core/example/EmbeddedServer.java | 0 .../core/example/EmbeddedExample.java | 0 .../core/example/PerfBase.java | 0 .../core/example/PerfListener.java | 0 .../core/example/PerfParams.java | 0 .../core/example/PerfSender.java | 0 .../core/example/TwitterConnectorExample.java | 0 .../core/example/ExampleVerticle.java | 0 .../core/example/VertxConnectorExample.java | 0 .../javaee/example/EJBClientExample.java | 0 .../example/server/SendMessageBean.java | 0 .../example/server/SendMessageService.java | 0 .../examples/MDBEJBTXRequiredRunnerTest.java | 0 .../example/MDBRemoteClientExample.java | 0 .../javaee/example/server/MDBQueueA.java | 0 .../javaee/example/server2/MDBQueueB.java | 0 .../example/server2/StatelessSender.java | 0 .../server2/StatelessSenderService.java | 0 .../example/server/ExampleRunner2Test.java | 0 .../example/MDBRemoteServerClientExample.java | 0 .../javaee/example/server/MDBQueue.java | 0 .../javaee/examples/JCARemoteRunnerTest.java | 0 .../javaee/example/JMSBridgeExample.java | 0 .../javaee/examples/JMSBridgeRunnerTest.java | 0 .../JmsContextInjectionClientExample.java | 0 .../server/JmsContextInjectionExample.java | 0 .../JmsContextInjectionRunnerTest.java | 0 .../javaee/example/MDB_BMTClientExample.java | 0 .../javaee/example/server/MDB_BMTExample.java | 0 .../example/server/ExampleRunnerTest.java | 0 ...T_SetRollbackOnlyWithDLQClientExample.java | 0 ...MDB_CMT_SetRollbackOnlyWithDLQExample.java | 0 ...DBCMTSetRollbackOnlyWithDLQRunnerTest.java | 0 .../MDB_CMT_SetRollbackOnlyClientExample.java | 0 .../MDB_CMT_SetRollbackOnlyExample.java | 0 .../MDBCMTSetRollbackOnlyRunnerTest.java | 0 .../example/MDB_CMT_TxLocalClientExample.java | 0 .../server/MDB_CMT_TxLocalExample.java | 0 .../example/MDBCMTSetLocalTXRunnerTest.java | 0 .../MDB_CMT_TxNotSupportedClientExample.java | 0 .../server/MDB_CMT_TxNotSupported.java | 0 .../MDBCMTSetTXNotSupportedRunnerTest.java | 0 .../MDB_CMT_TxRequiredClientExample.java | 0 .../server/MDB_CMT_TxRequiredExample.java | 0 .../MDBCMTSetTXRequiredRunnerTest.java | 0 .../MDBMessageSelectorClientExample.java | 0 .../server/MDBMessageSelectorExample.java | 0 .../MDBCMTSetMessageSelectorRunnerTest.java | 0 .../MDBRemoteFailoverStaticClientExample.java | 0 .../MDBRemoteFailoverStaticExample.java | 0 .../javaee/example/server/ServerKiller.java | 0 .../examples/FailoverStaticRunnerTest.java | 0 .../MDBRemoteFailoverClientExample.java | 0 .../server/MDBRemoteFailoverExample.java | 0 .../javaee/example/server/ServerKiller.java | 0 .../javaee/examples/FailoverRunnerTest.java | 0 .../MDBMessageSendTxClientExample.java | 0 .../server/MDBMessageSendTxExample.java | 0 .../examples/MDBCMTTxSendRunnerTest.java | 0 .../example/XARecoveryExampleStepOne.java | 0 .../example/XARecoveryExampleStepTwo.java | 0 .../example/server/XARecoveryExampleBean.java | 0 .../server/XARecoveryExampleService.java | 0 .../javaee/examples/XARecoveryRunnerTest.java | 0 .../common.css | 0 .../config/logging.properties | 0 .../config/server.properties | 0 .../images/hornetQ-banner_final.png | Bin .../pom.xml | 0 .../prettify.css | 0 .../prettify.js | 0 .../activemq}/common/example/DummyXid.java | 0 .../common/example/HornetQExample.java | 0 .../pom.xml | 0 .../src/main/resources/ra.xml | 0 .../jms/example/AerogearExample.java | 0 .../jms/example/AppletExample.java | 0 .../jms/example/HttpStaticFileServer.java | 0 .../example/HttpStaticFileServerHandler.java | 0 .../HttpStaticFileServerPipelineFactory.java | 0 .../ApplicationLayerFailoverExample.java | 0 .../jms/example/BridgeExample.java | 0 .../example/HatColourChangeTransformer.java | 0 .../jms/example/QueueBrowserExample.java | 0 .../jms/example/ClientKickoffExample.java | 0 .../ClientSideFailoverListerExample.java | 0 .../ClientSideLoadBalancingExample.java | 0 .../ClusteredDurableSubscriptionExample.java | 0 .../jms/example/ClusteredGroupingExample.java | 0 .../jms/example/ClusteredJgroupsExample.java | 0 .../jms/example/ClusteredQueueExample.java | 0 .../example/ClusteredStandaloneExample.java | 0 .../example/StaticClusteredQueueExample.java | 0 .../example/ClusterStaticOnewayExample.java | 0 .../jms/example/ClusteredTopicExample.java | 0 .../ColocatedFailoverScaleDownExample.java | 0 .../jms/example/ColocatedFailoverExample.java | 0 .../jms/example/ConsumerRateLimitExample.java | 0 .../jms/example/DeadLetterExample.java | 0 .../jms/example/DelayedRedeliveryExample.java | 0 .../example/AddForwardingTimeTransformer.java | 0 .../jms/example/DivertExample.java | 0 .../example/DurableSubscriptionExample.java | 0 .../jms/example/EmbeddedExample.java | 0 .../jms/example/EmbeddedExample.java | 0 .../jms/example/ExpiryExample.java | 0 .../example/HAPolicyAutoBackupExample.java | 0 .../jms/example/HttpTransportExample.java | 0 .../InstantiateConnectionFactoryExample.java | 0 .../jms/example/InterceptorExample.java | 0 .../jms/example/SimpleInterceptor.java | 0 .../jms/example/ExampleCallbackHandler.java | 0 .../jms/example/ExampleConfiguration.java | 0 .../jms/example/ExampleLoginModule.java | 0 .../jms/example/JAASExample.java | 0 .../jms/example/JMSAutoCloseableExample.java | 0 .../jms/example/JMSBridgeExample.java | 0 .../example/JMSCompletionListenerExample.java | 0 .../jms/example/JMSContextExample.java | 0 .../jms/example/JMSSharedConsumerExample.java | 0 .../jms/example/JMXExample.java | 0 .../jms/example/LargeMessageExample.java | 0 .../jms/example/LastValueQueueExample.java | 0 .../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 .../MultipleFailoverFailbackExample.java | 0 .../jms/example/MultipleFailoverExample.java | 0 .../example/NoConsumerBufferingExample.java | 0 .../NonTransactionFailoverExample.java | 0 .../jms/example/OpenWireExample.java | 0 .../jms/example/PagingExample.java | 0 .../jms/example/PerfBase.java | 0 .../jms/example/PerfListener.java | 0 .../jms/example/PerfParams.java | 0 .../jms/example/PerfSender.java | 0 .../jms/example/PreacknowledgeExample.java | 0 .../jms/example/ProducerRateLimitExample.java | 0 .../jms/example/ProtonJExample.java | 0 .../QueueMessageRedistributionExample.java | 0 .../jms/example/QueueRequestorExample.java | 0 .../jms/example/TextReverserService.java | 0 .../jms/example/QueueSelectorExample.java | 0 .../jms/example/QueueExample.java | 0 .../jms/example/ReattachExample.java | 0 .../ReplicatedFailbackStaticExample.java | 0 .../example/ReplicatedFailbackExample.java | 0 .../ReplicatedMultipleFailoverExample.java | 0 .../ReplicatedTransactionFailoverExample.java | 0 .../jms/example/RequestReplyExample.java | 0 .../jms/example/ScaleDownExample.java | 0 .../jms/example/ScheduledMessageExample.java | 0 .../jms/example/SecurityExample.java | 0 .../example/SendAcknowledgementsExample.java | 0 .../jms/example/ExampleListener.java | 0 .../jms/example/MessageSender.java | 0 .../jms/example/SpringExample.java | 0 .../jms/example/SSLExample.java | 0 .../jms/example/StaticSelectorJMSExample.java | 0 .../jms/example/StaticSelectorExample.java | 0 .../jms/example/StompWebSocketExample.java | 0 .../jms/example/StompExample.java | 0 .../jms/example/StompExample.java | 0 .../jms/example/StompExample.java | 0 .../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 .../jms/example/TopicExample.java | 0 .../example/TransactionFailoverExample.java | 0 .../jms/example/TransactionalExample.java | 0 .../jms/example/XAHeuristicExample.java | 0 .../jms/example/XAReceiveExample.java | 0 .../jms/example/XASendExample.java | 0 .../jms/example/XAwithJTAExample.java | 0 .../jms/soak/example/SoakBase.java | 0 .../jms/soak/example/SoakParams.java | 0 .../jms/soak/example/SoakReceiver.java | 0 .../jms/soak/example/SoakSender.java | 0 .../pom.xml | 0 .../aerogear/AeroGearConnectorService.java | 0 .../AeroGearConnectorServiceFactory.java | 0 .../aerogear/AeroGearConstants.java | 0 .../aerogear/HornetQAeroGearBundle.java | 0 .../aerogear/HornetQAeroGearLogger.java | 0 .../pom.xml | 0 .../integration/jboss/HornetQJBossBundle.java | 0 .../integration/jboss/HornetQJBossLogger.java | 0 .../jboss/security/AS4SecurityActions.java | 0 .../security/JBossASSecurityManager.java | 0 .../jboss/security/SecurityActions.java | 0 .../tm/JBoss4TransactionManagerLocator.java | 0 .../tm/JBoss5TransactionManagerLocator.java | 0 .../pom.xml | 0 .../spring/SpringBindingRegistry.java | 0 .../spring/SpringJmsBootstrap.java | 0 .../activemq}/spring/HornetQSpringBundle.java | 0 .../activemq}/spring/HornetQSpringLogger.java | 0 .../pom.xml | 0 .../integration/twitter/TwitterConstants.java | 0 ...witterIncomingConnectorServiceFactory.java | 0 ...witterOutgoingConnectorServiceFactory.java | 0 .../twitter/impl/IncomingTweetsHandler.java | 0 .../twitter/impl/OutgoingTweetsHandler.java | 0 .../twitter/HornetQTwitterBundle.java | 0 .../twitter/HornetQTwitterLogger.java | 0 .../pom.xml | 0 .../integration/vertx/HornetQVertxLogger.java | 0 .../vertx/IncomingVertxEventHandler.java | 0 .../vertx/OutgoingVertxEventHandler.java | 0 .../integration/vertx/VertxConstants.java | 0 .../VertxIncomingConnectorServiceFactory.java | 0 .../VertxOutgoingConnectorServiceFactory.java | 0 .../byteman/tests/BMFailoverTest.java | 0 .../BridgeServerLocatorConfigurationTest.java | 0 .../byteman/tests/ClusteredGroupingTest.java | 0 .../byteman/tests/GroupingTest.java | 0 .../tests/HornetQMessageHandlerTest.java | 0 .../tests/JMSBridgeReconnectionTest.java | 0 .../byteman/tests/LatencyTest.java | 0 .../byteman/tests/MessageCopyTest.java | 0 .../byteman/tests/OrphanedConsumerTest.java | 0 .../byteman/tests/PagingLeakTest.java | 0 .../byteman/tests/ScaleDownFailoverTest.java | 0 .../byteman/tests/ScaleDownFailureTest.java | 0 .../tests/ScaleDownGroupedFailoverTest.java | 0 .../tests/ScaleDownGroupedFailureTest.java | 0 .../byteman/tests/StartStopDeadlockTest.java | 0 .../byteman/tests/StompInternalStateTest.java | 0 .../HierarchicalObjectRepositoryTest.java | 0 .../concurrent/server/impl/QueueTest.java | 0 .../concurrent/stomp/ConcurrentStompTest.java | 0 .../integration/DuplicateDetectionTest.java | 0 .../integration/IntegrationTestLogger.java | 0 .../tests/integration/InterceptorTest.java | 0 .../SimpleNotificationService.java | 0 .../tests/integration/String64KLimitTest.java | 0 .../aerogear/AeroGearBasicServerTest.java | 0 .../integration/client/AckBatchSizeTest.java | 0 .../integration/client/AcknowledgeTest.java | 0 .../client/AddressSettingsTest.java | 0 .../integration/client/AutoCloseCoreTest.java | 0 .../integration/client/AutogroupIdTest.java | 0 .../integration/client/BlockingSendTest.java | 0 .../client/CommitRollbackTest.java | 0 .../ConcurrentCreateDeleteProduceTest.java | 0 .../integration/client/ConsumerCloseTest.java | 0 .../client/ConsumerFilterTest.java | 0 .../client/ConsumerRoundRobinTest.java | 0 .../integration/client/ConsumerStuckTest.java | 0 .../integration/client/ConsumerTest.java | 0 .../client/ConsumerWindowSizeTest.java | 0 .../integration/client/CoreClientTest.java | 0 .../client/CreateQueueIdempotentTest.java | 0 .../client/DeadLetterAddressTest.java | 0 .../integration/client/DeliveryOrderTest.java | 0 .../integration/client/DurableQueueTest.java | 0 .../client/ExpireTestOnRestartTest.java | 0 .../integration/client/ExpiryAddressTest.java | 0 .../client/ExpiryLargeMessageTest.java | 0 .../client/FailureDeadlockTest.java | 0 ...owControlOnIgnoreLargeMessageBodyTest.java | 0 .../integration/client/HangConsumerTest.java | 0 .../integration/client/HeuristicXATest.java | 0 .../integration/client/HornetQCrashTest.java | 0 .../InVMNonPersistentMessageBufferTest.java | 0 .../InVMPersistentMessageBufferTest.java | 0 .../client/IncompatibleVersionTest.java | 0 .../client/InterruptedLargeMessageTest.java | 0 .../client/JMSMessageCounterTest.java | 0 .../client/JMSPagingFileDeleteTest.java | 0 .../client/JmsNettyNioStressTest.java | 0 .../integration/client/JournalCrashTest.java | 0 .../LargeMessageAvoidLargeMessagesTest.java | 0 .../client/LargeMessageCompressTest.java | 0 .../integration/client/LargeMessageTest.java | 0 .../client/LibaioDependencyCheckTest.java | 0 .../client/MessageConcurrencyTest.java | 0 .../client/MessageConsumerRollbackTest.java | 0 .../client/MessageCounterTest.java | 0 .../client/MessageDurabilityTest.java | 0 .../client/MessageExpirationTest.java | 0 .../MessageGroupingConnectionFactoryTest.java | 0 .../client/MessageGroupingTest.java | 0 .../client/MessageHandlerTest.java | 0 .../client/MessagePriorityTest.java | 0 .../integration/client/MessageRateTest.java | 0 .../client/MultipleThreadFilterOneTest.java | 0 .../integration/client/NIOvsOIOTest.java | 0 .../client/NettyConnectorTest.java | 0 .../client/NettyConsumerWindowSizeTest.java | 0 .../NettyNonPersistentMessageBufferTest.java | 0 .../NettyPersistentMessageBufferTest.java | 0 .../client/NettyProducerFlowControlTest.java | 0 .../client/NewDeadLetterAddressTest.java | 0 .../tests/integration/client/OrderTest.java | 0 .../integration/client/PagingOrderTest.java | 0 .../integration/client/PagingSyncTest.java | 0 .../tests/integration/client/PagingTest.java | 0 .../integration/client/ProducerCloseTest.java | 0 .../client/ProducerFlowControlTest.java | 0 .../integration/client/ProducerTest.java | 0 .../integration/client/QueueBrowserTest.java | 0 .../client/ReceiveImmediateTest.java | 0 .../tests/integration/client/ReceiveTest.java | 0 .../client/RedeliveryConsumerTest.java | 0 .../integration/client/RequestorTest.java | 0 .../tests/integration/client/RoutingTest.java | 0 .../client/SelfExpandingBufferTest.java | 0 .../client/ServerLocatorConnectTest.java | 0 .../ServerLocatorSerializationTest.java | 0 .../client/SessionCloseOnGCTest.java | 0 .../integration/client/SessionCloseTest.java | 0 ...ClosedOnRemotingConnectionFailureTest.java | 0 .../SessionCreateAndDeleteQueueTest.java | 0 .../client/SessionCreateConsumerTest.java | 0 .../client/SessionCreateProducerTest.java | 0 .../client/SessionFactoryTest.java | 0 ...SessionSendAcknowledgementHandlerTest.java | 0 .../client/SessionStopStartTest.java | 0 .../tests/integration/client/SessionTest.java | 0 .../client/SimpleSendMultipleQueuesTest.java | 0 .../integration/client/SlowConsumerTest.java | 0 .../client/TemporaryQueueTest.java | 0 .../client/TransactionDurabilityTest.java | 0 .../client/TransactionalSendTest.java | 0 .../client/TransientQueueTest.java | 0 .../client/WildCardRoutingTest.java | 0 .../clientcrash/ClientCrashTest.java | 0 .../clientcrash/ClientExitTest.java | 0 .../clientcrash/ClientTestBase.java | 0 .../integration/clientcrash/CrashClient.java | 0 .../integration/clientcrash/CrashClient2.java | 0 .../clientcrash/DummyInterceptor.java | 0 .../clientcrash/DummyInterceptorB.java | 0 .../clientcrash/GracefulClient.java | 196 +- .../cluster/ClusterControllerTest.java | 0 .../cluster/NodeManagerAction.java | 0 .../integration/cluster/NodeManagerTest.java | 0 .../cluster/RealNodeManagerTest.java | 0 .../cluster/bridge/BridgeFailoverTest.java | 0 .../cluster/bridge/BridgeReconnectTest.java | 0 .../cluster/bridge/BridgeStartTest.java | 0 .../cluster/bridge/BridgeTest.java | 0 .../cluster/bridge/BridgeTestBase.java | 0 .../BridgeWithDiscoveryGroupStartTest.java | 0 .../cluster/bridge/SimpleTransformer.java | 0 .../ClusterHeadersRemovedTest.java | 0 .../cluster/distribution/ClusterTestBase.java | 0 .../distribution/ClusterWithBackupTest.java | 0 .../distribution/ClusteredGroupingTest.java | 0 .../ClusteredRequestResponseTest.java | 0 .../LargeMessageRedistributionTest.java | 0 .../MessageRedistributionTest.java | 0 ...essageRedistributionWithDiscoveryTest.java | 0 .../NettyFileStorageSymmetricClusterTest.java | 0 ...StorageSymmetricClusterWithBackupTest.java | 0 ...rageSymmetricClusterWithDiscoveryTest.java | 0 .../NettyOneWayChainClusterTest.java | 0 .../NettyOneWayTwoNodeClusterTest.java | 0 .../NettySymmetricClusterTest.java | 0 .../NettySymmetricClusterWithBackupTest.java | 0 ...ettySymmetricClusterWithDiscoveryTest.java | 0 .../distribution/OneWayChainClusterTest.java | 0 .../OnewayTwoNodeClusterTest.java | 0 .../SimpleSymmetricClusterTest.java | 0 .../distribution/SymmetricClusterTest.java | 0 .../SymmetricClusterWithBackupTest.java | 0 .../SymmetricClusterWithDiscoveryTest.java | 0 .../TemporaryQueueClusterTest.java | 0 .../TwoWayTwoNodeClusterTest.java | 0 ...TwoWayTwoNodeClusterWithDiscoveryTest.java | 0 .../AlmostLargeAsynchronousFailoverTest.java | 0 .../failover/AsynchronousFailoverTest.java | 0 .../AutomaticColocatedQuorumVoteTest.java | 0 .../failover/BackupAuthenticationTest.java | 0 .../failover/BackupSyncJournalTest.java | 0 .../failover/BackupSyncLargeMessageTest.java | 0 .../failover/BackupSyncPagingTest.java | 0 .../ClusterWithBackupFailoverTestBase.java | 0 .../cluster/failover/DelayInterceptor.java | 0 .../cluster/failover/DelayInterceptor2.java | 0 .../cluster/failover/DelayInterceptor3.java | 0 ...iscoveryClusterWithBackupFailoverTest.java | 0 .../cluster/failover/FailBackAutoTest.java | 0 .../cluster/failover/FailBackManualTest.java | 0 .../failover/FailoverListenerTest.java | 0 .../failover/FailoverOnFlowControlTest.java | 0 .../cluster/failover/FailoverTest.java | 0 .../cluster/failover/FailoverTestBase.java | 0 .../GroupingFailoverReplicationTest.java | 0 .../GroupingFailoverSharedServerTest.java | 0 .../failover/GroupingFailoverTestBase.java | 0 .../failover/LargeMessageFailoverTest.java | 0 .../failover/LiveToLiveFailoverTest.java | 0 .../MultipleBackupsFailoverTestBase.java | 0 ...tipleLivesMultipleBackupsFailoverTest.java | 0 .../MultipleServerFailoverTestBase.java | 0 .../NettyAsynchronousFailoverTest.java | 0 .../NettyAsynchronousReattachTest.java | 0 ...iscoveryClusterWithBackupFailoverTest.java | 0 .../cluster/failover/NettyFailoverTest.java | 0 ...iscoveryClusterWithBackupFailoverTest.java | 0 ...geStaticClusterWithBackupFailoverTest.java | 0 .../failover/NettyReplicatedFailoverTest.java | 0 ...tyStaticClusterWithBackupFailoverTest.java | 0 .../cluster/failover/PagingFailoverTest.java | 0 .../cluster/failover/QuorumFailOverTest.java | 0 .../failover/QuorumVoteServerConnectTest.java | 0 .../ReplicatedAsynchronousFailoverTest.java | 0 .../failover/ReplicatedDistributionTest.java | 0 .../failover/ReplicatedFailoverTest.java | 0 ...licatedFailoverUsingNodeGroupNameTest.java | 0 .../ReplicatedLargeMessageFailoverTest.java | 0 ...atedLargeMessageWithDelayFailoverTest.java | 0 ...ipleServerFailoverNoNodeGroupNameTest.java | 0 ...licatedManyMultipleServerFailoverTest.java | 0 ...ultipleServerFailoverExtraBackupsTest.java | 0 ...ipleServerFailoverNoGroupNodeNameTest.java | 0 .../ReplicatedMultipleServerFailoverTest.java | 0 ...plicatedNettyAsynchronousFailoverTest.java | 0 .../failover/ReplicatedPagedFailoverTest.java | 0 .../ReplicatedPagingFailoverTest.java | 0 .../ReplicatedWithDelayFailoverTest.java | 0 .../failover/SecurityFailoverTest.java | 0 .../failover/SharedStoreDistributionTest.java | 0 ...SingleLiveMultipleBackupsFailoverTest.java | 0 .../StaticClusterWithBackupFailoverTest.java | 0 .../remote/FailoverWithSharedStoreTest.java | 0 .../ha/HAAutomaticBackupSharedStore.java | 0 .../MultiThreadRandomReattachTest.java | 0 .../MultiThreadRandomReattachTestBase.java | 0 .../MultiThreadReattachSupportTestBase.java | 0 .../NettyMultiThreadRandomReattachTest.java | 0 .../cluster/reattach/OrderReattachTest.java | 0 .../cluster/reattach/RandomReattachTest.java | 0 .../cluster/reattach/ReattachTest.java | 0 .../cluster/restart/ClusterRestartTest.java | 0 .../topology/HAClientTopologyTest.java | 0 .../HAClientTopologyWithDiscoveryTest.java | 0 .../topology/IsolatedTopologyTest.java | 0 .../topology/NettyHAClientTopologyTest.java | 0 ...ettyHAClientTopologyWithDiscoveryTest.java | 0 .../cluster/topology/NonHATopologyTest.java | 0 .../topology/TopologyClusterTestBase.java | 0 .../cluster/util/BackupSyncDelay.java | 0 .../cluster/util/MultiServerTestBase.java | 0 .../util/RemoteServerConfiguration.java | 0 .../util/SameProcessHornetQServer.java | 0 .../cluster/util/TestableServer.java | 0 .../deployers/impl/QueueDeployerTest.java | 0 .../integration/discovery/DiscoveryTest.java | 0 .../tests/integration/divert/DivertTest.java | 0 .../divert/PersistentDivertTest.java | 0 .../integration/embedded/ValidateAIOTest.java | 0 .../http/CoreClientOverHttpTest.java | 0 .../integration/jms/FloodServerTest.java | 0 .../jms/HornetQConnectionFactoryTest.java | 0 .../integration/jms/JMSSecurityTest.java | 0 .../integration/jms/JmsProducerTest.java | 0 .../ManualReconnectionToSingleServerTest.java | 0 .../jms/bridge/BridgeTestBase.java | 1216 ++-- .../jms/bridge/ClusteredBridgeTestBase.java | 0 .../jms/bridge/JMSBridgeClusteredTest.java | 0 .../jms/bridge/JMSBridgeReconnectionTest.java | 1110 ++-- .../integration/jms/bridge/JMSBridgeTest.java | 0 .../jms/client/AutoGroupingTest.java | 0 .../jms/client/ConnectionTest.java | 0 .../jms/client/CreateQueueTest.java | 0 .../jms/client/ExpiryMessageTest.java | 0 .../integration/jms/client/GroupIDTest.java | 0 .../integration/jms/client/GroupingTest.java | 0 .../jms/client/MessageProducerTest.java | 0 .../integration/jms/client/MessageTest.java | 0 .../jms/client/NewQueueRequestorTest.java | 0 .../jms/client/NoLocalSubscriberTest.java | 0 .../integration/jms/client/PreACKJMSTest.java | 0 .../jms/client/ReSendMessageTest.java | 0 .../jms/client/ReceiveNoWaitTest.java | 0 .../client/RemoteConnectionStressTest.java | 0 ...ClosedOnRemotingConnectionFailureTest.java | 0 .../integration/jms/client/SessionTest.java | 0 .../jms/client/StoreConfigTest.java | 0 .../jms/client/TextMessageTest.java | 0 .../jms/client/TopicCleanupTest.java | 0 .../jms/cluster/BindingsClusterTest.java | 0 .../jms/cluster/JMSFailoverListenerTest.java | 0 .../jms/cluster/JMSFailoverTest.java | 0 .../jms/cluster/JMSReconnectTest.java | 0 .../cluster/LargeMessageOverBridgeTest.java | 0 .../cluster/MultipleThreadsOpeningTest.java | 0 .../cluster/ReplicatedJMSFailoverTest.java | 0 .../cluster/TemporaryQueueClusterTest.java | 0 .../jms/cluster/TopicClusterTest.java | 0 .../CloseConnectionFactoryOnGCest.java | 0 .../connection/CloseConnectionOnGCTest.java | 0 .../CloseDestroyedConnectionTest.java | 0 .../ConcurrentSessionCloseTest.java | 0 .../ConnectionFactorySerializationTest.java | 0 ...onFactoryWithJGroupsSerializationTest.java | 0 .../jms/connection/ExceptionListenerTest.java | 0 .../jms/connection/InvalidConnectorTest.java | 0 .../jms/consumer/ConsumerTest.java | 0 .../jms/divert/DivertAndACKClientTest.java | 0 .../integration/jms/jms2client/BodyTest.java | 0 .../jms2client/InvalidDestinationTest.java | 0 .../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 .../server/config/JMSConfigurationTest.java | 0 .../config/JMSServerConfigParserTest.java | 0 .../ConnectionFactoryControlTest.java | 0 .../server/management/JMSMessagingProxy.java | 0 .../management/JMSQueueControlTest.java | 0 .../JMSQueueControlUsingJMSTest.java | 0 .../management/JMSServerControl2Test.java | 0 .../JMSServerControlRestartTest.java | 0 .../management/JMSServerControlTest.java | 0 .../JMSServerControlUsingJMSTest.java | 0 .../jms/server/management/JMSUtil.java | 0 .../server/management/NullInitialContext.java | 0 .../management/TopicControlClusterTest.java | 0 .../server/management/TopicControlTest.java | 0 .../management/TopicControlUsingJMSTest.java | 0 .../journal/AIOImportExportTest.java | 0 .../journal/AIOJournalCompactTest.java | 0 .../journal/AIOJournalImplTest.java | 0 .../journal/AIOSequentialFileFactoryTest.java | 0 .../journal/JournalPerfTuneTest.java | 0 .../NIOBufferedJournalCompactTest.java | 0 .../journal/NIOImportExportTest.java | 0 .../journal/NIOJournalCompactTest.java | 0 .../journal/NIOJournalImplTest.java | 0 .../journal/NIONoBufferJournalImplTest.java | 0 ...ONonBufferedSequentialFileFactoryTest.java | 0 .../journal/NIOSequentialFileFactoryTest.java | 0 .../integration/journal/OldFormatTest.java | 0 .../ValidateTransactionHealthTest.java | 0 .../largemessage/LargeMessageTestBase.java | 0 .../largemessage/ServerLargeMessageTest.java | 0 .../management/AcceptorControlTest.java | 0 .../AcceptorControlUsingCoreTest.java | 0 .../management/AddressControlTest.java | 0 .../AddressControlUsingCoreTest.java | 0 .../management/BridgeControlTest.java | 0 .../BridgeControlUsingCoreTest.java | 0 .../management/BroadcastGroupControlTest.java | 0 .../BroadcastGroupControlUsingCoreTest.java | 0 .../ClusterConnectionControl2Test.java | 0 .../ClusterConnectionControlTest.java | 0 ...ClusterConnectionControlUsingCoreTest.java | 0 .../management/CoreMessagingProxy.java | 0 .../management/DivertControlTest.java | 0 .../DivertControlUsingCoreTest.java | 0 .../management/HornetQServerControlTest.java | 0 .../HornetQServerControlUsingCoreTest.java | 0 .../integration/management/JMXDomainTest.java | 0 .../management/ManagementActivationTest.java | 0 .../management/ManagementControlHelper.java | 0 .../management/ManagementHelperTest.java | 0 .../management/ManagementServiceImplTest.java | 0 .../management/ManagementTestBase.java | 0 .../ManagementWithPagingServerTest.java | 0 .../management/ManagementWithStompTest.java | 0 .../management/NotificationTest.java | 0 .../management/QueueControlTest.java | 0 .../management/QueueControlUsingCoreTest.java | 0 .../SecurityManagementTestBase.java | 0 ...ManagementWithConfiguredAdminUserTest.java | 0 ...anagementWithDefaultConfigurationTest.java | 0 ...nagementWithModifiedConfigurationTest.java | 0 .../management/SecurityNotificationTest.java | 0 .../openwire/BasicOpenWireTest.java | 0 .../openwire/BasicSecurityTest.java | 0 .../openwire/OpenWireTestBase.java | 0 .../openwire/OpenWireUtilTest.java | 0 .../openwire/SimpleOpenWireTest.java | 0 .../openwire/amq/JMSConsumer10Test.java | 0 .../openwire/amq/JMSConsumer11Test.java | 0 .../openwire/amq/JMSConsumer12Test.java | 0 .../openwire/amq/JMSConsumer13Test.java | 0 .../openwire/amq/JMSConsumer1Test.java | 0 .../openwire/amq/JMSConsumer2Test.java | 0 .../openwire/amq/JMSConsumer3Test.java | 0 .../openwire/amq/JMSConsumer4Test.java | 0 .../openwire/amq/JMSConsumer5Test.java | 0 .../openwire/amq/JMSConsumer6Test.java | 0 .../openwire/amq/JMSConsumer7Test.java | 0 .../openwire/amq/JMSConsumer8Test.java | 0 .../openwire/amq/JMSConsumer9Test.java | 0 .../amq/JMSDurableTopicRedeliverTest.java | 0 .../openwire/amq/JMSIndividualAckTest.java | 0 .../openwire/amq/JMSMessageTest.java | 0 .../openwire/amq/JMSQueueRedeliverTest.java | 0 .../openwire/amq/JMSUsecase1Test.java | 0 .../openwire/amq/JMSUsecaseTest.java | 0 .../openwire/amq/JmsAutoAckListenerTest.java | 0 .../openwire/amq/JmsAutoAckTest.java | 0 .../openwire/amq/JmsClientAckTest.java | 0 .../amq/JmsConnectionStartStopTest.java | 0 .../JmsConsumerResetActiveListenerTest.java | 0 .../amq/JmsCreateConsumerInOnMessageTest.java | 0 ...msDurableQueueWildcardSendReceiveTest.java | 0 .../amq/JmsDurableTopicSelectorTest.java | 0 .../amq/JmsDurableTopicSendReceiveTest.java | 0 .../amq/JmsDurableTopicTransactionTest.java | 0 ...msDurableTopicWildcardSendReceiveTest.java | 0 .../openwire/amq/JmsQueueBrowserTest.java | 0 .../amq/JmsQueueRequestReplyTest.java | 0 .../openwire/amq/JmsResourceProvider.java | 0 .../amq/JmsSendReceiveTestSupport.java | 0 .../openwire/amq/JmsTopicRedeliverTest.java | 0 .../amq/JmsTopicRequestReplyTest.java | 0 .../openwire/amq/JmsTopicSelectorTest.java | 0 .../openwire/amq/JmsTopicSendReceiveTest.java | 0 ...opicSendReceiveWithTwoConnectionsTest.java | 0 .../openwire/amq/JmsTopicTransactionTest.java | 0 .../amq/JmsTopicWildcardSendReceiveTest.java | 0 .../amq/JmsTransactionTestSupport.java | 0 .../amq/MessageListenerRedeliveryTest.java | 0 .../amq/ProducerFlowControlSendFailTest.java | 0 .../openwire/amq/ProducerFlowControlTest.java | 0 .../amq/ReconnectWithSameClientIDTest.java | 0 .../openwire/amq/RedeliveryPolicyTest.java | 0 .../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 .../paging/NettyPagingSendTest.java | 0 .../paging/PageCountSyncOnNonTXTest.java | 0 .../paging/PageCountSyncServer.java | 0 .../integration/paging/PagingCounterTest.java | 0 .../integration/paging/PagingReceiveTest.java | 0 .../integration/paging/PagingSendTest.java | 0 .../PagingWithFailoverAndCountersTest.java | 0 .../paging/PagingWithFailoverBackup.java | 0 .../paging/PagingWithFailoverServer.java | 0 .../paging/SpawnedServerSupport.java | 0 ...dressSettingsConfigurationStorageTest.java | 0 .../DeleteMessagesOnStartupTest.java | 0 .../persistence/DeleteQueueRestartTest.java | 0 .../persistence/DuplicateCacheTest.java | 0 .../persistence/ExportFormatTest.java | 0 ...ectionFactoryConfigurationStorageTest.java | 0 .../persistence/JMSDynamicConfigTest.java | 0 .../persistence/JMSStorageManagerTest.java | 0 .../persistence/RestartSMTest.java | 0 .../RolesConfigurationStorageTest.java | 0 .../persistence/StorageManagerTestBase.java | 0 ...sportConfigurationEncodingSupportTest.java | 0 .../persistence/XmlImportExportTest.java | 0 .../tests/integration/proton/ProtonTest.java | 0 .../integration/ra/DummyTransaction.java | 0 .../ra/DummyTransactionManager.java | 0 .../integration/ra/HornetQActivationTest.java | 0 .../integration/ra/HornetQClusteredTest.java | 0 .../ra/HornetQMessageHandlerSecurityTest.java | 0 .../ra/HornetQMessageHandlerTest.java | 0 .../ra/HornetQMessageHandlerXATest.java | 0 .../ra/HornetQRAClusteredTestBase.java | 0 .../integration/ra/HornetQRATestBase.java | 0 .../tests/integration/ra/JMSContextTest.java | 0 .../ra/OutgoingConnectionTest.java | 0 .../integration/ra/ResourceAdapterTest.java | 0 .../integration/remoting/BatchDelayTest.java | 0 .../remoting/DestroyConsumerTest.java | 0 .../remoting/DirectDeliverTest.java | 0 .../remoting/NettyNetworkAddressTest.java | 0 .../remoting/NettySynchronousCloseTest.java | 0 .../remoting/NetworkAddressTestBase.java | 0 .../tests/integration/remoting/PingTest.java | 0 .../integration/remoting/ReconnectTest.java | 0 .../remoting/SynchronousCloseTest.java | 0 .../replication/ReplicationOrderTest.java | 0 .../replication/ReplicationTest.java | 0 .../scheduling/DelayedMessageTest.java | 0 .../MultipliedDelayedMessageTest.java | 0 .../scheduling/ScheduledMessageTest.java | 0 .../security/NettySecurityClientTest.java | 0 .../integration/security/SecurityTest.java | 0 .../integration/security/SimpleClient.java | 212 +- .../server/AIOFileLockTimeoutTest.java | 0 .../server/AddressFullLoggingTest.java | 0 .../integration/server/ExpiryRunnerTest.java | 0 .../server/FakeStorageManager.java | 0 .../server/FileLockTimeoutTest.java | 0 .../integration/server/LVQRecoveryTest.java | 0 .../tests/integration/server/LVQTest.java | 0 .../server/NIOFileLockTimeoutTest.java | 0 .../server/PredefinedQueueTest.java | 0 .../server/ScaleDown3NodeTest.java | 0 .../integration/server/ScaleDownTest.java | 0 .../server/SuppliedThreadPoolTest.java | 0 .../integration/spring/ExampleListener.java | 0 .../integration/spring/MessageSender.java | 0 .../spring/SpringIntegrationTest.java | 0 .../ssl/CoreClientOverOneWaySSLTest.java | 0 .../ssl/CoreClientOverTwoWaySSLTest.java | 0 .../integration/stomp/ExtraStompTest.java | 0 .../stomp/StompConnectionCleanupTest.java | 0 .../integration/stomp/StompOverHttpTest.java | 0 .../stomp/StompOverWebsocketTest.java | 0 .../tests/integration/stomp/StompTest.java | 0 .../integration/stomp/StompTestBase.java | 0 .../integration/stomp/StompWebSocketTest.java | 0 .../stomp/util/AbstractClientStompFrame.java | 0 .../util/AbstractStompClientConnection.java | 0 .../stomp/util/ClientStompFrame.java | 0 .../stomp/util/ClientStompFrameV10.java | 0 .../stomp/util/ClientStompFrameV11.java | 0 .../stomp/util/ClientStompFrameV12.java | 0 .../stomp/util/StompClientConnection.java | 0 .../util/StompClientConnectionFactory.java | 0 .../stomp/util/StompClientConnectionV10.java | 0 .../stomp/util/StompClientConnectionV11.java | 0 .../stomp/util/StompClientConnectionV12.java | 0 .../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 .../integration/stomp/v11/ExtraStompTest.java | 0 .../integration/stomp/v11/StompV11Test.java | 0 .../stomp/v11/StompV11TestBase.java | 0 .../integration/stomp/v12/StompV12Test.java | 0 .../tools/TransferMessageTest.java | 0 .../netty/HornetQFrameDecoder2Test.java | 0 .../NettyConnectorWithHTTPUpgradeTest.java | 0 .../integration/twitter/TwitterTest.java | 0 .../vertx/HornetQVertxUnitTest.java | 0 .../integration/xa/BasicXaRecoveryTest.java | 0 .../tests/integration/xa/BasicXaTest.java | 0 .../tests/integration/xa/XaTimeoutTest.java | 0 .../largemessage/LargeMessageTestBase.java | 0 .../tests/util/JMSClusteredTestBase.java | 0 .../tests/util/JMSTestBase.java | 0 .../tests/util/JournalExample.java | 0 .../tests/util/NonSerializableFactory.java | 0 .../tests/util/ReplicatedBackupUtils.java | 0 .../util/TransportConfigurationUtils.java | 0 .../jms/tests/AcknowledgementTest.java | 0 .../jms/tests/AutoAckMesageListenerTest.java | 0 .../jms/tests/BrowserTest.java | 0 .../jms/tests/CTSMiscellaneousTest.java | 0 .../jms/tests/ConnectionClosedTest.java | 0 .../jms/tests/ConnectionFactoryTest.java | 0 .../jms/tests/ConnectionTest.java | 0 .../jms/tests/ConsumerClosedTest.java | 174 +- .../jms/tests/DeliveryOrderTest.java | 320 +- .../jms/tests/DurableSubscriptionTest.java | 938 ++-- .../jms/tests/HornetQServerTestCase.java | 0 .../jms/tests/JMSTest.java | 0 .../jms/tests/JMSTestCase.java | 0 .../jms/tests/JmsTestLogger.java | 0 .../jms/tests/MessageConsumerTest.java | 0 .../jms/tests/MessageProducerTest.java | 0 .../jms/tests/MessageWithReadResolveTest.java | 0 .../jms/tests/MiscellaneousTest.java | 0 .../jms/tests/NonDurableSubscriberTest.java | 0 .../jms/tests/PersistenceTest.java | 0 .../jms/tests/QueueReceiverTest.java | 0 .../jms/tests/QueueTest.java | 0 .../jms/tests/ReferenceableTest.java | 0 .../jms/tests/SecurityTest.java | 0 .../jms/tests/SessionTest.java | 0 .../jms/tests/TemporaryDestinationTest.java | 0 .../jms/tests/TopicTest.java | 0 .../jms/tests/TransactedSessionTest.java | 0 .../jms/tests/XARecoveryTest.java | 0 .../jms/tests/XATest.java | 0 .../message/BodyIsAssignableFromTest.java | 0 .../jms/tests/message/BytesMessageTest.java | 0 .../jms/tests/message/ExpiredMessageTest.java | 230 +- .../message/JMSCorrelationIDHeaderTest.java | 0 .../message/JMSDeliveryModeHeaderTest.java | 0 .../message/JMSDestinationHeaderTest.java | 0 .../message/JMSExpirationHeaderTest.java | 0 .../tests/message/JMSMessageIDHeaderTest.java | 0 .../tests/message/JMSPriorityHeaderTest.java | 0 .../tests/message/JMSReplyToHeaderTest.java | 0 .../tests/message/JMSTimestampHeaderTest.java | 0 .../jms/tests/message/JMSTypeHeaderTest.java | 0 .../tests/message/JMSXDeliveryCountTest.java | 0 .../jms/tests/message/MapMessageTest.java | 0 .../jms/tests/message/MessageBodyTest.java | 0 .../tests/message/MessageBodyTestCase.java | 0 .../jms/tests/message/MessageHeaderTest.java | 0 .../tests/message/MessageHeaderTestBase.java | 0 .../MessagePropertyConversionTest.java | 0 .../jms/tests/message/MessageTestBase.java | 0 .../message/ObjectMessageDeliveryTest.java | 0 .../jms/tests/message/ObjectMessageTest.java | 0 .../tests/message/SimpleJMSBytesMessage.java | 0 .../tests/message/SimpleJMSMapMessage.java | 0 .../jms/tests/message/SimpleJMSMessage.java | 0 .../tests/message/SimpleJMSObjectMessage.java | 0 .../tests/message/SimpleJMSStreamMessage.java | 0 .../tests/message/SimpleJMSTextMessage.java | 0 .../jms/tests/message/SomeObject.java | 142 +- .../jms/tests/message/StreamMessageTest.java | 0 .../jms/tests/message/TextMessageTest.java | 0 .../foreign/ForeignBytesMessageTest.java | 0 .../foreign/ForeignMapMessageTest.java | 0 .../message/foreign/ForeignMessageTest.java | 0 .../foreign/ForeignObjectMessageTest.java | 0 .../foreign/ForeignStreamMessageTest.java | 0 .../message/foreign/ForeignTestObject.java | 0 .../foreign/ForeignTextMessageTest.java | 0 .../jms/tests/selector/SelectorTest.java | 0 .../stress/ConcurrentCloseStressTest.java | 0 .../stress/CorruptMessageStressTest.java | 0 .../jms/tests/stress/JMSStressTestBase.java | 202 +- .../stress/ManyConnectionsStressTest.java | 0 .../jms/tests/stress/OpenCloseStressTest.java | 0 .../jms/tests/stress/QueueStressTest.java | 0 .../jms/tests/stress/Receiver.java | 0 .../jms/tests/stress/RecoveringReceiver.java | 0 .../jms/tests/stress/RelayStressTest.java | 496 +- .../jms/tests/stress/Runner.java | 0 .../jms/tests/stress/Sender.java | 0 .../stress/SeveralClientsStressTest.java | 1080 ++-- .../jms/tests/stress/TopicStressTest.java | 0 .../stress/Transactional2PCReceiver.java | 0 .../tests/stress/Transactional2PCSender.java | 0 .../tests/stress/TransactionalReceiver.java | 0 .../jms/tests/stress/TransactionalSender.java | 0 .../jms/tests/tools/ServerManagement.java | 0 .../jms/tests/tools/WrappedJNDIServer.java | 0 .../jms/tests/tools/container/Constants.java | 82 +- .../tests/tools/container/InVMContext.java | 0 .../container/InVMInitialContextFactory.java | 0 .../InVMInitialContextFactoryBuilder.java | 0 .../tests/tools/container/InVMNameParser.java | 0 .../tools/container/LocalTestServer.java | 0 .../container/NonSerializableFactory.java | 0 .../jms/tests/tools/container/Server.java | 0 .../jms/tests/util/JNDIUtilTest.java | 0 .../jms/tests/util/ProxyAssertSupport.java | 952 ++-- .../jms/AbstractAdmin.java | 0 .../jms/GenericAdmin.java | 0 .../jms/HornetQAdmin.java | 0 .../jms/JoramAggregationTest.java | 0 .../jms/SpawnedJMSServer.java | 0 .../journal/FakeJournalImplTest.java | 0 .../journal/JournalImplTestUnit.java | 0 .../journal/RealJournalImplAIOTest.java | 0 .../journal/RealJournalImplNIOTest.java | 0 .../paging/MeasurePagingMultiThreadTest.java | 0 .../tests/soak/client/ClientAbstract.java | 0 .../client/ClientNonDivertedSoakTest.java | 0 .../tests/soak/client/ClientSoakTest.java | 0 .../tests/soak/client/Receiver.java | 0 .../tests/soak/client/Sender.java | 0 .../client/SimpleSendReceiveSoakTest.java | 0 .../soak/failover/RandomFailoverSoakTest.java | 0 .../stress/chunk/LargeMessageStressTest.java | 0 .../tests/stress/client/SendStressTest.java | 0 .../MultiThreadRandomReattachStressTest.java | 0 .../failover/RandomReattachStressTest.java | 0 .../AIOAllPossibilitiesCompactStressTest.java | 0 .../AIOMultiThreadCompactorStressTest.java | 0 .../journal/AddAndRemoveStressTest.java | 0 .../AllPossibilitiesCompactStressTest.java | 0 ...ilitiesCompactWithAddDeleteStressTest.java | 0 .../stress/journal/CompactingStressTest.java | 0 .../JournalCleanupCompactStressTest.java | 0 .../journal/JournalRestartStressTest.java | 0 .../journal/LargeJournalStressTest.java | 0 .../journal/MixupCompactorTestBase.java | 0 .../MultiThreadConsumerStressTest.java | 0 .../NIOMultiThreadCompactorStressTest.java | 0 .../journal/XmlImportExportStressTest.java | 0 .../MultipleConsumersPageStressTest.java | 0 .../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 .../journal/impl/FakeJournalImplTest.java | 0 .../journal/impl/JournalImplTestUnit.java | 0 .../core/journal/impl/NIOJournalImplTest.java | 0 .../core/server/impl/QueueImplTest.java | 0 .../jms/bridge/impl/JMSBridgeImplTest.java | 0 .../tests/timing/util/ReusableLatchTest.java | 0 .../util/TokenBucketLimiterImplTest.java | 0 .../tests/timing/util/UTF8Test.java | 0 .../tests/timing/util/UUIDTest.java | 0 .../tests/unit/UnitTestLogger.java | 0 .../tests/unit/core/asyncio/AIOTestBase.java | 0 .../core/asyncio/AsynchronousFileTest.java | 0 .../asyncio/LibaioDependencyCheckTest.java | 0 .../MultiThreadAsynchronousFileTest.java | 0 .../client/impl/LargeMessageBufferTest.java | 0 .../impl/ConfigurationValidationTest.java | 0 .../config/impl/ConnectorsServiceTest.java | 0 .../impl/TransportConfigurationTest.java | 0 .../impl/fakes/FakeConnectorService.java | 0 .../fakes/FakeConnectorServiceFactory.java | 0 .../impl/AddressSettingsDeployerTest.java | 0 .../BasicUserCredentialsDeployerTest.java | 0 .../deployers/impl/FakeDeploymentManager.java | 0 .../impl/FileDeploymentManagerTest.java | 0 .../deployers/impl/SecurityDeployerTest.java | 0 .../core/deployers/impl/XMLDeployerTest.java | 0 .../journal/impl/AlignedJournalImplTest.java | 0 .../core/journal/impl/CleanBufferTest.java | 0 .../journal/impl/FakeJournalImplTest.java | 0 .../impl/FakeSequentialFileFactoryTest.java | 0 .../journal/impl/FileFactoryTestBase.java | 0 .../core/journal/impl/JournalAsyncTest.java | 0 .../journal/impl/JournalImplTestBase.java | 0 .../journal/impl/JournalImplTestUnit.java | 0 .../unit/core/journal/impl/ReclaimerTest.java | 0 .../impl/SequentialFileFactoryTestBase.java | 0 .../core/journal/impl/TimedBufferTest.java | 0 .../impl/fakes/FakeSequentialFileFactory.java | 0 .../journal/impl/fakes/SimpleEncoding.java | 0 .../core/message/impl/MessageImplTest.java | 0 .../core/paging/impl/PagePositionTest.java | 0 .../tests/unit/core/paging/impl/PageTest.java | 0 .../paging/impl/PagingManagerImplTest.java | 0 .../core/paging/impl/PagingStoreImplTest.java | 0 .../impl/BatchIDGeneratorUnitTest.java | 0 .../impl/OperationContextUnitTest.java | 0 .../core/postoffice/impl/AddressImplTest.java | 0 .../postoffice/impl/BindingsImplTest.java | 0 .../impl/DuplicateDetectionUnitTest.java | 0 .../unit/core/postoffice/impl/FakeQueue.java | 0 .../postoffice/impl/QueueComparatorTest.java | 0 .../impl/WildcardAddressManagerUnitTest.java | 0 .../core/remoting/HornetQBufferTestBase.java | 0 .../impl/invm/InVMConnectorFactoryTest.java | 0 .../impl/netty/ChannelBufferWrapper2Test.java | 0 .../impl/netty/NettyAcceptorFactoryTest.java | 0 .../impl/netty/NettyAcceptorTest.java | 0 .../impl/netty/NettyConnectionTest.java | 0 .../impl/netty/NettyConnectorFactoryTest.java | 0 .../impl/netty/NettyConnectorTest.java | 0 .../remoting/impl/ssl/SSLSupportTest.java | 0 .../server/impl/RemotingServiceImplTest.java | 0 .../server/impl/fake/FakeInterceptor.java | 0 .../impl/HornetQSecurityManagerImplTest.java | 0 .../impl/JAASSecurityManagerTest.java | 0 .../impl/ClusterConnectionBridgeTest.java | 0 .../cluster/impl/RemoteQueueBindImplTest.java | 0 .../impl/SystemPropertyOverrideTest.java | 0 .../unit/core/server/impl/FileLockTest.java | 0 .../unit/core/server/impl/QueueImplTest.java | 0 .../core/server/impl/fakes/FakeConsumer.java | 0 .../core/server/impl/fakes/FakeFilter.java | 0 .../server/impl/fakes/FakeJournalLoader.java | 0 .../server/impl/fakes/FakePostOffice.java | 0 .../server/impl/fakes/FakeQueueFactory.java | 0 .../unit/jms/HornetQDestinationTest.java | 0 .../jms/client/HornetQMapMessageTest.java | 0 .../jms/client/HornetQStreamMessageTest.java | 0 .../jms/client/JMSExceptionHelperTest.java | 0 .../jms/client/SelectorTranslatorTest.java | 0 .../tests/unit/jms/misc/ManifestTest.java | 0 .../ConnectionFactoryObjectFactoryTest.java | 0 .../DestinationObjectFactoryTest.java | 0 .../tests/unit/ra/BootstrapContext.java | 0 .../ra/ConnectionFactoryPropertiesTest.java | 0 .../ra/HornetQResourceAdapterConfigTest.java | 0 .../tests/unit/ra/MessageEndpointFactory.java | 0 .../tests/unit/ra/ResourceAdapterTest.java | 0 .../tests/unit/util/FakePagingManager.java | 0 .../util/HornetQBufferInputStreamTest.java | 0 .../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 .../unit/util/NonSerializableFactory.java | 0 .../ObjectInputStreamWithClassLoaderTest.java | 0 .../tests/unit/util/ReusableLatchTest.java | 0 .../tests/unit/util/SoftValueMapTest.java | 0 .../tests/unit/util/UTF8Test.java | 0 .../tests/unit/util/UUIDGeneratorTest.java | 0 .../tests/unit/util/UUIDTest.java | 0 .../tests/unit/util/VersionLoaderTest.java | 0 .../tests/unit/xa/XAResourceWrapperTest.java | 0 .../tests/util/CreateMessage.java | 0 .../tests/util/SpawnedVMSupport.java | 0 2298 files changed, 6941 insertions(+), 6941 deletions(-) rename {activemq6-bootstrap => activemq-bootstrap}/pom.xml (100%) rename {activemq6-bootstrap/src/main/filtered-resources/org/apache/activemq6 => activemq-bootstrap/src/main/filtered-resources/org/apache/activemq}/cli/banner.txt (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/ConfigurationException.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/HornetQ.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/commands/Action.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/commands/ActionContext.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/commands/HelpAction.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/commands/Run.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/cli/commands/Stop.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/BrokerFactory.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/BrokerFactoryHandler.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/CoreFactory.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/CoreFactoryHandler.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/FileCoreFactoryHandler.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/FileJmsFactoryHandler.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/JmsFactory.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/JmsFactoryHandler.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/SecurityManagerFactory.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/factory/XmlBrokerFactoryHandler.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/integration/bootstrap/HornetQBootstrapBundle.java (100%) rename {activemq6-bootstrap/src/main/java/org/apache/activemq6 => activemq-bootstrap/src/main/java/org/apache/activemq}/integration/bootstrap/HornetQBootstrapLogger.java (100%) rename {activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6 => activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq}/broker/core/file (100%) rename {activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6 => activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq}/broker/jms/file (100%) rename {activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6 => activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq}/broker/xml (100%) rename {activemq6-commons => activemq-commons}/pom.xml (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQAddressExistsException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQAddressFullException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQAlreadyReplicatingException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQBuffer.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQBuffers.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQClusterSecurityException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQConnectionTimedOutException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQDisconnectedException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQDuplicateIdException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQDuplicateMetaDataException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQExceptionType.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQIOErrorException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQIllegalStateException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQIncompatibleClientServerException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQInterceptorRejectedPacketException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQInternalErrorException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQInterruptedException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQInvalidFilterExpressionException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQInvalidTransientQueueUseException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQLargeMessageException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQLargeMessageInterruptedException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQNativeIOError.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQNonExistentQueueException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQNotConnectedException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQObjectClosedException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQPropertyConversionException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQQueueExistsException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQSecurityException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQSessionCreationException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQTransactionOutcomeUnknownException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQTransactionRolledBackException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQUnBlockedException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/HornetQUnsupportedPacketException.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/Pair.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/api/core/SimpleString.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/core/buffers/impl/ChannelBufferWrapper.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/core/server/HornetQComponent.java (96%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/Base64.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ByteUtil.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ClassloadingUtil.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ConcurrentHashSet.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ConcurrentSet.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/DataConstants.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/DefaultSensitiveStringCodec.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/FactoryFinder.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/HornetQThreadFactory.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/HornetQUtilBundle.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/HornetQUtilLogger.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/PasswordMaskingUtil.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ReferenceCounter.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ReferenceCounterUtil.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/ReusableLatch.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/SensitiveDataCodec.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/TypedProperties.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/UTF8Util.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/UUID.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/UUIDGenerator.java (100%) rename {activemq6-commons/src/main/java/org/apache/activemq6 => activemq-commons/src/main/java/org/apache/activemq}/utils/UUIDTimer.java (100%) rename {activemq6-commons/src/test/java/org/apache/activemq6 => activemq-commons/src/test/java/org/apache/activemq}/utils/ByteUtilTest.java (100%) rename {activemq6-commons/src/test/java/org/apache/activemq6 => activemq-commons/src/test/java/org/apache/activemq}/utils/PairTest.java (100%) rename {activemq6-commons/src/test/java/org/apache/activemq6 => activemq-commons/src/test/java/org/apache/activemq}/utils/ReferenceCounterTest.java (100%) rename {activemq6-core-client => activemq-core-client}/pom.xml (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/BroadcastEndpoint.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/BroadcastEndpointFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/BroadcastEndpointFactoryConfiguration.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/BroadcastGroupConfiguration.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/DiscoveryGroupConfiguration.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/FilterConstants.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/Interceptor.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/JGroupsBroadcastGroupConfiguration.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/Message.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/TransportConfiguration.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/TransportConfigurationHelper.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/UDPBroadcastGroupConfiguration.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClientConsumer.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClientMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClientProducer.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClientRequestor.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClientSession.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClientSessionFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ClusterTopologyListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/FailoverEventListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/FailoverEventType.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/HornetQClient.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/MessageHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/SendAcknowledgementHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/ServerLocator.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/SessionFailureListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/TopologyMember.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/loadbalance/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/client/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/AcceptorControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/AddressControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/AddressSettingsInfo.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/BridgeControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/BroadcastGroupControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/ClusterConnectionControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/CoreNotificationType.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/DayCounterInfo.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/DivertControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/HornetQComponentControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/HornetQServerControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/ManagementHelper.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/NotificationType.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/ObjectNameBuilder.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/Operation.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/Parameter.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/QueueControl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/ResourceNames.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/RoleInfo.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/management/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/api/core/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/HornetQClientLogger.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/HornetQClientMessageBundle.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/AddressQueryImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/AfterConnectInternalListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientConsumerImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientConsumerInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientLargeMessageImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientLargeMessageInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientMessageImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientMessageInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientProducerCreditManager.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientProducerCreditManagerImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientProducerCredits.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientProducerCreditsImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientProducerImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientProducerInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientSessionFactoryImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientSessionFactoryInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientSessionImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ClientSessionInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/CompressedLargeMessageControllerImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/DelegatingSession.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/HornetQXAResource.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/LargeMessageController.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/LargeMessageControllerImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/QueueQueryImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ServerLocatorImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/ServerLocatorInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/Topology.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/client/impl/TopologyMemberImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/cluster/DiscoveryEntry.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/cluster/DiscoveryGroup.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/cluster/DiscoveryListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/exception/HornetQXAException.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/message/BodyEncoder.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/message/impl/MessageImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/message/impl/MessageInternal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/ClientPacketDecoder.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/Channel.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/ChannelHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/CommandConfirmationHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/CoreRemotingConnection.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/Packet.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/ChannelImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/HornetQClientProtocolManager.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/HornetQConsumerContext.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/HornetQSessionContext.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/PacketDecoder.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/PacketImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/RemotingConnectionImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/CheckFailoverMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/CreateQueueMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/CreateSessionMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/DisconnectMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/MessagePacket.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/NullResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/Ping.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReattachSessionMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/RollbackMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionCloseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionCommitMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionContinuationMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionExpireMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionReceiveMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionSendMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXACommitMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAEndMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SessionXAStartMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/CloseListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/FailureListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/TransportConfigurationUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/HornetQChannelHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/HornetQFrameDecoder2.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/NettyConnection.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/NettyConnector.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/NettyConnectorFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/PartialPooledByteBufAllocator.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/SharedNioEventLoopGroup.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/netty/TransportConstants.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/impl/ssl/SSLSupport.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/remoting/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/security/HornetQPrincipal.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/security/Role.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/server/QueueQueryResult.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/server/management/Notification.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/server/management/NotificationListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/server/management/NotificationService.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/settings/impl/AddressFullMessagePolicy.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/transaction/impl/XidImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/version/Version.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/core/version/impl/VersionImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/reader/BytesMessageUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/reader/MapMessageUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/reader/MessageUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/reader/StreamMessageUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/reader/TextMessageUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/reader/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/protocol/AbstractRemotingConnection.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/protocol/ConnectionEntry.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/protocol/RemotingConnection.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/AbstractConnector.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/BufferDecoder.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/BufferHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/ClientProtocolManager.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/ClientProtocolManagerFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/Connection.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/ConnectionLifeCycleListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/Connector.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/ConnectorFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/ConsumerContext.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/ReadyListener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/SessionContext.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/TopologyResponseHandler.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/spi/core/remoting/package-info.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/BufferHelper.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/ConfigurationHelper.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/ConfirmationWindowWarning.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/DeflaterReader.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/ExecutorFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/FutureLatch.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/HornetQBufferInputStream.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/IDGenerator.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/InflaterReader.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/InflaterWriter.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/JNDIUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/LinkedList.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/LinkedListImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/LinkedListIterator.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/MemorySize.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/ObjectInputStreamWithClassLoader.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/OrderedExecutorFactory.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/PriorityLinkedList.java (96%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/PriorityLinkedListImpl.java (95%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/Random.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/SecurityFormatter.java (97%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/SimpleIDGenerator.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/SizeFormatterUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/SoftValueHashMap.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/TimeAndCounterIDGenerator.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/TokenBucketLimiter.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/TokenBucketLimiterImpl.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/VersionLoader.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/XMLUtil.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/XidCodecSupport.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/json/JSONArray.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/json/JSONException.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/json/JSONObject.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/json/JSONString.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/json/JSONTokener.java (100%) rename {activemq6-core-client/src/main/java/org/apache/activemq6 => activemq-core-client/src/main/java/org/apache/activemq}/utils/package-info.java (100%) rename {activemq6-core-client => activemq-core-client}/src/main/resources/HornetQDefaultConfiguration.txt (100%) rename {activemq6-core-client => activemq-core-client}/src/main/resources/hornetq-version.properties (100%) rename {activemq6-core-client => activemq-core-client}/src/main/resources/hqDefaults.xsl (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/tests/CoreUnitTestCase.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/tests/util/RandomUtil.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/tests/util/SilentTestCase.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/util/CompressionUtilTest.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/util/ConcurrentHashSetTest.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/util/TimeAndCounterIDGeneratorTest.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/util/TypedPropertiesConversionTest.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/util/TypedPropertiesTest.java (100%) rename {activemq6-core-client/src/test/java/org/apache/activemq6 => activemq-core-client/src/test/java/org/apache/activemq}/util/XMLUtilTest.java (100%) rename {activemq6-dto => activemq-dto}/pom.xml (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/BasicSecurityDTO.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/BrokerDTO.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/CoreDTO.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/JmsDTO.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/NamingDTO.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/SecurityDTO.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/XmlUtil.java (100%) rename {activemq6-dto/src/main/java/org/apache/activemq6 => activemq-dto/src/main/java/org/apache/activemq}/dto/package-info.java (100%) rename {activemq6-dto/src/main/resources/org/apache/activemq6 => activemq-dto/src/main/resources/org/apache/activemq}/dto/jaxb.index (100%) rename {activemq6-jms-client => activemq-jms-client}/pom.xml (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/HornetQJMSClient.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/HornetQJMSConstants.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/JMSFactoryType.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/ConnectionFactoryControl.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/DestinationControl.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/JMSConnectionInfo.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/JMSConsumerInfo.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/JMSManagementHelper.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/JMSQueueControl.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/JMSServerControl.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/JMSSessionInfo.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/SubscriptionInfo.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/TopicControl.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/management/package-info.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/api/jms/package-info.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQBytesMessage.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQConnection.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQConnectionForContext.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQConnectionForContextImpl.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQConnectionMetaData.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQDestination.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQJMSClientBundle.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQJMSClientLogger.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQJMSConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQJMSConsumer.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQJMSContext.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQJMSProducer.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQMapMessage.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQMessage.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQMessageConsumer.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQMessageProducer.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQObjectMessage.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQQueue.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQQueueBrowser.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQQueueConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQSession.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQStreamMessage.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQTemporaryQueue.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQTemporaryTopic.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQTextMessage.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQTopic.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQTopicConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQXAConnection.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQXAConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQXAJMSContext.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQXAQueueConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQXASession.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/HornetQXATopicConnectionFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/JMSExceptionHelper.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/JMSMessageListenerWrapper.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/JmsExceptionUtils.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/SelectorTranslator.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/ThreadAwareContext.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/client/package-info.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/referenceable/ConnectionFactoryObjectFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/referenceable/DestinationObjectFactory.java (100%) rename {activemq6-jms-client/src/main/java/org/apache/activemq6 => activemq-jms-client/src/main/java/org/apache/activemq}/jms/referenceable/SerializableObjectRefAddr.java (100%) rename {activemq6-jms-server => activemq-jms-server}/pom.xml (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/ConnectionFactoryFactory.java (97%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/DestinationFactory.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/HornetQJMSBridgeLogger.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/JMSBridge.java (96%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/JMSBridgeControl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/QualityOfServiceMode.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/impl/JMSBridgeControlImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/impl/JMSBridgeImpl.java (96%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/impl/JNDIConnectionFactoryFactory.java (96%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/impl/JNDIDestinationFactory.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/bridge/impl/JNDIFactorySupport.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/management/impl/JMSConnectionFactoryControlImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/management/impl/JMSQueueControlImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/management/impl/JMSServerControlImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/management/impl/JMSTopicControlImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/JMSStorageManager.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/config/PersistedConnectionFactory.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/config/PersistedDestination.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/config/PersistedJNDI.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/config/PersistedType.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/HornetQJMSServerBundle.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/HornetQJMSServerLogger.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/JMSServerConfigParser.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/JMSServerManager.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/ConnectionFactoryConfiguration.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/JMSConfiguration.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/JMSQueueConfiguration.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/TopicConfiguration.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/impl/JMSConfigurationImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/impl/JMSQueueConfigurationImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/impl/TopicConfigurationImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/config/impl/TransportConfigurationEncodingSupport.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/embedded/EmbeddedJMS.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/impl/JMSServerConfigParserImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/impl/JMSServerDeployer.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/impl/JMSServerManagerImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/impl/StandaloneNamingServer.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/management/JMSManagementService.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/management/JMSNotificationType.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/management/impl/JMSManagementServiceImpl.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/HornetQRecoveryRegistry.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/HornetQRegistryBase.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/HornetQXAResourceRecovery.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/HornetQXAResourceWrapper.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/RecoveryDiscovery.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/XARecoveryConfig.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/server/recovery/package-info.java (100%) rename {activemq6-jms-server/src/main/java/org/apache/activemq6 => activemq-jms-server/src/main/java/org/apache/activemq}/jms/transaction/JMSTransactionDetail.java (100%) rename {activemq6-jms-server => activemq-jms-server}/src/main/resources/schema/hornetq-jms.xsd (100%) rename {activemq6-journal => activemq-journal}/pom.xml (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/asyncio/AIOCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/asyncio/AsynchronousFile.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/asyncio/BufferCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/asyncio/IOExceptionListener.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/asyncio/impl/AsynchronousFileImpl.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/asyncio/impl/HornetQFileLock.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/EncodingSupport.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/IOAsyncTask.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/IOCompletion.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/IOCriticalErrorListener.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/Journal.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/JournalLoadInformation.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/LoaderCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/PreparedTransactionInfo.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/RecordInfo.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/SequentialFile.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/SequentialFileFactory.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/TestableJournal.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/TransactionFailureCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/AIOSequentialFile.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/AIOSequentialFileFactory.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/AbstractJournalUpdateTask.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/AbstractSequentialFile.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/AbstractSequentialFileFactory.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/CompactJournal.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/DummyCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/ExportJournal.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/FileWrapperJournal.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/ImportJournal.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalBase.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalCompactor.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalConstants.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalFile.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalFileImpl.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalFilesRepository.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalImpl.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalReaderCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalReaderCallbackAbstract.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalRecord.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalRecordProvider.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/JournalTransaction.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/NIOSequentialFile.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/NIOSequentialFileFactory.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/Reclaimer.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/SimpleWaitIOCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/SyncIOCompletion.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/SyncSpeedTest.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/TimedBuffer.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/TimedBufferObserver.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/TransactionCallback.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/ByteArrayEncoding.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalAddRecord.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalAddRecordTX.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalCompleteRecordTX.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalDeleteRecord.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalDeleteRecordTX.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalInternalRecord.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/core/journal/impl/dataformat/JournalRollbackRecordTX.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/journal/HornetQJournalBundle.java (100%) rename {activemq6-journal/src/main/java/org/apache/activemq6 => activemq-journal/src/main/java/org/apache/activemq}/journal/HornetQJournalLogger.java (100%) rename {activemq6-journal/src/test/java/org/apache/activemq6 => activemq-journal/src/test/java/org/apache/activemq}/tests/asyncio/LibaioDependencyCheckTest.java (100%) rename {activemq6-native => activemq-native}/README (100%) rename {activemq6-native => activemq-native}/compile-native.sh (100%) rename {activemq6-native => activemq-native}/pom.xml (100%) rename {activemq6-native => activemq-native}/src/main/c/AIOController.cpp (100%) rename {activemq6-native => activemq-native}/src/main/c/AIOController.h (100%) rename {activemq6-native => activemq-native}/src/main/c/AIOException.h (100%) rename {activemq6-native => activemq-native}/src/main/c/AsyncFile.cpp (100%) rename {activemq6-native => activemq-native}/src/main/c/AsyncFile.h (100%) rename {activemq6-native => activemq-native}/src/main/c/CallbackAdapter.h (100%) rename {activemq6-native => activemq-native}/src/main/c/JAIODatatypes.h (100%) rename {activemq6-native => activemq-native}/src/main/c/JNICallbackAdapter.cpp (100%) rename {activemq6-native => activemq-native}/src/main/c/JNICallbackAdapter.h (100%) rename {activemq6-native => activemq-native}/src/main/c/JNI_AsynchronousFileImpl.cpp (100%) rename {activemq6-native => activemq-native}/src/main/c/JavaUtilities.cpp (100%) rename {activemq6-native => activemq-native}/src/main/c/JavaUtilities.h (100%) rename {activemq6-native => activemq-native}/src/main/c/LockClass.h (100%) rename {activemq6-native => activemq-native}/src/main/c/Version.h (100%) rename {activemq6-native/src/main/java/org/apache/activemq6 => activemq-native/src/main/java/org/apache/activemq}/core/libaio/Native.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol => activemq-protocols/activemq-amqp-protocol}/pom.xml (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/HornetQProtonRemotingConnection.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/ProtonProtocolManager.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/ProtonProtocolManagerFactory.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/HornetQJMSVendor.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/ProtonMessageConverter.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/jms/ServerJMSMapMessage.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/jms/ServerJMSMessage.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/jms/ServerJMSTextMessage.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/converter/jms/package-info.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/plug/HornetQProtonConnectionCallback.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/plug/package-info.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq}/core/protocol/proton/sasl/HornetQPlainSASL.java (100%) rename {activemq6-protocols/activemq6-amqp-protocol => activemq-protocols/activemq-amqp-protocol}/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory (100%) rename {activemq6-protocols/activemq6-amqp-protocol/src/test/java/org/apache/activemq6 => activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq}/core/protocol/proton/TestConversions.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol => activemq-protocols/activemq-openwire-protocol}/pom.xml (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/AMQConnectorImpl.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/AMQTransactionImpl.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/BrokerState.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/DataInputWrapper.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/NotEnoughBytesException.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/OpenWireConnection.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/OpenWireMessageConverter.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/OpenWireProtocolManager.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/OpenWireProtocolManagerFactory.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/OpenWireUtil.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/SendingResult.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQBrokerStoppedException.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQConnectionContext.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQConnector.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQConnectorStatistics.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQConsumer.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQDeadLetterStrategy.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQDestination.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQDestinationStatistics.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQMessageStore.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQPersistenceAdapter.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQProducer.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQProducerBrokerExchange.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSecurityContext.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQServerConsumer.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQServerSession.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQServerSessionFactory.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSession.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSubscription.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQSubscriptionRecovery.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQTransaction.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQTransactionFactory.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQTransportConnectionState.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/BrowserListener.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq}/core/protocol/openwire/amq/MessageInfo.java (100%) rename {activemq6-protocols/activemq6-openwire-protocol => activemq-protocols/activemq-openwire-protocol}/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/pom.xml (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPClientConnectionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPClientReceiverContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPClientSenderContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPClientSessionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPConnectionCallback.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPConnectionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPServerConnectionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPSessionCallback.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/AMQPSessionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/ClientSASL.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/SASLResult.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/ServerSASL.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/AbstractConnectionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/ProtonInitializable.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/ProtonPlugSender.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/handler/EventHandler.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/handler/Events.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/handler/ProtonHandler.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/sasl/PlainSASLResult.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/ByteUtil.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/CodecCache.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/CreditsSemaphore.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/DebugInfo.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/DeliveryUtil.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/FutureRunnable.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/NettyWritable.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/ProtonServerMessage.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/main/java/org/proton/plug/util/ReusableLatch.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/AbstractJMSTest.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/Constants.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/ProtonTest.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalclient/Connector.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java (100%) rename {activemq6-protocols/activemq6-proton-plug => activemq-protocols/activemq-proton-plug}/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol => activemq-protocols/activemq-stomp-protocol}/pom.xml (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/FrameEventListener.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/HornetQStompException.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/HornetQStompProtocolLogger.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/HornetQStompProtocolMessageBundle.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/SimpleBytes.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/Stomp.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompCommands.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompConnection.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompDecoder.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompFrame.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompProtocolManager.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompProtocolManagerFactory.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompSession.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompSubscription.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompUtils.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/StompVersions.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/VersionedStompFrameHandler.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/v10/StompFrameHandlerV10.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/v10/StompFrameV10.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/v11/StompFrameHandlerV11.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/v11/StompFrameV11.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/v12/StompFrameHandlerV12.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6 => activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq}/core/protocol/stomp/v12/StompFrameV12.java (100%) rename {activemq6-protocols/activemq6-stomp-protocol => activemq-protocols/activemq-stomp-protocol}/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory (100%) rename {activemq6-protocols => activemq-protocols}/pom.xml (100%) rename {activemq6-ra => activemq-ra}/pom.xml (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/ConnectionFactoryProperties.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRABundle.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRABytesMessage.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAConnectionFactory.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAConnectionFactoryImpl.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAConnectionManager.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAConnectionMetaData.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAConnectionRequestInfo.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRACredential.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAJMSContext.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRALocalTransaction.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRALogger.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMCFProperties.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAManagedConnection.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAManagedConnectionFactory.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMapMessage.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMessage.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMessageConsumer.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMessageListener.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMessageProducer.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAMetaData.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAObjectMessage.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAProperties.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAQueueReceiver.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAQueueSender.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAService.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRASession.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRASessionFactory.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRASessionFactoryImpl.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAStreamMessage.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRATextMessage.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRATopicPublisher.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRATopicSubscriber.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAXAJMSContext.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRAXAResource.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQRaUtils.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQResourceAdapter.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/HornetQXAResourceWrapper.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/inflow/HornetQActivation.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/inflow/HornetQActivationSpec.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/inflow/HornetQMessageHandler.java (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/package.html (100%) rename {activemq6-ra/src/main/java/org/apache/activemq6 => activemq-ra/src/main/java/org/apache/activemq}/ra/recovery/RecoveryManager.java (100%) rename {activemq6-rest => activemq-rest}/pom.xml (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/HornetQRestBundle.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/HornetQRestLogger.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/Hornetq.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/HttpHeaderProperty.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/Jms.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/MessageServiceConfiguration.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/MessageServiceManager.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/UnknownMediaType.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/UnmarshalException.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/integration/EmbeddedRestHornetQ.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/integration/EmbeddedRestHornetQJMS.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/integration/HornetqBootstrapListener.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/integration/RestMessagingBootstrapListener.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/integration/ServletContextBindingRegistry.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/AcknowledgedQueueConsumer.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/Acknowledgement.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/ConsumedHttpMessage.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/ConsumedMessage.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/ConsumedObjectMessage.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/ConsumersResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/DestinationResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/DestinationServiceManager.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/DestinationSettings.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/PostMessage.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/PostMessageDupsOk.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/PostMessageNoDups.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/QueueConsumer.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/QueueDeployment.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/QueueDestinationsResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/QueueResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/QueueServiceManager.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/FilePushStore.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/HornetQPushStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/PushConsumer.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/PushConsumerMessageHandler.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/PushConsumerResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/PushStore.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/PushStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/UriStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/UriTemplateStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/Authentication.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/AuthenticationType.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/BasicAuth.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/DigestAuth.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/PushRegistration.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/XmlHttpHeader.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/queue/push/xml/XmlLink.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/AcknowledgedSubscriptionResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/FileTopicPushStore.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/PushSubscription.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/PushSubscriptionsResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/PushTopicRegistration.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/Subscription.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/SubscriptionResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/SubscriptionsResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/TopicDeployment.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/TopicDestinationsResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/TopicPushStore.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/TopicResource.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/topic/TopicServiceManager.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/util/Constants.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/util/CustomHeaderLinkStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/util/HttpMessageHelper.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/util/LinkHeaderLinkStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/util/LinkStrategy.java (100%) rename {activemq6-rest/src/main/java/org/apache/activemq6 => activemq-rest/src/main/java/org/apache/activemq}/rest/util/TimeoutTask.java (100%) rename {activemq6-rest => activemq-rest}/src/main/resources/schema/hornetq-rest.xsd (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/AutoAckQueueTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/AutoAckTopicTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/ClientAckQueueTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/ClientAckTopicTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/CreateDestinationTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/DupQueueTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/Embedded.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/EmbeddedTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/FindDestinationTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/JMSTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/MessageTestBase.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/PersistentPushQueueConsumerTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/PersistentPushTopicConsumerTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/PushQueueConsumerTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/PushTopicConsumerTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/RawAckTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/RepostingQueueTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/RepostingTopicTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/RoundtripTimeTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/SelectorTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/SessionTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/TransformTest.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/Util.java (100%) rename {activemq6-rest/src/test/java/org/apache/activemq6 => activemq-rest/src/test/java/org/apache/activemq}/rest/test/XmlTest.java (100%) rename {activemq6-rest => activemq-rest}/src/test/resources/hornetq-configuration.xml (100%) rename {activemq6-rest => activemq-rest}/src/test/resources/hornetq-jms.xml (100%) rename {activemq6-rest => activemq-rest}/src/test/resources/hornetq-rest.xml (100%) rename {activemq6-rest => activemq-rest}/src/test/resources/hornetq-users.xml (100%) rename {activemq6-selector => activemq-selector}/pom.xml (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/LRUCache.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/SelectorParser.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/ArithmeticExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/BinaryExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/BooleanExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/ComparisonExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/ConstantExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/Expression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/FilterException.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/Filterable.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/LogicExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/PropertyExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/UnaryExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/XPathExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/XQueryExpression.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/XalanXPathEvaluator.java (100%) rename {activemq6-selector/src/main/java/org/apache/activemq6 => activemq-selector/src/main/java/org/apache/activemq}/selector/filter/package.html (100%) rename {activemq6-selector => activemq-selector}/src/main/javacc/HyphenatedParser.jj (100%) rename {activemq6-selector => activemq-selector}/src/main/javacc/StrictParser.jj (100%) rename {activemq6-selector/src/test/java/org/apache/activemq6 => activemq-selector/src/test/java/org/apache/activemq}/selector/SelectorParserTest.java (100%) rename {activemq6-selector/src/test/java/org/apache/activemq6 => activemq-selector/src/test/java/org/apache/activemq}/selector/SelectorTest.java (100%) rename {activemq6-server => activemq-server}/pom.xml (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/api/core/management/MessageCounterInfo.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/BackupStrategy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/BridgeConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ClusterConnectionConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/Configuration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ConfigurationUtils.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ConnectorServiceConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/CoreQueueConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/DivertConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/HAPolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ScaleDownConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ha/ColocatedPolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ha/LiveOnlyPolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ha/ReplicaPolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ha/ReplicatedPolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ha/SharedStoreMasterPolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/ha/SharedStoreSlavePolicyConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/impl/ConfigurationImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/impl/FileConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/config/impl/Validators.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/Deployer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/DeploymentManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/AddressSettingsDeployer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/BasicUserCredentialsDeployer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/FileConfigurationParser.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/FileDeploymentManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/QueueDeployer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/SecurityDeployer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/deployers/impl/XmlDeployer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/filter/Filter.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/filter/impl/FilterImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/AbstractControl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/AcceptorControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/AddressControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/BridgeControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/BroadcastGroupControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/ClusterConnectionControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/DivertControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/HornetQServerControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/MBeanInfoHelper.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/management/impl/QueueControlImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/messagecounter/MessageCounter.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/messagecounter/MessageCounterManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/messagecounter/impl/MessageCounterHelper.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/messagecounter/impl/MessageCounterManagerImpl.java (96%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/PageTransactionInfo.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/PagedMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/PagingManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/PagingStore.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/PagingStoreFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/LivePageCache.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PageCache.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PageCursorProvider.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PagePosition.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PageSubscription.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PageSubscriptionCounter.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PagedReference.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/PagedReferenceImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/impl/LivePageCacheImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/impl/PageCacheImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/impl/PageCursorProviderImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/impl/PagePositionImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/impl/PageSubscriptionCounterImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/cursor/impl/PageSubscriptionImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/Page.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/PageSyncTimer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/PageTransactionInfoImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/PagedMessageImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/PagingManagerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/PagingStoreFactoryNIO.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/paging/impl/PagingStoreImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/GroupingInfo.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/OperationContext.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/QueueBindingInfo.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/StorageManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/config/PersistedAddressSetting.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/config/PersistedRoles.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/PageCountPending.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/AddMessageRecord.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/BatchingIDGenerator.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/DescribeJournal.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/JournalRecordIds.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/JournalStorageManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/LargeServerMessageImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/LargeServerMessageInSync.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/journal/OperationContextImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/persistence/impl/nullpm/NullStorageManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/Address.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/AddressManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/Binding.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/BindingType.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/Bindings.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/BindingsFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/DuplicateIDCache.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/PostOffice.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/QueueBinding.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/QueueInfo.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/AddressImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/BindingsImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/DivertBinding.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/DuplicateIDCacheImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/LocalQueueBinding.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/PostOfficeImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/SimpleAddressManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/postoffice/impl/WildcardAddressManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/ProtocolHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/ServerPacketDecoder.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/ServerSessionPacketHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/CoreProtocolManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/CoreProtocolManagerFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/CoreSessionCallback.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/HornetQPacketHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/BackupRequestMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/BackupResponseMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ClusterConnectMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/QuorumVoteMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationAddMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/protocol/stomp/WebSocketServerHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/registry/JndiBindingRegistry.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/registry/MapBindingRegistry.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/InVMAcceptor.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/InVMAcceptorFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/InVMConnection.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/InVMConnector.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/InVMConnectorFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/InVMRegistry.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/invm/TransportConstants.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/netty/ConnectionCreator.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/netty/HttpAcceptorHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/netty/HttpKeepAliveRunnable.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/netty/NettyAcceptor.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/netty/NettyAcceptorFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/impl/netty/NettyServerConnection.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/server/RemotingService.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/remoting/server/impl/RemotingServiceImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/replication/ReplicatedJournal.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/replication/ReplicatedLargeMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/replication/ReplicationEndpoint.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/replication/ReplicationManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/security/CheckType.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/security/SecurityStore.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/security/impl/SecurityStoreImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ActivateCallback.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ActivationParams.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/Bindable.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/BindingQueryResult.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ConnectorService.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ConnectorServiceFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/Consumer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/Divert.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/HandleStatus.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/HornetQMessageBundle.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/HornetQServer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/HornetQServerLogger.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/HornetQServers.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/JournalType.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/LargeServerMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/LiveNodeLocator.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/MemoryManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/MessageReference.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/NodeManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/Queue.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/QueueFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/RouteContextList.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/RoutingContext.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ScheduledDeliveryHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ServerConsumer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ServerMessage.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ServerSession.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/ServerSessionFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/TransientQueueManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/BackupManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/Bridge.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/BroadcastGroup.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ClusterConfigurationUtil.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ClusterConnection.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ClusterControl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ClusterController.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ClusterManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/HornetQServerSideProtocolManagerFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/MessageFlowRecord.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/RemoteQueueBinding.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/Transformer.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/BackupPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/ColocatedHAManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/ColocatedPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/HAManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/HAPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/LiveOnlyPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/ReplicaPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/ReplicatedPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/ScaleDownPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/SharedStoreMasterPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/SharedStoreSlavePolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/ha/StandaloneHAManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/impl/BridgeImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/impl/BroadcastGroupImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/impl/ClusterConnectionBridge.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/impl/ClusterConnectionImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/impl/Redistributor.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/impl/RemoteQueueBindingImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/BooleanVote.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/Quorum.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/QuorumManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/QuorumVote.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/QuorumVoteHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/QuorumVoteServerConnect.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/SharedNothingBackupQuorum.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/cluster/qourum/Vote.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/embedded/EmbeddedHornetQ.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/GroupingHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/UnproposalListener.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/GroupBinding.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/GroupHandlingAbstract.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/GroupingHandlerConfiguration.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/LocalGroupingHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/Proposal.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/RemoteGroupingHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/group/impl/Response.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/AIOFileLockNodeManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/Activation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/AnyLiveNodeLocatorForReplication.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/AnyLiveNodeLocatorForScaleDown.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/BackupRecoveryJournalLoader.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/BackupTopologyListener.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ColocatedActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ConnectorsService.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/DivertImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/FileLockNodeManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/HornetQServerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/InVMNodeManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/JournalLoader.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/LastValueQueue.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/LiveActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/LiveOnlyActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/MessageReferenceImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/NamedLiveNodeLocatorForReplication.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/NamedLiveNodeLocatorForScaleDown.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/NamedNodeIdNodeLocator.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/PostOfficeJournalLoader.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/QueueFactoryImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/QueueImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/RefsOperation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ReplicationError.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/RoutingContextImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ScaleDownHandler.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ScheduledDeliveryHandlerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ServerConsumerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ServerInfo.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ServerMessageImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ServerSessionImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/ServiceRegistry.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/SharedNothingBackupActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/SharedNothingLiveActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/SharedStoreBackupActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/SharedStoreLiveActivation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/impl/TransientQueueManagerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/management/ManagementService.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/server/management/impl/ManagementServiceImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/HierarchicalRepository.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/HierarchicalRepositoryChangeListener.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/Mergeable.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/impl/AddressSettings.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/impl/HierarchicalObjectRepository.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/impl/Match.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/settings/impl/SlowConsumerPolicy.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/ResourceManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/Transaction.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/TransactionDetail.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/TransactionFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/TransactionOperation.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/TransactionOperationAbstract.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/TransactionPropertyIndexes.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/impl/BindingsTransactionImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/impl/CoreTransactionDetail.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/impl/ResourceManagerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/core/transaction/impl/TransactionImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/naming/BindingRegistry.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/protocol/MessageConverter.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/protocol/ProtocolManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/protocol/ProtocolManagerFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/protocol/SessionCallback.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/remoting/Acceptor.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/remoting/AcceptorFactory.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/remoting/ServerConnectionLifeCycleListener.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/security/HornetQSecurityManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/security/HornetQSecurityManagerImpl.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/security/JAASSecurityManager.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/spi/core/security/package-info.java (100%) rename {activemq6-server/src/main/java/org/apache/activemq6 => activemq-server/src/main/java/org/apache/activemq}/utils/XMLConfigurationUtil.java (100%) rename {activemq6-server/src/main/resources/META-INF/services/org/apache/activemq6 => activemq-server/src/main/resources/META-INF/services/org/apache/activemq}/security/basic-security (100%) rename {activemq6-server => activemq-server}/src/main/resources/schema/hornetq-configuration.xsd (100%) rename {activemq6-server => activemq-server}/src/main/resources/schema/hornetq-users.xsd (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/ConfigurationImplTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/DefaultsFileConfigurationTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/FileConfigurationParserTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/FileConfigurationTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/HAPolicyConfigurationTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/ValidatorsTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/config/impl/WrongRoleFileConfigurationParserTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/filter/impl/FilterTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/list/PriorityLinkedListTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/message/impl/MessagePropertyTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/security/RoleTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/server/group/impl/ClusteredResetMockTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/server/impl/EmbeddedServerTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/server/impl/ScheduledDeliveryHandlerTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/settings/AddressSettingsTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/settings/RepositoryTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/core/version/impl/VersionImplTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/logging/AssertionLoggerHandler.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/ColocatedHornetQServer.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/CountDownSessionFailureListener.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/InVMNodeManagerServer.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/ServiceTestBase.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/SimpleStringTest.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/SingleServerTestBase.java (100%) rename {activemq6-server/src/test/java/org/apache/activemq6 => activemq-server/src/test/java/org/apache/activemq}/tests/util/UnitTestCase.java (100%) rename {activemq6-server => activemq-server}/src/test/resources/ConfigurationTest-defaults.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/ConfigurationTest-full-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/InvalidConfigurationTest0.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/InvalidConfigurationTest1.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/InvalidConfigurationTest2.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/InvalidConfigurationTest3.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/InvalidConfigurationTest4.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/InvalidConfigurationTest5.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/colocated-hapolicy-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/colocated-hapolicy-config2.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/divertRoutingNameNotRequired.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/live-only-hapolicy-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/live-only-hapolicy-config2.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/live-only-hapolicy-config3.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/live-only-hapolicy-config4.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/live-only-hapolicy-config5.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/logging.properties (100%) rename {activemq6-server => activemq-server}/src/test/resources/replica-hapolicy-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/replica-hapolicy-config2.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/replica-hapolicy-config3.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/replicated-hapolicy-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/shared-store-master-hapolicy-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/shared-store-slave-hapolicy-config.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/shared-store-slave-hapolicy-config2.xml (100%) rename {activemq6-server => activemq-server}/src/test/resources/shared-store-slave-hapolicy-config3.xml (100%) rename {activemq6-service-sar => activemq-service-sar}/pom.xml (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQFileConfigurationService.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQFileConfigurationServiceMBean.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQJMSStarterService.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQJMSStarterServiceMBean.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQServiceBundle.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQServiceLogger.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQStarterService.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/HornetQStarterServiceMBean.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/JBossASSecurityManagerService.java (100%) rename {activemq6-service-sar/src/main/java/org/apache/activemq6 => activemq-service-sar/src/main/java/org/apache/activemq}/service/JBossASSecurityManagerServiceMBean.java (100%) rename {activemq6-tools => activemq-tools}/pom.xml (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/DataTool.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/HornetQToolsLogger.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/Main.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/PrintData.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/PrintPages.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/TransferQueue.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/XmlDataConstants.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/XmlDataExporter.java (100%) rename {activemq6-tools/src/main/java/org/apache/activemq6 => activemq-tools/src/main/java/org/apache/activemq}/tools/XmlDataImporter.java (100%) rename distribution/{activemq6 => activemq}/pom.xml (100%) rename distribution/{activemq6 => activemq}/src/main/assembly/dep.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/hornetq (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/hornetq-service (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/hornetq.cmd (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/run.bat (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/run.sh (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/stop.bat (100%) rename distribution/{activemq6 => activemq}/src/main/resources/bin/stop.sh (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/clustered/bootstrap.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/clustered/hornetq-configuration.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/clustered/hornetq-jms.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/clustered/hornetq-users.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/clustered/jndi.properties (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/logging.properties (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/non-clustered/bootstrap.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/non-clustered/hornetq-configuration.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/non-clustered/hornetq-jms.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/non-clustered/hornetq-users.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/non-clustered/jndi.properties (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/replicated/bootstrap.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/replicated/hornetq-configuration.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/replicated/hornetq-jms.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/replicated/hornetq-users.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/replicated/jndi.properties (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/shared-store/bootstrap.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/shared-store/hornetq-configuration.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/shared-store/hornetq-jms.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/shared-store/hornetq-users.xml (100%) rename distribution/{activemq6 => activemq}/src/main/resources/config/shared-store/jndi.properties (100%) rename distribution/{activemq6 => activemq}/src/main/resources/licenses/LGPL.txt (100%) rename distribution/{activemq6 => activemq}/src/main/resources/licenses/LICENSE.txt (100%) rename distribution/{activemq6 => activemq}/src/main/resources/licenses/LICENSE_twitter4j.txt (100%) rename distribution/{activemq6 => activemq}/src/main/resources/licenses/base64.txt (100%) rename distribution/{activemq6 => activemq}/src/main/resources/licenses/json.txt (100%) rename examples/core/embedded-remote/src/main/java/org/apache/{activemq6 => activemq}/core/example/EmbeddedRemoteExample.java (100%) rename examples/core/embedded-remote/src/main/java/org/apache/{activemq6 => activemq}/core/example/EmbeddedServer.java (100%) rename examples/core/embedded/src/main/java/org/apache/{activemq6 => activemq}/core/example/EmbeddedExample.java (100%) rename examples/core/perf/src/main/java/org/apache/{activemq6 => activemq}/core/example/PerfBase.java (100%) rename examples/core/perf/src/main/java/org/apache/{activemq6 => activemq}/core/example/PerfListener.java (100%) rename examples/core/perf/src/main/java/org/apache/{activemq6 => activemq}/core/example/PerfParams.java (100%) rename examples/core/perf/src/main/java/org/apache/{activemq6 => activemq}/core/example/PerfSender.java (100%) rename examples/core/twitter-connector/src/main/java/org/apache/{activemq6 => activemq}/core/example/TwitterConnectorExample.java (100%) rename examples/core/vertx-connector/src/main/java/org/apache/{activemq6 => activemq}/core/example/ExampleVerticle.java (100%) rename examples/core/vertx-connector/src/main/java/org/apache/{activemq6 => activemq}/core/example/VertxConnectorExample.java (100%) rename examples/javaee/ejb-jms-transaction/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/EJBClientExample.java (100%) rename examples/javaee/ejb-jms-transaction/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/SendMessageBean.java (100%) rename examples/javaee/ejb-jms-transaction/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/SendMessageService.java (100%) rename examples/javaee/ejb-jms-transaction/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/MDBEJBTXRequiredRunnerTest.java (100%) rename examples/javaee/jca-config/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDBRemoteClientExample.java (100%) rename examples/javaee/jca-config/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDBQueueA.java (100%) rename examples/javaee/jca-config/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server2/MDBQueueB.java (100%) rename examples/javaee/jca-config/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server2/StatelessSender.java (100%) rename examples/javaee/jca-config/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server2/StatelessSenderService.java (100%) rename examples/javaee/jca-config/src/test/java/org/apache/{activemq6 => activemq}/javaee/example/server/ExampleRunner2Test.java (100%) rename examples/javaee/jca-remote/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDBRemoteServerClientExample.java (100%) rename examples/javaee/jca-remote/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDBQueue.java (100%) rename examples/javaee/jca-remote/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/JCARemoteRunnerTest.java (100%) rename examples/javaee/jms-bridge/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/JMSBridgeExample.java (100%) rename examples/javaee/jms-bridge/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/JMSBridgeRunnerTest.java (100%) rename examples/javaee/jms-context-injection/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/JmsContextInjectionClientExample.java (100%) rename examples/javaee/jms-context-injection/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/JmsContextInjectionExample.java (100%) rename examples/javaee/jms-context-injection/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/JmsContextInjectionRunnerTest.java (100%) rename examples/javaee/mdb-bmt/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDB_BMTClientExample.java (100%) rename examples/javaee/mdb-bmt/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDB_BMTExample.java (100%) rename examples/javaee/mdb-bmt/src/test/java/org/apache/{activemq6 => activemq}/javaee/example/server/ExampleRunnerTest.java (100%) rename examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java (100%) rename examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java (100%) rename examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/{activemq6 => activemq}/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java (100%) rename examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java (100%) rename examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java (100%) rename examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/{activemq6 => activemq}/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java (100%) rename examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDB_CMT_TxLocalClientExample.java (100%) rename examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDB_CMT_TxLocalExample.java (100%) rename examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/{activemq6 => activemq}/javaee/example/MDBCMTSetLocalTXRunnerTest.java (100%) rename examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDB_CMT_TxNotSupportedClientExample.java (100%) rename examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDB_CMT_TxNotSupported.java (100%) rename examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/{activemq6 => activemq}/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java (100%) rename examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDB_CMT_TxRequiredClientExample.java (100%) rename examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDB_CMT_TxRequiredExample.java (100%) rename examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java (100%) rename examples/javaee/mdb-message-selector/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDBMessageSelectorClientExample.java (100%) rename examples/javaee/mdb-message-selector/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDBMessageSelectorExample.java (100%) rename examples/javaee/mdb-message-selector/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java (100%) rename examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDBRemoteFailoverStaticClientExample.java (100%) rename examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDBRemoteFailoverStaticExample.java (100%) rename examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/ServerKiller.java (100%) rename examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/FailoverStaticRunnerTest.java (100%) rename examples/javaee/mdb-remote-failover/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDBRemoteFailoverClientExample.java (100%) rename examples/javaee/mdb-remote-failover/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDBRemoteFailoverExample.java (100%) rename examples/javaee/mdb-remote-failover/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/ServerKiller.java (100%) rename examples/javaee/mdb-remote-failover/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/FailoverRunnerTest.java (100%) rename examples/javaee/mdb-tx-send/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/MDBMessageSendTxClientExample.java (100%) rename examples/javaee/mdb-tx-send/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/MDBMessageSendTxExample.java (100%) rename examples/javaee/mdb-tx-send/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/MDBCMTTxSendRunnerTest.java (100%) rename examples/javaee/xarecovery/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/XARecoveryExampleStepOne.java (100%) rename examples/javaee/xarecovery/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/XARecoveryExampleStepTwo.java (100%) rename examples/javaee/xarecovery/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/XARecoveryExampleBean.java (100%) rename examples/javaee/xarecovery/src/main/java/org/apache/{activemq6 => activemq}/javaee/example/server/XARecoveryExampleService.java (100%) rename examples/javaee/xarecovery/src/test/java/org/apache/{activemq6 => activemq}/javaee/examples/XARecoveryRunnerTest.java (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/common.css (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/config/logging.properties (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/config/server.properties (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/images/hornetQ-banner_final.png (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/pom.xml (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/prettify.css (100%) rename examples/jms/{activemq6-jms-examples-common => activemq-jms-examples-common}/prettify.js (100%) rename examples/jms/{activemq6-jms-examples-common/src/main/java/org/apache/activemq6 => activemq-jms-examples-common/src/main/java/org/apache/activemq}/common/example/DummyXid.java (100%) rename examples/jms/{activemq6-jms-examples-common/src/main/java/org/apache/activemq6 => activemq-jms-examples-common/src/main/java/org/apache/activemq}/common/example/HornetQExample.java (100%) rename examples/jms/{activemq6-ra-rar => activemq-ra-rar}/pom.xml (100%) rename examples/jms/{activemq6-ra-rar => activemq-ra-rar}/src/main/resources/ra.xml (100%) rename examples/jms/aerogear/src/main/java/org/apache/{activemq6 => activemq}/jms/example/AerogearExample.java (100%) rename examples/jms/applet/src/main/java/org/apache/{activemq6 => activemq}/jms/example/AppletExample.java (100%) rename examples/jms/applet/src/main/java/org/apache/{activemq6 => activemq}/jms/example/HttpStaticFileServer.java (100%) rename examples/jms/applet/src/main/java/org/apache/{activemq6 => activemq}/jms/example/HttpStaticFileServerHandler.java (100%) rename examples/jms/applet/src/main/java/org/apache/{activemq6 => activemq}/jms/example/HttpStaticFileServerPipelineFactory.java (100%) rename examples/jms/application-layer-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ApplicationLayerFailoverExample.java (100%) rename examples/jms/bridge/src/main/java/org/apache/{activemq6 => activemq}/jms/example/BridgeExample.java (100%) rename examples/jms/bridge/src/main/java/org/apache/{activemq6 => activemq}/jms/example/HatColourChangeTransformer.java (100%) rename examples/jms/browser/src/main/java/org/apache/{activemq6 => activemq}/jms/example/QueueBrowserExample.java (100%) rename examples/jms/client-kickoff/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClientKickoffExample.java (100%) rename examples/jms/client-side-failoverlistener/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClientSideFailoverListerExample.java (100%) rename examples/jms/client-side-load-balancing/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClientSideLoadBalancingExample.java (100%) rename examples/jms/clustered-durable-subscription/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusteredDurableSubscriptionExample.java (100%) rename examples/jms/clustered-grouping/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusteredGroupingExample.java (100%) rename examples/jms/clustered-jgroups/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusteredJgroupsExample.java (100%) rename examples/jms/clustered-queue/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusteredQueueExample.java (100%) rename examples/jms/clustered-standalone/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusteredStandaloneExample.java (100%) rename examples/jms/clustered-static-discovery/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StaticClusteredQueueExample.java (100%) rename examples/jms/clustered-static-oneway/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusterStaticOnewayExample.java (100%) rename examples/jms/clustered-topic/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ClusteredTopicExample.java (100%) rename examples/jms/colocated-failover-scale-down/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ColocatedFailoverScaleDownExample.java (100%) rename examples/jms/colocated-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ColocatedFailoverExample.java (100%) rename examples/jms/consumer-rate-limit/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ConsumerRateLimitExample.java (100%) rename examples/jms/dead-letter/src/main/java/org/apache/{activemq6 => activemq}/jms/example/DeadLetterExample.java (100%) rename examples/jms/delayed-redelivery/src/main/java/org/apache/{activemq6 => activemq}/jms/example/DelayedRedeliveryExample.java (100%) rename examples/jms/divert/src/main/java/org/apache/{activemq6 => activemq}/jms/example/AddForwardingTimeTransformer.java (100%) rename examples/jms/divert/src/main/java/org/apache/{activemq6 => activemq}/jms/example/DivertExample.java (100%) rename examples/jms/durable-subscription/src/main/java/org/apache/{activemq6 => activemq}/jms/example/DurableSubscriptionExample.java (100%) rename examples/jms/embedded-simple/src/main/java/org/apache/{activemq6 => activemq}/jms/example/EmbeddedExample.java (100%) rename examples/jms/embedded/src/main/java/org/apache/{activemq6 => activemq}/jms/example/EmbeddedExample.java (100%) rename examples/jms/expiry/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ExpiryExample.java (100%) rename examples/jms/ha-policy-autobackup/src/main/java/org/apache/{activemq6 => activemq}/jms/example/HAPolicyAutoBackupExample.java (100%) rename examples/jms/http-transport/src/main/java/org/apache/{activemq6 => activemq}/jms/example/HttpTransportExample.java (100%) rename examples/jms/instantiate-connection-factory/src/main/java/org/apache/{activemq6 => activemq}/jms/example/InstantiateConnectionFactoryExample.java (100%) rename examples/jms/interceptor/src/main/java/org/apache/{activemq6 => activemq}/jms/example/InterceptorExample.java (100%) rename examples/jms/interceptor/src/main/java/org/apache/{activemq6 => activemq}/jms/example/SimpleInterceptor.java (100%) rename examples/jms/jaas/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ExampleCallbackHandler.java (100%) rename examples/jms/jaas/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ExampleConfiguration.java (100%) rename examples/jms/jaas/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ExampleLoginModule.java (100%) rename examples/jms/jaas/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JAASExample.java (100%) rename examples/jms/jms-auto-closeable/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JMSAutoCloseableExample.java (100%) rename examples/jms/jms-bridge/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JMSBridgeExample.java (100%) rename examples/jms/jms-completion-listener/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JMSCompletionListenerExample.java (100%) rename examples/jms/jms-context/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JMSContextExample.java (100%) rename examples/jms/jms-shared-consumer/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JMSSharedConsumerExample.java (100%) rename examples/jms/jmx/src/main/java/org/apache/{activemq6 => activemq}/jms/example/JMXExample.java (100%) rename examples/jms/large-message/src/main/java/org/apache/{activemq6 => activemq}/jms/example/LargeMessageExample.java (100%) rename examples/jms/last-value-queue/src/main/java/org/apache/{activemq6 => activemq}/jms/example/LastValueQueueExample.java (100%) rename examples/jms/management-notifications/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ManagementNotificationExample.java (100%) rename examples/jms/management/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ManagementExample.java (100%) rename examples/jms/message-counters/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MessageCounterExample.java (100%) rename examples/jms/message-group/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MessageGroupExample.java (100%) rename examples/jms/message-group2/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MessageGroup2Example.java (100%) rename examples/jms/message-priority/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MessagePriorityExample.java (100%) rename examples/jms/multiple-failover-failback/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MultipleFailoverFailbackExample.java (100%) rename examples/jms/multiple-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MultipleFailoverExample.java (100%) rename examples/jms/no-consumer-buffering/src/main/java/org/apache/{activemq6 => activemq}/jms/example/NoConsumerBufferingExample.java (100%) rename examples/jms/non-transaction-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/NonTransactionFailoverExample.java (100%) rename examples/jms/openwire/src/main/java/org/apache/{activemq6 => activemq}/jms/example/OpenWireExample.java (100%) rename examples/jms/paging/src/main/java/org/apache/{activemq6 => activemq}/jms/example/PagingExample.java (100%) rename examples/jms/perf/src/main/java/org/apache/{activemq6 => activemq}/jms/example/PerfBase.java (100%) rename examples/jms/perf/src/main/java/org/apache/{activemq6 => activemq}/jms/example/PerfListener.java (100%) rename examples/jms/perf/src/main/java/org/apache/{activemq6 => activemq}/jms/example/PerfParams.java (100%) rename examples/jms/perf/src/main/java/org/apache/{activemq6 => activemq}/jms/example/PerfSender.java (100%) rename examples/jms/pre-acknowledge/src/main/java/org/apache/{activemq6 => activemq}/jms/example/PreacknowledgeExample.java (100%) rename examples/jms/producer-rate-limit/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ProducerRateLimitExample.java (100%) rename examples/jms/proton-j/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ProtonJExample.java (100%) rename examples/jms/queue-message-redistribution/src/main/java/org/apache/{activemq6 => activemq}/jms/example/QueueMessageRedistributionExample.java (100%) rename examples/jms/queue-requestor/src/main/java/org/apache/{activemq6 => activemq}/jms/example/QueueRequestorExample.java (100%) rename examples/jms/queue-requestor/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TextReverserService.java (100%) rename examples/jms/queue-selector/src/main/java/org/apache/{activemq6 => activemq}/jms/example/QueueSelectorExample.java (100%) rename examples/jms/queue/src/main/java/org/apache/{activemq6 => activemq}/jms/example/QueueExample.java (100%) rename examples/jms/reattach-node/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ReattachExample.java (100%) rename examples/jms/replicated-failback-static/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ReplicatedFailbackStaticExample.java (100%) rename examples/jms/replicated-failback/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ReplicatedFailbackExample.java (100%) rename examples/jms/replicated-multiple-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ReplicatedMultipleFailoverExample.java (100%) rename examples/jms/replicated-transaction-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ReplicatedTransactionFailoverExample.java (100%) rename examples/jms/request-reply/src/main/java/org/apache/{activemq6 => activemq}/jms/example/RequestReplyExample.java (100%) rename examples/jms/scale-down/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ScaleDownExample.java (100%) rename examples/jms/scheduled-message/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ScheduledMessageExample.java (100%) rename examples/jms/security/src/main/java/org/apache/{activemq6 => activemq}/jms/example/SecurityExample.java (100%) rename examples/jms/send-acknowledgements/src/main/java/org/apache/{activemq6 => activemq}/jms/example/SendAcknowledgementsExample.java (100%) rename examples/jms/spring-integration/src/main/java/org/apache/{activemq6 => activemq}/jms/example/ExampleListener.java (100%) rename examples/jms/spring-integration/src/main/java/org/apache/{activemq6 => activemq}/jms/example/MessageSender.java (100%) rename examples/jms/spring-integration/src/main/java/org/apache/{activemq6 => activemq}/jms/example/SpringExample.java (100%) rename examples/jms/ssl-enabled/src/main/java/org/apache/{activemq6 => activemq}/jms/example/SSLExample.java (100%) rename examples/jms/static-selector-jms/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StaticSelectorJMSExample.java (100%) rename examples/jms/static-selector/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StaticSelectorExample.java (100%) rename examples/jms/stomp-websockets/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StompWebSocketExample.java (100%) rename examples/jms/stomp/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StompExample.java (100%) rename examples/jms/stomp1.1/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StompExample.java (100%) rename examples/jms/stomp1.2/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StompExample.java (100%) rename examples/jms/stop-server-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/StopServerFailoverExample.java (100%) rename examples/jms/symmetric-cluster/src/main/java/org/apache/{activemq6 => activemq}/jms/example/SymmetricClusterExample.java (100%) rename examples/jms/temp-queue/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TemporaryQueueExample.java (100%) rename examples/jms/topic-hierarchies/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TopicHierarchyExample.java (100%) rename examples/jms/topic-selector-example1/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TopicSelectorExample1.java (100%) rename examples/jms/topic-selector-example2/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TopicSelectorExample2.java (100%) rename examples/jms/topic/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TopicExample.java (100%) rename examples/jms/transaction-failover/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TransactionFailoverExample.java (100%) rename examples/jms/transactional/src/main/java/org/apache/{activemq6 => activemq}/jms/example/TransactionalExample.java (100%) rename examples/jms/xa-heuristic/src/main/java/org/apache/{activemq6 => activemq}/jms/example/XAHeuristicExample.java (100%) rename examples/jms/xa-receive/src/main/java/org/apache/{activemq6 => activemq}/jms/example/XAReceiveExample.java (100%) rename examples/jms/xa-send/src/main/java/org/apache/{activemq6 => activemq}/jms/example/XASendExample.java (100%) rename examples/jms/xa-with-jta/src/main/java/org/apache/{activemq6 => activemq}/jms/example/XAwithJTAExample.java (100%) rename examples/soak/normal/src/main/java/org/apache/{activemq6 => activemq}/jms/soak/example/SoakBase.java (100%) rename examples/soak/normal/src/main/java/org/apache/{activemq6 => activemq}/jms/soak/example/SoakParams.java (100%) rename examples/soak/normal/src/main/java/org/apache/{activemq6 => activemq}/jms/soak/example/SoakReceiver.java (100%) rename examples/soak/normal/src/main/java/org/apache/{activemq6 => activemq}/jms/soak/example/SoakSender.java (100%) rename integration/{activemq6-aerogear-integration => activemq-aerogear-integration}/pom.xml (100%) rename integration/{activemq6-aerogear-integration/src/main/java/org/apache/activemq6 => activemq-aerogear-integration/src/main/java/org/apache/activemq}/integration/aerogear/AeroGearConnectorService.java (100%) rename integration/{activemq6-aerogear-integration/src/main/java/org/apache/activemq6 => activemq-aerogear-integration/src/main/java/org/apache/activemq}/integration/aerogear/AeroGearConnectorServiceFactory.java (100%) rename integration/{activemq6-aerogear-integration/src/main/java/org/apache/activemq6 => activemq-aerogear-integration/src/main/java/org/apache/activemq}/integration/aerogear/AeroGearConstants.java (100%) rename integration/{activemq6-aerogear-integration/src/main/java/org/apache/activemq6 => activemq-aerogear-integration/src/main/java/org/apache/activemq}/integration/aerogear/HornetQAeroGearBundle.java (100%) rename integration/{activemq6-aerogear-integration/src/main/java/org/apache/activemq6 => activemq-aerogear-integration/src/main/java/org/apache/activemq}/integration/aerogear/HornetQAeroGearLogger.java (100%) rename integration/{activemq6-jboss-as-integration => activemq-jboss-as-integration}/pom.xml (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/HornetQJBossBundle.java (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/HornetQJBossLogger.java (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/security/AS4SecurityActions.java (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/security/JBossASSecurityManager.java (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/security/SecurityActions.java (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/tm/JBoss4TransactionManagerLocator.java (100%) rename integration/{activemq6-jboss-as-integration/src/main/java/org/apache/activemq6 => activemq-jboss-as-integration/src/main/java/org/apache/activemq}/integration/jboss/tm/JBoss5TransactionManagerLocator.java (100%) rename integration/{activemq6-spring-integration => activemq-spring-integration}/pom.xml (100%) rename integration/{activemq6-spring-integration/src/main/java/org/apache/activemq6 => activemq-spring-integration/src/main/java/org/apache/activemq}/integration/spring/SpringBindingRegistry.java (100%) rename integration/{activemq6-spring-integration/src/main/java/org/apache/activemq6 => activemq-spring-integration/src/main/java/org/apache/activemq}/integration/spring/SpringJmsBootstrap.java (100%) rename integration/{activemq6-spring-integration/src/main/java/org/apache/activemq6 => activemq-spring-integration/src/main/java/org/apache/activemq}/spring/HornetQSpringBundle.java (100%) rename integration/{activemq6-spring-integration/src/main/java/org/apache/activemq6 => activemq-spring-integration/src/main/java/org/apache/activemq}/spring/HornetQSpringLogger.java (100%) rename integration/{activemq6-twitter-integration => activemq-twitter-integration}/pom.xml (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/integration/twitter/TwitterConstants.java (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/integration/twitter/TwitterIncomingConnectorServiceFactory.java (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/integration/twitter/TwitterOutgoingConnectorServiceFactory.java (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/integration/twitter/impl/IncomingTweetsHandler.java (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/integration/twitter/impl/OutgoingTweetsHandler.java (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/twitter/HornetQTwitterBundle.java (100%) rename integration/{activemq6-twitter-integration/src/main/java/org/apache/activemq6 => activemq-twitter-integration/src/main/java/org/apache/activemq}/twitter/HornetQTwitterLogger.java (100%) rename integration/{activemq6-vertx-integration => activemq-vertx-integration}/pom.xml (100%) rename integration/{activemq6-vertx-integration/src/main/java/org/apache/activemq6 => activemq-vertx-integration/src/main/java/org/apache/activemq}/integration/vertx/HornetQVertxLogger.java (100%) rename integration/{activemq6-vertx-integration/src/main/java/org/apache/activemq6 => activemq-vertx-integration/src/main/java/org/apache/activemq}/integration/vertx/IncomingVertxEventHandler.java (100%) rename integration/{activemq6-vertx-integration/src/main/java/org/apache/activemq6 => activemq-vertx-integration/src/main/java/org/apache/activemq}/integration/vertx/OutgoingVertxEventHandler.java (100%) rename integration/{activemq6-vertx-integration/src/main/java/org/apache/activemq6 => activemq-vertx-integration/src/main/java/org/apache/activemq}/integration/vertx/VertxConstants.java (100%) rename integration/{activemq6-vertx-integration/src/main/java/org/apache/activemq6 => activemq-vertx-integration/src/main/java/org/apache/activemq}/integration/vertx/VertxIncomingConnectorServiceFactory.java (100%) rename integration/{activemq6-vertx-integration/src/main/java/org/apache/activemq6 => activemq-vertx-integration/src/main/java/org/apache/activemq}/integration/vertx/VertxOutgoingConnectorServiceFactory.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/BMFailoverTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/BridgeServerLocatorConfigurationTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/ClusteredGroupingTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/GroupingTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/HornetQMessageHandlerTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/JMSBridgeReconnectionTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/LatencyTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/MessageCopyTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/OrphanedConsumerTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/PagingLeakTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/ScaleDownFailoverTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/ScaleDownFailureTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/ScaleDownGroupedFailoverTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/ScaleDownGroupedFailureTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/StartStopDeadlockTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/byteman/tests/StompInternalStateTest.java (100%) rename tests/byteman-tests/src/test/java/org/apache/{activemq6 => activemq}/core/settings/impl/HierarchicalObjectRepositoryTest.java (100%) rename tests/concurrent-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/concurrent/server/impl/QueueTest.java (100%) rename tests/concurrent-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/concurrent/stomp/ConcurrentStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/DuplicateDetectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/IntegrationTestLogger.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/InterceptorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/SimpleNotificationService.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/String64KLimitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/aerogear/AeroGearBasicServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/AckBatchSizeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/AcknowledgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/AddressSettingsTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/AutoCloseCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/AutogroupIdTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/BlockingSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/CommitRollbackTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConcurrentCreateDeleteProduceTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConsumerCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConsumerFilterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConsumerRoundRobinTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConsumerStuckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ConsumerWindowSizeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/CoreClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/CreateQueueIdempotentTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/DeadLetterAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/DeliveryOrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/DurableQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ExpireTestOnRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ExpiryAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ExpiryLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/FailureDeadlockTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/HangConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/HeuristicXATest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/HornetQCrashTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/InVMNonPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/InVMPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/IncompatibleVersionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/InterruptedLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/JMSMessageCounterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/JMSPagingFileDeleteTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/JmsNettyNioStressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/JournalCrashTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/LargeMessageCompressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/LargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/LibaioDependencyCheckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageConcurrencyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageConsumerRollbackTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageCounterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageDurabilityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageExpirationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageGroupingConnectionFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageGroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageHandlerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessagePriorityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MessageRateTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/MultipleThreadFilterOneTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NIOvsOIOTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NettyConnectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NettyConsumerWindowSizeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NettyNonPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NettyPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NettyProducerFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/NewDeadLetterAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/OrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/PagingOrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/PagingSyncTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/PagingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ProducerCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ProducerFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/QueueBrowserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ReceiveImmediateTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/RedeliveryConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/RequestorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/RoutingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SelfExpandingBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ServerLocatorConnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/ServerLocatorSerializationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionCloseOnGCTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionCreateAndDeleteQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionCreateConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionCreateProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionSendAcknowledgementHandlerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionStopStartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SessionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SimpleSendMultipleQueuesTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/SlowConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/TemporaryQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/TransactionDurabilityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/TransactionalSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/TransientQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/client/WildCardRoutingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/ClientCrashTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/ClientExitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/ClientTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/CrashClient.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/CrashClient2.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/DummyInterceptor.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/DummyInterceptorB.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/clientcrash/GracefulClient.java (97%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/ClusterControllerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/NodeManagerAction.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/NodeManagerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/RealNodeManagerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/BridgeFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/BridgeReconnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/BridgeStartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/BridgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/BridgeTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/bridge/SimpleTransformer.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/ClusterTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/ClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/ClusteredGroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/MessageRedistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettySymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/OneWayChainClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/SymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/AsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/BackupAuthenticationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/BackupSyncJournalTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/BackupSyncPagingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/DelayInterceptor.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/DelayInterceptor2.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/DelayInterceptor3.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/FailBackAutoTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/FailBackManualTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/FailoverListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/FailoverOnFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/FailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/FailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/GroupingFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/LargeMessageFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/LiveToLiveFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/PagingFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/QuorumFailOverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedDistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/SecurityFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/SharedStoreDistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/OrderReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/RandomReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/reattach/ReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/restart/ClusterRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/HAClientTopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/IsolatedTopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/NettyHAClientTopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/NonHATopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/topology/TopologyClusterTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/util/BackupSyncDelay.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/util/MultiServerTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/util/RemoteServerConfiguration.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/util/SameProcessHornetQServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/cluster/util/TestableServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/core/deployers/impl/QueueDeployerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/discovery/DiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/divert/DivertTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/divert/PersistentDivertTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/embedded/ValidateAIOTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/http/CoreClientOverHttpTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/FloodServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/HornetQConnectionFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/JMSSecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/JmsProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/ManualReconnectionToSingleServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/bridge/BridgeTestBase.java (97%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/bridge/ClusteredBridgeTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/bridge/JMSBridgeClusteredTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java (96%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/bridge/JMSBridgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/AutoGroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/ConnectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/CreateQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/ExpiryMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/GroupIDTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/GroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/MessageProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/MessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/NewQueueRequestorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/NoLocalSubscriberTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/PreACKJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/ReSendMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/ReceiveNoWaitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/RemoteConnectionStressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/SessionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/StoreConfigTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/TextMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/client/TopicCleanupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/BindingsClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/JMSFailoverListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/JMSFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/JMSReconnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/TemporaryQueueClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/cluster/TopicClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/CloseConnectionOnGCTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/CloseDestroyedConnectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/ConcurrentSessionCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/ConnectionFactorySerializationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/ExceptionListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/connection/InvalidConnectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/consumer/ConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/divert/DivertAndACKClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/jms2client/BodyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/jms2client/InvalidDestinationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/jms2client/JmsContextTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/jms2client/NonExistentQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/jms2client/SharedConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/largemessage/JMSLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/JMSServerDeployerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/JMSServerStartStopTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/config/JMSConfigurationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/config/JMSServerConfigParserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/ConnectionFactoryControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSMessagingProxy.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSQueueControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSServerControl2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSServerControlRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSServerControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/JMSUtil.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/NullInitialContext.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/TopicControlClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/TopicControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/jms/server/management/TopicControlUsingJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/AIOImportExportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/AIOJournalCompactTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/AIOJournalImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/AIOSequentialFileFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/JournalPerfTuneTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIOBufferedJournalCompactTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIOImportExportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIOJournalCompactTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIOJournalImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIONoBufferJournalImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/NIOSequentialFileFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/OldFormatTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/journal/ValidateTransactionHealthTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/largemessage/LargeMessageTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/largemessage/ServerLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/AcceptorControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/AcceptorControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/AddressControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/AddressControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/BridgeControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/BridgeControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/BroadcastGroupControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/BroadcastGroupControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ClusterConnectionControl2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ClusterConnectionControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ClusterConnectionControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/CoreMessagingProxy.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/DivertControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/DivertControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/HornetQServerControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/HornetQServerControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/JMXDomainTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementActivationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementControlHelper.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementHelperTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementServiceImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementWithPagingServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/ManagementWithStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/NotificationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/QueueControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/QueueControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/SecurityManagementTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/management/SecurityNotificationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/BasicOpenWireTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/BasicSecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/OpenWireTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/OpenWireUtilTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/SimpleOpenWireTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer10Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer11Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer12Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer13Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer1Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer3Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer4Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer5Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer6Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer7Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer8Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSConsumer9Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSIndividualAckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSQueueRedeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSUsecase1Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JMSUsecaseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsAutoAckListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsAutoAckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsClientAckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsConnectionStartStopTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsQueueBrowserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsResourceProvider.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicRedeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicSelectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicTransactionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/JmsTransactionTestSupport.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/ProducerFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/RedeliveryPolicyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/TimeStampTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/amq/TransactionContextTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/interop/GeneralInteropTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/openwire/util/Wait.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/MultipleProducersPagingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/NettyPagingSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PageCountSyncOnNonTXTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PageCountSyncServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PagingCounterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PagingReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PagingSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PagingWithFailoverAndCountersTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PagingWithFailoverBackup.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/PagingWithFailoverServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/paging/SpawnedServerSupport.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/DeleteMessagesOnStartupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/DeleteQueueRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/DuplicateCacheTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/ExportFormatTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/JMSDynamicConfigTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/JMSStorageManagerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/RestartSMTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/RolesConfigurationStorageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/StorageManagerTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/persistence/XmlImportExportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/proton/ProtonTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/DummyTransaction.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/DummyTransactionManager.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQActivationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQClusteredTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQMessageHandlerSecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQMessageHandlerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQMessageHandlerXATest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQRAClusteredTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/HornetQRATestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/JMSContextTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/OutgoingConnectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ra/ResourceAdapterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/BatchDelayTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/DestroyConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/DirectDeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/NettyNetworkAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/NettySynchronousCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/NetworkAddressTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/PingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/ReconnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/remoting/SynchronousCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/replication/ReplicationOrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/replication/ReplicationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/scheduling/DelayedMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/scheduling/MultipliedDelayedMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/scheduling/ScheduledMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/security/NettySecurityClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/security/SecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/security/SimpleClient.java (97%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/AIOFileLockTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/AddressFullLoggingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/ExpiryRunnerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/FakeStorageManager.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/FileLockTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/LVQRecoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/LVQTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/NIOFileLockTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/PredefinedQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/ScaleDown3NodeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/ScaleDownTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/server/SuppliedThreadPoolTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/spring/ExampleListener.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/spring/MessageSender.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/spring/SpringIntegrationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ssl/CoreClientOverOneWaySSLTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/ExtraStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/StompConnectionCleanupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/StompOverHttpTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/StompOverWebsocketTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/StompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/StompTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/StompWebSocketTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/AbstractClientStompFrame.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/AbstractStompClientConnection.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/ClientStompFrame.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/ClientStompFrameV10.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/ClientStompFrameV11.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/ClientStompFrameV12.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompClientConnection.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompClientConnectionFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompClientConnectionV10.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompClientConnectionV11.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompClientConnectionV12.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompFrameFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompFrameFactoryFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompFrameFactoryV10.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompFrameFactoryV11.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/util/StompFrameFactoryV12.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/v11/ExtraStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/v11/StompV11Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/v11/StompV11TestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/stomp/v12/StompV12Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/tools/TransferMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/transports/netty/HornetQFrameDecoder2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/twitter/TwitterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/vertx/HornetQVertxUnitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/xa/BasicXaRecoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/xa/BasicXaTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/integration/xa/XaTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/largemessage/LargeMessageTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/JMSClusteredTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/JMSTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/JournalExample.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/NonSerializableFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/ReplicatedBackupUtils.java (100%) rename tests/integration-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/TransportConfigurationUtils.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/AcknowledgementTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/AutoAckMesageListenerTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/BrowserTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/CTSMiscellaneousTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/ConnectionClosedTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/ConnectionFactoryTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/ConnectionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/ConsumerClosedTest.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/DeliveryOrderTest.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/DurableSubscriptionTest.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/HornetQServerTestCase.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/JMSTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/JMSTestCase.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/JmsTestLogger.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/MessageConsumerTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/MessageProducerTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/MessageWithReadResolveTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/MiscellaneousTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/NonDurableSubscriberTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/PersistenceTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/QueueReceiverTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/QueueTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/ReferenceableTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/SecurityTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/SessionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/TemporaryDestinationTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/TopicTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/TransactedSessionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/XARecoveryTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/XATest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/BodyIsAssignableFromTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/BytesMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/ExpiredMessageTest.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSCorrelationIDHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSDeliveryModeHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSDestinationHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSExpirationHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSMessageIDHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSPriorityHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSReplyToHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSTimestampHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSTypeHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/JMSXDeliveryCountTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MapMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MessageBodyTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MessageBodyTestCase.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MessageHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MessageHeaderTestBase.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MessagePropertyConversionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/MessageTestBase.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/ObjectMessageDeliveryTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/ObjectMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SimpleJMSBytesMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SimpleJMSMapMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SimpleJMSMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SimpleJMSObjectMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SimpleJMSStreamMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SimpleJMSTextMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/SomeObject.java (95%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/StreamMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/TextMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignBytesMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignMapMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignObjectMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignStreamMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignTestObject.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/message/foreign/ForeignTextMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/selector/SelectorTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/ConcurrentCloseStressTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/CorruptMessageStressTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/JMSStressTestBase.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/ManyConnectionsStressTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/OpenCloseStressTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/QueueStressTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/Receiver.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/RecoveringReceiver.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/RelayStressTest.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/Runner.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/Sender.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/SeveralClientsStressTest.java (96%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/TopicStressTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/Transactional2PCReceiver.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/Transactional2PCSender.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/TransactionalReceiver.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/stress/TransactionalSender.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/ServerManagement.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/WrappedJNDIServer.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/Constants.java (97%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/InVMContext.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/InVMInitialContextFactory.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/InVMNameParser.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/LocalTestServer.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/NonSerializableFactory.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/tools/container/Server.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/util/JNDIUtilTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/tests/util/ProxyAssertSupport.java (96%) rename tests/joram-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/AbstractAdmin.java (100%) rename tests/joram-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/GenericAdmin.java (100%) rename tests/joram-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/HornetQAdmin.java (100%) rename tests/joram-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/JoramAggregationTest.java (100%) rename tests/joram-tests/src/test/java/org/apache/{activemq6 => activemq}/jms/SpawnedJMSServer.java (100%) rename tests/performance-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/performance/journal/FakeJournalImplTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/performance/journal/JournalImplTestUnit.java (100%) rename tests/performance-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/performance/journal/RealJournalImplAIOTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/performance/journal/RealJournalImplNIOTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/performance/paging/MeasurePagingMultiThreadTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/client/ClientAbstract.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/client/ClientNonDivertedSoakTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/client/ClientSoakTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/client/Receiver.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/client/Sender.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/client/SimpleSendReceiveSoakTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/soak/failover/RandomFailoverSoakTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/chunk/LargeMessageStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/client/SendStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/failover/MultiThreadRandomReattachStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/failover/RandomReattachStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/AIOMultiThreadCompactorStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/AddAndRemoveStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/AllPossibilitiesCompactStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/CompactingStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/JournalCleanupCompactStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/JournalRestartStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/LargeJournalStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/MixupCompactorTestBase.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/MultiThreadConsumerStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/NIOMultiThreadCompactorStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/journal/XmlImportExportStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/paging/MultipleConsumersPageStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/paging/PageCursorStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/paging/PageStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/remote/PingStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/stress/stomp/StompStressTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/core/journal/impl/AIOJournalImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/core/journal/impl/FakeJournalImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/core/journal/impl/JournalImplTestUnit.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/core/journal/impl/NIOJournalImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/core/server/impl/QueueImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/util/ReusableLatchTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/util/TokenBucketLimiterImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/util/UTF8Test.java (100%) rename tests/timing-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/timing/util/UUIDTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/UnitTestLogger.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/asyncio/AIOTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/asyncio/AsynchronousFileTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/asyncio/LibaioDependencyCheckTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/client/impl/LargeMessageBufferTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/config/impl/ConfigurationValidationTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/config/impl/ConnectorsServiceTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/config/impl/TransportConfigurationTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/config/impl/fakes/FakeConnectorService.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/deployers/impl/FakeDeploymentManager.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/deployers/impl/SecurityDeployerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/deployers/impl/XMLDeployerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/AlignedJournalImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/CleanBufferTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/FakeJournalImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/FileFactoryTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/JournalAsyncTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/JournalImplTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/JournalImplTestUnit.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/ReclaimerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/TimedBufferTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/journal/impl/fakes/SimpleEncoding.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/message/impl/MessageImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/paging/impl/PagePositionTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/paging/impl/PageTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/paging/impl/PagingManagerImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/paging/impl/PagingStoreImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/persistence/impl/OperationContextUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/postoffice/impl/AddressImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/postoffice/impl/BindingsImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/postoffice/impl/FakeQueue.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/postoffice/impl/QueueComparatorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/HornetQBufferTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/security/impl/JAASSecurityManagerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/FileLockTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/QueueImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/fakes/FakeConsumer.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/fakes/FakeFilter.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/fakes/FakeJournalLoader.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/fakes/FakePostOffice.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/core/server/impl/fakes/FakeQueueFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/HornetQDestinationTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/client/HornetQMapMessageTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/client/HornetQStreamMessageTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/client/JMSExceptionHelperTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/client/SelectorTranslatorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/misc/ManifestTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/ra/BootstrapContext.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/ra/ConnectionFactoryPropertiesTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/ra/HornetQResourceAdapterConfigTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/ra/MessageEndpointFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/ra/ResourceAdapterTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/FakePagingManager.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/HornetQBufferInputStreamTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/InVMContext.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/InVMNameParser.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/InVMNamingContext.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/LinkedListTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/MemorySizeTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/NonSerializableFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/ReusableLatchTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/SoftValueMapTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/UTF8Test.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/UUIDGeneratorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/UUIDTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/util/VersionLoaderTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/unit/xa/XAResourceWrapperTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/CreateMessage.java (100%) rename tests/unit-tests/src/test/java/org/apache/{activemq6 => activemq}/tests/util/SpawnedVMSupport.java (100%) diff --git a/activemq6-bootstrap/pom.xml b/activemq-bootstrap/pom.xml similarity index 100% rename from activemq6-bootstrap/pom.xml rename to activemq-bootstrap/pom.xml diff --git a/activemq6-bootstrap/src/main/filtered-resources/org/apache/activemq6/cli/banner.txt b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt similarity index 100% rename from activemq6-bootstrap/src/main/filtered-resources/org/apache/activemq6/cli/banner.txt rename to activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/ConfigurationException.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/ConfigurationException.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/HornetQ.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/HornetQ.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Action.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Action.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/ActionContext.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/ActionContext.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/HelpAction.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/HelpAction.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Run.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Stop.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/cli/commands/Stop.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactory.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/BrokerFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactory.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/CoreFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileCoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileCoreFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileJmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/FileJmsFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactory.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/JmsFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/SecurityManagerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/SecurityManagerFactory.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/XmlBrokerFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/factory/XmlBrokerFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapBundle.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapBundle.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java diff --git a/activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapLogger.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java similarity index 100% rename from activemq6-bootstrap/src/main/java/org/apache/activemq6/integration/bootstrap/HornetQBootstrapLogger.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java diff --git a/activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/core/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file similarity index 100% rename from activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/core/file rename to activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file diff --git a/activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/jms/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file similarity index 100% rename from activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/jms/file rename to activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file diff --git a/activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/xml b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml similarity index 100% rename from activemq6-bootstrap/src/main/resources/META-INF/services/org/apache/activemq6/broker/xml rename to activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml diff --git a/activemq6-commons/pom.xml b/activemq-commons/pom.xml similarity index 100% rename from activemq6-commons/pom.xml rename to activemq-commons/pom.xml diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressExistsException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressExistsException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressExistsException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressFullException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAddressFullException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAddressFullException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAlreadyReplicatingException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQAlreadyReplicatingException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQAlreadyReplicatingException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffer.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffer.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffer.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffers.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQBuffers.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQBuffers.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQClusterSecurityException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQClusterSecurityException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQClusterSecurityException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQConnectionTimedOutException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQConnectionTimedOutException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQConnectionTimedOutException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDisconnectedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDisconnectedException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDisconnectedException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateIdException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateIdException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateIdException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateMetaDataException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQDuplicateMetaDataException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQDuplicateMetaDataException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQExceptionType.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQExceptionType.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQExceptionType.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQExceptionType.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIOErrorException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIOErrorException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIOErrorException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIllegalStateException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIllegalStateException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIllegalStateException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIncompatibleClientServerException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQIncompatibleClientServerException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQIncompatibleClientServerException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterceptorRejectedPacketException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterceptorRejectedPacketException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInternalErrorException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInternalErrorException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInternalErrorException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterruptedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterruptedException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInterruptedException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInterruptedException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidFilterExpressionException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidFilterExpressionException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidFilterExpressionException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidTransientQueueUseException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQInvalidTransientQueueUseException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQInvalidTransientQueueUseException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageInterruptedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQLargeMessageInterruptedException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQLargeMessageInterruptedException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNativeIOError.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNativeIOError.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNativeIOError.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNonExistentQueueException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNonExistentQueueException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNonExistentQueueException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNotConnectedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQNotConnectedException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQObjectClosedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQObjectClosedException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQPropertyConversionException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQPropertyConversionException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQQueueExistsException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQQueueExistsException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSecurityException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSecurityException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSessionCreationException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQSessionCreationException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionOutcomeUnknownException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionOutcomeUnknownException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionRolledBackException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQTransactionRolledBackException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnBlockedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnBlockedException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnsupportedPacketException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/HornetQUnsupportedPacketException.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/Pair.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/Pair.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/api/core/SimpleString.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/api/core/SimpleString.java rename to activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/core/buffers/impl/ChannelBufferWrapper.java b/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/core/buffers/impl/ChannelBufferWrapper.java rename to activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java b/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java similarity index 96% rename from activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java rename to activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java index 95a5fdd22c..f00073f3b3 100644 --- a/activemq6-commons/src/main/java/org/apache/activemq6/core/server/HornetQComponent.java +++ b/activemq-commons/src/main/java/org/apache/activemq/core/server/HornetQComponent.java @@ -1,31 +1,31 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq6.core.server; - -/** - * A HornetQComponent - * - * @author Tim Fox - * @version $Revision: 2796 $ - * - * - */ -public interface HornetQComponent -{ - void start() throws Exception; - - void stop() throws Exception; - - boolean isStarted(); -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.apache.activemq6.core.server; + +/** + * A HornetQComponent + * + * @author Tim Fox + * @version $Revision: 2796 $ + * + * + */ +public interface HornetQComponent +{ + void start() throws Exception; + + void stop() throws Exception; + + boolean isStarted(); +} diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/Base64.java b/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/Base64.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ByteUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ByteUtil.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ClassloadingUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ClassloadingUtil.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentHashSet.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentHashSet.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentSet.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ConcurrentSet.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/DataConstants.java b/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/DataConstants.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/DefaultSensitiveStringCodec.java b/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/DefaultSensitiveStringCodec.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/FactoryFinder.java b/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/FactoryFinder.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQThreadFactory.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQThreadFactory.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/HornetQThreadFactory.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilBundle.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilBundle.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilLogger.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/HornetQUtilLogger.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilLogger.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/PasswordMaskingUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/PasswordMaskingUtil.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounter.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounter.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounterUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ReferenceCounterUtil.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/ReusableLatch.java b/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/ReusableLatch.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/SensitiveDataCodec.java b/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/SensitiveDataCodec.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/TypedProperties.java b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/TypedProperties.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/UTF8Util.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/UTF8Util.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUID.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/UUID.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDGenerator.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDGenerator.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java diff --git a/activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDTimer.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java similarity index 100% rename from activemq6-commons/src/main/java/org/apache/activemq6/utils/UUIDTimer.java rename to activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java diff --git a/activemq6-commons/src/test/java/org/apache/activemq6/utils/ByteUtilTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java similarity index 100% rename from activemq6-commons/src/test/java/org/apache/activemq6/utils/ByteUtilTest.java rename to activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java diff --git a/activemq6-commons/src/test/java/org/apache/activemq6/utils/PairTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java similarity index 100% rename from activemq6-commons/src/test/java/org/apache/activemq6/utils/PairTest.java rename to activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java diff --git a/activemq6-commons/src/test/java/org/apache/activemq6/utils/ReferenceCounterTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java similarity index 100% rename from activemq6-commons/src/test/java/org/apache/activemq6/utils/ReferenceCounterTest.java rename to activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java diff --git a/activemq6-core-client/pom.xml b/activemq-core-client/pom.xml similarity index 100% rename from activemq6-core-client/pom.xml rename to activemq-core-client/pom.xml diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpoint.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpoint.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactoryConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastEndpointFactoryConfiguration.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactoryConfiguration.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/BroadcastGroupConfiguration.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfiguration.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfigurationCompatibilityHelper.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/FilterConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/FilterConstants.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Interceptor.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Interceptor.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/JGroupsBroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/JGroupsBroadcastGroupConfiguration.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastGroupConfiguration.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Message.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/Message.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfiguration.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfigurationHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/TransportConfigurationHelper.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/UDPBroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/UDPBroadcastGroupConfiguration.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastGroupConfiguration.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientConsumer.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientConsumer.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientProducer.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientProducer.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientRequestor.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientRequestor.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSession.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSession.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSessionFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClientSessionFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClusterTopologyListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ClusterTopologyListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventType.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/FailoverEventType.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/HornetQClient.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/HornetQClient.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/MessageHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/MessageHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SendAcknowledgementHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SendAcknowledgementHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ServerLocator.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/ServerLocator.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SessionFailureListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/SessionFailureListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/TopologyMember.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/TopologyMember.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/loadbalance/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/client/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AcceptorControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AcceptorControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressSettingsInfo.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/AddressSettingsInfo.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BridgeControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BridgeControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BroadcastGroupControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/BroadcastGroupControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ClusterConnectionControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ClusterConnectionControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/CoreNotificationType.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/CoreNotificationType.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DayCounterInfo.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DayCounterInfo.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DivertControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/DivertControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQComponentControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQComponentControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQServerControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/HornetQServerControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ManagementHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ManagementHelper.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/NotificationType.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/NotificationType.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ObjectNameBuilder.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ObjectNameBuilder.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Operation.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Operation.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Parameter.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/Parameter.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/QueueControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/QueueControl.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ResourceNames.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/ResourceNames.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/RoleInfo.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/RoleInfo.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/management/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/api/core/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/api/core/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java b/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientLogger.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientLogger.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientMessageBundle.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/HornetQClientMessageBundle.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AddressQueryImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AddressQueryImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AfterConnectInternalListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/AfterConnectInternalListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientConsumerInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientLargeMessageInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientMessageInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManager.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManager.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManagerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditManagerImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCredits.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCredits.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditsImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerCreditsImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientProducerInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionFactoryInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ClientSessionInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/CompressedLargeMessageControllerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/CompressedLargeMessageControllerImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/DelegatingSession.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/DelegatingSession.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/HornetQXAResource.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/HornetQXAResource.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageController.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageController.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageControllerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/LargeMessageControllerImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/QueueQueryImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/QueueQueryImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/ServerLocatorInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/Topology.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/Topology.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/TopologyMemberImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/client/impl/TopologyMemberImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryEntry.java b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryEntry.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryGroup.java b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryGroup.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/cluster/DiscoveryListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/exception/HornetQXAException.java b/activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/exception/HornetQXAException.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/BodyEncoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/message/BodyEncoder.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/message/impl/MessageInternal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/ClientPacketDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/ClientPacketDecoder.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Channel.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Channel.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/ChannelHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/ChannelHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CommandConfirmationHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CommandConfirmationHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CoreRemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/CoreRemotingConnection.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Packet.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/Packet.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/ChannelImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/ChannelImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManager.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQClientProtocolManager.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManager.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQClientProtocolManager.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQClientProtocolManagerFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQConsumerContext.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQConsumerContext.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQConsumerContext.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQConsumerContext.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQSessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQSessionContext.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQSessionContext.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQSessionContext.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketDecoder.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/PacketImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/RemotingConnectionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/RemotingConnectionImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateQueueMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateQueueMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateQueueMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateQueueMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/MessagePacket.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/MessagePacket.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/MessagePacket.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/MessagePacket.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NullResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NullResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NullResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NullResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/Ping.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/Ping.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/RollbackMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/RollbackMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCloseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCloseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCloseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCloseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCommitMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCommitMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCommitMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCommitMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionContinuationMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionExpireMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionReceiveMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionSendMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXACommitMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXACommitMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAEndMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAEndMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SessionXAStartMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/CloseListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/CloseListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/FailureListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/FailureListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/TransportConfigurationUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/TransportConfigurationUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQChannelHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQChannelHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQFrameDecoder2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HornetQFrameDecoder2.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnection.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnector.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnectorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyConnectorFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/PartialPooledByteBufAllocator.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/PartialPooledByteBufAllocator.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/SharedNioEventLoopGroup.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/SharedNioEventLoopGroup.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/TransportConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/netty/TransportConstants.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/ssl/SSLSupport.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/impl/ssl/SSLSupport.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/remoting/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/security/HornetQPrincipal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/security/HornetQPrincipal.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/security/Role.java b/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/security/Role.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/QueueQueryResult.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/server/QueueQueryResult.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/Notification.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/Notification.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationService.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/server/management/NotificationService.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/settings/impl/AddressFullMessagePolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/settings/impl/AddressFullMessagePolicy.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/transaction/impl/XidImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/transaction/impl/XidImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/version/Version.java b/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/version/Version.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/core/version/impl/VersionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/core/version/impl/VersionImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/reader/BytesMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/reader/BytesMessageUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/reader/MapMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/reader/MapMessageUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/reader/MessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/reader/MessageUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/reader/StreamMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/reader/StreamMessageUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/reader/TextMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/reader/TextMessageUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/reader/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/reader/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/AbstractRemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/AbstractRemotingConnection.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/ConnectionEntry.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/ConnectionEntry.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/RemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/protocol/RemotingConnection.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/AbstractConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/AbstractConnector.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferDecoder.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/BufferHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManager.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManager.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManagerFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ClientProtocolManagerFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connection.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectionLifeCycleListener.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectionLifeCycleListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connector.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/Connector.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConnectorFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConsumerContext.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ConsumerContext.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ReadyListener.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/ReadyListener.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/SessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/SessionContext.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/TopologyResponseHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/TopologyResponseHandler.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/spi/core/remoting/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/BufferHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/BufferHelper.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfigurationHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfigurationHelper.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfirmationWindowWarning.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/ConfirmationWindowWarning.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/DeflaterReader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/DeflaterReader.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ExecutorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/ExecutorFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/FutureLatch.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/FutureLatch.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/HornetQBufferInputStream.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/HornetQBufferInputStream.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/IDGenerator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/IDGenerator.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterReader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterReader.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterWriter.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/InflaterWriter.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/JNDIUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/JNDIUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedList.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedList.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListIterator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/LinkedListIterator.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/MemorySize.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/MemorySize.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/ObjectInputStreamWithClassLoader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/ObjectInputStreamWithClassLoader.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/OrderedExecutorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/OrderedExecutorFactory.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedList.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java similarity index 96% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedList.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java index 668f95b497..e702c93920 100644 --- a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedList.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java @@ -1,38 +1,38 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.utils; - - -/** - * A type of linked list which maintains items according to a priority - * and allows adding and removing of elements at both ends, and peeking - * - * @author Tim Fox - * @version $Revision: 1174 $ - */ -public interface PriorityLinkedList -{ - void addHead(T t, int priority); - - void addTail(T t, int priority); - - T poll(); - - void clear(); - - int size(); - - LinkedListIterator iterator(); - - boolean isEmpty(); -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.utils; + + +/** + * A type of linked list which maintains items according to a priority + * and allows adding and removing of elements at both ends, and peeking + * + * @author Tim Fox + * @version $Revision: 1174 $ + */ +public interface PriorityLinkedList +{ + void addHead(T t, int priority); + + void addTail(T t, int priority); + + T poll(); + + void clear(); + + int size(); + + LinkedListIterator iterator(); + + boolean isEmpty(); +} diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedListImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java similarity index 95% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedListImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java index 50e7f97e54..ebd26f1a0e 100644 --- a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/PriorityLinkedListImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java @@ -1,277 +1,277 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.utils; - -import java.lang.reflect.Array; -import java.util.NoSuchElementException; - -/** - * A priority linked list implementation - *

- * It implements this by maintaining an individual LinkedBlockingDeque for each priority level. - * - * @author Tim Fox - * @author Jeff Mesnil - * @version $Revision: 1174 $ - */ -public class PriorityLinkedListImpl implements PriorityLinkedList -{ - protected LinkedListImpl[] levels; - - private int size; - - private int lastReset; - - private int highestPriority = -1; - - private int lastPriority = -1; - - public PriorityLinkedListImpl(final int priorities) - { - levels = (LinkedListImpl[]) Array.newInstance(LinkedListImpl.class, priorities); - - for (int i = 0; i < priorities; i++) - { - levels[i] = new LinkedListImpl(); - } - } - - private void checkHighest(final int priority) - { - if (lastPriority != priority || priority > highestPriority) - { - lastPriority = priority; - if (lastReset == Integer.MAX_VALUE) - { - lastReset = 0; - } - else - { - lastReset++; - } - } - - if (priority > highestPriority) - { - highestPriority = priority; - } - } - - public void addHead(final T t, final int priority) - { - checkHighest(priority); - - levels[priority].addHead(t); - - size++; - } - - public void addTail(final T t, final int priority) - { - checkHighest(priority); - - levels[priority].addTail(t); - - size++; - } - - public T poll() - { - T t = null; - - // We are just using a simple prioritization algorithm: - // Highest priority refs always get returned first. - // This could cause starvation of lower priority refs. - - // TODO - A better prioritization algorithm - - for (int i = highestPriority; i >= 0; i--) - { - LinkedListImpl ll = levels[i]; - - if (ll.size() != 0) - { - t = ll.poll(); - - if (t != null) - { - size--; - - if (ll.size() == 0) - { - if (highestPriority == i) - { - highestPriority--; - } - } - } - - break; - } - } - - return t; - } - - public void clear() - { - for (LinkedListImpl list : levels) - { - list.clear(); - } - - size = 0; - } - - public int size() - { - return size; - } - - public boolean isEmpty() - { - return size == 0; - } - - public LinkedListIterator iterator() - { - return new PriorityLinkedListIterator(); - } - - private class PriorityLinkedListIterator implements LinkedListIterator - { - private int index; - - private final LinkedListIterator[] cachedIters = new LinkedListIterator[levels.length]; - - private LinkedListIterator lastIter; - - private int resetCount = lastReset; - - volatile boolean closed = false; - - PriorityLinkedListIterator() - { - index = levels.length - 1; - } - - @Override - protected void finalize() - { - close(); - } - - public void repeat() - { - if (lastIter == null) - { - throw new NoSuchElementException(); - } - - lastIter.repeat(); - } - - public void close() - { - if (!closed) - { - closed = true; - lastIter = null; - - for (LinkedListIterator iter : cachedIters) - { - if (iter != null) - { - iter.close(); - } - } - } - } - - private void checkReset() - { - if (lastReset != resetCount) - { - index = highestPriority; - - resetCount = lastReset; - } - } - - public boolean hasNext() - { - checkReset(); - - while (index >= 0) - { - lastIter = cachedIters[index]; - - if (lastIter == null) - { - lastIter = cachedIters[index] = levels[index].iterator(); - } - - boolean b = lastIter.hasNext(); - - if (b) - { - return true; - } - - index--; - - if (index < 0) - { - index = levels.length - 1; - - break; - } - } - return false; - } - - public T next() - { - if (lastIter == null) - { - throw new NoSuchElementException(); - } - - return lastIter.next(); - } - - public void remove() - { - if (lastIter == null) - { - throw new NoSuchElementException(); - } - - lastIter.remove(); - - // This next statement would be the equivalent of: - // if (index == highestPriority && levels[index].size() == 0) - // However we have to keep checking all the previous levels - // otherwise we would cache a max that will not exist - // what would make us eventually having hasNext() returning false - // as a bug - // Part of the fix for HORNETQ-705 - for (int i = index; i >= 0 && levels[index].size() == 0; i--) - { - highestPriority = i; - } - - size--; - } - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.utils; + +import java.lang.reflect.Array; +import java.util.NoSuchElementException; + +/** + * A priority linked list implementation + *

+ * It implements this by maintaining an individual LinkedBlockingDeque for each priority level. + * + * @author Tim Fox + * @author Jeff Mesnil + * @version $Revision: 1174 $ + */ +public class PriorityLinkedListImpl implements PriorityLinkedList +{ + protected LinkedListImpl[] levels; + + private int size; + + private int lastReset; + + private int highestPriority = -1; + + private int lastPriority = -1; + + public PriorityLinkedListImpl(final int priorities) + { + levels = (LinkedListImpl[]) Array.newInstance(LinkedListImpl.class, priorities); + + for (int i = 0; i < priorities; i++) + { + levels[i] = new LinkedListImpl(); + } + } + + private void checkHighest(final int priority) + { + if (lastPriority != priority || priority > highestPriority) + { + lastPriority = priority; + if (lastReset == Integer.MAX_VALUE) + { + lastReset = 0; + } + else + { + lastReset++; + } + } + + if (priority > highestPriority) + { + highestPriority = priority; + } + } + + public void addHead(final T t, final int priority) + { + checkHighest(priority); + + levels[priority].addHead(t); + + size++; + } + + public void addTail(final T t, final int priority) + { + checkHighest(priority); + + levels[priority].addTail(t); + + size++; + } + + public T poll() + { + T t = null; + + // We are just using a simple prioritization algorithm: + // Highest priority refs always get returned first. + // This could cause starvation of lower priority refs. + + // TODO - A better prioritization algorithm + + for (int i = highestPriority; i >= 0; i--) + { + LinkedListImpl ll = levels[i]; + + if (ll.size() != 0) + { + t = ll.poll(); + + if (t != null) + { + size--; + + if (ll.size() == 0) + { + if (highestPriority == i) + { + highestPriority--; + } + } + } + + break; + } + } + + return t; + } + + public void clear() + { + for (LinkedListImpl list : levels) + { + list.clear(); + } + + size = 0; + } + + public int size() + { + return size; + } + + public boolean isEmpty() + { + return size == 0; + } + + public LinkedListIterator iterator() + { + return new PriorityLinkedListIterator(); + } + + private class PriorityLinkedListIterator implements LinkedListIterator + { + private int index; + + private final LinkedListIterator[] cachedIters = new LinkedListIterator[levels.length]; + + private LinkedListIterator lastIter; + + private int resetCount = lastReset; + + volatile boolean closed = false; + + PriorityLinkedListIterator() + { + index = levels.length - 1; + } + + @Override + protected void finalize() + { + close(); + } + + public void repeat() + { + if (lastIter == null) + { + throw new NoSuchElementException(); + } + + lastIter.repeat(); + } + + public void close() + { + if (!closed) + { + closed = true; + lastIter = null; + + for (LinkedListIterator iter : cachedIters) + { + if (iter != null) + { + iter.close(); + } + } + } + } + + private void checkReset() + { + if (lastReset != resetCount) + { + index = highestPriority; + + resetCount = lastReset; + } + } + + public boolean hasNext() + { + checkReset(); + + while (index >= 0) + { + lastIter = cachedIters[index]; + + if (lastIter == null) + { + lastIter = cachedIters[index] = levels[index].iterator(); + } + + boolean b = lastIter.hasNext(); + + if (b) + { + return true; + } + + index--; + + if (index < 0) + { + index = levels.length - 1; + + break; + } + } + return false; + } + + public T next() + { + if (lastIter == null) + { + throw new NoSuchElementException(); + } + + return lastIter.next(); + } + + public void remove() + { + if (lastIter == null) + { + throw new NoSuchElementException(); + } + + lastIter.remove(); + + // This next statement would be the equivalent of: + // if (index == highestPriority && levels[index].size() == 0) + // However we have to keep checking all the previous levels + // otherwise we would cache a max that will not exist + // what would make us eventually having hasNext() returning false + // as a bug + // Part of the fix for HORNETQ-705 + for (int i = index; i >= 0 && levels[index].size() == 0; i--) + { + highestPriority = i; + } + + size--; + } + } +} diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/Random.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/Random.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SecurityFormatter.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java similarity index 97% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/SecurityFormatter.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java index 89de2fb5d7..3d0dc3ae4f 100644 --- a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SecurityFormatter.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java @@ -1,73 +1,73 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.utils; - -import org.apache.activemq6.core.security.Role; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -public class SecurityFormatter -{ - public static Set createSecurity(String sendRoles, String consumeRoles, String createDurableQueueRoles, String deleteDurableQueueRoles, String createNonDurableQueueRoles, String deleteNonDurableQueueRoles, String manageRoles) - { - List createDurableQueue = toList(createDurableQueueRoles); - List deleteDurableQueue = toList(deleteDurableQueueRoles); - List createNonDurableQueue = toList(createNonDurableQueueRoles); - List deleteNonDurableQueue = toList(deleteNonDurableQueueRoles); - List send = toList(sendRoles); - List consume = toList(consumeRoles); - List manage = toList(manageRoles); - - Set allRoles = new HashSet(); - allRoles.addAll(createDurableQueue); - allRoles.addAll(deleteDurableQueue); - allRoles.addAll(createNonDurableQueue); - allRoles.addAll(deleteNonDurableQueue); - allRoles.addAll(send); - allRoles.addAll(consume); - allRoles.addAll(manage); - - Set roles = new HashSet(allRoles.size()); - for (String role : allRoles) - { - roles.add(new Role(role, - send.contains(role), - consume.contains(role), - createDurableQueue.contains(role), - deleteDurableQueue.contains(role), - createNonDurableQueue.contains(role), - deleteNonDurableQueue.contains(role), - manageRoles.contains(role))); - } - return roles; - } - - - private static List toList(final String commaSeparatedString) - { - List list = new ArrayList(); - if (commaSeparatedString == null || commaSeparatedString.trim().length() == 0) - { - return list; - } - String[] values = commaSeparatedString.split(","); - for (int i = 0; i < values.length; i++) - { - list.add(values[i].trim()); - } - return list; - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.utils; + +import org.apache.activemq6.core.security.Role; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class SecurityFormatter +{ + public static Set createSecurity(String sendRoles, String consumeRoles, String createDurableQueueRoles, String deleteDurableQueueRoles, String createNonDurableQueueRoles, String deleteNonDurableQueueRoles, String manageRoles) + { + List createDurableQueue = toList(createDurableQueueRoles); + List deleteDurableQueue = toList(deleteDurableQueueRoles); + List createNonDurableQueue = toList(createNonDurableQueueRoles); + List deleteNonDurableQueue = toList(deleteNonDurableQueueRoles); + List send = toList(sendRoles); + List consume = toList(consumeRoles); + List manage = toList(manageRoles); + + Set allRoles = new HashSet(); + allRoles.addAll(createDurableQueue); + allRoles.addAll(deleteDurableQueue); + allRoles.addAll(createNonDurableQueue); + allRoles.addAll(deleteNonDurableQueue); + allRoles.addAll(send); + allRoles.addAll(consume); + allRoles.addAll(manage); + + Set roles = new HashSet(allRoles.size()); + for (String role : allRoles) + { + roles.add(new Role(role, + send.contains(role), + consume.contains(role), + createDurableQueue.contains(role), + deleteDurableQueue.contains(role), + createNonDurableQueue.contains(role), + deleteNonDurableQueue.contains(role), + manageRoles.contains(role))); + } + return roles; + } + + + private static List toList(final String commaSeparatedString) + { + List list = new ArrayList(); + if (commaSeparatedString == null || commaSeparatedString.trim().length() == 0) + { + return list; + } + String[] values = commaSeparatedString.split(","); + for (int i = 0; i < values.length; i++) + { + list.add(values[i].trim()); + } + return list; + } +} diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SimpleIDGenerator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/SimpleIDGenerator.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SizeFormatterUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/SizeFormatterUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/SoftValueHashMap.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/SoftValueHashMap.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TimeAndCounterIDGenerator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/TimeAndCounterIDGenerator.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiter.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiter.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiterImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/TokenBucketLimiterImpl.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/VersionLoader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/VersionLoader.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/XMLUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/XMLUtil.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/XidCodecSupport.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/XidCodecSupport.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONArray.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONArray.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONException.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONException.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONObject.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONObject.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONString.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONString.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONTokener.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/json/JSONTokener.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java diff --git a/activemq6-core-client/src/main/java/org/apache/activemq6/utils/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java similarity index 100% rename from activemq6-core-client/src/main/java/org/apache/activemq6/utils/package-info.java rename to activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java diff --git a/activemq6-core-client/src/main/resources/HornetQDefaultConfiguration.txt b/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt similarity index 100% rename from activemq6-core-client/src/main/resources/HornetQDefaultConfiguration.txt rename to activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt diff --git a/activemq6-core-client/src/main/resources/hornetq-version.properties b/activemq-core-client/src/main/resources/hornetq-version.properties similarity index 100% rename from activemq6-core-client/src/main/resources/hornetq-version.properties rename to activemq-core-client/src/main/resources/hornetq-version.properties diff --git a/activemq6-core-client/src/main/resources/hqDefaults.xsl b/activemq-core-client/src/main/resources/hqDefaults.xsl similarity index 100% rename from activemq6-core-client/src/main/resources/hqDefaults.xsl rename to activemq-core-client/src/main/resources/hqDefaults.xsl diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/tests/CoreUnitTestCase.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/tests/CoreUnitTestCase.java rename to activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/RandomUtil.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/RandomUtil.java rename to activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/SilentTestCase.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/tests/util/SilentTestCase.java rename to activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/util/CompressionUtilTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/util/CompressionUtilTest.java rename to activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/util/ConcurrentHashSetTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/util/ConcurrentHashSetTest.java rename to activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/util/TimeAndCounterIDGeneratorTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/util/TimeAndCounterIDGeneratorTest.java rename to activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesConversionTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesConversionTest.java rename to activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/util/TypedPropertiesTest.java rename to activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java diff --git a/activemq6-core-client/src/test/java/org/apache/activemq6/util/XMLUtilTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java similarity index 100% rename from activemq6-core-client/src/test/java/org/apache/activemq6/util/XMLUtilTest.java rename to activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java diff --git a/activemq6-dto/pom.xml b/activemq-dto/pom.xml similarity index 100% rename from activemq6-dto/pom.xml rename to activemq-dto/pom.xml diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/BasicSecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/BasicSecurityDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/BrokerDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/BrokerDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/CoreDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/CoreDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/JmsDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/JmsDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/NamingDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/NamingDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/NamingDTO.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/SecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/SecurityDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/XmlUtil.java b/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/XmlUtil.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java diff --git a/activemq6-dto/src/main/java/org/apache/activemq6/dto/package-info.java b/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java similarity index 100% rename from activemq6-dto/src/main/java/org/apache/activemq6/dto/package-info.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java diff --git a/activemq6-dto/src/main/resources/org/apache/activemq6/dto/jaxb.index b/activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index similarity index 100% rename from activemq6-dto/src/main/resources/org/apache/activemq6/dto/jaxb.index rename to activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index diff --git a/activemq6-jms-client/pom.xml b/activemq-jms-client/pom.xml similarity index 100% rename from activemq6-jms-client/pom.xml rename to activemq-jms-client/pom.xml diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSClient.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSClient.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSClient.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSConstants.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/HornetQJMSConstants.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/HornetQJMSConstants.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/JMSFactoryType.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/JMSFactoryType.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/ConnectionFactoryControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/ConnectionFactoryControl.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/DestinationControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/DestinationControl.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConnectionInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConnectionInfo.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConsumerInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSConsumerInfo.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSManagementHelper.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSManagementHelper.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSQueueControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSQueueControl.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSServerControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSServerControl.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSSessionInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/JMSSessionInfo.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/SubscriptionInfo.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/SubscriptionInfo.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/TopicControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/TopicControl.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/management/package-info.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/api/jms/package-info.java rename to activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQBytesMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQBytesMessage.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnection.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnection.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContext.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContext.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContextImpl.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionForContextImpl.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionForContextImpl.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionMetaData.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQConnectionMetaData.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnectionMetaData.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQDestination.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQDestination.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQDestination.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientBundle.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientBundle.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientLogger.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSClientLogger.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientLogger.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConsumer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSConsumer.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSConsumer.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSContext.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSContext.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSProducer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQJMSProducer.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMapMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMapMessage.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessage.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageConsumer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageConsumer.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageProducer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQMessageProducer.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQObjectMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQObjectMessage.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueue.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueue.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueue.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueBrowser.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueBrowser.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQQueueConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQSession.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQSession.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQStreamMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQStreamMessage.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryQueue.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryQueue.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryQueue.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryTopic.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTemporaryTopic.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTemporaryTopic.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTextMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTextMessage.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopic.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopic.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopic.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopicConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQTopicConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTopicConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnection.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnection.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnection.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAJMSContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAJMSContext.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAJMSContext.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAQueueConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXAQueueConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXAQueueConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXASession.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXASession.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXASession.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXATopicConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/HornetQXATopicConnectionFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQXATopicConnectionFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSExceptionHelper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSExceptionHelper.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSMessageListenerWrapper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JMSMessageListenerWrapper.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JmsExceptionUtils.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/JmsExceptionUtils.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/SelectorTranslator.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/SelectorTranslator.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/ThreadAwareContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/ThreadAwareContext.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/client/package-info.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/ConnectionFactoryObjectFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/ConnectionFactoryObjectFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/DestinationObjectFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/DestinationObjectFactory.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java diff --git a/activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/SerializableObjectRefAddr.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java similarity index 100% rename from activemq6-jms-client/src/main/java/org/apache/activemq6/jms/referenceable/SerializableObjectRefAddr.java rename to activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java diff --git a/activemq6-jms-server/pom.xml b/activemq-jms-server/pom.xml similarity index 100% rename from activemq6-jms-server/pom.xml rename to activemq-jms-server/pom.xml diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/ConnectionFactoryFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java similarity index 97% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/ConnectionFactoryFactory.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java index 158b114abe..91783d440e 100644 --- a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/ConnectionFactoryFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java @@ -1,25 +1,25 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.bridge; - -/** - * A ConnectionFactoryFactory - * - * @author Tim Fox - * - * - */ -public interface ConnectionFactoryFactory -{ - Object createConnectionFactory() throws Exception; -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.bridge; + +/** + * A ConnectionFactoryFactory + * + * @author Tim Fox + * + * + */ +public interface ConnectionFactoryFactory +{ + Object createConnectionFactory() throws Exception; +} diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/DestinationFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/DestinationFactory.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/HornetQJMSBridgeLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/HornetQJMSBridgeLogger.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridge.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java similarity index 96% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridge.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java index ca862130ee..55f8e88d8c 100644 --- a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridge.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java @@ -1,115 +1,115 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.bridge; - -import javax.transaction.TransactionManager; - -import org.apache.activemq6.core.server.HornetQComponent; - -/** - * @author Tim Fox - * @author Jeff Mesnil - */ -public interface JMSBridge extends HornetQComponent -{ - void pause() throws Exception; - - void resume() throws Exception; - - DestinationFactory getSourceDestinationFactory(); - - void setSourceDestinationFactory(DestinationFactory dest); - - DestinationFactory getTargetDestinationFactory(); - - void setTargetDestinationFactory(DestinationFactory dest); - - String getSourceUsername(); - - void setSourceUsername(String name); - - String getSourcePassword(); - - void setSourcePassword(String pwd); - - String getTargetUsername(); - - void setTargetUsername(String name); - - String getTargetPassword(); - - void setTargetPassword(String pwd); - - String getSelector(); - - void setSelector(String selector); - - long getFailureRetryInterval(); - - void setFailureRetryInterval(long interval); - - int getMaxRetries(); - - void setMaxRetries(int retries); - - QualityOfServiceMode getQualityOfServiceMode(); - - void setQualityOfServiceMode(QualityOfServiceMode mode); - - int getMaxBatchSize(); - - void setMaxBatchSize(int size); - - long getMaxBatchTime(); - - void setMaxBatchTime(long time); - - String getSubscriptionName(); - - void setSubscriptionName(String subname); - - String getClientID(); - - void setClientID(String clientID); - - String getTransactionManagerLocatorClass(); - - void setTransactionManagerLocatorClass(String transactionManagerLocatorClass); - - String getTransactionManagerLocatorMethod(); - - void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod); - - boolean isAddMessageIDInHeader(); - - void setAddMessageIDInHeader(boolean value); - - boolean isPaused(); - - boolean isFailed(); - - void setSourceConnectionFactoryFactory(ConnectionFactoryFactory cff); - - void setTargetConnectionFactoryFactory(ConnectionFactoryFactory cff); - - void setTransactionManager(TransactionManager tm); - - boolean isUseMaskedPassword(); - - void setUseMaskedPassword(boolean maskPassword); - - String getPasswordCodec(); - - void setPasswordCodec(String codec); - +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.bridge; + +import javax.transaction.TransactionManager; + +import org.apache.activemq6.core.server.HornetQComponent; + +/** + * @author Tim Fox + * @author Jeff Mesnil + */ +public interface JMSBridge extends HornetQComponent +{ + void pause() throws Exception; + + void resume() throws Exception; + + DestinationFactory getSourceDestinationFactory(); + + void setSourceDestinationFactory(DestinationFactory dest); + + DestinationFactory getTargetDestinationFactory(); + + void setTargetDestinationFactory(DestinationFactory dest); + + String getSourceUsername(); + + void setSourceUsername(String name); + + String getSourcePassword(); + + void setSourcePassword(String pwd); + + String getTargetUsername(); + + void setTargetUsername(String name); + + String getTargetPassword(); + + void setTargetPassword(String pwd); + + String getSelector(); + + void setSelector(String selector); + + long getFailureRetryInterval(); + + void setFailureRetryInterval(long interval); + + int getMaxRetries(); + + void setMaxRetries(int retries); + + QualityOfServiceMode getQualityOfServiceMode(); + + void setQualityOfServiceMode(QualityOfServiceMode mode); + + int getMaxBatchSize(); + + void setMaxBatchSize(int size); + + long getMaxBatchTime(); + + void setMaxBatchTime(long time); + + String getSubscriptionName(); + + void setSubscriptionName(String subname); + + String getClientID(); + + void setClientID(String clientID); + + String getTransactionManagerLocatorClass(); + + void setTransactionManagerLocatorClass(String transactionManagerLocatorClass); + + String getTransactionManagerLocatorMethod(); + + void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod); + + boolean isAddMessageIDInHeader(); + + void setAddMessageIDInHeader(boolean value); + + boolean isPaused(); + + boolean isFailed(); + + void setSourceConnectionFactoryFactory(ConnectionFactoryFactory cff); + + void setTargetConnectionFactoryFactory(ConnectionFactoryFactory cff); + + void setTransactionManager(TransactionManager tm); + + boolean isUseMaskedPassword(); + + void setUseMaskedPassword(boolean maskPassword); + + String getPasswordCodec(); + + void setPasswordCodec(String codec); + } \ No newline at end of file diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridgeControl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/JMSBridgeControl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/QualityOfServiceMode.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/QualityOfServiceMode.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeControlImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java similarity index 96% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java index be78986fda..32282b862b 100644 --- a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JMSBridgeImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java @@ -1,2438 +1,2438 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.bridge.impl; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XASession; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.management.StandardMBean; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionRolledbackException; -import javax.transaction.xa.XAResource; -import java.lang.reflect.Method; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.api.core.client.FailoverEventListener; -import org.apache.activemq6.api.core.client.FailoverEventType; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.DestinationFactory; -import org.apache.activemq6.jms.bridge.HornetQJMSBridgeLogger; -import org.apache.activemq6.jms.bridge.JMSBridge; -import org.apache.activemq6.jms.bridge.JMSBridgeControl; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.client.HornetQConnection; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.server.HornetQJMSServerBundle; -import org.apache.activemq6.jms.server.recovery.HornetQRegistryBase; -import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; -import org.apache.activemq6.utils.ClassloadingUtil; -import org.apache.activemq6.utils.DefaultSensitiveStringCodec; -import org.apache.activemq6.utils.PasswordMaskingUtil; -import org.apache.activemq6.utils.SensitiveDataCodec; - -/** - * A JMSBridge - * - * @author Tim Fox - * @author Martyn Taylor - * @version $Revision:4566 $ - */ -public final class JMSBridgeImpl implements JMSBridge -{ - private static final String[] RESOURCE_RECOVERY_CLASS_NAMES = new String[]{"org.jboss.as.messaging.jms.AS7RecoveryRegistry"}; - - private static boolean trace = HornetQJMSBridgeLogger.LOGGER.isTraceEnabled(); - - private static final int TEN_YEARS = 60 * 60 * 24 * 365 * 10; // in ms - - private static final long DEFAULT_FAILOVER_TIMEOUT = 60 * 1000; - - private final Object lock = new Object(); - - private String sourceUsername; - - private String sourcePassword; - - private String targetUsername; - - private String targetPassword; - - private TransactionManager tm; - - private String selector; - - private long failureRetryInterval; - - private int maxRetries; - - private QualityOfServiceMode qualityOfServiceMode; - - private int maxBatchSize; - - private long maxBatchTime; - - private String subName; - - private String clientID; - - private volatile boolean addMessageIDInHeader; - - private boolean started; - - private final Object stoppingGuard = new Object(); - private boolean stopping = false; - - private final LinkedList messages; - - private ConnectionFactoryFactory sourceCff; - - private ConnectionFactoryFactory targetCff; - - private DestinationFactory sourceDestinationFactory; - - private DestinationFactory targetDestinationFactory; - - private Connection sourceConn; - - private Connection targetConn; - - private Destination sourceDestination; - - private Destination targetDestination; - - private Session sourceSession; - - private Session targetSession; - - private MessageConsumer sourceConsumer; - - private MessageProducer targetProducer; - - private BatchTimeChecker timeChecker; - - private ExecutorService executor; - - private long batchExpiryTime; - - private boolean paused; - - private Transaction tx; - - private boolean failed; - - private boolean connectedSource = false; - - private boolean connectedTarget = false; - - private int forwardMode; - - private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator"; - - private String transactionManagerLocatorMethod = "getTm"; - - private MBeanServer mbeanServer; - - private ObjectName objectName; - - private boolean useMaskedPassword = false; - - private String passwordCodec; - - private long failoverTimeout; - - private static final int FORWARD_MODE_XA = 0; - - private static final int FORWARD_MODE_LOCALTX = 1; - - private static final int FORWARD_MODE_NONTX = 2; - - private HornetQRegistryBase registry; - - /* - * Constructor for MBean - */ - public JMSBridgeImpl() - { - messages = new LinkedList(); - executor = createExecutor(); - } - - public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, - final ConnectionFactoryFactory targetCff, - final DestinationFactory sourceDestinationFactory, - final DestinationFactory targetDestinationFactory, - final String sourceUsername, - final String sourcePassword, - final String targetUsername, - final String targetPassword, - final String selector, - final long failureRetryInterval, - final int maxRetries, - final QualityOfServiceMode qosMode, - final int maxBatchSize, - final long maxBatchTime, - final String subName, - final String clientID, - final boolean addMessageIDInHeader) - { - - this(sourceCff, - targetCff, - sourceDestinationFactory, - targetDestinationFactory, - sourceUsername, - sourcePassword, - targetUsername, - targetPassword, - selector, - failureRetryInterval, - maxRetries, - qosMode, - maxBatchSize, - maxBatchTime, - subName, - clientID, - addMessageIDInHeader, - null, - null); - } - - public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, - final ConnectionFactoryFactory targetCff, - final DestinationFactory sourceDestinationFactory, - final DestinationFactory targetDestinationFactory, - final String sourceUsername, - final String sourcePassword, - final String targetUsername, - final String targetPassword, - final String selector, - final long failureRetryInterval, - final int maxRetries, - final QualityOfServiceMode qosMode, - final int maxBatchSize, - final long maxBatchTime, - final String subName, - final String clientID, - final boolean addMessageIDInHeader, - final MBeanServer mbeanServer, - final String objectName) - { - this(sourceCff, - targetCff, - sourceDestinationFactory, - targetDestinationFactory, - sourceUsername, - sourcePassword, - targetUsername, - targetPassword, - selector, - failureRetryInterval, - maxRetries, - qosMode, - maxBatchSize, - maxBatchTime, - subName, - clientID, - addMessageIDInHeader, - mbeanServer, - objectName, - DEFAULT_FAILOVER_TIMEOUT); - } - - public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, - final ConnectionFactoryFactory targetCff, - final DestinationFactory sourceDestinationFactory, - final DestinationFactory targetDestinationFactory, - final String sourceUsername, - final String sourcePassword, - final String targetUsername, - final String targetPassword, - final String selector, - final long failureRetryInterval, - final int maxRetries, - final QualityOfServiceMode qosMode, - final int maxBatchSize, - final long maxBatchTime, - final String subName, - final String clientID, - final boolean addMessageIDInHeader, - final MBeanServer mbeanServer, - final String objectName, - final long failoverTimeout) - { - this(); - - this.sourceCff = sourceCff; - - this.targetCff = targetCff; - - this.sourceDestinationFactory = sourceDestinationFactory; - - this.targetDestinationFactory = targetDestinationFactory; - - this.sourceUsername = sourceUsername; - - this.sourcePassword = sourcePassword; - - this.targetUsername = targetUsername; - - this.targetPassword = targetPassword; - - this.selector = selector; - - this.failureRetryInterval = failureRetryInterval; - - this.maxRetries = maxRetries; - - qualityOfServiceMode = qosMode; - - this.maxBatchSize = maxBatchSize; - - this.maxBatchTime = maxBatchTime; - - this.subName = subName; - - this.clientID = clientID; - - this.addMessageIDInHeader = addMessageIDInHeader; - - this.failoverTimeout = failoverTimeout; - - checkParams(); - - if (mbeanServer != null) - { - if (objectName != null) - { - this.mbeanServer = mbeanServer; - - try - { - JMSBridgeControlImpl controlBean = new JMSBridgeControlImpl(this); - this.objectName = ObjectName.getInstance(objectName); - StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class); - mbeanServer.registerMBean(mbean, this.objectName); - HornetQJMSBridgeLogger.LOGGER.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName()); - } - catch (Exception e) - { - throw new IllegalStateException("Failed to register JMSBridge MBean", e); - } - } - else - { - throw new IllegalArgumentException("objectName is required when specifying an MBeanServer"); - } - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Created " + this); - } - } - - // HornetQComponent overrides -------------------------------------------------- - - public synchronized void start() throws Exception - { - synchronized (stoppingGuard) - { - stopping = false; - } - - locateRecoveryRegistry(); - - if (started) - { - HornetQJMSBridgeLogger.LOGGER.errorBridgeAlreadyStarted(); - return; - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Starting " + this); - } - - // bridge has been stopped and is restarted - if (executor.isShutdown()) - { - executor = createExecutor(); - } - - initPasswords(); - - checkParams(); - - TransactionManager tm = getTm(); - - // There may already be a JTA transaction associated to the thread - - boolean ok; - - Transaction toResume = null; - try - { - toResume = tm.suspend(); - - ok = setupJMSObjects(); - } - finally - { - if (toResume != null) - { - tm.resume(toResume); - } - } - - if (ok) - { - connectedSource = true; - connectedTarget = true; - startSource(); - } - else - { - HornetQJMSBridgeLogger.LOGGER.errorStartingBridge(); - handleFailureOnStartup(); - } - - } - - private void startSource() throws JMSException - { - // start the source connection - - sourceConn.start(); - - started = true; - - if (maxBatchTime != -1) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Starting time checker thread"); - } - - timeChecker = new BatchTimeChecker(); - - executor.execute(timeChecker); - batchExpiryTime = System.currentTimeMillis() + maxBatchTime; - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Started time checker thread"); - } - } - - executor.execute(new SourceReceiver()); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Started " + this); - } - } - - private void initPasswords() throws HornetQException - { - if (useMaskedPassword) - { - SensitiveDataCodec codecInstance = new DefaultSensitiveStringCodec(); - - if (passwordCodec != null) - { - codecInstance = PasswordMaskingUtil.getCodec(passwordCodec); - } - - try - { - if (this.sourcePassword != null) - { - sourcePassword = codecInstance.decode(sourcePassword); - } - - if (this.targetPassword != null) - { - targetPassword = codecInstance.decode(targetPassword); - } - } - catch (Exception e) - { - throw HornetQJMSServerBundle.BUNDLE.errorDecodingPassword(e); - } - - } - } - - public void stop() throws Exception - { - synchronized (stoppingGuard) - { - if (stopping) return; - stopping = true; - } - - synchronized (this) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Stopping " + this); - } - if (!connectedSource && sourceConn != null) - { - sourceConn.close(); - } - if (!connectedTarget && targetConn != null) - { - targetConn.close(); - } - synchronized (lock) - { - started = false; - - executor.shutdownNow(); - } - - boolean ok = executor.awaitTermination(60, TimeUnit.SECONDS); - - if (!ok) - { - throw new Exception("fail to stop JMS Bridge"); - } - - if (tx != null) - { - // Terminate any transaction - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Rolling back remaining tx"); - } - - try - { - tx.rollback(); - } - catch (Exception ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore); - } - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Rolled back remaining tx"); - } - } - - try - { - sourceConn.close(); - } - catch (Exception ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to close source conn", ignore); - } - } - - if (targetConn != null) - { - try - { - targetConn.close(); - } - catch (Exception ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to close target conn", ignore); - } - } - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Stopped " + this); - } - } - } - - public synchronized boolean isStarted() - { - return started; - } - - public void destroy() - { - if (mbeanServer != null && objectName != null) - { - try - { - mbeanServer.unregisterMBean(objectName); - } - catch (Exception e) - { - HornetQJMSBridgeLogger.LOGGER.errorUnregisteringBridge(objectName); - } - } - } - - // JMSBridge implementation ------------------------------------------------------------ - - public synchronized void pause() throws Exception - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Pausing " + this); - } - - synchronized (lock) - { - paused = true; - - sourceConn.stop(); - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Paused " + this); - } - } - - public synchronized void resume() throws Exception - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Resuming " + this); - } - - synchronized (lock) - { - paused = false; - - sourceConn.start(); - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Resumed " + this); - } - } - - public DestinationFactory getSourceDestinationFactory() - { - return sourceDestinationFactory; - } - - public void setSourceDestinationFactory(final DestinationFactory dest) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); - - sourceDestinationFactory = dest; - } - - public DestinationFactory getTargetDestinationFactory() - { - return targetDestinationFactory; - } - - public void setTargetDestinationFactory(final DestinationFactory dest) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); - - targetDestinationFactory = dest; - } - - public synchronized String getSourceUsername() - { - return sourceUsername; - } - - public synchronized void setSourceUsername(final String name) - { - checkBridgeNotStarted(); - - sourceUsername = name; - } - - public synchronized String getSourcePassword() - { - return sourcePassword; - } - - public synchronized void setSourcePassword(final String pwd) - { - checkBridgeNotStarted(); - - sourcePassword = pwd; - } - - public synchronized String getTargetUsername() - { - return targetUsername; - } - - public synchronized void setTargetUsername(final String name) - { - checkBridgeNotStarted(); - - targetUsername = name; - } - - public synchronized String getTargetPassword() - { - return targetPassword; - } - - public synchronized void setTargetPassword(final String pwd) - { - checkBridgeNotStarted(); - - targetPassword = pwd; - } - - public synchronized String getSelector() - { - return selector; - } - - public synchronized void setSelector(final String selector) - { - checkBridgeNotStarted(); - - this.selector = selector; - } - - public synchronized long getFailureRetryInterval() - { - return failureRetryInterval; - } - - public synchronized void setFailureRetryInterval(final long interval) - { - checkBridgeNotStarted(); - if (interval < 1) - { - throw new IllegalArgumentException("FailureRetryInterval must be >= 1"); - } - - failureRetryInterval = interval; - } - - public synchronized int getMaxRetries() - { - return maxRetries; - } - - public synchronized void setMaxRetries(final int retries) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkValidValue(retries, "MaxRetries"); - - maxRetries = retries; - } - - public synchronized QualityOfServiceMode getQualityOfServiceMode() - { - return qualityOfServiceMode; - } - - public synchronized void setQualityOfServiceMode(final QualityOfServiceMode mode) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(mode, "QualityOfServiceMode"); - - qualityOfServiceMode = mode; - } - - public synchronized int getMaxBatchSize() - { - return maxBatchSize; - } - - public synchronized void setMaxBatchSize(final int size) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkMaxBatchSize(size); - - maxBatchSize = size; - } - - public synchronized long getMaxBatchTime() - { - return maxBatchTime; - } - - public synchronized void setMaxBatchTime(final long time) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkValidValue(time, "MaxBatchTime"); - - maxBatchTime = time; - } - - public synchronized String getSubscriptionName() - { - return subName; - } - - public synchronized void setSubscriptionName(final String subname) - { - checkBridgeNotStarted(); - subName = subname; - } - - public synchronized String getClientID() - { - return clientID; - } - - public synchronized void setClientID(final String clientID) - { - checkBridgeNotStarted(); - - this.clientID = clientID; - } - - public String getTransactionManagerLocatorClass() - { - return transactionManagerLocatorClass; - } - - public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass) - { - checkBridgeNotStarted(); - this.transactionManagerLocatorClass = transactionManagerLocatorClass; - } - - public String getTransactionManagerLocatorMethod() - { - return transactionManagerLocatorMethod; - } - - public void setTransactionManagerLocatorMethod(final String transactionManagerLocatorMethod) - { - this.transactionManagerLocatorMethod = transactionManagerLocatorMethod; - } - - public boolean isAddMessageIDInHeader() - { - return addMessageIDInHeader; - } - - public void setAddMessageIDInHeader(final boolean value) - { - addMessageIDInHeader = value; - } - - public synchronized boolean isPaused() - { - return paused; - } - - public synchronized boolean isFailed() - { - return failed; - } - - public synchronized void setSourceConnectionFactoryFactory(final ConnectionFactoryFactory cff) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(cff, "SourceConnectionFactoryFactory"); - - sourceCff = cff; - } - - public synchronized void setTargetConnectionFactoryFactory(final ConnectionFactoryFactory cff) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(cff, "TargetConnectionFactoryFactory"); - - targetCff = cff; - } - - public void setTransactionManager(final TransactionManager tm) - { - this.tm = tm; - } - - // Public --------------------------------------------------------------------------- - - // Private ------------------------------------------------------------------- - - private synchronized void checkParams() - { - checkNotNull(sourceCff, "sourceCff"); - checkNotNull(targetCff, "targetCff"); - checkNotNull(sourceDestinationFactory, "sourceDestinationFactory"); - checkNotNull(targetDestinationFactory, "targetDestinationFactory"); - checkValidValue(failureRetryInterval, "failureRetryInterval"); - checkValidValue(maxRetries, "maxRetries"); - if (failureRetryInterval == -1 && maxRetries > 0) - { - throw new IllegalArgumentException("If failureRetryInterval == -1 maxRetries must be set to -1"); - } - checkMaxBatchSize(maxBatchSize); - checkValidValue(maxBatchTime, "maxBatchTime"); - checkNotNull(qualityOfServiceMode, "qualityOfServiceMode"); - } - - /** - * Check the object is not null - * - * @throws IllegalArgumentException if the object is null - */ - private static void checkNotNull(final Object obj, final String name) - { - if (obj == null) - { - throw new IllegalArgumentException(name + " cannot be null"); - } - } - - /** - * Check the bridge is not started - * - * @throws IllegalStateException if the bridge is started - */ - private void checkBridgeNotStarted() - { - if (started) - { - throw new IllegalStateException("Cannot set bridge attributes while it is started"); - } - } - - /** - * Check that value is either equals to -1 or greater than 0 - * - * @throws IllegalArgumentException if the value is not valid - */ - private static void checkValidValue(final long value, final String name) - { - if (!(value == -1 || value > 0)) - { - throw new IllegalArgumentException(name + " must be > 0 or -1"); - } - } - - private static void checkMaxBatchSize(final int size) - { - if (!(size >= 1)) - { - throw new IllegalArgumentException("maxBatchSize must be >= 1"); - } - } - - private void enlistResources(final Transaction tx) throws Exception - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Enlisting resources in tx"); - } - - XAResource resSource = ((XASession) sourceSession).getXAResource(); - - tx.enlistResource(resSource); - - XAResource resDest = ((XASession) targetSession).getXAResource(); - - tx.enlistResource(resDest); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Enlisted resources in tx"); - } - } - - private void delistResources(final Transaction tx) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Delisting resources from tx"); - } - - XAResource resSource = ((XASession) sourceSession).getXAResource(); - - try - { - tx.delistResource(resSource, XAResource.TMSUCCESS); - } - catch (Exception e) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist source resource", e); - } - } - - XAResource resDest = ((XASession) targetSession).getXAResource(); - - try - { - tx.delistResource(resDest, XAResource.TMSUCCESS); - } - catch (Exception e) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist target resource", e); - } - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Delisted resources from tx"); - } - } - - private Transaction startTx() throws Exception - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction"); - } - - TransactionManager tm = getTm(); - - // Set timeout to a large value since we do not want to time out while waiting for messages - // to arrive - 10 years should be enough - tm.setTransactionTimeout(JMSBridgeImpl.TEN_YEARS); - - tm.begin(); - - Transaction tx = tm.getTransaction(); - - // Remove the association between current thread - we don't want it - // we will be committing /rolling back directly on the transaction object - - tm.suspend(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Started JTA transaction"); - } - - return tx; - } - - private TransactionManager getTm() - { - if (tm == null) - { - try - { - Object o = safeInitNewInstance(transactionManagerLocatorClass); - Method m = o.getClass().getMethod(transactionManagerLocatorMethod); - tm = (TransactionManager) m.invoke(o); - } - catch (Exception e) - { - throw new IllegalStateException("unable to create TransactionManager from " + transactionManagerLocatorClass + - "." + - transactionManagerLocatorMethod, - e); - } - - if (tm == null) - { - throw new IllegalStateException("Cannot locate a transaction manager"); - } - } - - return tm; - } - - private Connection createConnection(final String username, final String password, - final ConnectionFactoryFactory cff, - final String clientID, - final boolean isXA, - boolean isSource) throws Exception - { - Connection conn; - - Object cf = cff.createConnectionFactory(); - - if (cf instanceof HornetQConnectionFactory && registry != null) - { - registry.register(XARecoveryConfig.newConfig((HornetQConnectionFactory) cf, username, password)); - } - - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE && !(cf instanceof XAConnectionFactory)) - { - throw new IllegalArgumentException("Connection factory must be XAConnectionFactory"); - } - - if (username == null) - { - if (isXA) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating an XA connection"); - } - conn = ((XAConnectionFactory) cf).createXAConnection(); - } - else - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection"); - } - conn = ((ConnectionFactory) cf).createConnection(); - } - } - else - { - if (isXA) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating an XA connection"); - } - conn = ((XAConnectionFactory) cf).createXAConnection(username, password); - } - else - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection"); - } - conn = ((ConnectionFactory) cf).createConnection(username, password); - } - } - - if (clientID != null) - { - conn.setClientID(clientID); - } - - boolean ha = false; - BridgeFailoverListener failoverListener = null; - - if (conn instanceof HornetQConnection) - { - HornetQConnectionFactory hornetQCF = (HornetQConnectionFactory) cf; - ha = hornetQCF.isHA(); - - if (ha) - { - HornetQConnection hornetQConn = (HornetQConnection) conn; - failoverListener = new BridgeFailoverListener(isSource); - hornetQConn.setFailoverListener(failoverListener); - } - } - - conn.setExceptionListener(new BridgeExceptionListener(ha, failoverListener, isSource)); - - return conn; - } - - /* - * Source and target on same server - * -------------------------------- - * If the source and target destinations are on the same server (same resource manager) then, - * in order to get ONCE_AND_ONLY_ONCE, we simply need to consuming and send in a single - * local JMS transaction. - * - * We actually use a single local transacted session for the other QoS modes too since this - * is more performant than using DUPS_OK_ACKNOWLEDGE or AUTO_ACKNOWLEDGE session ack modes, so effectively - * the QoS is upgraded. - * - * Source and target on different server - * ------------------------------------- - * If the source and target destinations are on a different servers (different resource managers) then: - * - * If desired QoS is ONCE_AND_ONLY_ONCE, then we start a JTA transaction and enlist the consuming and sending - * XAResources in that. - * - * If desired QoS is DUPLICATES_OK then, we use CLIENT_ACKNOWLEDGE for the consuming session and - * AUTO_ACKNOWLEDGE (this is ignored) for the sending session if the maxBatchSize == 1, otherwise we - * use a local transacted session for the sending session where maxBatchSize > 1, since this is more performant - * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE - * *after* the batch has been sent - * - * If desired QoS is AT_MOST_ONCE then, if maxBatchSize == 1, we use AUTO_ACKNOWLEDGE for the consuming session, - * and AUTO_ACKNOWLEDGE for the sending session. - * If maxBatchSize > 1, we use CLIENT_ACKNOWLEDGE for the consuming session and a local transacted session for the - * sending session. - * - * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE - * *before* the batch has been sent - * - */ - private boolean setupJMSObjects() - { - try - { - if (sourceCff == targetCff) - { - // Source and target destinations are on the server - we can get once and only once - // just using a local transacted session - // everything becomes once and only once - - forwardMode = JMSBridgeImpl.FORWARD_MODE_LOCALTX; - } - else - { - // Different servers - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) - { - // Use XA - forwardMode = JMSBridgeImpl.FORWARD_MODE_XA; - } - else - { - forwardMode = JMSBridgeImpl.FORWARD_MODE_NONTX; - } - } - - // Lookup the destinations - sourceDestination = sourceDestinationFactory.createDestination(); - - targetDestination = targetDestinationFactory.createDestination(); - - // bridging on the same server - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - // We simply use a single local transacted session for consuming and sending - - sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true); - sourceSession = sourceConn.createSession(true, Session.SESSION_TRANSACTED); - } - else // bridging across different servers - { - // QoS = ONCE_AND_ONLY_ONCE - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - // Create an XASession for consuming from the source - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating XA source session"); - } - - sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, true, true); - sourceSession = ((XAConnection) sourceConn).createXASession(); - } - else // QoS = DUPLICATES_OK || AT_MOST_ONCE - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating non XA source session"); - } - - sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true); - if (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize == 1) - { - sourceSession = sourceConn.createSession(false, Session.AUTO_ACKNOWLEDGE); - } - else - { - sourceSession = sourceConn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - } - } - } - - if (subName == null) - { - if (selector == null) - { - sourceConsumer = sourceSession.createConsumer(sourceDestination); - } - else - { - sourceConsumer = sourceSession.createConsumer(sourceDestination, selector, false); - } - } - else - { - // Durable subscription - if (selector == null) - { - sourceConsumer = sourceSession.createDurableSubscriber((Topic) sourceDestination, subName); - } - else - { - sourceConsumer = sourceSession.createDurableSubscriber((Topic) sourceDestination, subName, selector, false); - } - } - - // Now the sending session - - // bridging on the same server - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - targetConn = sourceConn; - targetSession = sourceSession; - } - else // bridging across different servers - { - // QoS = ONCE_AND_ONLY_ONCE - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating XA dest session"); - } - - // Create an XA session for sending to the destination - - targetConn = createConnection(targetUsername, targetPassword, targetCff, null, true, false); - - targetSession = ((XAConnection) targetConn).createXASession(); - } - else // QoS = DUPLICATES_OK || AT_MOST_ONCE - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Creating non XA dest session"); - } - - // Create a standard session for sending to the target - - // If batch size > 1 we use a transacted session since is more efficient - - boolean transacted = maxBatchSize > 1; - - targetConn = createConnection(targetUsername, targetPassword, targetCff, null, false, false); - - targetSession = targetConn.createSession(transacted, transacted ? Session.SESSION_TRANSACTED - : Session.AUTO_ACKNOWLEDGE); - } - } - - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction"); - } - - tx = startTx(); - - enlistResources(tx); - } - - targetProducer = targetSession.createProducer(null); - - return true; - } - catch (Exception e) - { - // We shouldn't log this, as it's expected when trying to connect when target/source is not available - - // If this fails we should attempt to cleanup or we might end up in some weird state - - // Adding a log.warn, so the use may see the cause of the failure and take actions - HornetQJMSBridgeLogger.LOGGER.bridgeConnectError(e); - - cleanup(); - - return false; - } - } - - private void cleanup() - { - // Stop the source connection - try - { - sourceConn.stop(); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to stop source connection", ignore); - } - } - - if (tx != null) - { - try - { - delistResources(tx); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist resources", ignore); - } - } - try - { - // Terminate the tx - tx.rollback(); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore); - } - } - } - - // Close the old objects - try - { - sourceConn.close(); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to close source connection", ignore); - } - } - try - { - if (targetConn != null) - { - targetConn.close(); - } - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failed to close target connection", ignore); - } - } - } - - private void pause(final long interval) - { - long start = System.currentTimeMillis(); - while (System.currentTimeMillis() - start < failureRetryInterval) - { - try - { - Thread.sleep(failureRetryInterval); - } - catch (InterruptedException ex) - { - } - } - } - - private boolean setupJMSObjectsWithRetry() - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Setting up connections"); - } - - int count = 0; - - while (true && !stopping) - { - boolean ok = setupJMSObjects(); - - if (ok) - { - return true; - } - - count++; - - if (maxRetries != -1 && count == maxRetries) - { - break; - } - - HornetQJMSBridgeLogger.LOGGER.failedToSetUpBridge(failureRetryInterval); - - pause(failureRetryInterval); - } - - // If we get here then we exceeded maxRetries - return false; - } - - private void sendBatch() - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Sending batch of " + messages.size() + " messages"); - } - - if (paused) - { - // Don't send now - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Paused, so not sending now"); - } - - return; - } - - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - sendBatchLocalTx(); - } - else if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - sendBatchXA(); - } - else - { - sendBatchNonTransacted(); - } - } - - private void sendBatchNonTransacted() - { - try - { - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE || - (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize > 1)) - { - // We client ack before sending - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Client acking source session"); - } - - messages.getLast().acknowledge(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Client acked source session"); - } - } - - boolean exHappened; - - do - { - exHappened = false; - try - { - sendMessages(); - } - catch (TransactionRolledbackException e) - { - HornetQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e); - exHappened = true; - } - } - while (exHappened); - - if (maxBatchSize > 1) - { - // The sending session is transacted - we need to commit it - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Committing target session"); - } - - targetSession.commit(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Committed target session"); - } - } - - if (qualityOfServiceMode == QualityOfServiceMode.DUPLICATES_OK) - { - // We client ack after sending - - // Note we could actually use Session.DUPS_OK_ACKNOWLEDGE here - // For a slightly less strong delivery guarantee - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Client acking source session"); - } - - messages.getLast().acknowledge(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Client acked source session"); - } - } - } - catch (Exception e) - { - if (!stopping) - { - HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); - } - - // We don't call failure otherwise failover would be broken with HornetQ - // We let the ExceptionListener to deal with failures - - if (connectedSource) - { - try - { - sourceSession.recover(); - } - catch (Throwable ignored) - { - } - } - - } - finally - { - // Clear the messages - messages.clear(); - - } - } - - private void sendBatchXA() - { - try - { - sendMessages(); - - // Commit the JTA transaction and start another - delistResources(tx); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Committing JTA transaction"); - } - - tx.commit(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Committed JTA transaction"); - } - } - catch (Exception e) - { - try - { - // we call this just in case there is a failure other than failover - tx.rollback(); - } - catch (Throwable ignored) - { - } - - HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); - - //we don't do handle failure here because the tx - //may be rolledback due to failover. All failure handling - //will be done through exception listener. - //handleFailureOnSend(); - } - finally - { - try - { - tx = startTx(); - - enlistResources(tx); - - // Clear the messages - messages.clear(); - - } - catch (Exception e) - { - HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); - - handleFailureOnSend(); - } - } - } - - private void sendBatchLocalTx() - { - try - { - sendMessages(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Committing source session"); - } - - sourceSession.commit(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Committed source session"); - } - - } - catch (Exception e) - { - HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); - - try - { - sourceSession.rollback(); - } - catch (Throwable ignored) - { - } - try - { - targetSession.rollback(); - } - catch (Throwable ignored) - { - } - - // We don't call failure here, we let the exception listener to deal with it - } - finally - { - messages.clear(); - } - } - - private void sendMessages() throws Exception - { - Iterator iter = messages.iterator(); - - Message msg = null; - - while (iter.hasNext()) - { - msg = iter.next(); - - if (addMessageIDInHeader) - { - addMessageIDInHeader(msg); - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Sending message " + msg); - } - - // Make sure the correct time to live gets propagated - - long timeToLive = msg.getJMSExpiration(); - - if (timeToLive != 0) - { - timeToLive -= System.currentTimeMillis(); - - if (timeToLive <= 0) - { - timeToLive = 1; // Should have already expired - set to 1 so it expires when it is consumed or delivered - } - } - - targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Sent message " + msg); - } - } - } - - private void handleFailureOnSend() - { - handleFailure(new FailureHandler()); - } - - private void handleFailureOnStartup() - { - handleFailure(new StartupFailureHandler()); - } - - private void handleFailure(final Runnable failureHandler) - { - failed = true; - - // Failure must be handled on a separate thread to the calling thread (either onMessage or start). - // In the case of onMessage we can't close the connection from inside the onMessage method - // since it will block waiting for onMessage to complete. In the case of start we want to return - // from the call before the connections are reestablished so that the caller is not blocked unnecessarily. - executor.execute(failureHandler); - } - - private void addMessageIDInHeader(final Message msg) throws Exception - { - // We concatenate the old message id as a header in the message - // This allows the target to then use this as the JMSCorrelationID of any response message - // thus enabling a distributed request-response pattern. - // Each bridge (if there are more than one) in the chain can concatenate the message id - // So in the case of multiple bridges having routed the message this can be used in a multi-hop - // distributed request/response - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Adding old message id in Message header"); - } - - JMSBridgeImpl.copyProperties(msg); - - String val = null; - - val = msg.getStringProperty(HornetQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); - - if (val == null) - { - val = msg.getJMSMessageID(); - } - else - { - StringBuffer sb = new StringBuffer(val); - - sb.append(",").append(msg.getJMSMessageID()); - - val = sb.toString(); - } - - msg.setStringProperty(HornetQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val); - } - - /* - * JMS does not let you add a property on received message without first - * calling clearProperties, so we need to save and re-add all the old properties so we - * don't lose them!! - */ - private static void copyProperties(final Message msg) throws JMSException - { - @SuppressWarnings("unchecked") - Enumeration en = msg.getPropertyNames(); - - Map oldProps = null; - - while (en.hasMoreElements()) - { - String propName = en.nextElement(); - - if (oldProps == null) - { - oldProps = new HashMap(); - } - - oldProps.put(propName, msg.getObjectProperty(propName)); - } - - msg.clearProperties(); - - if (oldProps != null) - { - Iterator> oldPropsIter = oldProps.entrySet().iterator(); - - while (oldPropsIter.hasNext()) - { - Entry entry = oldPropsIter.next(); - - String propName = entry.getKey(); - - Object val = entry.getValue(); - - if (val instanceof byte[] == false) - { - //Can't set byte[] array props through the JMS API - if we're bridging a HornetQ message it might have such props - msg.setObjectProperty(propName, entry.getValue()); - } - else if (msg instanceof HornetQMessage) - { - ((HornetQMessage) msg).getCoreMessage().putBytesProperty(propName, (byte[]) val); - } - } - } - } - - /** - * Creates a 3-sized thread pool executor (1 thread for the sourceReceiver, 1 for the timeChecker - * and 1 for the eventual failureHandler) - */ - private ExecutorService createExecutor() - { - return Executors.newFixedThreadPool(3); - } - - // Inner classes --------------------------------------------------------------- - - /** - * We use a Thread which polls the sourceDestination instead of a MessageListener - * to ensure that message delivery does not happen concurrently with - * transaction enlistment of the XAResource (see HORNETQ-27) - */ - private final class SourceReceiver extends Thread - { - SourceReceiver() - { - super("jmsbridge-source-receiver-thread"); - } - - @Override - public void run() - { - while (started) - { - if (stopping) - { - return; - } - synchronized (lock) - { - if (paused || failed) - { - try - { - lock.wait(500); - } - catch (InterruptedException e) - { - if (stopping) - { - return; - } - throw new HornetQInterruptedException(e); - } - continue; - } - - Message msg = null; - try - { - msg = sourceConsumer.receive(1000); - - if (msg instanceof HornetQMessage) - { - // We need to check the buffer mainly in the case of LargeMessages - // As we need to reconstruct the buffer before resending the message - ((HornetQMessage) msg).checkBuffer(); - } - } - catch (JMSException jmse) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " exception while receiving a message", jmse); - } - } - - if (msg == null) - { - try - { - lock.wait(500); - } - catch (InterruptedException e) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted"); - } - if (stopping) - { - return; - } - throw new HornetQInterruptedException(e); - } - continue; - } - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " received message " + msg); - } - - messages.add(msg); - - batchExpiryTime = System.currentTimeMillis() + maxBatchTime; - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime); - } - - if (maxBatchSize != -1 && messages.size() >= maxBatchSize) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " maxBatchSize has been reached so sending batch"); - } - - sendBatch(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " sent batch"); - } - } - } - } - } - } - - private class FailureHandler implements Runnable - { - /** - * Start the source connection - note the source connection must not be started before - * otherwise messages will be received and ignored - */ - protected void startSourceConnection() - { - try - { - sourceConn.start(); - } - catch (JMSException e) - { - HornetQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e); - } - } - - protected void succeeded() - { - HornetQJMSBridgeLogger.LOGGER.bridgeReconnected(); - connectedSource = true; - connectedTarget = true; - synchronized (lock) - { - failed = false; - - startSourceConnection(); - } - } - - protected void failed() - { - // We haven't managed to recreate connections or maxRetries = 0 - HornetQJMSBridgeLogger.LOGGER.errorConnectingBridge(); - - try - { - stop(); - } - catch (Exception ignore) - { - } - } - - public void run() - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failure handler running"); - } - - // Clear the messages - messages.clear(); - - cleanup(); - - boolean ok = false; - - if (maxRetries > 0 || maxRetries == -1) - { - HornetQJMSBridgeLogger.LOGGER.bridgeRetry(failureRetryInterval); - - pause(failureRetryInterval); - - // Now we try - ok = setupJMSObjectsWithRetry(); - } - - if (!ok) - { - failed(); - } - else - { - succeeded(); - } - } - } - - private class StartupFailureHandler extends FailureHandler - { - @Override - protected void failed() - { - // Don't call super - HornetQJMSBridgeLogger.LOGGER.bridgeNotStarted(); - } - - @Override - protected void succeeded() - { - // Don't call super - a bit ugly in this case but better than taking the lock twice. - HornetQJMSBridgeLogger.LOGGER.bridgeConnected(); - - synchronized (lock) - { - - connectedSource = true; - connectedTarget = true; - failed = false; - started = true; - - // Start the source connection - note the source connection must not be started before - // otherwise messages will be received and ignored - - try - { - startSource(); - } - catch (JMSException e) - { - HornetQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e); - } - } - } - } - - private class BatchTimeChecker implements Runnable - { - public void run() - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " running"); - } - - synchronized (lock) - { - while (started) - { - long toWait = batchExpiryTime - System.currentTimeMillis(); - - if (toWait <= 0) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " waited enough"); - } - - synchronized (lock) - { - if (!failed && !messages.isEmpty()) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " got some messages so sending batch"); - } - - sendBatch(); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " sent batch"); - } - } - } - - batchExpiryTime = System.currentTimeMillis() + maxBatchTime; - } - else - { - try - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " waiting for " + toWait); - } - - lock.wait(toWait); - - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " woke up"); - } - } - catch (InterruptedException e) - { - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted"); - } - if (stopping) - { - return; - } - throw new HornetQInterruptedException(e); - } - - } - } - } - } - } - - private class BridgeExceptionListener implements ExceptionListener - { - boolean ha; - BridgeFailoverListener failoverListener; - private final boolean isSource; - - public BridgeExceptionListener(boolean ha, BridgeFailoverListener failoverListener, boolean isSource) - { - this.ha = ha; - this.failoverListener = failoverListener; - this.isSource = isSource; - } - - public void onException(final JMSException e) - { - if (stopping) - { - return; - } - HornetQJMSBridgeLogger.LOGGER.bridgeFailure(e); - if (isSource) - { - connectedSource = false; - } - else - { - connectedTarget = false; - } - - synchronized (lock) - { - if (stopping) - { - return; - } - if (failed) - { - // The failure has already been detected and is being handled - if (JMSBridgeImpl.trace) - { - HornetQJMSBridgeLogger.LOGGER.trace("Failure recovery already in progress"); - } - } - else - { - boolean shouldHandleFailure = true; - if (ha) - { - //make sure failover happened - shouldHandleFailure = !failoverListener.waitForFailover(); - } - - if (shouldHandleFailure) - { - handleFailure(new FailureHandler()); - } - } - } - } - } - - - private void locateRecoveryRegistry() - { - if (registry == null) - { - for (String locatorClasse : RESOURCE_RECOVERY_CLASS_NAMES) - { - try - { - registry = (HornetQRegistryBase) safeInitNewInstance(locatorClasse); - } - catch (Throwable e) - { - HornetQJMSBridgeLogger.LOGGER.debug("unable to load recovery registry " + locatorClasse, e); - } - if (registry != null) - { - break; - } - } - - if (registry != null) - { - HornetQJMSBridgeLogger.LOGGER.debug("Recovery Registry located = " + registry); - } - } - } - - /** - * This seems duplicate code all over the place, but for security reasons we can't let something like this to be open in a - * utility class, as it would be a door to load anything you like in a safe VM. - * For that reason any class trying to do a privileged block should do with the AccessController directly. - */ - private static Object safeInitNewInstance(final String className) - { - return AccessController.doPrivileged(new PrivilegedAction() - { - public Object run() - { - return ClassloadingUtil.newInstanceFromClassLoader(className); - } - }); - } - - public boolean isUseMaskedPassword() - { - return useMaskedPassword; - } - - public void setUseMaskedPassword(boolean maskPassword) - { - this.useMaskedPassword = maskPassword; - } - - public String getPasswordCodec() - { - return passwordCodec; - } - - public void setPasswordCodec(String passwordCodec) - { - this.passwordCodec = passwordCodec; - } - - private class BridgeFailoverListener implements FailoverEventListener - { - private final boolean isSource; - volatile FailoverEventType lastEvent; - - public BridgeFailoverListener(boolean isSource) - { - this.isSource = isSource; - } - - @Override - public void failoverEvent(FailoverEventType eventType) - { - synchronized (this) - { - lastEvent = eventType; - if (eventType == FailoverEventType.FAILURE_DETECTED) - { - if (isSource) - { - connectedSource = false; - } - else - { - connectedTarget = false; - } - } - this.notify(); - } - } - - //return true if failover completed successfully - public boolean waitForFailover() - { - long toWait = failoverTimeout; - long start = 0; - long waited = 0; - boolean timedOut = false; - FailoverEventType result = null; - synchronized (this) - { - while ((lastEvent == null || lastEvent == FailoverEventType.FAILURE_DETECTED)) - { - try - { - if (toWait <= 0) - { - timedOut = true; - break; - } - start = System.currentTimeMillis(); - this.wait(toWait); - } - catch (InterruptedException e) - { - } - finally - { - waited = System.currentTimeMillis() - start; - toWait = failoverTimeout - waited; - } - } - result = lastEvent; - lastEvent = null; - } - - if (timedOut) - { - //timeout, presumably failover failed. - HornetQJMSBridgeLogger.LOGGER.debug("Timed out waiting for failover completion " + this); - return false; - } - - /* - * make sure we reset the connected flags - * */ - if (result == FailoverEventType.FAILOVER_COMPLETED) - { - if (isSource) - { - connectedSource = true; - } - else - { - connectedTarget = true; - } - return true; - } - //failover failed, need retry. - return false; - } - } - - public long getFailoverTimeout() - { - return failoverTimeout; - } - - public void setFailoverTimeout(long failoverTimeout) - { - this.failoverTimeout = failoverTimeout; - } - - -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.bridge.impl; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.Topic; +import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; +import javax.jms.XASession; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.management.StandardMBean; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; +import javax.transaction.TransactionRolledbackException; +import javax.transaction.xa.XAResource; +import java.lang.reflect.Method; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + +import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq6.api.core.HornetQInterruptedException; +import org.apache.activemq6.api.core.client.FailoverEventListener; +import org.apache.activemq6.api.core.client.FailoverEventType; +import org.apache.activemq6.api.jms.HornetQJMSConstants; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.HornetQJMSBridgeLogger; +import org.apache.activemq6.jms.bridge.JMSBridge; +import org.apache.activemq6.jms.bridge.JMSBridgeControl; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.client.HornetQConnection; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.server.HornetQJMSServerBundle; +import org.apache.activemq6.jms.server.recovery.HornetQRegistryBase; +import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq6.utils.DefaultSensitiveStringCodec; +import org.apache.activemq6.utils.PasswordMaskingUtil; +import org.apache.activemq6.utils.SensitiveDataCodec; + +/** + * A JMSBridge + * + * @author Tim Fox + * @author Martyn Taylor + * @version $Revision:4566 $ + */ +public final class JMSBridgeImpl implements JMSBridge +{ + private static final String[] RESOURCE_RECOVERY_CLASS_NAMES = new String[]{"org.jboss.as.messaging.jms.AS7RecoveryRegistry"}; + + private static boolean trace = HornetQJMSBridgeLogger.LOGGER.isTraceEnabled(); + + private static final int TEN_YEARS = 60 * 60 * 24 * 365 * 10; // in ms + + private static final long DEFAULT_FAILOVER_TIMEOUT = 60 * 1000; + + private final Object lock = new Object(); + + private String sourceUsername; + + private String sourcePassword; + + private String targetUsername; + + private String targetPassword; + + private TransactionManager tm; + + private String selector; + + private long failureRetryInterval; + + private int maxRetries; + + private QualityOfServiceMode qualityOfServiceMode; + + private int maxBatchSize; + + private long maxBatchTime; + + private String subName; + + private String clientID; + + private volatile boolean addMessageIDInHeader; + + private boolean started; + + private final Object stoppingGuard = new Object(); + private boolean stopping = false; + + private final LinkedList messages; + + private ConnectionFactoryFactory sourceCff; + + private ConnectionFactoryFactory targetCff; + + private DestinationFactory sourceDestinationFactory; + + private DestinationFactory targetDestinationFactory; + + private Connection sourceConn; + + private Connection targetConn; + + private Destination sourceDestination; + + private Destination targetDestination; + + private Session sourceSession; + + private Session targetSession; + + private MessageConsumer sourceConsumer; + + private MessageProducer targetProducer; + + private BatchTimeChecker timeChecker; + + private ExecutorService executor; + + private long batchExpiryTime; + + private boolean paused; + + private Transaction tx; + + private boolean failed; + + private boolean connectedSource = false; + + private boolean connectedTarget = false; + + private int forwardMode; + + private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator"; + + private String transactionManagerLocatorMethod = "getTm"; + + private MBeanServer mbeanServer; + + private ObjectName objectName; + + private boolean useMaskedPassword = false; + + private String passwordCodec; + + private long failoverTimeout; + + private static final int FORWARD_MODE_XA = 0; + + private static final int FORWARD_MODE_LOCALTX = 1; + + private static final int FORWARD_MODE_NONTX = 2; + + private HornetQRegistryBase registry; + + /* + * Constructor for MBean + */ + public JMSBridgeImpl() + { + messages = new LinkedList(); + executor = createExecutor(); + } + + public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, + final ConnectionFactoryFactory targetCff, + final DestinationFactory sourceDestinationFactory, + final DestinationFactory targetDestinationFactory, + final String sourceUsername, + final String sourcePassword, + final String targetUsername, + final String targetPassword, + final String selector, + final long failureRetryInterval, + final int maxRetries, + final QualityOfServiceMode qosMode, + final int maxBatchSize, + final long maxBatchTime, + final String subName, + final String clientID, + final boolean addMessageIDInHeader) + { + + this(sourceCff, + targetCff, + sourceDestinationFactory, + targetDestinationFactory, + sourceUsername, + sourcePassword, + targetUsername, + targetPassword, + selector, + failureRetryInterval, + maxRetries, + qosMode, + maxBatchSize, + maxBatchTime, + subName, + clientID, + addMessageIDInHeader, + null, + null); + } + + public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, + final ConnectionFactoryFactory targetCff, + final DestinationFactory sourceDestinationFactory, + final DestinationFactory targetDestinationFactory, + final String sourceUsername, + final String sourcePassword, + final String targetUsername, + final String targetPassword, + final String selector, + final long failureRetryInterval, + final int maxRetries, + final QualityOfServiceMode qosMode, + final int maxBatchSize, + final long maxBatchTime, + final String subName, + final String clientID, + final boolean addMessageIDInHeader, + final MBeanServer mbeanServer, + final String objectName) + { + this(sourceCff, + targetCff, + sourceDestinationFactory, + targetDestinationFactory, + sourceUsername, + sourcePassword, + targetUsername, + targetPassword, + selector, + failureRetryInterval, + maxRetries, + qosMode, + maxBatchSize, + maxBatchTime, + subName, + clientID, + addMessageIDInHeader, + mbeanServer, + objectName, + DEFAULT_FAILOVER_TIMEOUT); + } + + public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, + final ConnectionFactoryFactory targetCff, + final DestinationFactory sourceDestinationFactory, + final DestinationFactory targetDestinationFactory, + final String sourceUsername, + final String sourcePassword, + final String targetUsername, + final String targetPassword, + final String selector, + final long failureRetryInterval, + final int maxRetries, + final QualityOfServiceMode qosMode, + final int maxBatchSize, + final long maxBatchTime, + final String subName, + final String clientID, + final boolean addMessageIDInHeader, + final MBeanServer mbeanServer, + final String objectName, + final long failoverTimeout) + { + this(); + + this.sourceCff = sourceCff; + + this.targetCff = targetCff; + + this.sourceDestinationFactory = sourceDestinationFactory; + + this.targetDestinationFactory = targetDestinationFactory; + + this.sourceUsername = sourceUsername; + + this.sourcePassword = sourcePassword; + + this.targetUsername = targetUsername; + + this.targetPassword = targetPassword; + + this.selector = selector; + + this.failureRetryInterval = failureRetryInterval; + + this.maxRetries = maxRetries; + + qualityOfServiceMode = qosMode; + + this.maxBatchSize = maxBatchSize; + + this.maxBatchTime = maxBatchTime; + + this.subName = subName; + + this.clientID = clientID; + + this.addMessageIDInHeader = addMessageIDInHeader; + + this.failoverTimeout = failoverTimeout; + + checkParams(); + + if (mbeanServer != null) + { + if (objectName != null) + { + this.mbeanServer = mbeanServer; + + try + { + JMSBridgeControlImpl controlBean = new JMSBridgeControlImpl(this); + this.objectName = ObjectName.getInstance(objectName); + StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class); + mbeanServer.registerMBean(mbean, this.objectName); + HornetQJMSBridgeLogger.LOGGER.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName()); + } + catch (Exception e) + { + throw new IllegalStateException("Failed to register JMSBridge MBean", e); + } + } + else + { + throw new IllegalArgumentException("objectName is required when specifying an MBeanServer"); + } + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Created " + this); + } + } + + // HornetQComponent overrides -------------------------------------------------- + + public synchronized void start() throws Exception + { + synchronized (stoppingGuard) + { + stopping = false; + } + + locateRecoveryRegistry(); + + if (started) + { + HornetQJMSBridgeLogger.LOGGER.errorBridgeAlreadyStarted(); + return; + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Starting " + this); + } + + // bridge has been stopped and is restarted + if (executor.isShutdown()) + { + executor = createExecutor(); + } + + initPasswords(); + + checkParams(); + + TransactionManager tm = getTm(); + + // There may already be a JTA transaction associated to the thread + + boolean ok; + + Transaction toResume = null; + try + { + toResume = tm.suspend(); + + ok = setupJMSObjects(); + } + finally + { + if (toResume != null) + { + tm.resume(toResume); + } + } + + if (ok) + { + connectedSource = true; + connectedTarget = true; + startSource(); + } + else + { + HornetQJMSBridgeLogger.LOGGER.errorStartingBridge(); + handleFailureOnStartup(); + } + + } + + private void startSource() throws JMSException + { + // start the source connection + + sourceConn.start(); + + started = true; + + if (maxBatchTime != -1) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Starting time checker thread"); + } + + timeChecker = new BatchTimeChecker(); + + executor.execute(timeChecker); + batchExpiryTime = System.currentTimeMillis() + maxBatchTime; + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Started time checker thread"); + } + } + + executor.execute(new SourceReceiver()); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Started " + this); + } + } + + private void initPasswords() throws HornetQException + { + if (useMaskedPassword) + { + SensitiveDataCodec codecInstance = new DefaultSensitiveStringCodec(); + + if (passwordCodec != null) + { + codecInstance = PasswordMaskingUtil.getCodec(passwordCodec); + } + + try + { + if (this.sourcePassword != null) + { + sourcePassword = codecInstance.decode(sourcePassword); + } + + if (this.targetPassword != null) + { + targetPassword = codecInstance.decode(targetPassword); + } + } + catch (Exception e) + { + throw HornetQJMSServerBundle.BUNDLE.errorDecodingPassword(e); + } + + } + } + + public void stop() throws Exception + { + synchronized (stoppingGuard) + { + if (stopping) return; + stopping = true; + } + + synchronized (this) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Stopping " + this); + } + if (!connectedSource && sourceConn != null) + { + sourceConn.close(); + } + if (!connectedTarget && targetConn != null) + { + targetConn.close(); + } + synchronized (lock) + { + started = false; + + executor.shutdownNow(); + } + + boolean ok = executor.awaitTermination(60, TimeUnit.SECONDS); + + if (!ok) + { + throw new Exception("fail to stop JMS Bridge"); + } + + if (tx != null) + { + // Terminate any transaction + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Rolling back remaining tx"); + } + + try + { + tx.rollback(); + } + catch (Exception ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore); + } + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Rolled back remaining tx"); + } + } + + try + { + sourceConn.close(); + } + catch (Exception ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to close source conn", ignore); + } + } + + if (targetConn != null) + { + try + { + targetConn.close(); + } + catch (Exception ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to close target conn", ignore); + } + } + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Stopped " + this); + } + } + } + + public synchronized boolean isStarted() + { + return started; + } + + public void destroy() + { + if (mbeanServer != null && objectName != null) + { + try + { + mbeanServer.unregisterMBean(objectName); + } + catch (Exception e) + { + HornetQJMSBridgeLogger.LOGGER.errorUnregisteringBridge(objectName); + } + } + } + + // JMSBridge implementation ------------------------------------------------------------ + + public synchronized void pause() throws Exception + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Pausing " + this); + } + + synchronized (lock) + { + paused = true; + + sourceConn.stop(); + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Paused " + this); + } + } + + public synchronized void resume() throws Exception + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Resuming " + this); + } + + synchronized (lock) + { + paused = false; + + sourceConn.start(); + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Resumed " + this); + } + } + + public DestinationFactory getSourceDestinationFactory() + { + return sourceDestinationFactory; + } + + public void setSourceDestinationFactory(final DestinationFactory dest) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); + + sourceDestinationFactory = dest; + } + + public DestinationFactory getTargetDestinationFactory() + { + return targetDestinationFactory; + } + + public void setTargetDestinationFactory(final DestinationFactory dest) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); + + targetDestinationFactory = dest; + } + + public synchronized String getSourceUsername() + { + return sourceUsername; + } + + public synchronized void setSourceUsername(final String name) + { + checkBridgeNotStarted(); + + sourceUsername = name; + } + + public synchronized String getSourcePassword() + { + return sourcePassword; + } + + public synchronized void setSourcePassword(final String pwd) + { + checkBridgeNotStarted(); + + sourcePassword = pwd; + } + + public synchronized String getTargetUsername() + { + return targetUsername; + } + + public synchronized void setTargetUsername(final String name) + { + checkBridgeNotStarted(); + + targetUsername = name; + } + + public synchronized String getTargetPassword() + { + return targetPassword; + } + + public synchronized void setTargetPassword(final String pwd) + { + checkBridgeNotStarted(); + + targetPassword = pwd; + } + + public synchronized String getSelector() + { + return selector; + } + + public synchronized void setSelector(final String selector) + { + checkBridgeNotStarted(); + + this.selector = selector; + } + + public synchronized long getFailureRetryInterval() + { + return failureRetryInterval; + } + + public synchronized void setFailureRetryInterval(final long interval) + { + checkBridgeNotStarted(); + if (interval < 1) + { + throw new IllegalArgumentException("FailureRetryInterval must be >= 1"); + } + + failureRetryInterval = interval; + } + + public synchronized int getMaxRetries() + { + return maxRetries; + } + + public synchronized void setMaxRetries(final int retries) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkValidValue(retries, "MaxRetries"); + + maxRetries = retries; + } + + public synchronized QualityOfServiceMode getQualityOfServiceMode() + { + return qualityOfServiceMode; + } + + public synchronized void setQualityOfServiceMode(final QualityOfServiceMode mode) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(mode, "QualityOfServiceMode"); + + qualityOfServiceMode = mode; + } + + public synchronized int getMaxBatchSize() + { + return maxBatchSize; + } + + public synchronized void setMaxBatchSize(final int size) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkMaxBatchSize(size); + + maxBatchSize = size; + } + + public synchronized long getMaxBatchTime() + { + return maxBatchTime; + } + + public synchronized void setMaxBatchTime(final long time) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkValidValue(time, "MaxBatchTime"); + + maxBatchTime = time; + } + + public synchronized String getSubscriptionName() + { + return subName; + } + + public synchronized void setSubscriptionName(final String subname) + { + checkBridgeNotStarted(); + subName = subname; + } + + public synchronized String getClientID() + { + return clientID; + } + + public synchronized void setClientID(final String clientID) + { + checkBridgeNotStarted(); + + this.clientID = clientID; + } + + public String getTransactionManagerLocatorClass() + { + return transactionManagerLocatorClass; + } + + public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass) + { + checkBridgeNotStarted(); + this.transactionManagerLocatorClass = transactionManagerLocatorClass; + } + + public String getTransactionManagerLocatorMethod() + { + return transactionManagerLocatorMethod; + } + + public void setTransactionManagerLocatorMethod(final String transactionManagerLocatorMethod) + { + this.transactionManagerLocatorMethod = transactionManagerLocatorMethod; + } + + public boolean isAddMessageIDInHeader() + { + return addMessageIDInHeader; + } + + public void setAddMessageIDInHeader(final boolean value) + { + addMessageIDInHeader = value; + } + + public synchronized boolean isPaused() + { + return paused; + } + + public synchronized boolean isFailed() + { + return failed; + } + + public synchronized void setSourceConnectionFactoryFactory(final ConnectionFactoryFactory cff) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(cff, "SourceConnectionFactoryFactory"); + + sourceCff = cff; + } + + public synchronized void setTargetConnectionFactoryFactory(final ConnectionFactoryFactory cff) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(cff, "TargetConnectionFactoryFactory"); + + targetCff = cff; + } + + public void setTransactionManager(final TransactionManager tm) + { + this.tm = tm; + } + + // Public --------------------------------------------------------------------------- + + // Private ------------------------------------------------------------------- + + private synchronized void checkParams() + { + checkNotNull(sourceCff, "sourceCff"); + checkNotNull(targetCff, "targetCff"); + checkNotNull(sourceDestinationFactory, "sourceDestinationFactory"); + checkNotNull(targetDestinationFactory, "targetDestinationFactory"); + checkValidValue(failureRetryInterval, "failureRetryInterval"); + checkValidValue(maxRetries, "maxRetries"); + if (failureRetryInterval == -1 && maxRetries > 0) + { + throw new IllegalArgumentException("If failureRetryInterval == -1 maxRetries must be set to -1"); + } + checkMaxBatchSize(maxBatchSize); + checkValidValue(maxBatchTime, "maxBatchTime"); + checkNotNull(qualityOfServiceMode, "qualityOfServiceMode"); + } + + /** + * Check the object is not null + * + * @throws IllegalArgumentException if the object is null + */ + private static void checkNotNull(final Object obj, final String name) + { + if (obj == null) + { + throw new IllegalArgumentException(name + " cannot be null"); + } + } + + /** + * Check the bridge is not started + * + * @throws IllegalStateException if the bridge is started + */ + private void checkBridgeNotStarted() + { + if (started) + { + throw new IllegalStateException("Cannot set bridge attributes while it is started"); + } + } + + /** + * Check that value is either equals to -1 or greater than 0 + * + * @throws IllegalArgumentException if the value is not valid + */ + private static void checkValidValue(final long value, final String name) + { + if (!(value == -1 || value > 0)) + { + throw new IllegalArgumentException(name + " must be > 0 or -1"); + } + } + + private static void checkMaxBatchSize(final int size) + { + if (!(size >= 1)) + { + throw new IllegalArgumentException("maxBatchSize must be >= 1"); + } + } + + private void enlistResources(final Transaction tx) throws Exception + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Enlisting resources in tx"); + } + + XAResource resSource = ((XASession) sourceSession).getXAResource(); + + tx.enlistResource(resSource); + + XAResource resDest = ((XASession) targetSession).getXAResource(); + + tx.enlistResource(resDest); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Enlisted resources in tx"); + } + } + + private void delistResources(final Transaction tx) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Delisting resources from tx"); + } + + XAResource resSource = ((XASession) sourceSession).getXAResource(); + + try + { + tx.delistResource(resSource, XAResource.TMSUCCESS); + } + catch (Exception e) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist source resource", e); + } + } + + XAResource resDest = ((XASession) targetSession).getXAResource(); + + try + { + tx.delistResource(resDest, XAResource.TMSUCCESS); + } + catch (Exception e) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist target resource", e); + } + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Delisted resources from tx"); + } + } + + private Transaction startTx() throws Exception + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction"); + } + + TransactionManager tm = getTm(); + + // Set timeout to a large value since we do not want to time out while waiting for messages + // to arrive - 10 years should be enough + tm.setTransactionTimeout(JMSBridgeImpl.TEN_YEARS); + + tm.begin(); + + Transaction tx = tm.getTransaction(); + + // Remove the association between current thread - we don't want it + // we will be committing /rolling back directly on the transaction object + + tm.suspend(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Started JTA transaction"); + } + + return tx; + } + + private TransactionManager getTm() + { + if (tm == null) + { + try + { + Object o = safeInitNewInstance(transactionManagerLocatorClass); + Method m = o.getClass().getMethod(transactionManagerLocatorMethod); + tm = (TransactionManager) m.invoke(o); + } + catch (Exception e) + { + throw new IllegalStateException("unable to create TransactionManager from " + transactionManagerLocatorClass + + "." + + transactionManagerLocatorMethod, + e); + } + + if (tm == null) + { + throw new IllegalStateException("Cannot locate a transaction manager"); + } + } + + return tm; + } + + private Connection createConnection(final String username, final String password, + final ConnectionFactoryFactory cff, + final String clientID, + final boolean isXA, + boolean isSource) throws Exception + { + Connection conn; + + Object cf = cff.createConnectionFactory(); + + if (cf instanceof HornetQConnectionFactory && registry != null) + { + registry.register(XARecoveryConfig.newConfig((HornetQConnectionFactory) cf, username, password)); + } + + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE && !(cf instanceof XAConnectionFactory)) + { + throw new IllegalArgumentException("Connection factory must be XAConnectionFactory"); + } + + if (username == null) + { + if (isXA) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating an XA connection"); + } + conn = ((XAConnectionFactory) cf).createXAConnection(); + } + else + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection"); + } + conn = ((ConnectionFactory) cf).createConnection(); + } + } + else + { + if (isXA) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating an XA connection"); + } + conn = ((XAConnectionFactory) cf).createXAConnection(username, password); + } + else + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection"); + } + conn = ((ConnectionFactory) cf).createConnection(username, password); + } + } + + if (clientID != null) + { + conn.setClientID(clientID); + } + + boolean ha = false; + BridgeFailoverListener failoverListener = null; + + if (conn instanceof HornetQConnection) + { + HornetQConnectionFactory hornetQCF = (HornetQConnectionFactory) cf; + ha = hornetQCF.isHA(); + + if (ha) + { + HornetQConnection hornetQConn = (HornetQConnection) conn; + failoverListener = new BridgeFailoverListener(isSource); + hornetQConn.setFailoverListener(failoverListener); + } + } + + conn.setExceptionListener(new BridgeExceptionListener(ha, failoverListener, isSource)); + + return conn; + } + + /* + * Source and target on same server + * -------------------------------- + * If the source and target destinations are on the same server (same resource manager) then, + * in order to get ONCE_AND_ONLY_ONCE, we simply need to consuming and send in a single + * local JMS transaction. + * + * We actually use a single local transacted session for the other QoS modes too since this + * is more performant than using DUPS_OK_ACKNOWLEDGE or AUTO_ACKNOWLEDGE session ack modes, so effectively + * the QoS is upgraded. + * + * Source and target on different server + * ------------------------------------- + * If the source and target destinations are on a different servers (different resource managers) then: + * + * If desired QoS is ONCE_AND_ONLY_ONCE, then we start a JTA transaction and enlist the consuming and sending + * XAResources in that. + * + * If desired QoS is DUPLICATES_OK then, we use CLIENT_ACKNOWLEDGE for the consuming session and + * AUTO_ACKNOWLEDGE (this is ignored) for the sending session if the maxBatchSize == 1, otherwise we + * use a local transacted session for the sending session where maxBatchSize > 1, since this is more performant + * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE + * *after* the batch has been sent + * + * If desired QoS is AT_MOST_ONCE then, if maxBatchSize == 1, we use AUTO_ACKNOWLEDGE for the consuming session, + * and AUTO_ACKNOWLEDGE for the sending session. + * If maxBatchSize > 1, we use CLIENT_ACKNOWLEDGE for the consuming session and a local transacted session for the + * sending session. + * + * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE + * *before* the batch has been sent + * + */ + private boolean setupJMSObjects() + { + try + { + if (sourceCff == targetCff) + { + // Source and target destinations are on the server - we can get once and only once + // just using a local transacted session + // everything becomes once and only once + + forwardMode = JMSBridgeImpl.FORWARD_MODE_LOCALTX; + } + else + { + // Different servers + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) + { + // Use XA + forwardMode = JMSBridgeImpl.FORWARD_MODE_XA; + } + else + { + forwardMode = JMSBridgeImpl.FORWARD_MODE_NONTX; + } + } + + // Lookup the destinations + sourceDestination = sourceDestinationFactory.createDestination(); + + targetDestination = targetDestinationFactory.createDestination(); + + // bridging on the same server + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + // We simply use a single local transacted session for consuming and sending + + sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true); + sourceSession = sourceConn.createSession(true, Session.SESSION_TRANSACTED); + } + else // bridging across different servers + { + // QoS = ONCE_AND_ONLY_ONCE + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + // Create an XASession for consuming from the source + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating XA source session"); + } + + sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, true, true); + sourceSession = ((XAConnection) sourceConn).createXASession(); + } + else // QoS = DUPLICATES_OK || AT_MOST_ONCE + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating non XA source session"); + } + + sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true); + if (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize == 1) + { + sourceSession = sourceConn.createSession(false, Session.AUTO_ACKNOWLEDGE); + } + else + { + sourceSession = sourceConn.createSession(false, Session.CLIENT_ACKNOWLEDGE); + } + } + } + + if (subName == null) + { + if (selector == null) + { + sourceConsumer = sourceSession.createConsumer(sourceDestination); + } + else + { + sourceConsumer = sourceSession.createConsumer(sourceDestination, selector, false); + } + } + else + { + // Durable subscription + if (selector == null) + { + sourceConsumer = sourceSession.createDurableSubscriber((Topic) sourceDestination, subName); + } + else + { + sourceConsumer = sourceSession.createDurableSubscriber((Topic) sourceDestination, subName, selector, false); + } + } + + // Now the sending session + + // bridging on the same server + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + targetConn = sourceConn; + targetSession = sourceSession; + } + else // bridging across different servers + { + // QoS = ONCE_AND_ONLY_ONCE + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating XA dest session"); + } + + // Create an XA session for sending to the destination + + targetConn = createConnection(targetUsername, targetPassword, targetCff, null, true, false); + + targetSession = ((XAConnection) targetConn).createXASession(); + } + else // QoS = DUPLICATES_OK || AT_MOST_ONCE + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Creating non XA dest session"); + } + + // Create a standard session for sending to the target + + // If batch size > 1 we use a transacted session since is more efficient + + boolean transacted = maxBatchSize > 1; + + targetConn = createConnection(targetUsername, targetPassword, targetCff, null, false, false); + + targetSession = targetConn.createSession(transacted, transacted ? Session.SESSION_TRANSACTED + : Session.AUTO_ACKNOWLEDGE); + } + } + + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction"); + } + + tx = startTx(); + + enlistResources(tx); + } + + targetProducer = targetSession.createProducer(null); + + return true; + } + catch (Exception e) + { + // We shouldn't log this, as it's expected when trying to connect when target/source is not available + + // If this fails we should attempt to cleanup or we might end up in some weird state + + // Adding a log.warn, so the use may see the cause of the failure and take actions + HornetQJMSBridgeLogger.LOGGER.bridgeConnectError(e); + + cleanup(); + + return false; + } + } + + private void cleanup() + { + // Stop the source connection + try + { + sourceConn.stop(); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to stop source connection", ignore); + } + } + + if (tx != null) + { + try + { + delistResources(tx); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist resources", ignore); + } + } + try + { + // Terminate the tx + tx.rollback(); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore); + } + } + } + + // Close the old objects + try + { + sourceConn.close(); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to close source connection", ignore); + } + } + try + { + if (targetConn != null) + { + targetConn.close(); + } + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failed to close target connection", ignore); + } + } + } + + private void pause(final long interval) + { + long start = System.currentTimeMillis(); + while (System.currentTimeMillis() - start < failureRetryInterval) + { + try + { + Thread.sleep(failureRetryInterval); + } + catch (InterruptedException ex) + { + } + } + } + + private boolean setupJMSObjectsWithRetry() + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Setting up connections"); + } + + int count = 0; + + while (true && !stopping) + { + boolean ok = setupJMSObjects(); + + if (ok) + { + return true; + } + + count++; + + if (maxRetries != -1 && count == maxRetries) + { + break; + } + + HornetQJMSBridgeLogger.LOGGER.failedToSetUpBridge(failureRetryInterval); + + pause(failureRetryInterval); + } + + // If we get here then we exceeded maxRetries + return false; + } + + private void sendBatch() + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Sending batch of " + messages.size() + " messages"); + } + + if (paused) + { + // Don't send now + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Paused, so not sending now"); + } + + return; + } + + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + sendBatchLocalTx(); + } + else if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + sendBatchXA(); + } + else + { + sendBatchNonTransacted(); + } + } + + private void sendBatchNonTransacted() + { + try + { + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE || + (qualityOfServiceMode == QualityOfServiceMode.AT_MOST_ONCE && maxBatchSize > 1)) + { + // We client ack before sending + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Client acking source session"); + } + + messages.getLast().acknowledge(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Client acked source session"); + } + } + + boolean exHappened; + + do + { + exHappened = false; + try + { + sendMessages(); + } + catch (TransactionRolledbackException e) + { + HornetQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e); + exHappened = true; + } + } + while (exHappened); + + if (maxBatchSize > 1) + { + // The sending session is transacted - we need to commit it + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Committing target session"); + } + + targetSession.commit(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Committed target session"); + } + } + + if (qualityOfServiceMode == QualityOfServiceMode.DUPLICATES_OK) + { + // We client ack after sending + + // Note we could actually use Session.DUPS_OK_ACKNOWLEDGE here + // For a slightly less strong delivery guarantee + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Client acking source session"); + } + + messages.getLast().acknowledge(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Client acked source session"); + } + } + } + catch (Exception e) + { + if (!stopping) + { + HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); + } + + // We don't call failure otherwise failover would be broken with HornetQ + // We let the ExceptionListener to deal with failures + + if (connectedSource) + { + try + { + sourceSession.recover(); + } + catch (Throwable ignored) + { + } + } + + } + finally + { + // Clear the messages + messages.clear(); + + } + } + + private void sendBatchXA() + { + try + { + sendMessages(); + + // Commit the JTA transaction and start another + delistResources(tx); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Committing JTA transaction"); + } + + tx.commit(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Committed JTA transaction"); + } + } + catch (Exception e) + { + try + { + // we call this just in case there is a failure other than failover + tx.rollback(); + } + catch (Throwable ignored) + { + } + + HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); + + //we don't do handle failure here because the tx + //may be rolledback due to failover. All failure handling + //will be done through exception listener. + //handleFailureOnSend(); + } + finally + { + try + { + tx = startTx(); + + enlistResources(tx); + + // Clear the messages + messages.clear(); + + } + catch (Exception e) + { + HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); + + handleFailureOnSend(); + } + } + } + + private void sendBatchLocalTx() + { + try + { + sendMessages(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Committing source session"); + } + + sourceSession.commit(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Committed source session"); + } + + } + catch (Exception e) + { + HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e); + + try + { + sourceSession.rollback(); + } + catch (Throwable ignored) + { + } + try + { + targetSession.rollback(); + } + catch (Throwable ignored) + { + } + + // We don't call failure here, we let the exception listener to deal with it + } + finally + { + messages.clear(); + } + } + + private void sendMessages() throws Exception + { + Iterator iter = messages.iterator(); + + Message msg = null; + + while (iter.hasNext()) + { + msg = iter.next(); + + if (addMessageIDInHeader) + { + addMessageIDInHeader(msg); + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Sending message " + msg); + } + + // Make sure the correct time to live gets propagated + + long timeToLive = msg.getJMSExpiration(); + + if (timeToLive != 0) + { + timeToLive -= System.currentTimeMillis(); + + if (timeToLive <= 0) + { + timeToLive = 1; // Should have already expired - set to 1 so it expires when it is consumed or delivered + } + } + + targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Sent message " + msg); + } + } + } + + private void handleFailureOnSend() + { + handleFailure(new FailureHandler()); + } + + private void handleFailureOnStartup() + { + handleFailure(new StartupFailureHandler()); + } + + private void handleFailure(final Runnable failureHandler) + { + failed = true; + + // Failure must be handled on a separate thread to the calling thread (either onMessage or start). + // In the case of onMessage we can't close the connection from inside the onMessage method + // since it will block waiting for onMessage to complete. In the case of start we want to return + // from the call before the connections are reestablished so that the caller is not blocked unnecessarily. + executor.execute(failureHandler); + } + + private void addMessageIDInHeader(final Message msg) throws Exception + { + // We concatenate the old message id as a header in the message + // This allows the target to then use this as the JMSCorrelationID of any response message + // thus enabling a distributed request-response pattern. + // Each bridge (if there are more than one) in the chain can concatenate the message id + // So in the case of multiple bridges having routed the message this can be used in a multi-hop + // distributed request/response + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Adding old message id in Message header"); + } + + JMSBridgeImpl.copyProperties(msg); + + String val = null; + + val = msg.getStringProperty(HornetQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); + + if (val == null) + { + val = msg.getJMSMessageID(); + } + else + { + StringBuffer sb = new StringBuffer(val); + + sb.append(",").append(msg.getJMSMessageID()); + + val = sb.toString(); + } + + msg.setStringProperty(HornetQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val); + } + + /* + * JMS does not let you add a property on received message without first + * calling clearProperties, so we need to save and re-add all the old properties so we + * don't lose them!! + */ + private static void copyProperties(final Message msg) throws JMSException + { + @SuppressWarnings("unchecked") + Enumeration en = msg.getPropertyNames(); + + Map oldProps = null; + + while (en.hasMoreElements()) + { + String propName = en.nextElement(); + + if (oldProps == null) + { + oldProps = new HashMap(); + } + + oldProps.put(propName, msg.getObjectProperty(propName)); + } + + msg.clearProperties(); + + if (oldProps != null) + { + Iterator> oldPropsIter = oldProps.entrySet().iterator(); + + while (oldPropsIter.hasNext()) + { + Entry entry = oldPropsIter.next(); + + String propName = entry.getKey(); + + Object val = entry.getValue(); + + if (val instanceof byte[] == false) + { + //Can't set byte[] array props through the JMS API - if we're bridging a HornetQ message it might have such props + msg.setObjectProperty(propName, entry.getValue()); + } + else if (msg instanceof HornetQMessage) + { + ((HornetQMessage) msg).getCoreMessage().putBytesProperty(propName, (byte[]) val); + } + } + } + } + + /** + * Creates a 3-sized thread pool executor (1 thread for the sourceReceiver, 1 for the timeChecker + * and 1 for the eventual failureHandler) + */ + private ExecutorService createExecutor() + { + return Executors.newFixedThreadPool(3); + } + + // Inner classes --------------------------------------------------------------- + + /** + * We use a Thread which polls the sourceDestination instead of a MessageListener + * to ensure that message delivery does not happen concurrently with + * transaction enlistment of the XAResource (see HORNETQ-27) + */ + private final class SourceReceiver extends Thread + { + SourceReceiver() + { + super("jmsbridge-source-receiver-thread"); + } + + @Override + public void run() + { + while (started) + { + if (stopping) + { + return; + } + synchronized (lock) + { + if (paused || failed) + { + try + { + lock.wait(500); + } + catch (InterruptedException e) + { + if (stopping) + { + return; + } + throw new HornetQInterruptedException(e); + } + continue; + } + + Message msg = null; + try + { + msg = sourceConsumer.receive(1000); + + if (msg instanceof HornetQMessage) + { + // We need to check the buffer mainly in the case of LargeMessages + // As we need to reconstruct the buffer before resending the message + ((HornetQMessage) msg).checkBuffer(); + } + } + catch (JMSException jmse) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " exception while receiving a message", jmse); + } + } + + if (msg == null) + { + try + { + lock.wait(500); + } + catch (InterruptedException e) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted"); + } + if (stopping) + { + return; + } + throw new HornetQInterruptedException(e); + } + continue; + } + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " received message " + msg); + } + + messages.add(msg); + + batchExpiryTime = System.currentTimeMillis() + maxBatchTime; + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime); + } + + if (maxBatchSize != -1 && messages.size() >= maxBatchSize) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " maxBatchSize has been reached so sending batch"); + } + + sendBatch(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " sent batch"); + } + } + } + } + } + } + + private class FailureHandler implements Runnable + { + /** + * Start the source connection - note the source connection must not be started before + * otherwise messages will be received and ignored + */ + protected void startSourceConnection() + { + try + { + sourceConn.start(); + } + catch (JMSException e) + { + HornetQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e); + } + } + + protected void succeeded() + { + HornetQJMSBridgeLogger.LOGGER.bridgeReconnected(); + connectedSource = true; + connectedTarget = true; + synchronized (lock) + { + failed = false; + + startSourceConnection(); + } + } + + protected void failed() + { + // We haven't managed to recreate connections or maxRetries = 0 + HornetQJMSBridgeLogger.LOGGER.errorConnectingBridge(); + + try + { + stop(); + } + catch (Exception ignore) + { + } + } + + public void run() + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failure handler running"); + } + + // Clear the messages + messages.clear(); + + cleanup(); + + boolean ok = false; + + if (maxRetries > 0 || maxRetries == -1) + { + HornetQJMSBridgeLogger.LOGGER.bridgeRetry(failureRetryInterval); + + pause(failureRetryInterval); + + // Now we try + ok = setupJMSObjectsWithRetry(); + } + + if (!ok) + { + failed(); + } + else + { + succeeded(); + } + } + } + + private class StartupFailureHandler extends FailureHandler + { + @Override + protected void failed() + { + // Don't call super + HornetQJMSBridgeLogger.LOGGER.bridgeNotStarted(); + } + + @Override + protected void succeeded() + { + // Don't call super - a bit ugly in this case but better than taking the lock twice. + HornetQJMSBridgeLogger.LOGGER.bridgeConnected(); + + synchronized (lock) + { + + connectedSource = true; + connectedTarget = true; + failed = false; + started = true; + + // Start the source connection - note the source connection must not be started before + // otherwise messages will be received and ignored + + try + { + startSource(); + } + catch (JMSException e) + { + HornetQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e); + } + } + } + } + + private class BatchTimeChecker implements Runnable + { + public void run() + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " running"); + } + + synchronized (lock) + { + while (started) + { + long toWait = batchExpiryTime - System.currentTimeMillis(); + + if (toWait <= 0) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " waited enough"); + } + + synchronized (lock) + { + if (!failed && !messages.isEmpty()) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " got some messages so sending batch"); + } + + sendBatch(); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " sent batch"); + } + } + } + + batchExpiryTime = System.currentTimeMillis() + maxBatchTime; + } + else + { + try + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " waiting for " + toWait); + } + + lock.wait(toWait); + + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " woke up"); + } + } + catch (InterruptedException e) + { + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted"); + } + if (stopping) + { + return; + } + throw new HornetQInterruptedException(e); + } + + } + } + } + } + } + + private class BridgeExceptionListener implements ExceptionListener + { + boolean ha; + BridgeFailoverListener failoverListener; + private final boolean isSource; + + public BridgeExceptionListener(boolean ha, BridgeFailoverListener failoverListener, boolean isSource) + { + this.ha = ha; + this.failoverListener = failoverListener; + this.isSource = isSource; + } + + public void onException(final JMSException e) + { + if (stopping) + { + return; + } + HornetQJMSBridgeLogger.LOGGER.bridgeFailure(e); + if (isSource) + { + connectedSource = false; + } + else + { + connectedTarget = false; + } + + synchronized (lock) + { + if (stopping) + { + return; + } + if (failed) + { + // The failure has already been detected and is being handled + if (JMSBridgeImpl.trace) + { + HornetQJMSBridgeLogger.LOGGER.trace("Failure recovery already in progress"); + } + } + else + { + boolean shouldHandleFailure = true; + if (ha) + { + //make sure failover happened + shouldHandleFailure = !failoverListener.waitForFailover(); + } + + if (shouldHandleFailure) + { + handleFailure(new FailureHandler()); + } + } + } + } + } + + + private void locateRecoveryRegistry() + { + if (registry == null) + { + for (String locatorClasse : RESOURCE_RECOVERY_CLASS_NAMES) + { + try + { + registry = (HornetQRegistryBase) safeInitNewInstance(locatorClasse); + } + catch (Throwable e) + { + HornetQJMSBridgeLogger.LOGGER.debug("unable to load recovery registry " + locatorClasse, e); + } + if (registry != null) + { + break; + } + } + + if (registry != null) + { + HornetQJMSBridgeLogger.LOGGER.debug("Recovery Registry located = " + registry); + } + } + } + + /** + * This seems duplicate code all over the place, but for security reasons we can't let something like this to be open in a + * utility class, as it would be a door to load anything you like in a safe VM. + * For that reason any class trying to do a privileged block should do with the AccessController directly. + */ + private static Object safeInitNewInstance(final String className) + { + return AccessController.doPrivileged(new PrivilegedAction() + { + public Object run() + { + return ClassloadingUtil.newInstanceFromClassLoader(className); + } + }); + } + + public boolean isUseMaskedPassword() + { + return useMaskedPassword; + } + + public void setUseMaskedPassword(boolean maskPassword) + { + this.useMaskedPassword = maskPassword; + } + + public String getPasswordCodec() + { + return passwordCodec; + } + + public void setPasswordCodec(String passwordCodec) + { + this.passwordCodec = passwordCodec; + } + + private class BridgeFailoverListener implements FailoverEventListener + { + private final boolean isSource; + volatile FailoverEventType lastEvent; + + public BridgeFailoverListener(boolean isSource) + { + this.isSource = isSource; + } + + @Override + public void failoverEvent(FailoverEventType eventType) + { + synchronized (this) + { + lastEvent = eventType; + if (eventType == FailoverEventType.FAILURE_DETECTED) + { + if (isSource) + { + connectedSource = false; + } + else + { + connectedTarget = false; + } + } + this.notify(); + } + } + + //return true if failover completed successfully + public boolean waitForFailover() + { + long toWait = failoverTimeout; + long start = 0; + long waited = 0; + boolean timedOut = false; + FailoverEventType result = null; + synchronized (this) + { + while ((lastEvent == null || lastEvent == FailoverEventType.FAILURE_DETECTED)) + { + try + { + if (toWait <= 0) + { + timedOut = true; + break; + } + start = System.currentTimeMillis(); + this.wait(toWait); + } + catch (InterruptedException e) + { + } + finally + { + waited = System.currentTimeMillis() - start; + toWait = failoverTimeout - waited; + } + } + result = lastEvent; + lastEvent = null; + } + + if (timedOut) + { + //timeout, presumably failover failed. + HornetQJMSBridgeLogger.LOGGER.debug("Timed out waiting for failover completion " + this); + return false; + } + + /* + * make sure we reset the connected flags + * */ + if (result == FailoverEventType.FAILOVER_COMPLETED) + { + if (isSource) + { + connectedSource = true; + } + else + { + connectedTarget = true; + } + return true; + } + //failover failed, need retry. + return false; + } + } + + public long getFailoverTimeout() + { + return failoverTimeout; + } + + public void setFailoverTimeout(long failoverTimeout) + { + this.failoverTimeout = failoverTimeout; + } + + +} diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIConnectionFactoryFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java similarity index 96% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIConnectionFactoryFactory.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java index 8f0d1a762b..65dcd2b180 100644 --- a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIConnectionFactoryFactory.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java @@ -1,40 +1,40 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.bridge.impl; - -import java.util.Hashtable; - -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; - - -/** - * A JNDIConnectionFactoryFactory - * - * @author Tim Fox - * @version $Revision:4566 $ - * - * - */ -public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements ConnectionFactoryFactory -{ - public JNDIConnectionFactoryFactory(final Hashtable jndiProperties, final String lookup) - { - super(jndiProperties, lookup); - } - - public Object createConnectionFactory() throws Exception - { - return createObject(); - } - -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.bridge.impl; + +import java.util.Hashtable; + +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; + + +/** + * A JNDIConnectionFactoryFactory + * + * @author Tim Fox + * @version $Revision:4566 $ + * + * + */ +public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements ConnectionFactoryFactory +{ + public JNDIConnectionFactoryFactory(final Hashtable jndiProperties, final String lookup) + { + super(jndiProperties, lookup); + } + + public Object createConnectionFactory() throws Exception + { + return createObject(); + } + +} diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIDestinationFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIDestinationFactory.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIFactorySupport.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/bridge/impl/JNDIFactorySupport.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSConnectionFactoryControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSConnectionFactoryControlImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSQueueControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSQueueControlImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSServerControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSServerControlImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSTopicControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/management/impl/JMSTopicControlImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/JMSStorageManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/JMSStorageManager.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedConnectionFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedConnectionFactory.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedDestination.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedDestination.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedJNDI.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedJNDI.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedType.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/config/PersistedType.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerBundle.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/HornetQJMSServerLogger.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerConfigParser.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerConfigParser.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/JMSServerManager.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/ConnectionFactoryConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/ConnectionFactoryConfiguration.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSConfiguration.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSQueueConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/JMSQueueConfiguration.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/TopicConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/TopicConfiguration.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSConfigurationImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSQueueConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/JMSQueueConfigurationImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TopicConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TopicConfigurationImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/config/impl/TransportConfigurationEncodingSupport.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/embedded/EmbeddedJMS.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/embedded/EmbeddedJMS.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerConfigParserImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerDeployer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerDeployer.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/JMSServerManagerImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/StandaloneNamingServer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/impl/StandaloneNamingServer.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSManagementService.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSManagementService.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSNotificationType.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/JMSNotificationType.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/impl/JMSManagementServiceImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/management/impl/JMSManagementServiceImpl.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRecoveryRegistry.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRecoveryRegistry.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRegistryBase.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQRegistryBase.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceRecovery.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceRecovery.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceWrapper.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/HornetQXAResourceWrapper.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/RecoveryDiscovery.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/RecoveryDiscovery.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/XARecoveryConfig.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/XARecoveryConfig.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/package-info.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/server/recovery/package-info.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java diff --git a/activemq6-jms-server/src/main/java/org/apache/activemq6/jms/transaction/JMSTransactionDetail.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java similarity index 100% rename from activemq6-jms-server/src/main/java/org/apache/activemq6/jms/transaction/JMSTransactionDetail.java rename to activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java diff --git a/activemq6-jms-server/src/main/resources/schema/hornetq-jms.xsd b/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd similarity index 100% rename from activemq6-jms-server/src/main/resources/schema/hornetq-jms.xsd rename to activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd diff --git a/activemq6-journal/pom.xml b/activemq-journal/pom.xml similarity index 100% rename from activemq6-journal/pom.xml rename to activemq-journal/pom.xml diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AIOCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AIOCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AsynchronousFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/AsynchronousFile.java rename to activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/BufferCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/BufferCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/IOExceptionListener.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/IOExceptionListener.java rename to activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/AsynchronousFileImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/AsynchronousFileImpl.java rename to activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/HornetQFileLock.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/asyncio/impl/HornetQFileLock.java rename to activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/EncodingSupport.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/EncodingSupport.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOAsyncTask.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOAsyncTask.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCompletion.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCompletion.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCriticalErrorListener.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/IOCriticalErrorListener.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/Journal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/Journal.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/JournalLoadInformation.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/JournalLoadInformation.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/LoaderCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/LoaderCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/PreparedTransactionInfo.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/PreparedTransactionInfo.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/RecordInfo.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/RecordInfo.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFile.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/SequentialFileFactory.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TestableJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TestableJournal.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TransactionFailureCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/TransactionFailureCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFile.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AIOSequentialFileFactory.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractJournalUpdateTask.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractJournalUpdateTask.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFile.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/AbstractSequentialFileFactory.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/CompactJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/CompactJournal.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/DummyCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/DummyCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ExportJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ExportJournal.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/FileWrapperJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/FileWrapperJournal.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ImportJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/ImportJournal.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalBase.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalBase.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalCompactor.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalCompactor.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalConstants.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalConstants.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFile.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFileImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFileImpl.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFilesRepository.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalFilesRepository.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalImpl.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalReaderCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalReaderCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalReaderCallbackAbstract.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalReaderCallbackAbstract.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalRecord.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalRecordProvider.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalRecordProvider.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalTransaction.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/JournalTransaction.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/NIOSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/NIOSequentialFile.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/NIOSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/NIOSequentialFileFactory.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/Reclaimer.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/Reclaimer.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/SimpleWaitIOCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/SimpleWaitIOCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/SyncIOCompletion.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/SyncIOCompletion.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/SyncSpeedTest.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/SyncSpeedTest.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/TimedBuffer.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/TimedBuffer.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/TimedBufferObserver.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/TimedBufferObserver.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/TransactionCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/TransactionCallback.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/ByteArrayEncoding.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/ByteArrayEncoding.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalAddRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalAddRecord.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalAddRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalAddRecordTX.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalCompleteRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalCompleteRecordTX.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecord.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalDeleteRecordTX.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalInternalRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalInternalRecord.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalRollbackRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/core/journal/impl/dataformat/JournalRollbackRecordTX.java rename to activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalBundle.java b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalBundle.java rename to activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java diff --git a/activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalLogger.java b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java similarity index 100% rename from activemq6-journal/src/main/java/org/apache/activemq6/journal/HornetQJournalLogger.java rename to activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java diff --git a/activemq6-journal/src/test/java/org/apache/activemq6/tests/asyncio/LibaioDependencyCheckTest.java b/activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java similarity index 100% rename from activemq6-journal/src/test/java/org/apache/activemq6/tests/asyncio/LibaioDependencyCheckTest.java rename to activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java diff --git a/activemq6-native/README b/activemq-native/README similarity index 100% rename from activemq6-native/README rename to activemq-native/README diff --git a/activemq6-native/compile-native.sh b/activemq-native/compile-native.sh similarity index 100% rename from activemq6-native/compile-native.sh rename to activemq-native/compile-native.sh diff --git a/activemq6-native/pom.xml b/activemq-native/pom.xml similarity index 100% rename from activemq6-native/pom.xml rename to activemq-native/pom.xml diff --git a/activemq6-native/src/main/c/AIOController.cpp b/activemq-native/src/main/c/AIOController.cpp similarity index 100% rename from activemq6-native/src/main/c/AIOController.cpp rename to activemq-native/src/main/c/AIOController.cpp diff --git a/activemq6-native/src/main/c/AIOController.h b/activemq-native/src/main/c/AIOController.h similarity index 100% rename from activemq6-native/src/main/c/AIOController.h rename to activemq-native/src/main/c/AIOController.h diff --git a/activemq6-native/src/main/c/AIOException.h b/activemq-native/src/main/c/AIOException.h similarity index 100% rename from activemq6-native/src/main/c/AIOException.h rename to activemq-native/src/main/c/AIOException.h diff --git a/activemq6-native/src/main/c/AsyncFile.cpp b/activemq-native/src/main/c/AsyncFile.cpp similarity index 100% rename from activemq6-native/src/main/c/AsyncFile.cpp rename to activemq-native/src/main/c/AsyncFile.cpp diff --git a/activemq6-native/src/main/c/AsyncFile.h b/activemq-native/src/main/c/AsyncFile.h similarity index 100% rename from activemq6-native/src/main/c/AsyncFile.h rename to activemq-native/src/main/c/AsyncFile.h diff --git a/activemq6-native/src/main/c/CallbackAdapter.h b/activemq-native/src/main/c/CallbackAdapter.h similarity index 100% rename from activemq6-native/src/main/c/CallbackAdapter.h rename to activemq-native/src/main/c/CallbackAdapter.h diff --git a/activemq6-native/src/main/c/JAIODatatypes.h b/activemq-native/src/main/c/JAIODatatypes.h similarity index 100% rename from activemq6-native/src/main/c/JAIODatatypes.h rename to activemq-native/src/main/c/JAIODatatypes.h diff --git a/activemq6-native/src/main/c/JNICallbackAdapter.cpp b/activemq-native/src/main/c/JNICallbackAdapter.cpp similarity index 100% rename from activemq6-native/src/main/c/JNICallbackAdapter.cpp rename to activemq-native/src/main/c/JNICallbackAdapter.cpp diff --git a/activemq6-native/src/main/c/JNICallbackAdapter.h b/activemq-native/src/main/c/JNICallbackAdapter.h similarity index 100% rename from activemq6-native/src/main/c/JNICallbackAdapter.h rename to activemq-native/src/main/c/JNICallbackAdapter.h diff --git a/activemq6-native/src/main/c/JNI_AsynchronousFileImpl.cpp b/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp similarity index 100% rename from activemq6-native/src/main/c/JNI_AsynchronousFileImpl.cpp rename to activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp diff --git a/activemq6-native/src/main/c/JavaUtilities.cpp b/activemq-native/src/main/c/JavaUtilities.cpp similarity index 100% rename from activemq6-native/src/main/c/JavaUtilities.cpp rename to activemq-native/src/main/c/JavaUtilities.cpp diff --git a/activemq6-native/src/main/c/JavaUtilities.h b/activemq-native/src/main/c/JavaUtilities.h similarity index 100% rename from activemq6-native/src/main/c/JavaUtilities.h rename to activemq-native/src/main/c/JavaUtilities.h diff --git a/activemq6-native/src/main/c/LockClass.h b/activemq-native/src/main/c/LockClass.h similarity index 100% rename from activemq6-native/src/main/c/LockClass.h rename to activemq-native/src/main/c/LockClass.h diff --git a/activemq6-native/src/main/c/Version.h b/activemq-native/src/main/c/Version.h similarity index 100% rename from activemq6-native/src/main/c/Version.h rename to activemq-native/src/main/c/Version.h diff --git a/activemq6-native/src/main/java/org/apache/activemq6/core/libaio/Native.java b/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java similarity index 100% rename from activemq6-native/src/main/java/org/apache/activemq6/core/libaio/Native.java rename to activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/pom.xml rename to activemq-protocols/activemq-amqp-protocol/pom.xml diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/HornetQProtonRemotingConnection.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/HornetQProtonRemotingConnection.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManager.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManager.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManagerFactory.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/ProtonProtocolManagerFactory.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/HornetQJMSVendor.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/HornetQJMSVendor.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/ProtonMessageConverter.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/ProtonMessageConverter.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMapMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMapMessage.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSMessage.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSTextMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/ServerJMSTextMessage.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/package-info.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/converter/jms/package-info.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/HornetQProtonConnectionCallback.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/HornetQProtonConnectionCallback.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/package-info.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/plug/package-info.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/sasl/HornetQPlainSASL.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/java/org/apache/activemq6/core/protocol/proton/sasl/HornetQPlainSASL.java rename to activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory rename to activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory diff --git a/activemq6-protocols/activemq6-amqp-protocol/src/test/java/org/apache/activemq6/core/protocol/proton/TestConversions.java b/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java similarity index 100% rename from activemq6-protocols/activemq6-amqp-protocol/src/test/java/org/apache/activemq6/core/protocol/proton/TestConversions.java rename to activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/pom.xml rename to activemq-protocols/activemq-openwire-protocol/pom.xml diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQConnectorImpl.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQConnectorImpl.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQTransactionImpl.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/AMQTransactionImpl.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/BrokerState.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/BrokerState.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/DataInputWrapper.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/DataInputWrapper.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/NotEnoughBytesException.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/NotEnoughBytesException.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireConnection.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireConnection.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireMessageConverter.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireMessageConverter.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManager.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManager.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManagerFactory.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireProtocolManagerFactory.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireUtil.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/OpenWireUtil.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/SendingResult.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/SendingResult.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQBrokerStoppedException.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQBrokerStoppedException.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectionContext.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectionContext.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnector.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnector.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectorStatistics.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConnectorStatistics.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumer.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDeadLetterStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDeadLetterStrategy.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestination.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestination.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestinationStatistics.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQDestinationStatistics.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageStore.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQMessageStore.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQPersistenceAdapter.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQPersistenceAdapter.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducer.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducerBrokerExchange.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQProducerBrokerExchange.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSecurityContext.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSecurityContext.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerConsumer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerConsumer.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSession.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSession.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSessionFactory.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQServerSessionFactory.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSession.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSession.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscription.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscription.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscriptionRecovery.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQSubscriptionRecovery.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransaction.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransaction.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransactionFactory.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransactionFactory.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionState.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionState.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/BrowserListener.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/BrowserListener.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/MessageInfo.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/java/org/apache/activemq6/core/protocol/openwire/amq/MessageInfo.java rename to activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java diff --git a/activemq6-protocols/activemq6-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from activemq6-protocols/activemq6-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory rename to activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory diff --git a/activemq6-protocols/activemq6-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/pom.xml rename to activemq-protocols/activemq-proton-plug/pom.xml diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ClientSASL.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ClientSASL.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ClientSASL.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ClientSASL.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/SASLResult.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/SASLResult.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/SASLResult.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/SASLResult.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ServerSASL.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ServerSASL.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/ServerSASL.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ServerSASL.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPException.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPIllegalStateException.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInternalErrorException.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPInvalidFieldException.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPNotImplementedException.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/HornetQAMQPTimeoutException.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/Events.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/Events.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/Events.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/Events.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/HornetQAMQPProtocolMessageBundle.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java rename to activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/Constants.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/Constants.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/Constants.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/Constants.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java diff --git a/activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java b/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java similarity index 100% rename from activemq6-protocols/activemq6-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java rename to activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/pom.xml rename to activemq-protocols/activemq-stomp-protocol/pom.xml diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/FrameEventListener.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/FrameEventListener.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompException.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompException.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolLogger.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolLogger.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolMessageBundle.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/HornetQStompProtocolMessageBundle.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/SimpleBytes.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/SimpleBytes.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/Stomp.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/Stomp.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompCommands.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompCommands.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompConnection.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompConnection.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompDecoder.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompDecoder.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompFrame.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompFrame.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManager.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManager.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManagerFactory.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompProtocolManagerFactory.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSession.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSession.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSubscription.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompSubscription.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompUtils.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompUtils.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompVersions.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/StompVersions.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/VersionedStompFrameHandler.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/VersionedStompFrameHandler.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameHandlerV10.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameHandlerV10.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameV10.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v10/StompFrameV10.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameHandlerV11.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameHandlerV11.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameV11.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v11/StompFrameV11.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameHandlerV12.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameHandlerV12.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameV12.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/java/org/apache/activemq6/core/protocol/stomp/v12/StompFrameV12.java rename to activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java diff --git a/activemq6-protocols/activemq6-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from activemq6-protocols/activemq6-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory rename to activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory diff --git a/activemq6-protocols/pom.xml b/activemq-protocols/pom.xml similarity index 100% rename from activemq6-protocols/pom.xml rename to activemq-protocols/pom.xml diff --git a/activemq6-ra/pom.xml b/activemq-ra/pom.xml similarity index 100% rename from activemq6-ra/pom.xml rename to activemq-ra/pom.xml diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/ConnectionFactoryProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/ConnectionFactoryProperties.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABundle.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABundle.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABytesMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRABytesMessage.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactory.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactoryImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionFactoryImpl.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionManager.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionManager.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionMetaData.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionMetaData.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionRequestInfo.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAConnectionRequestInfo.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRACredential.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRACredential.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAJMSContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAJMSContext.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALocalTransaction.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALocalTransaction.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALogger.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRALogger.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMCFProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMCFProperties.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnection.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnection.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAManagedConnectionFactory.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMapMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMapMessage.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessage.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageConsumer.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageConsumer.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageListener.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageListener.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageProducer.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMessageProducer.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMetaData.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAMetaData.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAObjectMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAObjectMessage.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAProperties.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueReceiver.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueReceiver.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueSender.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAQueueSender.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAService.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAService.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASession.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASession.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactory.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactoryImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRASessionFactoryImpl.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAStreamMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAStreamMessage.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATextMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATextMessage.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicPublisher.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicPublisher.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicSubscriber.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRATopicSubscriber.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAJMSContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAJMSContext.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAResource.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRAXAResource.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRaUtils.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQRaUtils.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQResourceAdapter.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQXAResourceWrapper.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/HornetQXAResourceWrapper.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivation.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivation.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivationSpec.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQActivationSpec.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQMessageHandler.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/inflow/HornetQMessageHandler.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/package.html b/activemq-ra/src/main/java/org/apache/activemq/ra/package.html similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/package.html rename to activemq-ra/src/main/java/org/apache/activemq/ra/package.html diff --git a/activemq6-ra/src/main/java/org/apache/activemq6/ra/recovery/RecoveryManager.java b/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java similarity index 100% rename from activemq6-ra/src/main/java/org/apache/activemq6/ra/recovery/RecoveryManager.java rename to activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java diff --git a/activemq6-rest/pom.xml b/activemq-rest/pom.xml similarity index 100% rename from activemq6-rest/pom.xml rename to activemq-rest/pom.xml diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestBundle.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestBundle.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestLogger.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/HornetQRestLogger.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/Hornetq.java b/activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/Hornetq.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/HttpHeaderProperty.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/HttpHeaderProperty.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/Jms.java b/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/Jms.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceConfiguration.java b/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceConfiguration.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/MessageServiceManager.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/UnknownMediaType.java b/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/UnknownMediaType.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/UnmarshalException.java b/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/UnmarshalException.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQ.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQ.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQJMS.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/EmbeddedRestHornetQJMS.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/HornetqBootstrapListener.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/HornetqBootstrapListener.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/RestMessagingBootstrapListener.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/RestMessagingBootstrapListener.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/ServletContextBindingRegistry.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/integration/ServletContextBindingRegistry.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/AcknowledgedQueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/AcknowledgedQueueConsumer.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/Acknowledgement.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/Acknowledgement.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedHttpMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedHttpMessage.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedMessage.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedObjectMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumedObjectMessage.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumersResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/ConsumersResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationServiceManager.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationSettings.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/DestinationSettings.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessage.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageDupsOk.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageDupsOk.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageNoDups.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/PostMessageNoDups.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueConsumer.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDeployment.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDeployment.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueDestinationsResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/QueueServiceManager.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/FilePushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/FilePushStore.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/HornetQPushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/HornetQPushStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumer.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerMessageHandler.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerMessageHandler.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushConsumerResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStore.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/PushStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriTemplateStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/UriTemplateStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/Authentication.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/Authentication.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/AuthenticationType.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/AuthenticationType.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/BasicAuth.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/BasicAuth.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/DigestAuth.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/DigestAuth.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/PushRegistration.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/PushRegistration.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlHttpHeader.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlHttpHeader.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlLink.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/queue/push/xml/XmlLink.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/AcknowledgedSubscriptionResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/AcknowledgedSubscriptionResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/FileTopicPushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/FileTopicPushStore.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscription.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscription.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushSubscriptionsResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushTopicRegistration.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/PushTopicRegistration.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/Subscription.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/Subscription.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/SubscriptionsResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDeployment.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDeployment.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicDestinationsResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicPushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicPushStore.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicResource.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/topic/TopicServiceManager.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/Constants.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/util/Constants.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/CustomHeaderLinkStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/util/CustomHeaderLinkStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/HttpMessageHelper.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/util/HttpMessageHelper.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkHeaderLinkStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkHeaderLinkStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/util/LinkStrategy.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java diff --git a/activemq6-rest/src/main/java/org/apache/activemq6/rest/util/TimeoutTask.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java similarity index 100% rename from activemq6-rest/src/main/java/org/apache/activemq6/rest/util/TimeoutTask.java rename to activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java diff --git a/activemq6-rest/src/main/resources/schema/hornetq-rest.xsd b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd similarity index 100% rename from activemq6-rest/src/main/resources/schema/hornetq-rest.xsd rename to activemq-rest/src/main/resources/schema/hornetq-rest.xsd diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckQueueTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckQueueTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckTopicTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/AutoAckTopicTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckQueueTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckQueueTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckQueueTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckQueueTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckTopicTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckTopicTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/ClientAckTopicTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckTopicTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/CreateDestinationTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/CreateDestinationTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/DupQueueTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/DupQueueTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/DupQueueTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/DupQueueTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Embedded.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Embedded.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/EmbeddedTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/EmbeddedTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/FindDestinationTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/FindDestinationTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/JMSTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/JMSTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/MessageTestBase.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/MessageTestBase.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushQueueConsumerTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushTopicConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PersistentPushTopicConsumerTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushQueueConsumerTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushTopicConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/PushTopicConsumerTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RawAckTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RawAckTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingQueueTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingQueueTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingTopicTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RepostingTopicTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RoundtripTimeTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/RoundtripTimeTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SelectorTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SelectorTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SessionTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/SessionTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/TransformTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/TransformTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Util.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/Util.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java diff --git a/activemq6-rest/src/test/java/org/apache/activemq6/rest/test/XmlTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java similarity index 100% rename from activemq6-rest/src/test/java/org/apache/activemq6/rest/test/XmlTest.java rename to activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java diff --git a/activemq6-rest/src/test/resources/hornetq-configuration.xml b/activemq-rest/src/test/resources/hornetq-configuration.xml similarity index 100% rename from activemq6-rest/src/test/resources/hornetq-configuration.xml rename to activemq-rest/src/test/resources/hornetq-configuration.xml diff --git a/activemq6-rest/src/test/resources/hornetq-jms.xml b/activemq-rest/src/test/resources/hornetq-jms.xml similarity index 100% rename from activemq6-rest/src/test/resources/hornetq-jms.xml rename to activemq-rest/src/test/resources/hornetq-jms.xml diff --git a/activemq6-rest/src/test/resources/hornetq-rest.xml b/activemq-rest/src/test/resources/hornetq-rest.xml similarity index 100% rename from activemq6-rest/src/test/resources/hornetq-rest.xml rename to activemq-rest/src/test/resources/hornetq-rest.xml diff --git a/activemq6-rest/src/test/resources/hornetq-users.xml b/activemq-rest/src/test/resources/hornetq-users.xml similarity index 100% rename from activemq6-rest/src/test/resources/hornetq-users.xml rename to activemq-rest/src/test/resources/hornetq-users.xml diff --git a/activemq6-selector/pom.xml b/activemq-selector/pom.xml similarity index 100% rename from activemq6-selector/pom.xml rename to activemq-selector/pom.xml diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/LRUCache.java b/activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/LRUCache.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/SelectorParser.java b/activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/SelectorParser.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ArithmeticExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ArithmeticExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BinaryExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BinaryExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BooleanExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/BooleanExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ComparisonExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ComparisonExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ConstantExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/ConstantExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Expression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Expression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/FilterException.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/FilterException.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Filterable.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/Filterable.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/LogicExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/LogicExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/PropertyExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/PropertyExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/UnaryExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/UnaryExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XPathExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XPathExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XQueryExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XQueryExpression.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XalanXPathEvaluator.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/XalanXPathEvaluator.java rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java diff --git a/activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/package.html b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/package.html similarity index 100% rename from activemq6-selector/src/main/java/org/apache/activemq6/selector/filter/package.html rename to activemq-selector/src/main/java/org/apache/activemq/selector/filter/package.html diff --git a/activemq6-selector/src/main/javacc/HyphenatedParser.jj b/activemq-selector/src/main/javacc/HyphenatedParser.jj similarity index 100% rename from activemq6-selector/src/main/javacc/HyphenatedParser.jj rename to activemq-selector/src/main/javacc/HyphenatedParser.jj diff --git a/activemq6-selector/src/main/javacc/StrictParser.jj b/activemq-selector/src/main/javacc/StrictParser.jj similarity index 100% rename from activemq6-selector/src/main/javacc/StrictParser.jj rename to activemq-selector/src/main/javacc/StrictParser.jj diff --git a/activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorParserTest.java b/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java similarity index 100% rename from activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorParserTest.java rename to activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java diff --git a/activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorTest.java b/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java similarity index 100% rename from activemq6-selector/src/test/java/org/apache/activemq6/selector/SelectorTest.java rename to activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java diff --git a/activemq6-server/pom.xml b/activemq-server/pom.xml similarity index 100% rename from activemq6-server/pom.xml rename to activemq-server/pom.xml diff --git a/activemq6-server/src/main/java/org/apache/activemq6/api/core/management/MessageCounterInfo.java b/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/api/core/management/MessageCounterInfo.java rename to activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/BackupStrategy.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/BackupStrategy.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/BridgeConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/BridgeConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ClusterConnectionConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ClusterConnectionConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/Configuration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/Configuration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ConfigurationUtils.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ConfigurationUtils.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ConnectorServiceConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ConnectorServiceConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/CoreQueueConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/CoreQueueConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/DivertConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/DivertConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/HAPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/HAPolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ScaleDownConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ScaleDownConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ColocatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ColocatedPolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/LiveOnlyPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/LiveOnlyPolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicaPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicaPolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/ReplicatedPolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreMasterPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreMasterPolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreSlavePolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/ha/SharedStoreSlavePolicyConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/ConfigurationImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/ConfigurationImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/FileConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/FileConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/Validators.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/config/impl/Validators.java rename to activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/Deployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/Deployer.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/DeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/DeploymentManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/AddressSettingsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/AddressSettingsDeployer.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/BasicUserCredentialsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/BasicUserCredentialsDeployer.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/FileConfigurationParser.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/FileDeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/FileDeploymentManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/QueueDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/QueueDeployer.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/SecurityDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/SecurityDeployer.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/XmlDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/deployers/impl/XmlDeployer.java rename to activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/filter/Filter.java b/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/filter/Filter.java rename to activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/filter/impl/FilterImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/filter/impl/FilterImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AbstractControl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AbstractControl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AcceptorControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AcceptorControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AddressControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/AddressControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BridgeControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BridgeControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BroadcastGroupControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/BroadcastGroupControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/ClusterConnectionControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/ClusterConnectionControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/DivertControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/DivertControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/HornetQServerControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/HornetQServerControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/MBeanInfoHelper.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/MBeanInfoHelper.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/QueueControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/management/impl/QueueControlImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounter.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounter.java rename to activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounterManager.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/MessageCounterManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterHelper.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterHelper.java rename to activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java similarity index 96% rename from activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterManagerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java index a6d419d44a..89177d8b4c 100644 --- a/activemq6-server/src/main/java/org/apache/activemq6/core/messagecounter/impl/MessageCounterManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java @@ -1,230 +1,230 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.core.messagecounter.impl; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; - -/** - * - * A MessageCounterManager - * - * @author Tim Fox - * @author Jeff Mesnil - * - * @version $Revision: 3307 $ - * - * - */ -public class MessageCounterManagerImpl implements MessageCounterManager -{ - - public static final long DEFAULT_SAMPLE_PERIOD = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(); - - public static final long MIN_SAMPLE_PERIOD = 1000; - - public static final int DEFAULT_MAX_DAY_COUNT = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(); - - private final Map messageCounters; - - private boolean started; - - private long period = MessageCounterManagerImpl.DEFAULT_SAMPLE_PERIOD; - - private MessageCountersPinger messageCountersPinger; - - private int maxDayCount = MessageCounterManagerImpl.DEFAULT_MAX_DAY_COUNT; - - private final ScheduledExecutorService scheduledThreadPool; - - public MessageCounterManagerImpl(final ScheduledExecutorService scheduledThreadPool) - { - messageCounters = new HashMap(); - - this.scheduledThreadPool = scheduledThreadPool; - } - - public synchronized void start() - { - if (started) - { - return; - } - - messageCountersPinger = new MessageCountersPinger(); - - Future future = scheduledThreadPool.scheduleAtFixedRate(messageCountersPinger, - 0, - period, - TimeUnit.MILLISECONDS); - messageCountersPinger.setFuture(future); - - started = true; - } - - public synchronized void stop() - { - if (!started) - { - return; - } - - messageCountersPinger.stop(); - - started = false; - } - - public synchronized void clear() - { - messageCounters.clear(); - } - - public synchronized void reschedule(final long newPeriod) - { - boolean wasStarted = started; - - if (wasStarted) - { - stop(); - } - - period = newPeriod; - - if (wasStarted) - { - start(); - } - } - - public long getSamplePeriod() - { - return period; - } - - public int getMaxDayCount() - { - return maxDayCount; - } - - public void setMaxDayCount(final int count) - { - maxDayCount = count; - } - - public void registerMessageCounter(final String name, final MessageCounter counter) - { - synchronized (messageCounters) - { - messageCounters.put(name, counter); - } - } - - public MessageCounter unregisterMessageCounter(final String name) - { - synchronized (messageCounters) - { - return messageCounters.remove(name); - } - } - - public Set getMessageCounters() - { - synchronized (messageCounters) - { - return new HashSet(messageCounters.values()); - } - } - - public void resetAllCounters() - { - synchronized (messageCounters) - { - Iterator iter = messageCounters.values().iterator(); - - while (iter.hasNext()) - { - MessageCounter counter = iter.next(); - - counter.resetCounter(); - } - } - } - - public void resetAllCounterHistories() - { - synchronized (messageCounters) - { - Iterator iter = messageCounters.values().iterator(); - - while (iter.hasNext()) - { - MessageCounter counter = iter.next(); - - counter.resetHistory(); - } - } - } - - private class MessageCountersPinger implements Runnable - { - private boolean closed = false; - - private Future future; - - public synchronized void run() - { - if (closed) - { - return; - } - - synchronized (messageCounters) - { - Iterator iter = messageCounters.values().iterator(); - - while (iter.hasNext()) - { - MessageCounter counter = iter.next(); - - counter.onTimer(); - } - } - } - - public void setFuture(final Future future) - { - this.future = future; - } - - synchronized void stop() - { - if (future != null) - { - future.cancel(false); - } - - closed = true; - } - } - -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.core.messagecounter.impl; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq6.core.messagecounter.MessageCounter; +import org.apache.activemq6.core.messagecounter.MessageCounterManager; + +/** + * + * A MessageCounterManager + * + * @author Tim Fox + * @author Jeff Mesnil + * + * @version $Revision: 3307 $ + * + * + */ +public class MessageCounterManagerImpl implements MessageCounterManager +{ + + public static final long DEFAULT_SAMPLE_PERIOD = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(); + + public static final long MIN_SAMPLE_PERIOD = 1000; + + public static final int DEFAULT_MAX_DAY_COUNT = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(); + + private final Map messageCounters; + + private boolean started; + + private long period = MessageCounterManagerImpl.DEFAULT_SAMPLE_PERIOD; + + private MessageCountersPinger messageCountersPinger; + + private int maxDayCount = MessageCounterManagerImpl.DEFAULT_MAX_DAY_COUNT; + + private final ScheduledExecutorService scheduledThreadPool; + + public MessageCounterManagerImpl(final ScheduledExecutorService scheduledThreadPool) + { + messageCounters = new HashMap(); + + this.scheduledThreadPool = scheduledThreadPool; + } + + public synchronized void start() + { + if (started) + { + return; + } + + messageCountersPinger = new MessageCountersPinger(); + + Future future = scheduledThreadPool.scheduleAtFixedRate(messageCountersPinger, + 0, + period, + TimeUnit.MILLISECONDS); + messageCountersPinger.setFuture(future); + + started = true; + } + + public synchronized void stop() + { + if (!started) + { + return; + } + + messageCountersPinger.stop(); + + started = false; + } + + public synchronized void clear() + { + messageCounters.clear(); + } + + public synchronized void reschedule(final long newPeriod) + { + boolean wasStarted = started; + + if (wasStarted) + { + stop(); + } + + period = newPeriod; + + if (wasStarted) + { + start(); + } + } + + public long getSamplePeriod() + { + return period; + } + + public int getMaxDayCount() + { + return maxDayCount; + } + + public void setMaxDayCount(final int count) + { + maxDayCount = count; + } + + public void registerMessageCounter(final String name, final MessageCounter counter) + { + synchronized (messageCounters) + { + messageCounters.put(name, counter); + } + } + + public MessageCounter unregisterMessageCounter(final String name) + { + synchronized (messageCounters) + { + return messageCounters.remove(name); + } + } + + public Set getMessageCounters() + { + synchronized (messageCounters) + { + return new HashSet(messageCounters.values()); + } + } + + public void resetAllCounters() + { + synchronized (messageCounters) + { + Iterator iter = messageCounters.values().iterator(); + + while (iter.hasNext()) + { + MessageCounter counter = iter.next(); + + counter.resetCounter(); + } + } + } + + public void resetAllCounterHistories() + { + synchronized (messageCounters) + { + Iterator iter = messageCounters.values().iterator(); + + while (iter.hasNext()) + { + MessageCounter counter = iter.next(); + + counter.resetHistory(); + } + } + } + + private class MessageCountersPinger implements Runnable + { + private boolean closed = false; + + private Future future; + + public synchronized void run() + { + if (closed) + { + return; + } + + synchronized (messageCounters) + { + Iterator iter = messageCounters.values().iterator(); + + while (iter.hasNext()) + { + MessageCounter counter = iter.next(); + + counter.onTimer(); + } + } + } + + public void setFuture(final Future future) + { + this.future = future; + } + + synchronized void stop() + { + if (future != null) + { + future.cancel(false); + } + + closed = true; + } + } + +} diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PageTransactionInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/PageTransactionInfo.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagedMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagedMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingManager.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStore.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStore.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStoreFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/PagingStoreFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/LivePageCache.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/LivePageCache.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCache.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCache.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCursorProvider.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageCursorProvider.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagePosition.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagePosition.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscription.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscription.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscriptionCounter.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PageSubscriptionCounter.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReference.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReference.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReferenceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/PagedReferenceImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/LivePageCacheImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/LivePageCacheImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCacheImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCacheImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCursorProviderImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageCursorProviderImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PagePositionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PagePositionImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionCounterImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/cursor/impl/PageSubscriptionImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/Page.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/Page.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageSyncTimer.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageSyncTimer.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageTransactionInfoImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PageTransactionInfoImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagedMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagedMessageImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingManagerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreFactoryNIO.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreFactoryNIO.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/paging/impl/PagingStoreImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/GroupingInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/GroupingInfo.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/OperationContext.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/OperationContext.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/QueueBindingInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/QueueBindingInfo.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/StorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/StorageManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedAddressSetting.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedAddressSetting.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedRoles.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/config/PersistedRoles.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/PageCountPending.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/PageCountPending.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/AddMessageRecord.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/AddMessageRecord.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/BatchingIDGenerator.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/BatchingIDGenerator.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/DescribeJournal.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/DescribeJournal.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalRecordIds.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalRecordIds.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalStorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/JournalStorageManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageInSync.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/LargeServerMessageInSync.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/OperationContextImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/journal/OperationContextImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/persistence/impl/nullpm/NullStorageManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Address.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Address.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/AddressManager.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/AddressManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Binding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Binding.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingType.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingType.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Bindings.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/Bindings.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingsFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/BindingsFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/DuplicateIDCache.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/DuplicateIDCache.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/PostOffice.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/PostOffice.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueBinding.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/QueueInfo.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/AddressImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/AddressImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/BindingsImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/BindingsImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DivertBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DivertBinding.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DuplicateIDCacheImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/DuplicateIDCacheImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/LocalQueueBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/LocalQueueBinding.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/PostOfficeImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/PostOfficeImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/SimpleAddressManager.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/SimpleAddressManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/WildcardAddressManager.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/postoffice/impl/WildcardAddressManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ProtocolHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ProtocolHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ServerPacketDecoder.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/ServerPacketDecoder.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/ServerSessionPacketHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/ServerSessionPacketHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreProtocolManagerFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreSessionCallback.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/CoreSessionCallback.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQPacketHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/HornetQPacketHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRequestMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupRequestMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupResponseMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/BackupResponseMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/protocol/stomp/WebSocketServerHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/protocol/stomp/WebSocketServerHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/registry/JndiBindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/registry/JndiBindingRegistry.java rename to activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/registry/MapBindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/registry/MapBindingRegistry.java rename to activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptor.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMAcceptorFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnection.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnector.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnector.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnectorFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMConnectorFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/InVMRegistry.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/TransportConstants.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/invm/TransportConstants.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/ConnectionCreator.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/ConnectionCreator.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpAcceptorHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpAcceptorHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpKeepAliveRunnable.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/HttpKeepAliveRunnable.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptor.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyAcceptorFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyServerConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/impl/netty/NettyServerConnection.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/RemotingService.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/RemotingService.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/impl/RemotingServiceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/remoting/server/impl/RemotingServiceImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedJournal.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedJournal.java rename to activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedLargeMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicatedLargeMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationEndpoint.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationEndpoint.java rename to activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationManager.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/replication/ReplicationManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/security/CheckType.java b/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/security/CheckType.java rename to activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/security/SecurityStore.java b/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/security/SecurityStore.java rename to activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/security/impl/SecurityStoreImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/security/impl/SecurityStoreImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivateCallback.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivateCallback.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivationParams.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ActivationParams.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/Bindable.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/Bindable.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/BindingQueryResult.java b/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/BindingQueryResult.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorService.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorServiceFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ConnectorServiceFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/Consumer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/Consumer.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/Divert.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/Divert.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/HandleStatus.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/HandleStatus.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQMessageBundle.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQMessageBundle.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServer.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServerLogger.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServerLogger.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServers.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/HornetQServers.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/JournalType.java b/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/JournalType.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/LargeServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/LargeServerMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/LiveNodeLocator.java b/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/LiveNodeLocator.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/MemoryManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/MemoryManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/MessageReference.java b/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/MessageReference.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/NodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/NodeManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/Queue.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/Queue.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/QueueFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/QueueFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/RouteContextList.java b/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/RouteContextList.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/RoutingContext.java b/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/RoutingContext.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ScheduledDeliveryHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ScheduledDeliveryHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerConsumer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerConsumer.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerMessage.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSession.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSession.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSessionFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/ServerSessionFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/TransientQueueManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/TransientQueueManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BackupManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BackupManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Bridge.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Bridge.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BroadcastGroup.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/BroadcastGroup.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConfigurationUtil.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConfigurationUtil.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterConnection.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterControl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterControl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterController.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterController.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ClusterManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/HornetQServerSideProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/HornetQServerSideProtocolManagerFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/MessageFlowRecord.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/MessageFlowRecord.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/RemoteQueueBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/RemoteQueueBinding.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Transformer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/Transformer.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/BackupPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/BackupPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedHAManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedHAManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ColocatedPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/HAPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/LiveOnlyPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/LiveOnlyPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicaPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicaPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ReplicatedPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ScaleDownPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/ScaleDownPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreMasterPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreMasterPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreSlavePolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/SharedStoreSlavePolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/StandaloneHAManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/ha/StandaloneHAManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BridgeImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BridgeImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BroadcastGroupImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/BroadcastGroupImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionBridge.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionBridge.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/ClusterConnectionImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/Redistributor.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/Redistributor.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/RemoteQueueBindingImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/impl/RemoteQueueBindingImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/BooleanVote.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/BooleanVote.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Quorum.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Quorum.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVote.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVote.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteServerConnect.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/QuorumVoteServerConnect.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/SharedNothingBackupQuorum.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/SharedNothingBackupQuorum.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Vote.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/cluster/qourum/Vote.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/embedded/EmbeddedHornetQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/embedded/EmbeddedHornetQ.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/GroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/GroupingHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/UnproposalListener.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/UnproposalListener.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupBinding.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupHandlingAbstract.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupHandlingAbstract.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupingHandlerConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/GroupingHandlerConfiguration.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/LocalGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/LocalGroupingHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Proposal.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Proposal.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/RemoteGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/RemoteGroupingHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Response.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/group/impl/Response.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AIOFileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AIOFileLockNodeManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/Activation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/Activation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForReplication.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/AnyLiveNodeLocatorForScaleDown.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupRecoveryJournalLoader.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupRecoveryJournalLoader.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupTopologyListener.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/BackupTopologyListener.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ColocatedActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ColocatedActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ConnectorsService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ConnectorsService.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/DivertImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/DivertImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/FileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/FileLockNodeManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/HornetQServerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/HornetQServerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/InVMNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/InVMNodeManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/JournalLoader.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/JournalLoader.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LastValueQueue.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LastValueQueue.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveOnlyActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/LiveOnlyActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/MessageReferenceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/MessageReferenceImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForReplication.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedLiveNodeLocatorForScaleDown.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedNodeIdNodeLocator.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/NamedNodeIdNodeLocator.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/PostOfficeJournalLoader.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/PostOfficeJournalLoader.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueFactoryImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueFactoryImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/QueueImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RefsOperation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RefsOperation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ReplicationError.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ReplicationError.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RoutingContextImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/RoutingContextImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScaleDownHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScaleDownHandler.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerConsumerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerConsumerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerInfo.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerMessageImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerSessionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServerSessionImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServiceRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/ServiceRegistry.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingBackupActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingBackupActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingLiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedNothingLiveActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreBackupActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreBackupActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreLiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/SharedStoreLiveActivation.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/TransientQueueManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/impl/TransientQueueManagerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/management/ManagementService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/management/ManagementService.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/server/management/impl/ManagementServiceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/server/management/impl/ManagementServiceImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepository.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepository.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepositoryChangeListener.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/HierarchicalRepositoryChangeListener.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/Mergeable.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/Mergeable.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/AddressSettings.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/AddressSettings.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepository.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepository.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/Match.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/Match.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/SlowConsumerPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/settings/impl/SlowConsumerPolicy.java rename to activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/ResourceManager.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/ResourceManager.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/Transaction.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/Transaction.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionDetail.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionDetail.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionFactory.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperation.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperation.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperationAbstract.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionOperationAbstract.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionPropertyIndexes.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/TransactionPropertyIndexes.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/BindingsTransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/BindingsTransactionImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/CoreTransactionDetail.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/CoreTransactionDetail.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/ResourceManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/ResourceManagerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/TransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/core/transaction/impl/TransactionImpl.java rename to activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/naming/BindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/naming/BindingRegistry.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/MessageConverter.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/MessageConverter.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManager.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/ProtocolManagerFactory.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/SessionCallback.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/protocol/SessionCallback.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/Acceptor.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/Acceptor.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/AcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/AcceptorFactory.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/ServerConnectionLifeCycleListener.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/remoting/ServerConnectionLifeCycleListener.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManager.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/HornetQSecurityManagerImpl.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/JAASSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/JAASSecurityManager.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/package-info.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/spi/core/security/package-info.java rename to activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java diff --git a/activemq6-server/src/main/java/org/apache/activemq6/utils/XMLConfigurationUtil.java b/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java similarity index 100% rename from activemq6-server/src/main/java/org/apache/activemq6/utils/XMLConfigurationUtil.java rename to activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java diff --git a/activemq6-server/src/main/resources/META-INF/services/org/apache/activemq6/security/basic-security b/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security similarity index 100% rename from activemq6-server/src/main/resources/META-INF/services/org/apache/activemq6/security/basic-security rename to activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security diff --git a/activemq6-server/src/main/resources/schema/hornetq-configuration.xsd b/activemq-server/src/main/resources/schema/hornetq-configuration.xsd similarity index 100% rename from activemq6-server/src/main/resources/schema/hornetq-configuration.xsd rename to activemq-server/src/main/resources/schema/hornetq-configuration.xsd diff --git a/activemq6-server/src/main/resources/schema/hornetq-users.xsd b/activemq-server/src/main/resources/schema/hornetq-users.xsd similarity index 100% rename from activemq6-server/src/main/resources/schema/hornetq-users.xsd rename to activemq-server/src/main/resources/schema/hornetq-users.xsd diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ConfigurationImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ConfigurationImplTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/DefaultsFileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/DefaultsFileConfigurationTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationParserTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/FileConfigurationTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/HAPolicyConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/HAPolicyConfigurationTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ValidatorsTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/ValidatorsTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/config/impl/WrongRoleFileConfigurationParserTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/filter/impl/FilterTest.java b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/filter/impl/FilterTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/list/PriorityLinkedListTest.java b/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/list/PriorityLinkedListTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/message/impl/MessagePropertyTest.java b/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/message/impl/MessagePropertyTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/security/RoleTest.java b/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/security/RoleTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/server/group/impl/ClusteredResetMockTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/server/group/impl/ClusteredResetMockTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/server/impl/EmbeddedServerTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/server/impl/EmbeddedServerTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/server/impl/ScheduledDeliveryHandlerTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/settings/AddressSettingsTest.java b/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/settings/AddressSettingsTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/settings/RepositoryTest.java b/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/settings/RepositoryTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/core/version/impl/VersionImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/core/version/impl/VersionImplTest.java rename to activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/logging/AssertionLoggerHandler.java b/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/logging/AssertionLoggerHandler.java rename to activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/ColocatedHornetQServer.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/ColocatedHornetQServer.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/CountDownSessionFailureListener.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/CountDownSessionFailureListener.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/InVMNodeManagerServer.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/InVMNodeManagerServer.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/ServiceTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/ServiceTestBase.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/SimpleStringTest.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/SimpleStringTest.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/SingleServerTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/SingleServerTestBase.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java diff --git a/activemq6-server/src/test/java/org/apache/activemq6/tests/util/UnitTestCase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java similarity index 100% rename from activemq6-server/src/test/java/org/apache/activemq6/tests/util/UnitTestCase.java rename to activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java diff --git a/activemq6-server/src/test/resources/ConfigurationTest-defaults.xml b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml similarity index 100% rename from activemq6-server/src/test/resources/ConfigurationTest-defaults.xml rename to activemq-server/src/test/resources/ConfigurationTest-defaults.xml diff --git a/activemq6-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml similarity index 100% rename from activemq6-server/src/test/resources/ConfigurationTest-full-config.xml rename to activemq-server/src/test/resources/ConfigurationTest-full-config.xml diff --git a/activemq6-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml similarity index 100% rename from activemq6-server/src/test/resources/InvalidConfigurationTest0.xml rename to activemq-server/src/test/resources/InvalidConfigurationTest0.xml diff --git a/activemq6-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml similarity index 100% rename from activemq6-server/src/test/resources/InvalidConfigurationTest1.xml rename to activemq-server/src/test/resources/InvalidConfigurationTest1.xml diff --git a/activemq6-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml similarity index 100% rename from activemq6-server/src/test/resources/InvalidConfigurationTest2.xml rename to activemq-server/src/test/resources/InvalidConfigurationTest2.xml diff --git a/activemq6-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml similarity index 100% rename from activemq6-server/src/test/resources/InvalidConfigurationTest3.xml rename to activemq-server/src/test/resources/InvalidConfigurationTest3.xml diff --git a/activemq6-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml similarity index 100% rename from activemq6-server/src/test/resources/InvalidConfigurationTest4.xml rename to activemq-server/src/test/resources/InvalidConfigurationTest4.xml diff --git a/activemq6-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml similarity index 100% rename from activemq6-server/src/test/resources/InvalidConfigurationTest5.xml rename to activemq-server/src/test/resources/InvalidConfigurationTest5.xml diff --git a/activemq6-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml similarity index 100% rename from activemq6-server/src/test/resources/colocated-hapolicy-config.xml rename to activemq-server/src/test/resources/colocated-hapolicy-config.xml diff --git a/activemq6-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml similarity index 100% rename from activemq6-server/src/test/resources/colocated-hapolicy-config2.xml rename to activemq-server/src/test/resources/colocated-hapolicy-config2.xml diff --git a/activemq6-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml similarity index 100% rename from activemq6-server/src/test/resources/divertRoutingNameNotRequired.xml rename to activemq-server/src/test/resources/divertRoutingNameNotRequired.xml diff --git a/activemq6-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml similarity index 100% rename from activemq6-server/src/test/resources/live-only-hapolicy-config.xml rename to activemq-server/src/test/resources/live-only-hapolicy-config.xml diff --git a/activemq6-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml similarity index 100% rename from activemq6-server/src/test/resources/live-only-hapolicy-config2.xml rename to activemq-server/src/test/resources/live-only-hapolicy-config2.xml diff --git a/activemq6-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml similarity index 100% rename from activemq6-server/src/test/resources/live-only-hapolicy-config3.xml rename to activemq-server/src/test/resources/live-only-hapolicy-config3.xml diff --git a/activemq6-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml similarity index 100% rename from activemq6-server/src/test/resources/live-only-hapolicy-config4.xml rename to activemq-server/src/test/resources/live-only-hapolicy-config4.xml diff --git a/activemq6-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml similarity index 100% rename from activemq6-server/src/test/resources/live-only-hapolicy-config5.xml rename to activemq-server/src/test/resources/live-only-hapolicy-config5.xml diff --git a/activemq6-server/src/test/resources/logging.properties b/activemq-server/src/test/resources/logging.properties similarity index 100% rename from activemq6-server/src/test/resources/logging.properties rename to activemq-server/src/test/resources/logging.properties diff --git a/activemq6-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml similarity index 100% rename from activemq6-server/src/test/resources/replica-hapolicy-config.xml rename to activemq-server/src/test/resources/replica-hapolicy-config.xml diff --git a/activemq6-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml similarity index 100% rename from activemq6-server/src/test/resources/replica-hapolicy-config2.xml rename to activemq-server/src/test/resources/replica-hapolicy-config2.xml diff --git a/activemq6-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml similarity index 100% rename from activemq6-server/src/test/resources/replica-hapolicy-config3.xml rename to activemq-server/src/test/resources/replica-hapolicy-config3.xml diff --git a/activemq6-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml similarity index 100% rename from activemq6-server/src/test/resources/replicated-hapolicy-config.xml rename to activemq-server/src/test/resources/replicated-hapolicy-config.xml diff --git a/activemq6-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml similarity index 100% rename from activemq6-server/src/test/resources/shared-store-master-hapolicy-config.xml rename to activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml diff --git a/activemq6-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml similarity index 100% rename from activemq6-server/src/test/resources/shared-store-slave-hapolicy-config.xml rename to activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml diff --git a/activemq6-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml similarity index 100% rename from activemq6-server/src/test/resources/shared-store-slave-hapolicy-config2.xml rename to activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml diff --git a/activemq6-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml similarity index 100% rename from activemq6-server/src/test/resources/shared-store-slave-hapolicy-config3.xml rename to activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml diff --git a/activemq6-service-sar/pom.xml b/activemq-service-sar/pom.xml similarity index 100% rename from activemq6-service-sar/pom.xml rename to activemq-service-sar/pom.xml diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationService.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQFileConfigurationServiceMBean.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterService.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQJMSStarterServiceMBean.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceBundle.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceBundle.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceLogger.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQServiceLogger.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterService.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/HornetQStarterServiceMBean.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerService.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java diff --git a/activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java similarity index 100% rename from activemq6-service-sar/src/main/java/org/apache/activemq6/service/JBossASSecurityManagerServiceMBean.java rename to activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java diff --git a/activemq6-tools/pom.xml b/activemq-tools/pom.xml similarity index 100% rename from activemq6-tools/pom.xml rename to activemq-tools/pom.xml diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/DataTool.java b/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/DataTool.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/HornetQToolsLogger.java b/activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/HornetQToolsLogger.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/Main.java b/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/Main.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/Main.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintData.java b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintData.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintPages.java b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/PrintPages.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/TransferQueue.java b/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/TransferQueue.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataConstants.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataConstants.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataExporter.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataExporter.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java diff --git a/activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataImporter.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java similarity index 100% rename from activemq6-tools/src/main/java/org/apache/activemq6/tools/XmlDataImporter.java rename to activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java diff --git a/distribution/activemq6/pom.xml b/distribution/activemq/pom.xml similarity index 100% rename from distribution/activemq6/pom.xml rename to distribution/activemq/pom.xml diff --git a/distribution/activemq6/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml similarity index 100% rename from distribution/activemq6/src/main/assembly/dep.xml rename to distribution/activemq/src/main/assembly/dep.xml diff --git a/distribution/activemq6/src/main/resources/bin/hornetq b/distribution/activemq/src/main/resources/bin/hornetq similarity index 100% rename from distribution/activemq6/src/main/resources/bin/hornetq rename to distribution/activemq/src/main/resources/bin/hornetq diff --git a/distribution/activemq6/src/main/resources/bin/hornetq-service b/distribution/activemq/src/main/resources/bin/hornetq-service similarity index 100% rename from distribution/activemq6/src/main/resources/bin/hornetq-service rename to distribution/activemq/src/main/resources/bin/hornetq-service diff --git a/distribution/activemq6/src/main/resources/bin/hornetq.cmd b/distribution/activemq/src/main/resources/bin/hornetq.cmd similarity index 100% rename from distribution/activemq6/src/main/resources/bin/hornetq.cmd rename to distribution/activemq/src/main/resources/bin/hornetq.cmd diff --git a/distribution/activemq6/src/main/resources/bin/run.bat b/distribution/activemq/src/main/resources/bin/run.bat similarity index 100% rename from distribution/activemq6/src/main/resources/bin/run.bat rename to distribution/activemq/src/main/resources/bin/run.bat diff --git a/distribution/activemq6/src/main/resources/bin/run.sh b/distribution/activemq/src/main/resources/bin/run.sh similarity index 100% rename from distribution/activemq6/src/main/resources/bin/run.sh rename to distribution/activemq/src/main/resources/bin/run.sh diff --git a/distribution/activemq6/src/main/resources/bin/stop.bat b/distribution/activemq/src/main/resources/bin/stop.bat similarity index 100% rename from distribution/activemq6/src/main/resources/bin/stop.bat rename to distribution/activemq/src/main/resources/bin/stop.bat diff --git a/distribution/activemq6/src/main/resources/bin/stop.sh b/distribution/activemq/src/main/resources/bin/stop.sh similarity index 100% rename from distribution/activemq6/src/main/resources/bin/stop.sh rename to distribution/activemq/src/main/resources/bin/stop.sh diff --git a/distribution/activemq6/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/clustered/bootstrap.xml rename to distribution/activemq/src/main/resources/config/clustered/bootstrap.xml diff --git a/distribution/activemq6/src/main/resources/config/clustered/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/clustered/hornetq-configuration.xml rename to distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml diff --git a/distribution/activemq6/src/main/resources/config/clustered/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/clustered/hornetq-jms.xml rename to distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml diff --git a/distribution/activemq6/src/main/resources/config/clustered/hornetq-users.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/clustered/hornetq-users.xml rename to distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml diff --git a/distribution/activemq6/src/main/resources/config/clustered/jndi.properties b/distribution/activemq/src/main/resources/config/clustered/jndi.properties similarity index 100% rename from distribution/activemq6/src/main/resources/config/clustered/jndi.properties rename to distribution/activemq/src/main/resources/config/clustered/jndi.properties diff --git a/distribution/activemq6/src/main/resources/config/logging.properties b/distribution/activemq/src/main/resources/config/logging.properties similarity index 100% rename from distribution/activemq6/src/main/resources/config/logging.properties rename to distribution/activemq/src/main/resources/config/logging.properties diff --git a/distribution/activemq6/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/non-clustered/bootstrap.xml rename to distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml diff --git a/distribution/activemq6/src/main/resources/config/non-clustered/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/non-clustered/hornetq-configuration.xml rename to distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml diff --git a/distribution/activemq6/src/main/resources/config/non-clustered/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/non-clustered/hornetq-jms.xml rename to distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml diff --git a/distribution/activemq6/src/main/resources/config/non-clustered/hornetq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/non-clustered/hornetq-users.xml rename to distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml diff --git a/distribution/activemq6/src/main/resources/config/non-clustered/jndi.properties b/distribution/activemq/src/main/resources/config/non-clustered/jndi.properties similarity index 100% rename from distribution/activemq6/src/main/resources/config/non-clustered/jndi.properties rename to distribution/activemq/src/main/resources/config/non-clustered/jndi.properties diff --git a/distribution/activemq6/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/replicated/bootstrap.xml rename to distribution/activemq/src/main/resources/config/replicated/bootstrap.xml diff --git a/distribution/activemq6/src/main/resources/config/replicated/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/replicated/hornetq-configuration.xml rename to distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml diff --git a/distribution/activemq6/src/main/resources/config/replicated/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/replicated/hornetq-jms.xml rename to distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml diff --git a/distribution/activemq6/src/main/resources/config/replicated/hornetq-users.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/replicated/hornetq-users.xml rename to distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml diff --git a/distribution/activemq6/src/main/resources/config/replicated/jndi.properties b/distribution/activemq/src/main/resources/config/replicated/jndi.properties similarity index 100% rename from distribution/activemq6/src/main/resources/config/replicated/jndi.properties rename to distribution/activemq/src/main/resources/config/replicated/jndi.properties diff --git a/distribution/activemq6/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/shared-store/bootstrap.xml rename to distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml diff --git a/distribution/activemq6/src/main/resources/config/shared-store/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/shared-store/hornetq-configuration.xml rename to distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml diff --git a/distribution/activemq6/src/main/resources/config/shared-store/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/shared-store/hornetq-jms.xml rename to distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml diff --git a/distribution/activemq6/src/main/resources/config/shared-store/hornetq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml similarity index 100% rename from distribution/activemq6/src/main/resources/config/shared-store/hornetq-users.xml rename to distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml diff --git a/distribution/activemq6/src/main/resources/config/shared-store/jndi.properties b/distribution/activemq/src/main/resources/config/shared-store/jndi.properties similarity index 100% rename from distribution/activemq6/src/main/resources/config/shared-store/jndi.properties rename to distribution/activemq/src/main/resources/config/shared-store/jndi.properties diff --git a/distribution/activemq6/src/main/resources/licenses/LGPL.txt b/distribution/activemq/src/main/resources/licenses/LGPL.txt similarity index 100% rename from distribution/activemq6/src/main/resources/licenses/LGPL.txt rename to distribution/activemq/src/main/resources/licenses/LGPL.txt diff --git a/distribution/activemq6/src/main/resources/licenses/LICENSE.txt b/distribution/activemq/src/main/resources/licenses/LICENSE.txt similarity index 100% rename from distribution/activemq6/src/main/resources/licenses/LICENSE.txt rename to distribution/activemq/src/main/resources/licenses/LICENSE.txt diff --git a/distribution/activemq6/src/main/resources/licenses/LICENSE_twitter4j.txt b/distribution/activemq/src/main/resources/licenses/LICENSE_twitter4j.txt similarity index 100% rename from distribution/activemq6/src/main/resources/licenses/LICENSE_twitter4j.txt rename to distribution/activemq/src/main/resources/licenses/LICENSE_twitter4j.txt diff --git a/distribution/activemq6/src/main/resources/licenses/base64.txt b/distribution/activemq/src/main/resources/licenses/base64.txt similarity index 100% rename from distribution/activemq6/src/main/resources/licenses/base64.txt rename to distribution/activemq/src/main/resources/licenses/base64.txt diff --git a/distribution/activemq6/src/main/resources/licenses/json.txt b/distribution/activemq/src/main/resources/licenses/json.txt similarity index 100% rename from distribution/activemq6/src/main/resources/licenses/json.txt rename to distribution/activemq/src/main/resources/licenses/json.txt diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java similarity index 100% rename from examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedRemoteExample.java rename to examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java similarity index 100% rename from examples/core/embedded-remote/src/main/java/org/apache/activemq6/core/example/EmbeddedServer.java rename to examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java diff --git a/examples/core/embedded/src/main/java/org/apache/activemq6/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java similarity index 100% rename from examples/core/embedded/src/main/java/org/apache/activemq6/core/example/EmbeddedExample.java rename to examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java diff --git a/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfBase.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java similarity index 100% rename from examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfBase.java rename to examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java diff --git a/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfListener.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java similarity index 100% rename from examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfListener.java rename to examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java diff --git a/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfParams.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java similarity index 100% rename from examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfParams.java rename to examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java diff --git a/examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfSender.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java similarity index 100% rename from examples/core/perf/src/main/java/org/apache/activemq6/core/example/PerfSender.java rename to examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java diff --git a/examples/core/twitter-connector/src/main/java/org/apache/activemq6/core/example/TwitterConnectorExample.java b/examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java similarity index 100% rename from examples/core/twitter-connector/src/main/java/org/apache/activemq6/core/example/TwitterConnectorExample.java rename to examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java diff --git a/examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/ExampleVerticle.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java similarity index 100% rename from examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/ExampleVerticle.java rename to examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java diff --git a/examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/VertxConnectorExample.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java similarity index 100% rename from examples/core/vertx-connector/src/main/java/org/apache/activemq6/core/example/VertxConnectorExample.java rename to examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/EJBClientExample.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java similarity index 100% rename from examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/EJBClientExample.java rename to examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageBean.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java similarity index 100% rename from examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageBean.java rename to examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageService.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java similarity index 100% rename from examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq6/javaee/example/server/SendMessageService.java rename to examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java diff --git a/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq6/javaee/examples/MDBEJBTXRequiredRunnerTest.java b/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java similarity index 100% rename from examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq6/javaee/examples/MDBEJBTXRequiredRunnerTest.java rename to examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteClientExample.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java similarity index 100% rename from examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteClientExample.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueueA.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java similarity index 100% rename from examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueueA.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/MDBQueueB.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java similarity index 100% rename from examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/MDBQueueB.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSender.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java similarity index 100% rename from examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSender.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSenderService.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java similarity index 100% rename from examples/javaee/jca-config/src/main/java/org/apache/activemq6/javaee/example/server2/StatelessSenderService.java rename to examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java diff --git a/examples/javaee/jca-config/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunner2Test.java b/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java similarity index 100% rename from examples/javaee/jca-config/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunner2Test.java rename to examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java diff --git a/examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteServerClientExample.java b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java similarity index 100% rename from examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteServerClientExample.java rename to examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java diff --git a/examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueue.java b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java similarity index 100% rename from examples/javaee/jca-remote/src/main/java/org/apache/activemq6/javaee/example/server/MDBQueue.java rename to examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java diff --git a/examples/javaee/jca-remote/src/test/java/org/apache/activemq6/javaee/examples/JCARemoteRunnerTest.java b/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java similarity index 100% rename from examples/javaee/jca-remote/src/test/java/org/apache/activemq6/javaee/examples/JCARemoteRunnerTest.java rename to examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java diff --git a/examples/javaee/jms-bridge/src/main/java/org/apache/activemq6/javaee/example/JMSBridgeExample.java b/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java similarity index 100% rename from examples/javaee/jms-bridge/src/main/java/org/apache/activemq6/javaee/example/JMSBridgeExample.java rename to examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java diff --git a/examples/javaee/jms-bridge/src/test/java/org/apache/activemq6/javaee/examples/JMSBridgeRunnerTest.java b/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java similarity index 100% rename from examples/javaee/jms-bridge/src/test/java/org/apache/activemq6/javaee/examples/JMSBridgeRunnerTest.java rename to examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java diff --git a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/JmsContextInjectionClientExample.java b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java similarity index 100% rename from examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/JmsContextInjectionClientExample.java rename to examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java diff --git a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/server/JmsContextInjectionExample.java b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java similarity index 100% rename from examples/javaee/jms-context-injection/src/main/java/org/apache/activemq6/javaee/example/server/JmsContextInjectionExample.java rename to examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java diff --git a/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq6/javaee/examples/JmsContextInjectionRunnerTest.java b/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java similarity index 100% rename from examples/javaee/jms-context-injection/src/test/java/org/apache/activemq6/javaee/examples/JmsContextInjectionRunnerTest.java rename to examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java diff --git a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/MDB_BMTClientExample.java b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java similarity index 100% rename from examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/MDB_BMTClientExample.java rename to examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java diff --git a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/server/MDB_BMTExample.java b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java similarity index 100% rename from examples/javaee/mdb-bmt/src/main/java/org/apache/activemq6/javaee/example/server/MDB_BMTExample.java rename to examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java diff --git a/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunnerTest.java b/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java similarity index 100% rename from examples/javaee/mdb-bmt/src/test/java/org/apache/activemq6/javaee/example/server/ExampleRunnerTest.java rename to examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java similarity index 100% rename from examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java rename to examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java similarity index 100% rename from examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java rename to examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java similarity index 100% rename from examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java rename to examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java similarity index 100% rename from examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java rename to examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java similarity index 100% rename from examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java rename to examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java b/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java similarity index 100% rename from examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java rename to examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxLocalClientExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxLocalClientExample.java rename to examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxLocalExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxLocalExample.java rename to examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java diff --git a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetLocalTXRunnerTest.java b/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetLocalTXRunnerTest.java rename to examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxNotSupportedClientExample.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxNotSupportedClientExample.java rename to examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxNotSupported.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxNotSupported.java rename to examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java b/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq6/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java rename to examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java diff --git a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxRequiredClientExample.java b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/MDB_CMT_TxRequiredClientExample.java rename to examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java diff --git a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxRequiredExample.java b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq6/javaee/example/server/MDB_CMT_TxRequiredExample.java rename to examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java diff --git a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java b/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java similarity index 100% rename from examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java rename to examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java diff --git a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSelectorClientExample.java b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java similarity index 100% rename from examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSelectorClientExample.java rename to examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java diff --git a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSelectorExample.java b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java similarity index 100% rename from examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSelectorExample.java rename to examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java diff --git a/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java b/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java similarity index 100% rename from examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java rename to examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverStaticClientExample.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java similarity index 100% rename from examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverStaticClientExample.java rename to examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverStaticExample.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverStaticExample.java similarity index 100% rename from examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverStaticExample.java rename to examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverStaticExample.java diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java similarity index 100% rename from examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java rename to examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java diff --git a/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq6/javaee/examples/FailoverStaticRunnerTest.java b/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq/javaee/examples/FailoverStaticRunnerTest.java similarity index 100% rename from examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq6/javaee/examples/FailoverStaticRunnerTest.java rename to examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq/javaee/examples/FailoverStaticRunnerTest.java diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverClientExample.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverClientExample.java similarity index 100% rename from examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/MDBRemoteFailoverClientExample.java rename to examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverClientExample.java diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverExample.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverExample.java similarity index 100% rename from examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/MDBRemoteFailoverExample.java rename to examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverExample.java diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java similarity index 100% rename from examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq6/javaee/example/server/ServerKiller.java rename to examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java diff --git a/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq6/javaee/examples/FailoverRunnerTest.java b/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq/javaee/examples/FailoverRunnerTest.java similarity index 100% rename from examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq6/javaee/examples/FailoverRunnerTest.java rename to examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq/javaee/examples/FailoverRunnerTest.java diff --git a/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSendTxClientExample.java b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/MDBMessageSendTxClientExample.java similarity index 100% rename from examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/MDBMessageSendTxClientExample.java rename to examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/MDBMessageSendTxClientExample.java diff --git a/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSendTxExample.java b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSendTxExample.java similarity index 100% rename from examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq6/javaee/example/server/MDBMessageSendTxExample.java rename to examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSendTxExample.java diff --git a/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTTxSendRunnerTest.java b/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq/javaee/examples/MDBCMTTxSendRunnerTest.java similarity index 100% rename from examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq6/javaee/examples/MDBCMTTxSendRunnerTest.java rename to examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq/javaee/examples/MDBCMTTxSendRunnerTest.java diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/XARecoveryExampleStepOne.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepOne.java similarity index 100% rename from examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/XARecoveryExampleStepOne.java rename to examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepOne.java diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/XARecoveryExampleStepTwo.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepTwo.java similarity index 100% rename from examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/XARecoveryExampleStepTwo.java rename to examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepTwo.java diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/server/XARecoveryExampleBean.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleBean.java similarity index 100% rename from examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/server/XARecoveryExampleBean.java rename to examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleBean.java diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/server/XARecoveryExampleService.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleService.java similarity index 100% rename from examples/javaee/xarecovery/src/main/java/org/apache/activemq6/javaee/example/server/XARecoveryExampleService.java rename to examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleService.java diff --git a/examples/javaee/xarecovery/src/test/java/org/apache/activemq6/javaee/examples/XARecoveryRunnerTest.java b/examples/javaee/xarecovery/src/test/java/org/apache/activemq/javaee/examples/XARecoveryRunnerTest.java similarity index 100% rename from examples/javaee/xarecovery/src/test/java/org/apache/activemq6/javaee/examples/XARecoveryRunnerTest.java rename to examples/javaee/xarecovery/src/test/java/org/apache/activemq/javaee/examples/XARecoveryRunnerTest.java diff --git a/examples/jms/activemq6-jms-examples-common/common.css b/examples/jms/activemq-jms-examples-common/common.css similarity index 100% rename from examples/jms/activemq6-jms-examples-common/common.css rename to examples/jms/activemq-jms-examples-common/common.css diff --git a/examples/jms/activemq6-jms-examples-common/config/logging.properties b/examples/jms/activemq-jms-examples-common/config/logging.properties similarity index 100% rename from examples/jms/activemq6-jms-examples-common/config/logging.properties rename to examples/jms/activemq-jms-examples-common/config/logging.properties diff --git a/examples/jms/activemq6-jms-examples-common/config/server.properties b/examples/jms/activemq-jms-examples-common/config/server.properties similarity index 100% rename from examples/jms/activemq6-jms-examples-common/config/server.properties rename to examples/jms/activemq-jms-examples-common/config/server.properties diff --git a/examples/jms/activemq6-jms-examples-common/images/hornetQ-banner_final.png b/examples/jms/activemq-jms-examples-common/images/hornetQ-banner_final.png similarity index 100% rename from examples/jms/activemq6-jms-examples-common/images/hornetQ-banner_final.png rename to examples/jms/activemq-jms-examples-common/images/hornetQ-banner_final.png diff --git a/examples/jms/activemq6-jms-examples-common/pom.xml b/examples/jms/activemq-jms-examples-common/pom.xml similarity index 100% rename from examples/jms/activemq6-jms-examples-common/pom.xml rename to examples/jms/activemq-jms-examples-common/pom.xml diff --git a/examples/jms/activemq6-jms-examples-common/prettify.css b/examples/jms/activemq-jms-examples-common/prettify.css similarity index 100% rename from examples/jms/activemq6-jms-examples-common/prettify.css rename to examples/jms/activemq-jms-examples-common/prettify.css diff --git a/examples/jms/activemq6-jms-examples-common/prettify.js b/examples/jms/activemq-jms-examples-common/prettify.js similarity index 100% rename from examples/jms/activemq6-jms-examples-common/prettify.js rename to examples/jms/activemq-jms-examples-common/prettify.js diff --git a/examples/jms/activemq6-jms-examples-common/src/main/java/org/apache/activemq6/common/example/DummyXid.java b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java similarity index 100% rename from examples/jms/activemq6-jms-examples-common/src/main/java/org/apache/activemq6/common/example/DummyXid.java rename to examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java diff --git a/examples/jms/activemq6-jms-examples-common/src/main/java/org/apache/activemq6/common/example/HornetQExample.java b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java similarity index 100% rename from examples/jms/activemq6-jms-examples-common/src/main/java/org/apache/activemq6/common/example/HornetQExample.java rename to examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java diff --git a/examples/jms/activemq6-ra-rar/pom.xml b/examples/jms/activemq-ra-rar/pom.xml similarity index 100% rename from examples/jms/activemq6-ra-rar/pom.xml rename to examples/jms/activemq-ra-rar/pom.xml diff --git a/examples/jms/activemq6-ra-rar/src/main/resources/ra.xml b/examples/jms/activemq-ra-rar/src/main/resources/ra.xml similarity index 100% rename from examples/jms/activemq6-ra-rar/src/main/resources/ra.xml rename to examples/jms/activemq-ra-rar/src/main/resources/ra.xml diff --git a/examples/jms/aerogear/src/main/java/org/apache/activemq6/jms/example/AerogearExample.java b/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java similarity index 100% rename from examples/jms/aerogear/src/main/java/org/apache/activemq6/jms/example/AerogearExample.java rename to examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java diff --git a/examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/AppletExample.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/AppletExample.java similarity index 100% rename from examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/AppletExample.java rename to examples/jms/applet/src/main/java/org/apache/activemq/jms/example/AppletExample.java diff --git a/examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/HttpStaticFileServer.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java similarity index 100% rename from examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/HttpStaticFileServer.java rename to examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java diff --git a/examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/HttpStaticFileServerHandler.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java similarity index 100% rename from examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/HttpStaticFileServerHandler.java rename to examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java diff --git a/examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/HttpStaticFileServerPipelineFactory.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java similarity index 100% rename from examples/jms/applet/src/main/java/org/apache/activemq6/jms/example/HttpStaticFileServerPipelineFactory.java rename to examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java diff --git a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq6/jms/example/ApplicationLayerFailoverExample.java b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java similarity index 100% rename from examples/jms/application-layer-failover/src/main/java/org/apache/activemq6/jms/example/ApplicationLayerFailoverExample.java rename to examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq6/jms/example/BridgeExample.java b/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java similarity index 100% rename from examples/jms/bridge/src/main/java/org/apache/activemq6/jms/example/BridgeExample.java rename to examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq6/jms/example/HatColourChangeTransformer.java b/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/HatColourChangeTransformer.java similarity index 100% rename from examples/jms/bridge/src/main/java/org/apache/activemq6/jms/example/HatColourChangeTransformer.java rename to examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/HatColourChangeTransformer.java diff --git a/examples/jms/browser/src/main/java/org/apache/activemq6/jms/example/QueueBrowserExample.java b/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java similarity index 100% rename from examples/jms/browser/src/main/java/org/apache/activemq6/jms/example/QueueBrowserExample.java rename to examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq6/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java similarity index 100% rename from examples/jms/client-kickoff/src/main/java/org/apache/activemq6/jms/example/ClientKickoffExample.java rename to examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java diff --git a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq6/jms/example/ClientSideFailoverListerExample.java b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java similarity index 100% rename from examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq6/jms/example/ClientSideFailoverListerExample.java rename to examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java diff --git a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq6/jms/example/ClientSideLoadBalancingExample.java b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java similarity index 100% rename from examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq6/jms/example/ClientSideLoadBalancingExample.java rename to examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java diff --git a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq6/jms/example/ClusteredDurableSubscriptionExample.java b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java similarity index 100% rename from examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq6/jms/example/ClusteredDurableSubscriptionExample.java rename to examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java diff --git a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq6/jms/example/ClusteredGroupingExample.java b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java similarity index 100% rename from examples/jms/clustered-grouping/src/main/java/org/apache/activemq6/jms/example/ClusteredGroupingExample.java rename to examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq6/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java similarity index 100% rename from examples/jms/clustered-jgroups/src/main/java/org/apache/activemq6/jms/example/ClusteredJgroupsExample.java rename to examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq6/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java similarity index 100% rename from examples/jms/clustered-queue/src/main/java/org/apache/activemq6/jms/example/ClusteredQueueExample.java rename to examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq6/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java similarity index 100% rename from examples/jms/clustered-standalone/src/main/java/org/apache/activemq6/jms/example/ClusteredStandaloneExample.java rename to examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java diff --git a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq6/jms/example/StaticClusteredQueueExample.java b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java similarity index 100% rename from examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq6/jms/example/StaticClusteredQueueExample.java rename to examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java diff --git a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq6/jms/example/ClusterStaticOnewayExample.java b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java similarity index 100% rename from examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq6/jms/example/ClusterStaticOnewayExample.java rename to examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java diff --git a/examples/jms/clustered-topic/src/main/java/org/apache/activemq6/jms/example/ClusteredTopicExample.java b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java similarity index 100% rename from examples/jms/clustered-topic/src/main/java/org/apache/activemq6/jms/example/ClusteredTopicExample.java rename to examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq6/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java similarity index 100% rename from examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq6/jms/example/ColocatedFailoverScaleDownExample.java rename to examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq6/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java similarity index 100% rename from examples/jms/colocated-failover/src/main/java/org/apache/activemq6/jms/example/ColocatedFailoverExample.java rename to examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java diff --git a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ConsumerRateLimitExample.java b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java similarity index 100% rename from examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ConsumerRateLimitExample.java rename to examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq6/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java similarity index 100% rename from examples/jms/dead-letter/src/main/java/org/apache/activemq6/jms/example/DeadLetterExample.java rename to examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq6/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java similarity index 100% rename from examples/jms/delayed-redelivery/src/main/java/org/apache/activemq6/jms/example/DelayedRedeliveryExample.java rename to examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java diff --git a/examples/jms/divert/src/main/java/org/apache/activemq6/jms/example/AddForwardingTimeTransformer.java b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java similarity index 100% rename from examples/jms/divert/src/main/java/org/apache/activemq6/jms/example/AddForwardingTimeTransformer.java rename to examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java diff --git a/examples/jms/divert/src/main/java/org/apache/activemq6/jms/example/DivertExample.java b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java similarity index 100% rename from examples/jms/divert/src/main/java/org/apache/activemq6/jms/example/DivertExample.java rename to examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java diff --git a/examples/jms/durable-subscription/src/main/java/org/apache/activemq6/jms/example/DurableSubscriptionExample.java b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java similarity index 100% rename from examples/jms/durable-subscription/src/main/java/org/apache/activemq6/jms/example/DurableSubscriptionExample.java rename to examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq6/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java similarity index 100% rename from examples/jms/embedded-simple/src/main/java/org/apache/activemq6/jms/example/EmbeddedExample.java rename to examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq6/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java similarity index 100% rename from examples/jms/embedded/src/main/java/org/apache/activemq6/jms/example/EmbeddedExample.java rename to examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java diff --git a/examples/jms/expiry/src/main/java/org/apache/activemq6/jms/example/ExpiryExample.java b/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java similarity index 100% rename from examples/jms/expiry/src/main/java/org/apache/activemq6/jms/example/ExpiryExample.java rename to examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java diff --git a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq6/jms/example/HAPolicyAutoBackupExample.java b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java similarity index 100% rename from examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq6/jms/example/HAPolicyAutoBackupExample.java rename to examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java diff --git a/examples/jms/http-transport/src/main/java/org/apache/activemq6/jms/example/HttpTransportExample.java b/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java similarity index 100% rename from examples/jms/http-transport/src/main/java/org/apache/activemq6/jms/example/HttpTransportExample.java rename to examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java diff --git a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq6/jms/example/InstantiateConnectionFactoryExample.java b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java similarity index 100% rename from examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq6/jms/example/InstantiateConnectionFactoryExample.java rename to examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq6/jms/example/InterceptorExample.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java similarity index 100% rename from examples/jms/interceptor/src/main/java/org/apache/activemq6/jms/example/InterceptorExample.java rename to examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq6/jms/example/SimpleInterceptor.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java similarity index 100% rename from examples/jms/interceptor/src/main/java/org/apache/activemq6/jms/example/SimpleInterceptor.java rename to examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/ExampleCallbackHandler.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleCallbackHandler.java similarity index 100% rename from examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/ExampleCallbackHandler.java rename to examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleCallbackHandler.java diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/ExampleConfiguration.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleConfiguration.java similarity index 100% rename from examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/ExampleConfiguration.java rename to examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleConfiguration.java diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/ExampleLoginModule.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleLoginModule.java similarity index 100% rename from examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/ExampleLoginModule.java rename to examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleLoginModule.java diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/JAASExample.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java similarity index 100% rename from examples/jms/jaas/src/main/java/org/apache/activemq6/jms/example/JAASExample.java rename to examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java diff --git a/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq6/jms/example/JMSAutoCloseableExample.java b/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java similarity index 100% rename from examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq6/jms/example/JMSAutoCloseableExample.java rename to examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java diff --git a/examples/jms/jms-bridge/src/main/java/org/apache/activemq6/jms/example/JMSBridgeExample.java b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java similarity index 100% rename from examples/jms/jms-bridge/src/main/java/org/apache/activemq6/jms/example/JMSBridgeExample.java rename to examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java diff --git a/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq6/jms/example/JMSCompletionListenerExample.java b/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java similarity index 100% rename from examples/jms/jms-completion-listener/src/main/java/org/apache/activemq6/jms/example/JMSCompletionListenerExample.java rename to examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java diff --git a/examples/jms/jms-context/src/main/java/org/apache/activemq6/jms/example/JMSContextExample.java b/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java similarity index 100% rename from examples/jms/jms-context/src/main/java/org/apache/activemq6/jms/example/JMSContextExample.java rename to examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java diff --git a/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq6/jms/example/JMSSharedConsumerExample.java b/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java similarity index 100% rename from examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq6/jms/example/JMSSharedConsumerExample.java rename to examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java diff --git a/examples/jms/jmx/src/main/java/org/apache/activemq6/jms/example/JMXExample.java b/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java similarity index 100% rename from examples/jms/jmx/src/main/java/org/apache/activemq6/jms/example/JMXExample.java rename to examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java diff --git a/examples/jms/large-message/src/main/java/org/apache/activemq6/jms/example/LargeMessageExample.java b/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java similarity index 100% rename from examples/jms/large-message/src/main/java/org/apache/activemq6/jms/example/LargeMessageExample.java rename to examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java diff --git a/examples/jms/last-value-queue/src/main/java/org/apache/activemq6/jms/example/LastValueQueueExample.java b/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java similarity index 100% rename from examples/jms/last-value-queue/src/main/java/org/apache/activemq6/jms/example/LastValueQueueExample.java rename to examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java diff --git a/examples/jms/management-notifications/src/main/java/org/apache/activemq6/jms/example/ManagementNotificationExample.java b/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java similarity index 100% rename from examples/jms/management-notifications/src/main/java/org/apache/activemq6/jms/example/ManagementNotificationExample.java rename to examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java diff --git a/examples/jms/management/src/main/java/org/apache/activemq6/jms/example/ManagementExample.java b/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java similarity index 100% rename from examples/jms/management/src/main/java/org/apache/activemq6/jms/example/ManagementExample.java rename to examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java diff --git a/examples/jms/message-counters/src/main/java/org/apache/activemq6/jms/example/MessageCounterExample.java b/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java similarity index 100% rename from examples/jms/message-counters/src/main/java/org/apache/activemq6/jms/example/MessageCounterExample.java rename to examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java diff --git a/examples/jms/message-group/src/main/java/org/apache/activemq6/jms/example/MessageGroupExample.java b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java similarity index 100% rename from examples/jms/message-group/src/main/java/org/apache/activemq6/jms/example/MessageGroupExample.java rename to examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java diff --git a/examples/jms/message-group2/src/main/java/org/apache/activemq6/jms/example/MessageGroup2Example.java b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java similarity index 100% rename from examples/jms/message-group2/src/main/java/org/apache/activemq6/jms/example/MessageGroup2Example.java rename to examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java diff --git a/examples/jms/message-priority/src/main/java/org/apache/activemq6/jms/example/MessagePriorityExample.java b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java similarity index 100% rename from examples/jms/message-priority/src/main/java/org/apache/activemq6/jms/example/MessagePriorityExample.java rename to examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java diff --git a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq6/jms/example/MultipleFailoverFailbackExample.java b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java similarity index 100% rename from examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq6/jms/example/MultipleFailoverFailbackExample.java rename to examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java diff --git a/examples/jms/multiple-failover/src/main/java/org/apache/activemq6/jms/example/MultipleFailoverExample.java b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java similarity index 100% rename from examples/jms/multiple-failover/src/main/java/org/apache/activemq6/jms/example/MultipleFailoverExample.java rename to examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java diff --git a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq6/jms/example/NoConsumerBufferingExample.java b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java similarity index 100% rename from examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq6/jms/example/NoConsumerBufferingExample.java rename to examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java diff --git a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq6/jms/example/NonTransactionFailoverExample.java b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java similarity index 100% rename from examples/jms/non-transaction-failover/src/main/java/org/apache/activemq6/jms/example/NonTransactionFailoverExample.java rename to examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java diff --git a/examples/jms/openwire/src/main/java/org/apache/activemq6/jms/example/OpenWireExample.java b/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java similarity index 100% rename from examples/jms/openwire/src/main/java/org/apache/activemq6/jms/example/OpenWireExample.java rename to examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java diff --git a/examples/jms/paging/src/main/java/org/apache/activemq6/jms/example/PagingExample.java b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java similarity index 100% rename from examples/jms/paging/src/main/java/org/apache/activemq6/jms/example/PagingExample.java rename to examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java diff --git a/examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfBase.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java similarity index 100% rename from examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfBase.java rename to examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java diff --git a/examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfListener.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java similarity index 100% rename from examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfListener.java rename to examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java diff --git a/examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfParams.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java similarity index 100% rename from examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfParams.java rename to examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java diff --git a/examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfSender.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java similarity index 100% rename from examples/jms/perf/src/main/java/org/apache/activemq6/jms/example/PerfSender.java rename to examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java diff --git a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq6/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java similarity index 100% rename from examples/jms/pre-acknowledge/src/main/java/org/apache/activemq6/jms/example/PreacknowledgeExample.java rename to examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java diff --git a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ProducerRateLimitExample.java b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java similarity index 100% rename from examples/jms/producer-rate-limit/src/main/java/org/apache/activemq6/jms/example/ProducerRateLimitExample.java rename to examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java diff --git a/examples/jms/proton-j/src/main/java/org/apache/activemq6/jms/example/ProtonJExample.java b/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java similarity index 100% rename from examples/jms/proton-j/src/main/java/org/apache/activemq6/jms/example/ProtonJExample.java rename to examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq6/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java similarity index 100% rename from examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq6/jms/example/QueueMessageRedistributionExample.java rename to examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java diff --git a/examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/QueueRequestorExample.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java similarity index 100% rename from examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/QueueRequestorExample.java rename to examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java diff --git a/examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/TextReverserService.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java similarity index 100% rename from examples/jms/queue-requestor/src/main/java/org/apache/activemq6/jms/example/TextReverserService.java rename to examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java diff --git a/examples/jms/queue-selector/src/main/java/org/apache/activemq6/jms/example/QueueSelectorExample.java b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java similarity index 100% rename from examples/jms/queue-selector/src/main/java/org/apache/activemq6/jms/example/QueueSelectorExample.java rename to examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java diff --git a/examples/jms/queue/src/main/java/org/apache/activemq6/jms/example/QueueExample.java b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java similarity index 100% rename from examples/jms/queue/src/main/java/org/apache/activemq6/jms/example/QueueExample.java rename to examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java diff --git a/examples/jms/reattach-node/src/main/java/org/apache/activemq6/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java similarity index 100% rename from examples/jms/reattach-node/src/main/java/org/apache/activemq6/jms/example/ReattachExample.java rename to examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java diff --git a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackStaticExample.java b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java similarity index 100% rename from examples/jms/replicated-failback-static/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackStaticExample.java rename to examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java diff --git a/examples/jms/replicated-failback/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackExample.java b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java similarity index 100% rename from examples/jms/replicated-failback/src/main/java/org/apache/activemq6/jms/example/ReplicatedFailbackExample.java rename to examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java diff --git a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedMultipleFailoverExample.java b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java similarity index 100% rename from examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedMultipleFailoverExample.java rename to examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java similarity index 100% rename from examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq6/jms/example/ReplicatedTransactionFailoverExample.java rename to examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java diff --git a/examples/jms/request-reply/src/main/java/org/apache/activemq6/jms/example/RequestReplyExample.java b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java similarity index 100% rename from examples/jms/request-reply/src/main/java/org/apache/activemq6/jms/example/RequestReplyExample.java rename to examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java diff --git a/examples/jms/scale-down/src/main/java/org/apache/activemq6/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java similarity index 100% rename from examples/jms/scale-down/src/main/java/org/apache/activemq6/jms/example/ScaleDownExample.java rename to examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java diff --git a/examples/jms/scheduled-message/src/main/java/org/apache/activemq6/jms/example/ScheduledMessageExample.java b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java similarity index 100% rename from examples/jms/scheduled-message/src/main/java/org/apache/activemq6/jms/example/ScheduledMessageExample.java rename to examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java diff --git a/examples/jms/security/src/main/java/org/apache/activemq6/jms/example/SecurityExample.java b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java similarity index 100% rename from examples/jms/security/src/main/java/org/apache/activemq6/jms/example/SecurityExample.java rename to examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java diff --git a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq6/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java similarity index 100% rename from examples/jms/send-acknowledgements/src/main/java/org/apache/activemq6/jms/example/SendAcknowledgementsExample.java rename to examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/ExampleListener.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java similarity index 100% rename from examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/ExampleListener.java rename to examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/MessageSender.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java similarity index 100% rename from examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/MessageSender.java rename to examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/SpringExample.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java similarity index 100% rename from examples/jms/spring-integration/src/main/java/org/apache/activemq6/jms/example/SpringExample.java rename to examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java diff --git a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq6/jms/example/SSLExample.java b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java similarity index 100% rename from examples/jms/ssl-enabled/src/main/java/org/apache/activemq6/jms/example/SSLExample.java rename to examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java diff --git a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq6/jms/example/StaticSelectorJMSExample.java b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java similarity index 100% rename from examples/jms/static-selector-jms/src/main/java/org/apache/activemq6/jms/example/StaticSelectorJMSExample.java rename to examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java diff --git a/examples/jms/static-selector/src/main/java/org/apache/activemq6/jms/example/StaticSelectorExample.java b/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java similarity index 100% rename from examples/jms/static-selector/src/main/java/org/apache/activemq6/jms/example/StaticSelectorExample.java rename to examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java diff --git a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq6/jms/example/StompWebSocketExample.java b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java similarity index 100% rename from examples/jms/stomp-websockets/src/main/java/org/apache/activemq6/jms/example/StompWebSocketExample.java rename to examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java diff --git a/examples/jms/stomp/src/main/java/org/apache/activemq6/jms/example/StompExample.java b/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java similarity index 100% rename from examples/jms/stomp/src/main/java/org/apache/activemq6/jms/example/StompExample.java rename to examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java diff --git a/examples/jms/stomp1.1/src/main/java/org/apache/activemq6/jms/example/StompExample.java b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java similarity index 100% rename from examples/jms/stomp1.1/src/main/java/org/apache/activemq6/jms/example/StompExample.java rename to examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java diff --git a/examples/jms/stomp1.2/src/main/java/org/apache/activemq6/jms/example/StompExample.java b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java similarity index 100% rename from examples/jms/stomp1.2/src/main/java/org/apache/activemq6/jms/example/StompExample.java rename to examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java diff --git a/examples/jms/stop-server-failover/src/main/java/org/apache/activemq6/jms/example/StopServerFailoverExample.java b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java similarity index 100% rename from examples/jms/stop-server-failover/src/main/java/org/apache/activemq6/jms/example/StopServerFailoverExample.java rename to examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java diff --git a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq6/jms/example/SymmetricClusterExample.java b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java similarity index 100% rename from examples/jms/symmetric-cluster/src/main/java/org/apache/activemq6/jms/example/SymmetricClusterExample.java rename to examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java diff --git a/examples/jms/temp-queue/src/main/java/org/apache/activemq6/jms/example/TemporaryQueueExample.java b/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java similarity index 100% rename from examples/jms/temp-queue/src/main/java/org/apache/activemq6/jms/example/TemporaryQueueExample.java rename to examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java diff --git a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq6/jms/example/TopicHierarchyExample.java b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java similarity index 100% rename from examples/jms/topic-hierarchies/src/main/java/org/apache/activemq6/jms/example/TopicHierarchyExample.java rename to examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java diff --git a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample1.java b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java similarity index 100% rename from examples/jms/topic-selector-example1/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample1.java rename to examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java diff --git a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample2.java b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java similarity index 100% rename from examples/jms/topic-selector-example2/src/main/java/org/apache/activemq6/jms/example/TopicSelectorExample2.java rename to examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java diff --git a/examples/jms/topic/src/main/java/org/apache/activemq6/jms/example/TopicExample.java b/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java similarity index 100% rename from examples/jms/topic/src/main/java/org/apache/activemq6/jms/example/TopicExample.java rename to examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java diff --git a/examples/jms/transaction-failover/src/main/java/org/apache/activemq6/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java similarity index 100% rename from examples/jms/transaction-failover/src/main/java/org/apache/activemq6/jms/example/TransactionFailoverExample.java rename to examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java diff --git a/examples/jms/transactional/src/main/java/org/apache/activemq6/jms/example/TransactionalExample.java b/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java similarity index 100% rename from examples/jms/transactional/src/main/java/org/apache/activemq6/jms/example/TransactionalExample.java rename to examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java diff --git a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq6/jms/example/XAHeuristicExample.java b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java similarity index 100% rename from examples/jms/xa-heuristic/src/main/java/org/apache/activemq6/jms/example/XAHeuristicExample.java rename to examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java diff --git a/examples/jms/xa-receive/src/main/java/org/apache/activemq6/jms/example/XAReceiveExample.java b/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java similarity index 100% rename from examples/jms/xa-receive/src/main/java/org/apache/activemq6/jms/example/XAReceiveExample.java rename to examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java diff --git a/examples/jms/xa-send/src/main/java/org/apache/activemq6/jms/example/XASendExample.java b/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java similarity index 100% rename from examples/jms/xa-send/src/main/java/org/apache/activemq6/jms/example/XASendExample.java rename to examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java diff --git a/examples/jms/xa-with-jta/src/main/java/org/apache/activemq6/jms/example/XAwithJTAExample.java b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java similarity index 100% rename from examples/jms/xa-with-jta/src/main/java/org/apache/activemq6/jms/example/XAwithJTAExample.java rename to examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java diff --git a/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakBase.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java similarity index 100% rename from examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakBase.java rename to examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java diff --git a/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakParams.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java similarity index 100% rename from examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakParams.java rename to examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java diff --git a/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java similarity index 100% rename from examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakReceiver.java rename to examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java diff --git a/examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java similarity index 100% rename from examples/soak/normal/src/main/java/org/apache/activemq6/jms/soak/example/SoakSender.java rename to examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java diff --git a/integration/activemq6-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml similarity index 100% rename from integration/activemq6-aerogear-integration/pom.xml rename to integration/activemq-aerogear-integration/pom.xml diff --git a/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorService.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java similarity index 100% rename from integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorService.java rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java diff --git a/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorServiceFactory.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java similarity index 100% rename from integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConnectorServiceFactory.java rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java diff --git a/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConstants.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java similarity index 100% rename from integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/AeroGearConstants.java rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java diff --git a/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java similarity index 100% rename from integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearBundle.java rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java diff --git a/integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearLogger.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java similarity index 100% rename from integration/activemq6-aerogear-integration/src/main/java/org/apache/activemq6/integration/aerogear/HornetQAeroGearLogger.java rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearLogger.java diff --git a/integration/activemq6-jboss-as-integration/pom.xml b/integration/activemq-jboss-as-integration/pom.xml similarity index 100% rename from integration/activemq6-jboss-as-integration/pom.xml rename to integration/activemq-jboss-as-integration/pom.xml diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossBundle.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossBundle.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossBundle.java diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossLogger.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/HornetQJBossLogger.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/HornetQJBossLogger.java diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/AS4SecurityActions.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/AS4SecurityActions.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/AS4SecurityActions.java diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/JBossASSecurityManager.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/JBossASSecurityManager.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/JBossASSecurityManager.java diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/SecurityActions.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/security/SecurityActions.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/security/SecurityActions.java diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss4TransactionManagerLocator.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss4TransactionManagerLocator.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss4TransactionManagerLocator.java diff --git a/integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss5TransactionManagerLocator.java b/integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java similarity index 100% rename from integration/activemq6-jboss-as-integration/src/main/java/org/apache/activemq6/integration/jboss/tm/JBoss5TransactionManagerLocator.java rename to integration/activemq-jboss-as-integration/src/main/java/org/apache/activemq/integration/jboss/tm/JBoss5TransactionManagerLocator.java diff --git a/integration/activemq6-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml similarity index 100% rename from integration/activemq6-spring-integration/pom.xml rename to integration/activemq-spring-integration/pom.xml diff --git a/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringBindingRegistry.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java similarity index 100% rename from integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringBindingRegistry.java rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java diff --git a/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringJmsBootstrap.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java similarity index 100% rename from integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/integration/spring/SpringJmsBootstrap.java rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java diff --git a/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringBundle.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java similarity index 100% rename from integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringBundle.java rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringBundle.java diff --git a/integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringLogger.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java similarity index 100% rename from integration/activemq6-spring-integration/src/main/java/org/apache/activemq6/spring/HornetQSpringLogger.java rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/HornetQSpringLogger.java diff --git a/integration/activemq6-twitter-integration/pom.xml b/integration/activemq-twitter-integration/pom.xml similarity index 100% rename from integration/activemq6-twitter-integration/pom.xml rename to integration/activemq-twitter-integration/pom.xml diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterConstants.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterConstants.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterConstants.java diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterIncomingConnectorServiceFactory.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterIncomingConnectorServiceFactory.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterIncomingConnectorServiceFactory.java diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterOutgoingConnectorServiceFactory.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/TwitterOutgoingConnectorServiceFactory.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/TwitterOutgoingConnectorServiceFactory.java diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/IncomingTweetsHandler.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/IncomingTweetsHandler.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/IncomingTweetsHandler.java diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/OutgoingTweetsHandler.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/integration/twitter/impl/OutgoingTweetsHandler.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/integration/twitter/impl/OutgoingTweetsHandler.java diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterBundle.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterBundle.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterBundle.java diff --git a/integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterLogger.java b/integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java similarity index 100% rename from integration/activemq6-twitter-integration/src/main/java/org/apache/activemq6/twitter/HornetQTwitterLogger.java rename to integration/activemq-twitter-integration/src/main/java/org/apache/activemq/twitter/HornetQTwitterLogger.java diff --git a/integration/activemq6-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml similarity index 100% rename from integration/activemq6-vertx-integration/pom.xml rename to integration/activemq-vertx-integration/pom.xml diff --git a/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/HornetQVertxLogger.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java similarity index 100% rename from integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/HornetQVertxLogger.java rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/HornetQVertxLogger.java diff --git a/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java similarity index 100% rename from integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/IncomingVertxEventHandler.java rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java diff --git a/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java similarity index 100% rename from integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/OutgoingVertxEventHandler.java rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java diff --git a/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxConstants.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java similarity index 100% rename from integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxConstants.java rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java diff --git a/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxIncomingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java similarity index 100% rename from integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxIncomingConnectorServiceFactory.java rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java diff --git a/integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxOutgoingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java similarity index 100% rename from integration/activemq6-vertx-integration/src/main/java/org/apache/activemq6/integration/vertx/VertxOutgoingConnectorServiceFactory.java rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BMFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BMFailoverTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BridgeServerLocatorConfigurationTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/BridgeServerLocatorConfigurationTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BridgeServerLocatorConfigurationTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ClusteredGroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ClusteredGroupingTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/GroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/GroupingTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/HornetQMessageHandlerTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/HornetQMessageHandlerTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/HornetQMessageHandlerTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/JMSBridgeReconnectionTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/JMSBridgeReconnectionTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/LatencyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/LatencyTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/MessageCopyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/MessageCopyTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/OrphanedConsumerTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/OrphanedConsumerTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/PagingLeakTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/PagingLeakTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailoverTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailureTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownFailureTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailoverTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailureTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/ScaleDownGroupedFailureTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StartStopDeadlockTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StartStopDeadlockTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StompInternalStateTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/byteman/tests/StompInternalStateTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepositoryTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java similarity index 100% rename from tests/byteman-tests/src/test/java/org/apache/activemq6/core/settings/impl/HierarchicalObjectRepositoryTest.java rename to tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java diff --git a/tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/server/impl/QueueTest.java b/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.java similarity index 100% rename from tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/server/impl/QueueTest.java rename to tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.java diff --git a/tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/stomp/ConcurrentStompTest.java b/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.java similarity index 100% rename from tests/concurrent-tests/src/test/java/org/apache/activemq6/tests/concurrent/stomp/ConcurrentStompTest.java rename to tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/DuplicateDetectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/DuplicateDetectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/IntegrationTestLogger.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/IntegrationTestLogger.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/InterceptorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/SimpleNotificationService.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/String64KLimitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/aerogear/AeroGearBasicServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/aerogear/AeroGearBasicServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AckBatchSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AckBatchSizeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AcknowledgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AddressSettingsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AddressSettingsTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutoCloseCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutoCloseCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/AutogroupIdTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/BlockingSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CommitRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CommitRollbackTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConcurrentCreateDeleteProduceTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConcurrentCreateDeleteProduceTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerFilterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerFilterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerFilterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerFilterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerRoundRobinTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerRoundRobinTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerRoundRobinTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerRoundRobinTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerStuckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerStuckTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerStuckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerStuckTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerWindowSizeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ConsumerWindowSizeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerWindowSizeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CoreClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CoreClientTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/CreateQueueIdempotentTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeadLetterAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeliveryOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DeliveryOrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DurableQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DurableQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/DurableQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DurableQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpireTestOnRestartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpireTestOnRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpireTestOnRestartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryAddressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryAddressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryLargeMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ExpiryLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryLargeMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FailureDeadlockTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FailureDeadlockTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HangConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HeuristicXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HeuristicXATest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HeuristicXATest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HeuristicXATest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HornetQCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/HornetQCrashTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMNonPersistentMessageBufferTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMNonPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMNonPersistentMessageBufferTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMPersistentMessageBufferTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InVMPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMPersistentMessageBufferTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/IncompatibleVersionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/InterruptedLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSMessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSMessageCounterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSMessageCounterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSMessageCounterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSPagingFileDeleteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSPagingFileDeleteTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JMSPagingFileDeleteTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSPagingFileDeleteTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JmsNettyNioStressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/JournalCrashTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageCompressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/LibaioDependencyCheckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConcurrencyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConcurrencyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageConsumerRollbackTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageCounterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageDurabilityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageExpirationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingConnectionFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageGroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageHandlerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessagePriorityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MessageRateTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/MultipleThreadFilterOneTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NIOvsOIOTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConnectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyConsumerWindowSizeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyNonPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyPersistentMessageBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NettyProducerFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NewDeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/NewDeadLetterAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/OrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingOrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingSyncTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/PagingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/QueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/QueueBrowserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveImmediateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveImmediateTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RedeliveryConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RequestorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/RoutingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SelfExpandingBufferTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorConnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorSerializationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/ServerLocatorSerializationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorSerializationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseOnGCTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateAndDeleteQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateAndDeleteQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionCreateProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionSendAcknowledgementHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionSendAcknowledgementHandlerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionStopStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionStopStartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SessionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SimpleSendMultipleQueuesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SimpleSendMultipleQueuesTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/SlowConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TemporaryQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionDurabilityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionalSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransactionalSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransientQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/TransientQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/client/WildCardRoutingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientCrashTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientExitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/ClientTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/CrashClient2.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptor.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptorB.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/DummyInterceptorB.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java similarity index 97% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/GracefulClient.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java index 338eb727bc..a87484fa48 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/clientcrash/GracefulClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java @@ -1,98 +1,98 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.tests.integration.clientcrash; - -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.jms.client.HornetQTextMessage; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; - -/** - * Code to be run in an external VM, via main() - * - * @author Ovidiu Feodorov - * @author Jeff Mesnil - */ -public class GracefulClient -{ - // Constants ------------------------------------------------------------------------------------ - - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - - // Static --------------------------------------------------------------------------------------- - - public static void main(final String[] args) throws Exception - { - if (args.length != 2) - { - throw new Exception("require 2 arguments: queue name + message text"); - } - String queueName = args[0]; - String messageText = args[1]; - - try - { - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName())); - ClientSessionFactory sf = locator.createSessionFactory(); - ClientSession session = sf.createSession(false, true, true); - ClientProducer producer = session.createProducer(queueName); - ClientConsumer consumer = session.createConsumer(queueName); - - ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte) 1); - message.getBodyBuffer().writeString(messageText); - producer.send(message); - - session.start(); - - // block in receiving for 5 secs, we won't receive anything - consumer.receive(5000); - - // this should silence any non-daemon thread and allow for graceful exit - session.close(); - System.exit(0); - } - catch (Throwable t) - { - GracefulClient.log.error(t.getMessage(), t); - System.exit(1); - } - } - - // Attributes ----------------------------------------------------------------------------------- - - // Constructors --------------------------------------------------------------------------------- - - // Command implementation ----------------------------------------------------------------------- - - // Public --------------------------------------------------------------------------------------- - - // Package protected ---------------------------------------------------------------------------- - - // Protected ------------------------------------------------------------------------------------ - - // Private -------------------------------------------------------------------------------------- - - // Inner classes -------------------------------------------------------------------------------- - -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.tests.integration.clientcrash; + +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; + +/** + * Code to be run in an external VM, via main() + * + * @author Ovidiu Feodorov + * @author Jeff Mesnil + */ +public class GracefulClient +{ + // Constants ------------------------------------------------------------------------------------ + + private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + + // Static --------------------------------------------------------------------------------------- + + public static void main(final String[] args) throws Exception + { + if (args.length != 2) + { + throw new Exception("require 2 arguments: queue name + message text"); + } + String queueName = args[0]; + String messageText = args[1]; + + try + { + ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = locator.createSessionFactory(); + ClientSession session = sf.createSession(false, true, true); + ClientProducer producer = session.createProducer(queueName); + ClientConsumer consumer = session.createConsumer(queueName); + + ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, + false, + 0, + System.currentTimeMillis(), + (byte) 1); + message.getBodyBuffer().writeString(messageText); + producer.send(message); + + session.start(); + + // block in receiving for 5 secs, we won't receive anything + consumer.receive(5000); + + // this should silence any non-daemon thread and allow for graceful exit + session.close(); + System.exit(0); + } + catch (Throwable t) + { + GracefulClient.log.error(t.getMessage(), t); + System.exit(1); + } + } + + // Attributes ----------------------------------------------------------------------------------- + + // Constructors --------------------------------------------------------------------------------- + + // Command implementation ----------------------------------------------------------------------- + + // Public --------------------------------------------------------------------------------------- + + // Package protected ---------------------------------------------------------------------------- + + // Protected ------------------------------------------------------------------------------------ + + // Private -------------------------------------------------------------------------------------- + + // Inner classes -------------------------------------------------------------------------------- + +} diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ClusterControllerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ClusterControllerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerAction.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerAction.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/NodeManagerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/RealNodeManagerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeReconnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeStartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/SimpleTransformer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/bridge/SimpleTransformer.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredGroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OneWayChainClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupAuthenticationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncJournalTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/BackupSyncPagingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor2.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor2.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor3.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DelayInterceptor3.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackAutoTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackAutoTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackAutoTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackAutoTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackManualTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackManualTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailBackManualTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackManualTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverListenerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverListenerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverOnFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverOnFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/FailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/GroupingFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LargeMessageFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LargeMessageFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LargeMessageFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LiveToLiveFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/LiveToLiveFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/PagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/PagingFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/PagingFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/PagingFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumFailOverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumFailOverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumFailOverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumFailOverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedDistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SecurityFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SecurityFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SharedStoreDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SharedStoreDistributionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SharedStoreDistributionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SharedStoreDistributionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/OrderReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/RandomReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/reattach/ReattachTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/restart/ClusterRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/restart/ClusterRestartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/restart/ClusterRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/restart/ClusterRestartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/IsolatedTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/IsolatedTopologyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/IsolatedTopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/IsolatedTopologyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NonHATopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NonHATopologyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/NonHATopologyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NonHATopologyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/topology/TopologyClusterTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/BackupSyncDelay.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/BackupSyncDelay.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/MultiServerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/MultiServerTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/MultiServerTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/MultiServerTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/RemoteServerConfiguration.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/RemoteServerConfiguration.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/RemoteServerConfiguration.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/RemoteServerConfiguration.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/SameProcessHornetQServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/SameProcessHornetQServer.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/SameProcessHornetQServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/SameProcessHornetQServer.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/TestableServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/TestableServer.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/cluster/util/TestableServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/TestableServer.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/core/deployers/impl/QueueDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/core/deployers/impl/QueueDeployerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/core/deployers/impl/QueueDeployerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/core/deployers/impl/QueueDeployerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/discovery/DiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/discovery/DiscoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/DivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/DivertTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/DivertTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/DivertTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/PersistentDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/PersistentDivertTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/divert/PersistentDivertTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/PersistentDivertTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/embedded/ValidateAIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/embedded/ValidateAIOTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/embedded/ValidateAIOTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/embedded/ValidateAIOTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/http/CoreClientOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/http/CoreClientOverHttpTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/http/CoreClientOverHttpTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/http/CoreClientOverHttpTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/FloodServerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/FloodServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/FloodServerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/HornetQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/HornetQConnectionFactoryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/HornetQConnectionFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/HornetQConnectionFactoryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JMSSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JMSSecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/JmsProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/ManualReconnectionToSingleServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.java similarity index 97% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/BridgeTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.java index ecb1f73387..422cc5691a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.java @@ -1,608 +1,608 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.tests.integration.jms.bridge; - -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.XAConnectionFactory; -import javax.transaction.TransactionManager; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; - -import com.arjuna.ats.arjuna.coordinator.TransactionReaper; -import com.arjuna.ats.arjuna.coordinator.TxControl; -import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.JMSQueueControl; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.DestinationFactory; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; - -/** - * A BridgeTestBase - * - * @author Tim Fox - */ -public abstract class BridgeTestBase extends UnitTestCase -{ - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - - protected ConnectionFactoryFactory cff0, cff1; - - protected ConnectionFactoryFactory cff0xa, cff1xa; - - protected ConnectionFactory cf0, cf1; - - protected XAConnectionFactory cf0xa, cf1xa; - - protected DestinationFactory sourceQueueFactory; - protected DestinationFactory targetQueueFactory; - protected DestinationFactory localTargetQueueFactory; - protected DestinationFactory sourceTopicFactory; - - protected Queue sourceQueue, targetQueue, localTargetQueue; - - protected Topic sourceTopic; - - protected HornetQServer server0; - - protected JMSServerManager jmsServer0; - - protected HornetQServer server1; - - protected JMSServerManager jmsServer1; - - private InVMNamingContext context0; - - protected InVMNamingContext context1; - - protected HashMap params1; - - protected ConnectionFactoryFactory cff0LowProducerWindow; - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - - // Start the servers - Configuration conf0 = createBasicConfig() - .setJournalDirectory(getJournalDir(0, false)) - .setBindingsDirectory(getBindingsDir(0, false)) - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - - server0 = addServer(HornetQServers.newHornetQServer(conf0, false)); - - context0 = new InVMNamingContext(); - jmsServer0 = new JMSServerManagerImpl(server0); - jmsServer0.setContext(context0); - jmsServer0.start(); - - params1 = new HashMap(); - params1.put(TransportConstants.SERVER_ID_PROP_NAME, 1); - - Configuration conf1 = createBasicConfig() - .setJournalDirectory(getJournalDir(1, false)) - .setBindingsDirectory(getBindingsDir(1, false)) - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params1)); - - server1 = addServer(HornetQServers.newHornetQServer(conf1, false)); - - context1 = new InVMNamingContext(); - - jmsServer1 = new JMSServerManagerImpl(server1); - jmsServer1.setContext(context1); - jmsServer1.start(); - - createQueue("sourceQueue", 0); - - jmsServer0.createTopic(false, "sourceTopic", "/topic/sourceTopic"); - - createQueue("localTargetQueue", 0); - - createQueue("targetQueue", 1); - - setUpAdministeredObjects(); - TxControl.enable(); - // We need a local transaction and recovery manager - // We must start this after the remote servers have been created or it won't - // have deleted the database and the recovery manager may attempt to recover transactions - - } - - protected void createQueue(final String queueName, final int index) throws Exception - { - JMSServerManager server = jmsServer0; - if (index == 1) - { - server = jmsServer1; - } - assertTrue("queue '/queue/" + queueName + "' created", - server.createQueue(false, queueName, null, true, "/queue/" + queueName)); - } - - @Override - @After - public void tearDown() throws Exception - { - checkEmpty(sourceQueue, 0); - checkEmpty(localTargetQueue, 0); - checkEmpty(targetQueue, 1); - - // Check no subscriptions left lying around - - checkNoSubscriptions(sourceTopic, 0); - if (cff0 instanceof HornetQConnectionFactory) - { - ((HornetQConnectionFactory) cff0).close(); - } - if (cff1 instanceof HornetQConnectionFactory) - { - ((HornetQConnectionFactory) cff1).close(); - } - stopComponent(jmsServer0); - stopComponent(jmsServer1); - cff0 = cff1 = null; - cff0xa = cff1xa = null; - - cf0 = cf1 = null; - - cf0xa = cf1xa = null; - - sourceQueueFactory = targetQueueFactory = localTargetQueueFactory = sourceTopicFactory = null; - - sourceQueue = targetQueue = localTargetQueue = null; - - sourceTopic = null; - - server0 = null; - - jmsServer0 = null; - - server1 = null; - - jmsServer1 = null; - if (context0 != null) - context0.close(); - context0 = null; - if (context1 != null) - context1.close(); - context1 = null; - - // Shutting down Arjuna threads - TxControl.disable(true); - - TransactionReaper.terminate(false); - super.tearDown(); - } - - - protected void setUpAdministeredObjects() throws Exception - { - cff0LowProducerWindow = new ConnectionFactoryFactory() - { - public ConnectionFactory createConnectionFactory() throws Exception - { - HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration( - INVM_CONNECTOR_FACTORY)); - - // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection - cf.setReconnectAttempts(0); - cf.setBlockOnNonDurableSend(true); - cf.setBlockOnDurableSend(true); - cf.setCacheLargeMessagesClient(true); - cf.setProducerWindowSize(100); - - return cf; - } - - }; - - - cff0 = new ConnectionFactoryFactory() - { - public ConnectionFactory createConnectionFactory() throws Exception - { - HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration( - INVM_CONNECTOR_FACTORY)); - - // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection - cf.setReconnectAttempts(0); - cf.setBlockOnNonDurableSend(true); - cf.setBlockOnDurableSend(true); - cf.setCacheLargeMessagesClient(true); - - return cf; - } - - }; - - cff0xa = new ConnectionFactoryFactory() - { - public Object createConnectionFactory() throws Exception - { - HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, - new TransportConfiguration( - INVM_CONNECTOR_FACTORY)); - - // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection - cf.setReconnectAttempts(0); - cf.setBlockOnNonDurableSend(true); - cf.setBlockOnDurableSend(true); - cf.setCacheLargeMessagesClient(true); - - return cf; - } - - }; - - cf0 = (ConnectionFactory) cff0.createConnectionFactory(); - cf0xa = (XAConnectionFactory) cff0xa.createConnectionFactory(); - - cff1 = new ConnectionFactoryFactory() - { - - public ConnectionFactory createConnectionFactory() throws Exception - { - HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration( - INVM_CONNECTOR_FACTORY, - params1)); - - // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection - cf.setReconnectAttempts(0); - cf.setBlockOnNonDurableSend(true); - cf.setBlockOnDurableSend(true); - cf.setCacheLargeMessagesClient(true); - - return cf; - } - }; - - cff1xa = new ConnectionFactoryFactory() - { - - public XAConnectionFactory createConnectionFactory() throws Exception - { - HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, - new TransportConfiguration( - INVM_CONNECTOR_FACTORY, - params1)); - - // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection - cf.setReconnectAttempts(0); - cf.setBlockOnNonDurableSend(true); - cf.setBlockOnDurableSend(true); - cf.setCacheLargeMessagesClient(true); - - return cf; - } - }; - - cf1 = (ConnectionFactory) cff1.createConnectionFactory(); - cf1xa = (XAConnectionFactory) cff1xa.createConnectionFactory(); - - sourceQueueFactory = new DestinationFactory() - { - public Destination createDestination() throws Exception - { - return (Destination) context0.lookup("/queue/sourceQueue"); - } - }; - - sourceQueue = (Queue) sourceQueueFactory.createDestination(); - - targetQueueFactory = new DestinationFactory() - { - public Destination createDestination() throws Exception - { - return (Destination) context1.lookup("/queue/targetQueue"); - } - }; - - targetQueue = (Queue) targetQueueFactory.createDestination(); - - sourceTopicFactory = new DestinationFactory() - { - public Destination createDestination() throws Exception - { - return (Destination) context0.lookup("/topic/sourceTopic"); - } - }; - - sourceTopic = (Topic) sourceTopicFactory.createDestination(); - - localTargetQueueFactory = new DestinationFactory() - { - public Destination createDestination() throws Exception - { - return (Destination) context0.lookup("/queue/localTargetQueue"); - } - }; - - localTargetQueue = (Queue) localTargetQueueFactory.createDestination(); - } - - protected void sendMessages(final ConnectionFactory cf, - final Destination dest, - final int start, - final int numMessages, - final boolean persistent, - final boolean largeMessage) throws Exception - { - Connection conn = null; - - try - { - conn = cf.createConnection(); - - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageProducer prod = sess.createProducer(dest); - - prod.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT); - - for (int i = start; i < start + numMessages; i++) - { - if (largeMessage) - { - BytesMessage msg = sess.createBytesMessage(); - ((HornetQMessage) msg).setInputStream(UnitTestCase.createFakeLargeStream(1024L * 1024L)); - msg.setStringProperty("msg", "message" + i); - prod.send(msg); - } - else - { - TextMessage tm = sess.createTextMessage("message" + i); - prod.send(tm); - } - - } - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - protected void checkMessagesReceived(final ConnectionFactory cf, - final Destination dest, - final QualityOfServiceMode qosMode, - final int numMessages, - final boolean longWaitForFirst, - final boolean largeMessage) throws Exception - { - Connection conn = null; - - try - { - conn = cf.createConnection(); - - conn.start(); - - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageConsumer cons = sess.createConsumer(dest); - - // Consume the messages - - Set msgs = new HashSet(); - - int count = 0; - - // We always wait longer for the first one - it may take some time to arrive especially if we are - // waiting for recovery to kick in - while (true) - { - Message tm = cons.receive(count == 0 ? (longWaitForFirst ? 60000 : 10000) : 5000); - - if (tm == null) - { - break; - } - - // log.info("Got message " + tm.getText()); - - if (largeMessage) - { - BytesMessage bmsg = (BytesMessage) tm; - msgs.add(tm.getStringProperty("msg")); - byte[] buffRead = new byte[1024]; - for (int i = 0; i < 1024; i++) - { - Assert.assertEquals(1024, bmsg.readBytes(buffRead)); - } - } - else - { - msgs.add(((TextMessage) tm).getText()); - } - - count++; - - } - - if (qosMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE || qosMode == QualityOfServiceMode.DUPLICATES_OK) - { - // All the messages should be received - - for (int i = 0; i < numMessages; i++) - { - Assert.assertTrue("quality=" + qosMode + ", #=" + i + ", message=" + msgs, msgs.contains("message" + i)); - } - - // Should be no more - if (qosMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) - { - Assert.assertEquals(numMessages, msgs.size()); - } - } - else if (qosMode == QualityOfServiceMode.AT_MOST_ONCE) - { - // No *guarantee* that any messages will be received - // but you still might get some depending on how/where the crash occurred - } - - BridgeTestBase.log.trace("Check complete"); - - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - protected void checkAllMessageReceivedInOrder(final ConnectionFactory cf, - final Destination dest, - final int start, - final int numMessages, - final boolean largeMessage) throws Exception - { - Connection conn = null; - try - { - conn = cf.createConnection(); - - conn.start(); - - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageConsumer cons = sess.createConsumer(dest); - - // Consume the messages - - for (int i = 0; i < numMessages; i++) - { - Message tm = cons.receive(30000); - - Assert.assertNotNull(tm); - - if (largeMessage) - { - BytesMessage bmsg = (BytesMessage) tm; - Assert.assertEquals("message" + (i + start), tm.getStringProperty("msg")); - byte[] buffRead = new byte[1024]; - for (int j = 0; j < 1024; j++) - { - Assert.assertEquals(1024, bmsg.readBytes(buffRead)); - } - } - else - { - Assert.assertEquals("message" + (i + start), ((TextMessage) tm).getText()); - } - } - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - public boolean checkEmpty(final Queue queue, final int index) throws Exception - { - ManagementService managementService = server0.getManagementService(); - if (index == 1) - { - managementService = server1.getManagementService(); - } - JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(ResourceNames.JMS_QUEUE + queue.getQueueName()); - - //server may be closed - if (queueControl != null) - { - queueControl.flushExecutor(); - Long messageCount = queueControl.getMessageCount(); - - if (messageCount > 0) - { - queueControl.removeMessages(null); - } - } - return true; - } - - protected void checkNoSubscriptions(final Topic topic, final int index) throws Exception - { - ManagementService managementService = server0.getManagementService(); - if (index == 1) - { - managementService = server1.getManagementService(); - } - TopicControl topicControl = (TopicControl) managementService.getResource(ResourceNames.JMS_TOPIC + topic.getTopicName()); - Assert.assertEquals(0, topicControl.getSubscriptionCount()); - - } - - protected void removeAllMessages(final String queueName, final int index) throws Exception - { - ManagementService managementService = server0.getManagementService(); - if (index == 1) - { - managementService = server1.getManagementService(); - } - JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(ResourceNames.JMS_QUEUE + queueName); - queueControl.removeMessages(null); - } - - protected TransactionManager newTransactionManager() - { - return new TransactionManagerImple(); - } - - // Inner classes ------------------------------------------------------------------- -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.tests.integration.jms.bridge; + +import javax.jms.BytesMessage; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.DeliveryMode; +import javax.jms.Destination; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.XAConnectionFactory; +import javax.transaction.TransactionManager; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; + +import com.arjuna.ats.arjuna.coordinator.TransactionReaper; +import com.arjuna.ats.arjuna.coordinator.TxControl; +import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.management.ResourceNames; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.api.jms.management.JMSQueueControl; +import org.apache.activemq6.api.jms.management.TopicControl; +import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq6.core.server.management.ManagementService; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.DestinationFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq6.jms.client.HornetQMessage; +import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq6.jms.server.JMSServerManager; +import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq6.tests.util.UnitTestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; + +/** + * A BridgeTestBase + * + * @author Tim Fox + */ +public abstract class BridgeTestBase extends UnitTestCase +{ + private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + + protected ConnectionFactoryFactory cff0, cff1; + + protected ConnectionFactoryFactory cff0xa, cff1xa; + + protected ConnectionFactory cf0, cf1; + + protected XAConnectionFactory cf0xa, cf1xa; + + protected DestinationFactory sourceQueueFactory; + protected DestinationFactory targetQueueFactory; + protected DestinationFactory localTargetQueueFactory; + protected DestinationFactory sourceTopicFactory; + + protected Queue sourceQueue, targetQueue, localTargetQueue; + + protected Topic sourceTopic; + + protected HornetQServer server0; + + protected JMSServerManager jmsServer0; + + protected HornetQServer server1; + + protected JMSServerManager jmsServer1; + + private InVMNamingContext context0; + + protected InVMNamingContext context1; + + protected HashMap params1; + + protected ConnectionFactoryFactory cff0LowProducerWindow; + + @Override + @Before + public void setUp() throws Exception + { + super.setUp(); + + // Start the servers + Configuration conf0 = createBasicConfig() + .setJournalDirectory(getJournalDir(0, false)) + .setBindingsDirectory(getBindingsDir(0, false)) + .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); + + server0 = addServer(HornetQServers.newHornetQServer(conf0, false)); + + context0 = new InVMNamingContext(); + jmsServer0 = new JMSServerManagerImpl(server0); + jmsServer0.setContext(context0); + jmsServer0.start(); + + params1 = new HashMap(); + params1.put(TransportConstants.SERVER_ID_PROP_NAME, 1); + + Configuration conf1 = createBasicConfig() + .setJournalDirectory(getJournalDir(1, false)) + .setBindingsDirectory(getBindingsDir(1, false)) + .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params1)); + + server1 = addServer(HornetQServers.newHornetQServer(conf1, false)); + + context1 = new InVMNamingContext(); + + jmsServer1 = new JMSServerManagerImpl(server1); + jmsServer1.setContext(context1); + jmsServer1.start(); + + createQueue("sourceQueue", 0); + + jmsServer0.createTopic(false, "sourceTopic", "/topic/sourceTopic"); + + createQueue("localTargetQueue", 0); + + createQueue("targetQueue", 1); + + setUpAdministeredObjects(); + TxControl.enable(); + // We need a local transaction and recovery manager + // We must start this after the remote servers have been created or it won't + // have deleted the database and the recovery manager may attempt to recover transactions + + } + + protected void createQueue(final String queueName, final int index) throws Exception + { + JMSServerManager server = jmsServer0; + if (index == 1) + { + server = jmsServer1; + } + assertTrue("queue '/queue/" + queueName + "' created", + server.createQueue(false, queueName, null, true, "/queue/" + queueName)); + } + + @Override + @After + public void tearDown() throws Exception + { + checkEmpty(sourceQueue, 0); + checkEmpty(localTargetQueue, 0); + checkEmpty(targetQueue, 1); + + // Check no subscriptions left lying around + + checkNoSubscriptions(sourceTopic, 0); + if (cff0 instanceof HornetQConnectionFactory) + { + ((HornetQConnectionFactory) cff0).close(); + } + if (cff1 instanceof HornetQConnectionFactory) + { + ((HornetQConnectionFactory) cff1).close(); + } + stopComponent(jmsServer0); + stopComponent(jmsServer1); + cff0 = cff1 = null; + cff0xa = cff1xa = null; + + cf0 = cf1 = null; + + cf0xa = cf1xa = null; + + sourceQueueFactory = targetQueueFactory = localTargetQueueFactory = sourceTopicFactory = null; + + sourceQueue = targetQueue = localTargetQueue = null; + + sourceTopic = null; + + server0 = null; + + jmsServer0 = null; + + server1 = null; + + jmsServer1 = null; + if (context0 != null) + context0.close(); + context0 = null; + if (context1 != null) + context1.close(); + context1 = null; + + // Shutting down Arjuna threads + TxControl.disable(true); + + TransactionReaper.terminate(false); + super.tearDown(); + } + + + protected void setUpAdministeredObjects() throws Exception + { + cff0LowProducerWindow = new ConnectionFactoryFactory() + { + public ConnectionFactory createConnectionFactory() throws Exception + { + HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, + new TransportConfiguration( + INVM_CONNECTOR_FACTORY)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + cf.setProducerWindowSize(100); + + return cf; + } + + }; + + + cff0 = new ConnectionFactoryFactory() + { + public ConnectionFactory createConnectionFactory() throws Exception + { + HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, + new TransportConfiguration( + INVM_CONNECTOR_FACTORY)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + + }; + + cff0xa = new ConnectionFactoryFactory() + { + public Object createConnectionFactory() throws Exception + { + HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, + new TransportConfiguration( + INVM_CONNECTOR_FACTORY)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + + }; + + cf0 = (ConnectionFactory) cff0.createConnectionFactory(); + cf0xa = (XAConnectionFactory) cff0xa.createConnectionFactory(); + + cff1 = new ConnectionFactoryFactory() + { + + public ConnectionFactory createConnectionFactory() throws Exception + { + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, + new TransportConfiguration( + INVM_CONNECTOR_FACTORY, + params1)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + }; + + cff1xa = new ConnectionFactoryFactory() + { + + public XAConnectionFactory createConnectionFactory() throws Exception + { + HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, + new TransportConfiguration( + INVM_CONNECTOR_FACTORY, + params1)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + }; + + cf1 = (ConnectionFactory) cff1.createConnectionFactory(); + cf1xa = (XAConnectionFactory) cff1xa.createConnectionFactory(); + + sourceQueueFactory = new DestinationFactory() + { + public Destination createDestination() throws Exception + { + return (Destination) context0.lookup("/queue/sourceQueue"); + } + }; + + sourceQueue = (Queue) sourceQueueFactory.createDestination(); + + targetQueueFactory = new DestinationFactory() + { + public Destination createDestination() throws Exception + { + return (Destination) context1.lookup("/queue/targetQueue"); + } + }; + + targetQueue = (Queue) targetQueueFactory.createDestination(); + + sourceTopicFactory = new DestinationFactory() + { + public Destination createDestination() throws Exception + { + return (Destination) context0.lookup("/topic/sourceTopic"); + } + }; + + sourceTopic = (Topic) sourceTopicFactory.createDestination(); + + localTargetQueueFactory = new DestinationFactory() + { + public Destination createDestination() throws Exception + { + return (Destination) context0.lookup("/queue/localTargetQueue"); + } + }; + + localTargetQueue = (Queue) localTargetQueueFactory.createDestination(); + } + + protected void sendMessages(final ConnectionFactory cf, + final Destination dest, + final int start, + final int numMessages, + final boolean persistent, + final boolean largeMessage) throws Exception + { + Connection conn = null; + + try + { + conn = cf.createConnection(); + + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageProducer prod = sess.createProducer(dest); + + prod.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT); + + for (int i = start; i < start + numMessages; i++) + { + if (largeMessage) + { + BytesMessage msg = sess.createBytesMessage(); + ((HornetQMessage) msg).setInputStream(UnitTestCase.createFakeLargeStream(1024L * 1024L)); + msg.setStringProperty("msg", "message" + i); + prod.send(msg); + } + else + { + TextMessage tm = sess.createTextMessage("message" + i); + prod.send(tm); + } + + } + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + protected void checkMessagesReceived(final ConnectionFactory cf, + final Destination dest, + final QualityOfServiceMode qosMode, + final int numMessages, + final boolean longWaitForFirst, + final boolean largeMessage) throws Exception + { + Connection conn = null; + + try + { + conn = cf.createConnection(); + + conn.start(); + + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageConsumer cons = sess.createConsumer(dest); + + // Consume the messages + + Set msgs = new HashSet(); + + int count = 0; + + // We always wait longer for the first one - it may take some time to arrive especially if we are + // waiting for recovery to kick in + while (true) + { + Message tm = cons.receive(count == 0 ? (longWaitForFirst ? 60000 : 10000) : 5000); + + if (tm == null) + { + break; + } + + // log.info("Got message " + tm.getText()); + + if (largeMessage) + { + BytesMessage bmsg = (BytesMessage) tm; + msgs.add(tm.getStringProperty("msg")); + byte[] buffRead = new byte[1024]; + for (int i = 0; i < 1024; i++) + { + Assert.assertEquals(1024, bmsg.readBytes(buffRead)); + } + } + else + { + msgs.add(((TextMessage) tm).getText()); + } + + count++; + + } + + if (qosMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE || qosMode == QualityOfServiceMode.DUPLICATES_OK) + { + // All the messages should be received + + for (int i = 0; i < numMessages; i++) + { + Assert.assertTrue("quality=" + qosMode + ", #=" + i + ", message=" + msgs, msgs.contains("message" + i)); + } + + // Should be no more + if (qosMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) + { + Assert.assertEquals(numMessages, msgs.size()); + } + } + else if (qosMode == QualityOfServiceMode.AT_MOST_ONCE) + { + // No *guarantee* that any messages will be received + // but you still might get some depending on how/where the crash occurred + } + + BridgeTestBase.log.trace("Check complete"); + + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + protected void checkAllMessageReceivedInOrder(final ConnectionFactory cf, + final Destination dest, + final int start, + final int numMessages, + final boolean largeMessage) throws Exception + { + Connection conn = null; + try + { + conn = cf.createConnection(); + + conn.start(); + + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageConsumer cons = sess.createConsumer(dest); + + // Consume the messages + + for (int i = 0; i < numMessages; i++) + { + Message tm = cons.receive(30000); + + Assert.assertNotNull(tm); + + if (largeMessage) + { + BytesMessage bmsg = (BytesMessage) tm; + Assert.assertEquals("message" + (i + start), tm.getStringProperty("msg")); + byte[] buffRead = new byte[1024]; + for (int j = 0; j < 1024; j++) + { + Assert.assertEquals(1024, bmsg.readBytes(buffRead)); + } + } + else + { + Assert.assertEquals("message" + (i + start), ((TextMessage) tm).getText()); + } + } + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + public boolean checkEmpty(final Queue queue, final int index) throws Exception + { + ManagementService managementService = server0.getManagementService(); + if (index == 1) + { + managementService = server1.getManagementService(); + } + JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(ResourceNames.JMS_QUEUE + queue.getQueueName()); + + //server may be closed + if (queueControl != null) + { + queueControl.flushExecutor(); + Long messageCount = queueControl.getMessageCount(); + + if (messageCount > 0) + { + queueControl.removeMessages(null); + } + } + return true; + } + + protected void checkNoSubscriptions(final Topic topic, final int index) throws Exception + { + ManagementService managementService = server0.getManagementService(); + if (index == 1) + { + managementService = server1.getManagementService(); + } + TopicControl topicControl = (TopicControl) managementService.getResource(ResourceNames.JMS_TOPIC + topic.getTopicName()); + Assert.assertEquals(0, topicControl.getSubscriptionCount()); + + } + + protected void removeAllMessages(final String queueName, final int index) throws Exception + { + ManagementService managementService = server0.getManagementService(); + if (index == 1) + { + managementService = server1.getManagementService(); + } + JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(ResourceNames.JMS_QUEUE + queueName); + queueControl.removeMessages(null); + } + + protected TransactionManager newTransactionManager() + { + return new TransactionManagerImple(); + } + + // Inner classes ------------------------------------------------------------------- +} diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/ClusteredBridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/ClusteredBridgeTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeClusteredTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java similarity index 96% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java index 7c1f36b7fa..4c7922f643 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java @@ -1,555 +1,555 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.tests.integration.jms.bridge; - -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; -import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.integration.ra.DummyTransactionManager; -import org.junit.Assert; -import org.junit.Test; - -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.xa.XAResource; - -/** - * @author Tim Fox - */ -public class JMSBridgeReconnectionTest extends BridgeTestBase -{ - /** - * - */ - private static final int TIME_WAIT = 5000; - - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - - // Crash and reconnect - - // Once and only once - - @Test - public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_P() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.ONCE_AND_ONLY_ONCE, true, false); - } - - @Test - public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_P_LargeMessage() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.ONCE_AND_ONLY_ONCE, true, true); - } - - @Test - public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_NP() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.ONCE_AND_ONLY_ONCE, false, false); - } - - // dups ok - - @Test - public void testCrashAndReconnectDestBasic_DuplicatesOk_P() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.DUPLICATES_OK, true, false); - } - - @Test - public void testCrashAndReconnectDestBasic_DuplicatesOk_NP() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.DUPLICATES_OK, false, false); - } - - // At most once - - @Test - public void testCrashAndReconnectDestBasic_AtMostOnce_P() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.AT_MOST_ONCE, true, false); - } - - @Test - public void testCrashAndReconnectDestBasic_AtMostOnce_NP() throws Exception - { - performCrashAndReconnectDestBasic(QualityOfServiceMode.AT_MOST_ONCE, false, false); - } - - // Crash tests specific to XA transactions - - @Test - public void testCrashAndReconnectDestCrashBeforePrepare_P() throws Exception - { - performCrashAndReconnectDestCrashBeforePrepare(true); - } - - @Test - public void testCrashAndReconnectDestCrashBeforePrepare_NP() throws Exception - { - performCrashAndReconnectDestCrashBeforePrepare(false); - } - - // Crash before bridge is started - - @Test - public void testRetryConnectionOnStartup() throws Exception - { - jmsServer1.stop(); - - JMSBridgeImpl bridge = new JMSBridgeImpl(cff0, - cff1, - sourceQueueFactory, - targetQueueFactory, - null, - null, - null, - null, - null, - 1000, - -1, - QualityOfServiceMode.DUPLICATES_OK, - 10, - -1, - null, - null, - false); - bridge.setTransactionManager(newTransactionManager()); - addHornetQComponent(bridge); - bridge.start(); - Assert.assertFalse(bridge.isStarted()); - Assert.assertTrue(bridge.isFailed()); - - // Restart the server - jmsServer1.start(); - - createQueue("targetQueue", 1); - setUpAdministeredObjects(); - - Thread.sleep(3000); - - Assert.assertTrue(bridge.isStarted()); - Assert.assertFalse(bridge.isFailed()); - } - - /** - * https://jira.jboss.org/jira/browse/HORNETQ-287 - */ - @Test - public void testStopBridgeWithFailureWhenStarted() throws Exception - { - jmsServer1.stop(); - - JMSBridgeImpl bridge = new JMSBridgeImpl(cff0, - cff1, - sourceQueueFactory, - targetQueueFactory, - null, - null, - null, - null, - null, - 500, - -1, - QualityOfServiceMode.DUPLICATES_OK, - 10, - -1, - null, - null, - false); - bridge.setTransactionManager(newTransactionManager()); - - bridge.start(); - Assert.assertFalse(bridge.isStarted()); - Assert.assertTrue(bridge.isFailed()); - - bridge.stop(); - Assert.assertFalse(bridge.isStarted()); - - // we restart and setup the server for the test's tearDown checks - jmsServer1.start(); - createQueue("targetQueue", 1); - setUpAdministeredObjects(); - } - - /* - * Send some messages - * Crash the destination server - * Bring the destination server back up - * Send some more messages - * Verify all messages are received - */ - private void performCrashAndReconnectDestBasic(final QualityOfServiceMode qosMode, - final boolean persistent, - final boolean largeMessage) throws Exception - { - JMSBridgeImpl bridge = null; - - ConnectionFactoryFactory factInUse0 = cff0; - ConnectionFactoryFactory factInUse1 = cff1; - if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) - { - factInUse0 = cff0xa; - factInUse1 = cff1xa; - } - - bridge = - new JMSBridgeImpl(factInUse0, - factInUse1, - sourceQueueFactory, - targetQueueFactory, - null, - null, - null, - null, - null, - 1000, - -1, - qosMode, - 10, - -1, - null, - null, - false); - addHornetQComponent(bridge); - bridge.setTransactionManager(newTransactionManager()); - bridge.start(); - - final int NUM_MESSAGES = 10; - - // Send some messages - - sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, persistent, largeMessage); - - // Verify none are received - - checkEmpty(targetQueue, 1); - - // Now crash the dest server - - JMSBridgeReconnectionTest.log.info("About to crash server"); - - jmsServer1.stop(); - - // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); - Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); - - // Restart the server - JMSBridgeReconnectionTest.log.info("Restarting server"); - jmsServer1.start(); - - // jmsServer1.createQueue(false, "targetQueue", null, true, "queue/targetQueue"); - - createQueue("targetQueue", 1); - - setUpAdministeredObjects(); - - // Send some more messages - - JMSBridgeReconnectionTest.log.info("Sending more messages"); - - sendMessages(cf0, sourceQueue, NUM_MESSAGES / 2, NUM_MESSAGES / 2, persistent, largeMessage); - - JMSBridgeReconnectionTest.log.info("Sent messages"); - - jmsServer1.stop(); - - bridge.stop(); - - System.out.println("JMSBridgeReconnectionTest.performCrashAndReconnectDestBasic"); - } - - @Test - public void performCrashDestinationStopBridge() throws Exception - { - ConnectionFactoryFactory factInUse0 = cff0; - ConnectionFactoryFactory factInUse1 = cff1; - final JMSBridgeImpl bridge = - new JMSBridgeImpl(factInUse0, - factInUse1, - sourceQueueFactory, - targetQueueFactory, - null, - null, - null, - null, - null, - 1000, - -1, - QualityOfServiceMode.DUPLICATES_OK, - 10, - -1, - null, - null, - false); - - - addHornetQComponent(bridge); - bridge.setTransactionManager(newTransactionManager()); - bridge.start(); - - Thread clientThread = new Thread(new Runnable() - { - @Override - public void run() - { - while (bridge.isStarted()) - { - try - { - sendMessages(cf0, sourceQueue, 0, 1, false, false); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - } - }); - - clientThread.start(); - - checkAllMessageReceivedInOrder(cf1, targetQueue, 0, 1, false); - - JMSBridgeReconnectionTest.log.info("About to crash server"); - - jmsServer1.stop(); - - // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); - Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); - - bridge.stop(); - - clientThread.join(5000); - - assertTrue(!clientThread.isAlive()); - } - - @Test - public void performCrashAndReconnect() throws Exception - { - performCrashAndReconnect(true); - } - - @Test - public void performCrashAndNoReconnect() throws Exception - { - performCrashAndReconnect(false); - } - - - private void performCrashAndReconnect(boolean restart) throws Exception - { - cff1xa = new ConnectionFactoryFactory() - { - public Object createConnectionFactory() throws Exception - { - HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, - new TransportConfiguration( - INVM_CONNECTOR_FACTORY, - params1)); - - // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection - cf.setReconnectAttempts(-1); - cf.setBlockOnNonDurableSend(true); - cf.setBlockOnDurableSend(true); - cf.setCacheLargeMessagesClient(true); - - return cf; - } - - }; - - DummyTransactionManager tm = new DummyTransactionManager(); - DummyTransaction tx = new DummyTransaction(); - tm.tx = tx; - - JMSBridgeImpl bridge = - new JMSBridgeImpl(cff0xa, - cff1xa, - sourceQueueFactory, - targetQueueFactory, - null, - null, - null, - null, - null, - 1000, - -1, - QualityOfServiceMode.ONCE_AND_ONLY_ONCE, - 10, - 5000, - null, - null, - false); - addHornetQComponent(bridge); - bridge.setTransactionManager(tm); - - bridge.start(); - - // Now crash the dest server - - JMSBridgeReconnectionTest.log.info("About to crash server"); - - jmsServer1.stop(); - - if (restart) - { - jmsServer1.start(); - } - // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); - Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); - - bridge.stop(); - - if (restart) - { - assertTrue(tx.rolledback); - assertTrue(tx.targetConnected); - } - else - { - assertTrue(tx.rolledback); - assertFalse(tx.targetConnected); - } - } - - private class DummyTransaction implements Transaction - { - boolean rolledback = false; - ClientSession targetSession; - boolean targetConnected = false; - @Override - public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, SystemException - { - - } - - @Override - public void rollback() throws IllegalStateException, SystemException - { - rolledback = true; - targetConnected = !targetSession.isClosed(); - } - - @Override - public void setRollbackOnly() throws IllegalStateException, SystemException - { - - } - - @Override - public int getStatus() throws SystemException - { - return 0; - } - - @Override - public boolean enlistResource(XAResource xaResource) throws RollbackException, IllegalStateException, SystemException - { - targetSession = (ClientSession) xaResource; - return false; - } - - @Override - public boolean delistResource(XAResource xaResource, int i) throws IllegalStateException, SystemException - { - return false; - } - - @Override - public void registerSynchronization(Synchronization synchronization) throws RollbackException, IllegalStateException, SystemException - { - - } - } - /* - * Send some messages - * Crash the destination server - * Set the max batch time such that it will attempt to send the batch while the dest server is down - * Bring up the destination server - * Send some more messages - * Verify all messages are received - */ - private void performCrashAndReconnectDestCrashBeforePrepare(final boolean persistent) throws Exception - { - JMSBridgeImpl bridge = - new JMSBridgeImpl(cff0xa, - cff1xa, - sourceQueueFactory, - targetQueueFactory, - null, - null, - null, - null, - null, - 1000, - -1, - QualityOfServiceMode.ONCE_AND_ONLY_ONCE, - 10, - 5000, - null, - null, - false); - addHornetQComponent(bridge); - bridge.setTransactionManager(newTransactionManager()); - - bridge.start(); - - final int NUM_MESSAGES = 10; - // Send some messages - - sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, persistent, false); - - // verify none are received - - checkEmpty(targetQueue, 1); - - // Now crash the dest server - - JMSBridgeReconnectionTest.log.info("About to crash server"); - - jmsServer1.stop(); - - // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); - Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); - - // Restart the server - jmsServer1.start(); - - createQueue("targetQueue", 1); - - setUpAdministeredObjects(); - - sendMessages(cf0, sourceQueue, NUM_MESSAGES / 2, NUM_MESSAGES / 2, persistent, false); - - checkMessagesReceived(cf1, targetQueue, QualityOfServiceMode.ONCE_AND_ONLY_ONCE, NUM_MESSAGES, false, false); - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.tests.integration.jms.bridge; + +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.jms.HornetQJMSClient; +import org.apache.activemq6.api.jms.JMSFactoryType; +import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq6.jms.bridge.QualityOfServiceMode; +import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq6.tests.integration.ra.DummyTransactionManager; +import org.junit.Assert; +import org.junit.Test; + +import javax.transaction.HeuristicMixedException; +import javax.transaction.HeuristicRollbackException; +import javax.transaction.RollbackException; +import javax.transaction.Synchronization; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.xa.XAResource; + +/** + * @author Tim Fox + */ +public class JMSBridgeReconnectionTest extends BridgeTestBase +{ + /** + * + */ + private static final int TIME_WAIT = 5000; + + private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + + // Crash and reconnect + + // Once and only once + + @Test + public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_P() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.ONCE_AND_ONLY_ONCE, true, false); + } + + @Test + public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_P_LargeMessage() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.ONCE_AND_ONLY_ONCE, true, true); + } + + @Test + public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_NP() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.ONCE_AND_ONLY_ONCE, false, false); + } + + // dups ok + + @Test + public void testCrashAndReconnectDestBasic_DuplicatesOk_P() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.DUPLICATES_OK, true, false); + } + + @Test + public void testCrashAndReconnectDestBasic_DuplicatesOk_NP() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.DUPLICATES_OK, false, false); + } + + // At most once + + @Test + public void testCrashAndReconnectDestBasic_AtMostOnce_P() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.AT_MOST_ONCE, true, false); + } + + @Test + public void testCrashAndReconnectDestBasic_AtMostOnce_NP() throws Exception + { + performCrashAndReconnectDestBasic(QualityOfServiceMode.AT_MOST_ONCE, false, false); + } + + // Crash tests specific to XA transactions + + @Test + public void testCrashAndReconnectDestCrashBeforePrepare_P() throws Exception + { + performCrashAndReconnectDestCrashBeforePrepare(true); + } + + @Test + public void testCrashAndReconnectDestCrashBeforePrepare_NP() throws Exception + { + performCrashAndReconnectDestCrashBeforePrepare(false); + } + + // Crash before bridge is started + + @Test + public void testRetryConnectionOnStartup() throws Exception + { + jmsServer1.stop(); + + JMSBridgeImpl bridge = new JMSBridgeImpl(cff0, + cff1, + sourceQueueFactory, + targetQueueFactory, + null, + null, + null, + null, + null, + 1000, + -1, + QualityOfServiceMode.DUPLICATES_OK, + 10, + -1, + null, + null, + false); + bridge.setTransactionManager(newTransactionManager()); + addHornetQComponent(bridge); + bridge.start(); + Assert.assertFalse(bridge.isStarted()); + Assert.assertTrue(bridge.isFailed()); + + // Restart the server + jmsServer1.start(); + + createQueue("targetQueue", 1); + setUpAdministeredObjects(); + + Thread.sleep(3000); + + Assert.assertTrue(bridge.isStarted()); + Assert.assertFalse(bridge.isFailed()); + } + + /** + * https://jira.jboss.org/jira/browse/HORNETQ-287 + */ + @Test + public void testStopBridgeWithFailureWhenStarted() throws Exception + { + jmsServer1.stop(); + + JMSBridgeImpl bridge = new JMSBridgeImpl(cff0, + cff1, + sourceQueueFactory, + targetQueueFactory, + null, + null, + null, + null, + null, + 500, + -1, + QualityOfServiceMode.DUPLICATES_OK, + 10, + -1, + null, + null, + false); + bridge.setTransactionManager(newTransactionManager()); + + bridge.start(); + Assert.assertFalse(bridge.isStarted()); + Assert.assertTrue(bridge.isFailed()); + + bridge.stop(); + Assert.assertFalse(bridge.isStarted()); + + // we restart and setup the server for the test's tearDown checks + jmsServer1.start(); + createQueue("targetQueue", 1); + setUpAdministeredObjects(); + } + + /* + * Send some messages + * Crash the destination server + * Bring the destination server back up + * Send some more messages + * Verify all messages are received + */ + private void performCrashAndReconnectDestBasic(final QualityOfServiceMode qosMode, + final boolean persistent, + final boolean largeMessage) throws Exception + { + JMSBridgeImpl bridge = null; + + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + factInUse1 = cff1xa; + } + + bridge = + new JMSBridgeImpl(factInUse0, + factInUse1, + sourceQueueFactory, + targetQueueFactory, + null, + null, + null, + null, + null, + 1000, + -1, + qosMode, + 10, + -1, + null, + null, + false); + addHornetQComponent(bridge); + bridge.setTransactionManager(newTransactionManager()); + bridge.start(); + + final int NUM_MESSAGES = 10; + + // Send some messages + + sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, persistent, largeMessage); + + // Verify none are received + + checkEmpty(targetQueue, 1); + + // Now crash the dest server + + JMSBridgeReconnectionTest.log.info("About to crash server"); + + jmsServer1.stop(); + + // Wait a while before starting up to simulate the dest being down for a while + JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + Thread.sleep(TIME_WAIT); + JMSBridgeReconnectionTest.log.info("Done wait"); + + // Restart the server + JMSBridgeReconnectionTest.log.info("Restarting server"); + jmsServer1.start(); + + // jmsServer1.createQueue(false, "targetQueue", null, true, "queue/targetQueue"); + + createQueue("targetQueue", 1); + + setUpAdministeredObjects(); + + // Send some more messages + + JMSBridgeReconnectionTest.log.info("Sending more messages"); + + sendMessages(cf0, sourceQueue, NUM_MESSAGES / 2, NUM_MESSAGES / 2, persistent, largeMessage); + + JMSBridgeReconnectionTest.log.info("Sent messages"); + + jmsServer1.stop(); + + bridge.stop(); + + System.out.println("JMSBridgeReconnectionTest.performCrashAndReconnectDestBasic"); + } + + @Test + public void performCrashDestinationStopBridge() throws Exception + { + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + final JMSBridgeImpl bridge = + new JMSBridgeImpl(factInUse0, + factInUse1, + sourceQueueFactory, + targetQueueFactory, + null, + null, + null, + null, + null, + 1000, + -1, + QualityOfServiceMode.DUPLICATES_OK, + 10, + -1, + null, + null, + false); + + + addHornetQComponent(bridge); + bridge.setTransactionManager(newTransactionManager()); + bridge.start(); + + Thread clientThread = new Thread(new Runnable() + { + @Override + public void run() + { + while (bridge.isStarted()) + { + try + { + sendMessages(cf0, sourceQueue, 0, 1, false, false); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } + }); + + clientThread.start(); + + checkAllMessageReceivedInOrder(cf1, targetQueue, 0, 1, false); + + JMSBridgeReconnectionTest.log.info("About to crash server"); + + jmsServer1.stop(); + + // Wait a while before starting up to simulate the dest being down for a while + JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + Thread.sleep(TIME_WAIT); + JMSBridgeReconnectionTest.log.info("Done wait"); + + bridge.stop(); + + clientThread.join(5000); + + assertTrue(!clientThread.isAlive()); + } + + @Test + public void performCrashAndReconnect() throws Exception + { + performCrashAndReconnect(true); + } + + @Test + public void performCrashAndNoReconnect() throws Exception + { + performCrashAndReconnect(false); + } + + + private void performCrashAndReconnect(boolean restart) throws Exception + { + cff1xa = new ConnectionFactoryFactory() + { + public Object createConnectionFactory() throws Exception + { + HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, + new TransportConfiguration( + INVM_CONNECTOR_FACTORY, + params1)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(-1); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + + }; + + DummyTransactionManager tm = new DummyTransactionManager(); + DummyTransaction tx = new DummyTransaction(); + tm.tx = tx; + + JMSBridgeImpl bridge = + new JMSBridgeImpl(cff0xa, + cff1xa, + sourceQueueFactory, + targetQueueFactory, + null, + null, + null, + null, + null, + 1000, + -1, + QualityOfServiceMode.ONCE_AND_ONLY_ONCE, + 10, + 5000, + null, + null, + false); + addHornetQComponent(bridge); + bridge.setTransactionManager(tm); + + bridge.start(); + + // Now crash the dest server + + JMSBridgeReconnectionTest.log.info("About to crash server"); + + jmsServer1.stop(); + + if (restart) + { + jmsServer1.start(); + } + // Wait a while before starting up to simulate the dest being down for a while + JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + Thread.sleep(TIME_WAIT); + JMSBridgeReconnectionTest.log.info("Done wait"); + + bridge.stop(); + + if (restart) + { + assertTrue(tx.rolledback); + assertTrue(tx.targetConnected); + } + else + { + assertTrue(tx.rolledback); + assertFalse(tx.targetConnected); + } + } + + private class DummyTransaction implements Transaction + { + boolean rolledback = false; + ClientSession targetSession; + boolean targetConnected = false; + @Override + public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, SystemException + { + + } + + @Override + public void rollback() throws IllegalStateException, SystemException + { + rolledback = true; + targetConnected = !targetSession.isClosed(); + } + + @Override + public void setRollbackOnly() throws IllegalStateException, SystemException + { + + } + + @Override + public int getStatus() throws SystemException + { + return 0; + } + + @Override + public boolean enlistResource(XAResource xaResource) throws RollbackException, IllegalStateException, SystemException + { + targetSession = (ClientSession) xaResource; + return false; + } + + @Override + public boolean delistResource(XAResource xaResource, int i) throws IllegalStateException, SystemException + { + return false; + } + + @Override + public void registerSynchronization(Synchronization synchronization) throws RollbackException, IllegalStateException, SystemException + { + + } + } + /* + * Send some messages + * Crash the destination server + * Set the max batch time such that it will attempt to send the batch while the dest server is down + * Bring up the destination server + * Send some more messages + * Verify all messages are received + */ + private void performCrashAndReconnectDestCrashBeforePrepare(final boolean persistent) throws Exception + { + JMSBridgeImpl bridge = + new JMSBridgeImpl(cff0xa, + cff1xa, + sourceQueueFactory, + targetQueueFactory, + null, + null, + null, + null, + null, + 1000, + -1, + QualityOfServiceMode.ONCE_AND_ONLY_ONCE, + 10, + 5000, + null, + null, + false); + addHornetQComponent(bridge); + bridge.setTransactionManager(newTransactionManager()); + + bridge.start(); + + final int NUM_MESSAGES = 10; + // Send some messages + + sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, persistent, false); + + // verify none are received + + checkEmpty(targetQueue, 1); + + // Now crash the dest server + + JMSBridgeReconnectionTest.log.info("About to crash server"); + + jmsServer1.stop(); + + // Wait a while before starting up to simulate the dest being down for a while + JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + Thread.sleep(TIME_WAIT); + JMSBridgeReconnectionTest.log.info("Done wait"); + + // Restart the server + jmsServer1.start(); + + createQueue("targetQueue", 1); + + setUpAdministeredObjects(); + + sendMessages(cf0, sourceQueue, NUM_MESSAGES / 2, NUM_MESSAGES / 2, persistent, false); + + checkMessagesReceived(cf1, targetQueue, QualityOfServiceMode.ONCE_AND_ONLY_ONCE, NUM_MESSAGES, false, false); + } +} diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/bridge/JMSBridgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/AutoGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/AutoGroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ConnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/CreateQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ExpiryMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupIDTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/GroupingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageProducerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/MessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NewQueueRequestorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/NoLocalSubscriberTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/PreACKJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReSendMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReceiveNoWaitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/ReceiveNoWaitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/RemoteConnectionStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/RemoteConnectionStressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/SessionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/StoreConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/StoreConfigTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TextMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TextMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/client/TopicCleanupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/BindingsClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/JMSReconnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TemporaryQueueClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/cluster/TopicClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseConnectionOnGCTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseDestroyedConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/CloseDestroyedConnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConcurrentSessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConcurrentSessionCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactorySerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactorySerializationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/ExceptionListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/InvalidConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/connection/InvalidConnectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/consumer/ConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/divert/DivertAndACKClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/divert/DivertAndACKClientTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/BodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/BodyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/InvalidDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/InvalidDestinationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsContextTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/NonExistentQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/SharedConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/jms2client/SharedConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/largemessage/JMSLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerDeployerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/JMSServerStartStopTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSConfigurationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/config/JMSServerConfigParserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/ConnectionFactoryControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/ConnectionFactoryControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSMessagingProxy.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControl2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/JMSUtil.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/NullInitialContext.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/NullInitialContext.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlClusterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/jms/server/management/TopicControlUsingJMSTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOImportExportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalCompactTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOJournalImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/AIOSequentialFileFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/JournalPerfTuneTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOBufferedJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOBufferedJournalCompactTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOImportExportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalCompactTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOJournalImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONoBufferJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONoBufferJournalImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/NIOSequentialFileFactoryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/OldFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/OldFormatTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/journal/ValidateTransactionHealthTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/LargeMessageTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/largemessage/ServerLargeMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AcceptorControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/AddressControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BridgeControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/BroadcastGroupControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControl2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ClusterConnectionControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/CoreMessagingProxy.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/DivertControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/HornetQServerControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/JMXDomainTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementActivationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementControlHelper.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementControlHelper.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementControlHelper.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementControlHelper.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementHelperTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementHelperTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementHelperTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementServiceImplTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementServiceImplTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementServiceImplTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithPagingServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithPagingServerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/ManagementWithStompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/NotificationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlUsingCoreTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/QueueControlUsingCoreTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlUsingCoreTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/management/SecurityNotificationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicOpenWireTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicOpenWireTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicOpenWireTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicSecurityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/BasicSecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicSecurityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireUtilTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireUtilTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/OpenWireUtilTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireUtilTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/SimpleOpenWireTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer10Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer10Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer10Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer10Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer11Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer11Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer11Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer12Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer12Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer12Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer13Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer13Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer13Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer13Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer1Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer1Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer1Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer1Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer2Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer2Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer3Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer3Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer3Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer3Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer4Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer4Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer4Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer4Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer5Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer5Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer5Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer5Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer6Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer6Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer6Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer6Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer7Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer7Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer7Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer7Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer8Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer8Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer8Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer8Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer9Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer9Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSConsumer9Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer9Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSIndividualAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSIndividualAckTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSIndividualAckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSIndividualAckTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSQueueRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSQueueRedeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecase1Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecase1Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecase1Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecase1Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecaseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecaseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JMSUsecaseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecaseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsAutoAckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsClientAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsClientAckTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsClientAckTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsClientAckTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConnectionStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConnectionStartStopTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueBrowserTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueBrowserTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueBrowserTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsResourceProvider.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsResourceProvider.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsResourceProvider.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsResourceProvider.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRedeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSelectorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSelectorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSelectorTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicTransactionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicTransactionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicTransactionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTransactionTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTransactionTestSupport.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/JmsTransactionTestSupport.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTransactionTestSupport.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ProducerFlowControlTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/RedeliveryPolicyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/RedeliveryPolicyTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/RedeliveryPolicyTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/RedeliveryPolicyTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TimeStampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TimeStampTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TimeStampTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TimeStampTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TransactionContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TransactionContextTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/amq/TransactionContextTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TransactionContextTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/interop/GeneralInteropTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/interop/GeneralInteropTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/interop/GeneralInteropTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/interop/GeneralInteropTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/util/Wait.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/util/Wait.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/openwire/util/Wait.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/util/Wait.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/MultipleProducersPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/MultipleProducersPagingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/MultipleProducersPagingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/MultipleProducersPagingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/NettyPagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/NettyPagingSendTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/NettyPagingSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/NettyPagingSendTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncOnNonTXTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncOnNonTXTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncOnNonTXTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncOnNonTXTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncServer.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PageCountSyncServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncServer.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingCounterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingCounterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingCounterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingReceiveTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingReceiveTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingReceiveTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingSendTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingSendTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingSendTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverAndCountersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverAndCountersTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverAndCountersTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverAndCountersTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverBackup.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverBackup.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverBackup.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverBackup.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverServer.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/PagingWithFailoverServer.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverServer.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/SpawnedServerSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/SpawnedServerSupport.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/paging/SpawnedServerSupport.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/SpawnedServerSupport.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteMessagesOnStartupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteMessagesOnStartupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteMessagesOnStartupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DeleteQueueRestartTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DuplicateCacheTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/DuplicateCacheTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/ExportFormatTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/ExportFormatTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/ExportFormatTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSDynamicConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSDynamicConfigTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSDynamicConfigTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSDynamicConfigTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSStorageManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSStorageManagerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/JMSStorageManagerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSStorageManagerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RestartSMTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RestartSMTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RestartSMTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RolesConfigurationStorageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/RolesConfigurationStorageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RolesConfigurationStorageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/StorageManagerTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/StorageManagerTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/StorageManagerTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/XmlImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/XmlImportExportTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/persistence/XmlImportExportTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/XmlImportExportTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/proton/ProtonTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/proton/ProtonTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/proton/ProtonTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransaction.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransaction.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransaction.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransaction.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransactionManager.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransactionManager.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/DummyTransactionManager.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransactionManager.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQActivationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQActivationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQActivationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQClusteredTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQClusteredTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQClusteredTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerSecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerXATest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQMessageHandlerXATest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerXATest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRAClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQRAClusteredTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRAClusteredTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQRAClusteredTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRATestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQRATestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/HornetQRATestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQRATestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/JMSContextTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/OutgoingConnectionTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ra/ResourceAdapterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/BatchDelayTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/BatchDelayTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/BatchDelayTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/BatchDelayTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DestroyConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DestroyConsumerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DestroyConsumerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DestroyConsumerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DirectDeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DirectDeliverTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/DirectDeliverTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DirectDeliverTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettyNetworkAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettyNetworkAddressTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettyNetworkAddressTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettyNetworkAddressTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettySynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettySynchronousCloseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NettySynchronousCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettySynchronousCloseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NetworkAddressTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/NetworkAddressTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NetworkAddressTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/PingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/ReconnectTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/SynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/SynchronousCloseTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/remoting/SynchronousCloseTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/SynchronousCloseTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationOrderTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationOrderTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationOrderTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/replication/ReplicationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/DelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/DelayedMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/DelayedMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/DelayedMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/MultipliedDelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/MultipliedDelayedMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/MultipliedDelayedMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/MultipliedDelayedMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/ScheduledMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/scheduling/ScheduledMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/ScheduledMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/NettySecurityClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/NettySecurityClientTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/NettySecurityClientTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/NettySecurityClientTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SecurityTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SimpleClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SimpleClient.java similarity index 97% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SimpleClient.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SimpleClient.java index 5d8f8b66d1..04d8a2a9f1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/security/SimpleClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SimpleClient.java @@ -1,106 +1,106 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.tests.integration.security; - -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.jms.client.HornetQTextMessage; -import org.apache.activemq6.tests.util.RandomUtil; - -/** - * Code to be run in an external VM, via main() - * - * @author Jeff Mesnil - */ -final class SimpleClient -{ - - public static void main(final String[] args) throws Exception - { - try - { - if (args.length != 1) - { - throw new Exception("require 1 argument: connector factory class name"); - } - String connectorFactoryClassName = args[0]; - - String queueName = RandomUtil.randomString(); - String messageText = RandomUtil.randomString(); - - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(connectorFactoryClassName)); - try - { - ClientSessionFactory sf = locator.createSessionFactory(); - ClientSession session = sf.createSession(false, true, true); - - session.createQueue(queueName, queueName, null, false); - ClientProducer producer = session.createProducer(queueName); - ClientConsumer consumer = session.createConsumer(queueName); - - ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte) 1); - message.getBodyBuffer().writeString(messageText); - producer.send(message); - - session.start(); - - ClientMessage receivedMsg = consumer.receive(5000); - if (receivedMsg == null) - { - throw new Exception("did not receive the message"); - } - - String text = receivedMsg.getBodyBuffer().readString(); - if (text == null || !text.equals(messageText)) - { - throw new Exception("received " + text + ", was expecting " + messageText); - } - - // clean all resources to exit cleanly - consumer.close(); - session.deleteQueue(queueName); - session.close(); - sf.close(); - System.out.println("OK"); - } - finally - { - locator.close(); - } - } - catch (Throwable t) - { - - String allStack = t.getMessage() + "|"; - StackTraceElement[] stackTrace = t.getStackTrace(); - for (StackTraceElement stackTraceElement : stackTrace) - { - allStack += stackTraceElement.toString() + "|"; - } - // System.out.println(t.getClass().getName()); - // System.out.println(t.getMessage()); - System.out.println(allStack); - System.exit(1); - } - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.tests.integration.security; + +import org.apache.activemq6.api.core.TransportConfiguration; +import org.apache.activemq6.api.core.client.ClientConsumer; +import org.apache.activemq6.api.core.client.ClientMessage; +import org.apache.activemq6.api.core.client.ClientProducer; +import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq6.api.core.client.ClientSessionFactory; +import org.apache.activemq6.api.core.client.HornetQClient; +import org.apache.activemq6.api.core.client.ServerLocator; +import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq6.tests.util.RandomUtil; + +/** + * Code to be run in an external VM, via main() + * + * @author Jeff Mesnil + */ +final class SimpleClient +{ + + public static void main(final String[] args) throws Exception + { + try + { + if (args.length != 1) + { + throw new Exception("require 1 argument: connector factory class name"); + } + String connectorFactoryClassName = args[0]; + + String queueName = RandomUtil.randomString(); + String messageText = RandomUtil.randomString(); + + ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(connectorFactoryClassName)); + try + { + ClientSessionFactory sf = locator.createSessionFactory(); + ClientSession session = sf.createSession(false, true, true); + + session.createQueue(queueName, queueName, null, false); + ClientProducer producer = session.createProducer(queueName); + ClientConsumer consumer = session.createConsumer(queueName); + + ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, + false, + 0, + System.currentTimeMillis(), + (byte) 1); + message.getBodyBuffer().writeString(messageText); + producer.send(message); + + session.start(); + + ClientMessage receivedMsg = consumer.receive(5000); + if (receivedMsg == null) + { + throw new Exception("did not receive the message"); + } + + String text = receivedMsg.getBodyBuffer().readString(); + if (text == null || !text.equals(messageText)) + { + throw new Exception("received " + text + ", was expecting " + messageText); + } + + // clean all resources to exit cleanly + consumer.close(); + session.deleteQueue(queueName); + session.close(); + sf.close(); + System.out.println("OK"); + } + finally + { + locator.close(); + } + } + catch (Throwable t) + { + + String allStack = t.getMessage() + "|"; + StackTraceElement[] stackTrace = t.getStackTrace(); + for (StackTraceElement stackTraceElement : stackTrace) + { + allStack += stackTraceElement.toString() + "|"; + } + // System.out.println(t.getClass().getName()); + // System.out.println(t.getMessage()); + System.out.println(allStack); + System.exit(1); + } + } +} diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AIOFileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AIOFileLockTimeoutTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AIOFileLockTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AIOFileLockTimeoutTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/AddressFullLoggingTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ExpiryRunnerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ExpiryRunnerTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FakeStorageManager.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FakeStorageManager.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FakeStorageManager.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FakeStorageManager.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/FileLockTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQRecoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/LVQTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/NIOFileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/NIOFileLockTimeoutTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/NIOFileLockTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/NIOFileLockTimeoutTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/PredefinedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/PredefinedQueueTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDown3NodeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/ScaleDownTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/SuppliedThreadPoolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SuppliedThreadPoolTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/server/SuppliedThreadPoolTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SuppliedThreadPoolTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/ExampleListener.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/ExampleListener.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/ExampleListener.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/ExampleListener.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/MessageSender.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/MessageSender.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/MessageSender.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/MessageSender.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/SpringIntegrationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/SpringIntegrationTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/spring/SpringIntegrationTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/SpringIntegrationTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverOneWaySSLTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/ExtraStompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompConnectionCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompConnectionCleanupTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompConnectionCleanupTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompConnectionCleanupTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverHttpTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverHttpTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverHttpTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverWebsocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverWebsocketTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompOverWebsocketTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverWebsocketTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompWebSocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompWebSocketTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/StompWebSocketTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompWebSocketTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractClientStompFrame.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractClientStompFrame.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractClientStompFrame.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractClientStompFrame.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractStompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractStompClientConnection.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/AbstractStompClientConnection.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractStompClientConnection.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrame.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrame.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrame.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrame.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV10.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV10.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV10.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV10.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV11.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV11.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV11.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV12.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/ClientStompFrameV12.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV12.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnection.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnection.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnection.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionFactory.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionFactory.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV10.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV10.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV10.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV10.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV11.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV11.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV11.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV12.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompClientConnectionV12.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV12.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactory.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactory.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryFactory.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryFactory.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV10.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV10.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV10.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV10.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV11.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV11.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV11.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV12.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/util/StompFrameFactoryV12.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV12.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/ExtraStompTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/ExtraStompTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/ExtraStompTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11TestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v11/StompV11TestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11TestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v12/StompV12Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/stomp/v12/StompV12Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v12/StompV12Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/tools/TransferMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/tools/TransferMessageTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/HornetQFrameDecoder2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/HornetQFrameDecoder2Test.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/twitter/TwitterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/twitter/TwitterTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/twitter/TwitterTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/twitter/TwitterTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/vertx/HornetQVertxUnitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/vertx/HornetQVertxUnitTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaRecoveryTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/BasicXaTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/XaTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/integration/xa/XaTimeoutTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/largemessage/LargeMessageTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSClusteredTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSClusteredTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSClusteredTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSTestBase.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JMSTestBase.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSTestBase.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JournalExample.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JournalExample.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/JournalExample.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JournalExample.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/NonSerializableFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/NonSerializableFactory.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/NonSerializableFactory.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/util/NonSerializableFactory.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/ReplicatedBackupUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/ReplicatedBackupUtils.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/ReplicatedBackupUtils.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/util/ReplicatedBackupUtils.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/TransportConfigurationUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq6/tests/util/TransportConfigurationUtils.java rename to tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AcknowledgementTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AcknowledgementTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AcknowledgementTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AcknowledgementTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AutoAckMesageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AutoAckMesageListenerTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/AutoAckMesageListenerTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AutoAckMesageListenerTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/BrowserTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/BrowserTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/BrowserTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/BrowserTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/CTSMiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/CTSMiscellaneousTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/CTSMiscellaneousTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/CTSMiscellaneousTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionClosedTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionClosedTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionClosedTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionFactoryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionFactoryTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionFactoryTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionFactoryTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConnectionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConsumerClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConsumerClosedTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConsumerClosedTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConsumerClosedTest.java index 946a1b9d5e..f2075f79b8 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ConsumerClosedTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConsumerClosedTest.java @@ -1,90 +1,90 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ package org.apache.activemq6.jms.tests; -import javax.jms.Connection; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.naming.InitialContext; - -import org.junit.Test; - -/** - * @author Ovidiu Feodorov - * - */ -public class ConsumerClosedTest extends JMSTestCase -{ - // Constants ----------------------------------------------------- - - public static final int NUMBER_OF_MESSAGES = 10; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - InitialContext ic; - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - +import javax.jms.Connection; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.naming.InitialContext; + +import org.junit.Test; + +/** + * @author Ovidiu Feodorov + * + */ +public class ConsumerClosedTest extends JMSTestCase +{ + // Constants ----------------------------------------------------- + + public static final int NUMBER_OF_MESSAGES = 10; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + InitialContext ic; + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + @Test - public void testMessagesSentDuringClose() throws Exception - { - Connection c = null; - - try - { - c = createConnection(); - c.start(); - - Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer p = s.createProducer(queue1); - - for (int i = 0; i < ConsumerClosedTest.NUMBER_OF_MESSAGES; i++) - { - p.send(s.createTextMessage("message" + i)); - } - - log.debug("all messages sent"); - - MessageConsumer cons = s.createConsumer(queue1); - cons.close(); - - log.debug("consumer closed"); - - // make sure that all messages are in queue - - assertRemainingMessages(ConsumerClosedTest.NUMBER_OF_MESSAGES); - } - finally - { - if (c != null) - { - c.close(); - } - - removeAllMessages(queue1.getQueueName(), true); - } - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} + public void testMessagesSentDuringClose() throws Exception + { + Connection c = null; + + try + { + c = createConnection(); + c.start(); + + Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageProducer p = s.createProducer(queue1); + + for (int i = 0; i < ConsumerClosedTest.NUMBER_OF_MESSAGES; i++) + { + p.send(s.createTextMessage("message" + i)); + } + + log.debug("all messages sent"); + + MessageConsumer cons = s.createConsumer(queue1); + cons.close(); + + log.debug("consumer closed"); + + // make sure that all messages are in queue + + assertRemainingMessages(ConsumerClosedTest.NUMBER_OF_MESSAGES); + } + finally + { + if (c != null) + { + c.close(); + } + + removeAllMessages(queue1.getQueueName(), true); + } + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DeliveryOrderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DeliveryOrderTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DeliveryOrderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DeliveryOrderTest.java index 0aae730c56..67c2a4d389 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DeliveryOrderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DeliveryOrderTest.java @@ -1,160 +1,160 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.tests; - -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; -import java.util.concurrent.CountDownLatch; - -import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; -import org.junit.Assert; -import org.junit.Test; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; - -/** - * A DeliveryOrderTest - * - * @author Tim Fox - */ -public class DeliveryOrderTest extends JMSTestCase -{ - - @Test - public void testOutOfOrder() throws Exception - { - Connection conn = createConnection(); - - Session sess = conn.createSession(true, Session.SESSION_TRANSACTED); - - Session sess2 = conn.createSession(true, Session.SESSION_TRANSACTED); - - MessageProducer prod = sess.createProducer(queue1); - - MessageConsumer cons = sess2.createConsumer(queue1); - - CountDownLatch latch = new CountDownLatch(1); - - final int NUM_MESSAGES = 1000; - - MyListener listener = new MyListener(latch, sess2, NUM_MESSAGES); - - cons.setMessageListener(listener); - - conn.start(); - - for (int i = 0; i < NUM_MESSAGES; i++) - { - TextMessage tm = sess.createTextMessage("message" + i); - - prod.send(tm); - - if (i % 10 == 0) - { - sess.commit(); - } - } - - // need extra commit for cases in which the last message index is not a multiple of 10 - sess.commit(); - - Assert.assertTrue(latch.await(20000, MILLISECONDS)); - - if (listener.failed) - { - ProxyAssertSupport.fail("listener failed: " + listener.getError()); - } - } - - class MyListener implements MessageListener - { - private int c; - - private final int num; - - private final CountDownLatch latch; - - private volatile boolean failed; - - private String error; - - private final Session sess; - - MyListener(final CountDownLatch latch, final Session sess, final int num) - { - this.latch = latch; - this.num = num; - this.sess = sess; - } - - public void onMessage(final Message msg) - { - // preserve the first error - if (failed) - { - return; - } - - try - { - TextMessage tm = (TextMessage) msg; - - if (!("message" + c).equals(tm.getText())) - { - // Failed - failed = true; - setError("Listener was supposed to get " + "message" + c + " but got " + tm.getText()); - latch.countDown(); - } - - c++; - - if (c % 500 == 0) - { - sess.commit(); - } - - if (c == num) - { - sess.commit(); - latch.countDown(); - } - } - catch (JMSException e) - { - e.printStackTrace(); - - // Failed - failed = true; - setError("Listener got exception " + e.toString()); - latch.countDown(); - } - } - - public synchronized String getError() - { - return error; - } - - private synchronized void setError(final String s) - { - error = s; - } - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.tests; + +import javax.jms.Connection; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import java.util.concurrent.CountDownLatch; + +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.junit.Assert; +import org.junit.Test; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; + +/** + * A DeliveryOrderTest + * + * @author Tim Fox + */ +public class DeliveryOrderTest extends JMSTestCase +{ + + @Test + public void testOutOfOrder() throws Exception + { + Connection conn = createConnection(); + + Session sess = conn.createSession(true, Session.SESSION_TRANSACTED); + + Session sess2 = conn.createSession(true, Session.SESSION_TRANSACTED); + + MessageProducer prod = sess.createProducer(queue1); + + MessageConsumer cons = sess2.createConsumer(queue1); + + CountDownLatch latch = new CountDownLatch(1); + + final int NUM_MESSAGES = 1000; + + MyListener listener = new MyListener(latch, sess2, NUM_MESSAGES); + + cons.setMessageListener(listener); + + conn.start(); + + for (int i = 0; i < NUM_MESSAGES; i++) + { + TextMessage tm = sess.createTextMessage("message" + i); + + prod.send(tm); + + if (i % 10 == 0) + { + sess.commit(); + } + } + + // need extra commit for cases in which the last message index is not a multiple of 10 + sess.commit(); + + Assert.assertTrue(latch.await(20000, MILLISECONDS)); + + if (listener.failed) + { + ProxyAssertSupport.fail("listener failed: " + listener.getError()); + } + } + + class MyListener implements MessageListener + { + private int c; + + private final int num; + + private final CountDownLatch latch; + + private volatile boolean failed; + + private String error; + + private final Session sess; + + MyListener(final CountDownLatch latch, final Session sess, final int num) + { + this.latch = latch; + this.num = num; + this.sess = sess; + } + + public void onMessage(final Message msg) + { + // preserve the first error + if (failed) + { + return; + } + + try + { + TextMessage tm = (TextMessage) msg; + + if (!("message" + c).equals(tm.getText())) + { + // Failed + failed = true; + setError("Listener was supposed to get " + "message" + c + " but got " + tm.getText()); + latch.countDown(); + } + + c++; + + if (c % 500 == 0) + { + sess.commit(); + } + + if (c == num) + { + sess.commit(); + latch.countDown(); + } + } + catch (JMSException e) + { + e.printStackTrace(); + + // Failed + failed = true; + setError("Listener got exception " + e.toString()); + latch.countDown(); + } + } + + public synchronized String getError() + { + return error; + } + + private synchronized void setError(final String s) + { + error = s; + } + } +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DurableSubscriptionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DurableSubscriptionTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DurableSubscriptionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DurableSubscriptionTest.java index aa6967f1d8..98a203cdd6 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/DurableSubscriptionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DurableSubscriptionTest.java @@ -1,469 +1,469 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.tests; - -import javax.jms.Connection; -import javax.jms.DeliveryMode; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.InvalidSelectorException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.TopicSubscriber; -import java.util.List; - -import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; -import org.junit.Test; - -/** - * Tests focused on durable subscription behavior. More durable subscription tests can be found in - * MessageConsumerTest. - * - * @author Ovidiu Feodorov - * @author Tim Fox - */ -public class DurableSubscriptionTest extends JMSTestCase -{ - // Constants ----------------------------------------------------- - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - @Test - public void testSimplestDurableSubscription() throws Exception - { - Connection conn = null; - - try - { - conn = createConnection(); - - conn.setClientID("brookeburke"); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); - prod.setDeliveryMode(DeliveryMode.PERSISTENT); - - s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci"); - - List subs = listAllSubscribersForTopic("Topic1"); - - ProxyAssertSupport.assertNotNull(subs); - - ProxyAssertSupport.assertEquals(1, subs.size()); - - ProxyAssertSupport.assertEquals("monicabelucci", subs.get(0)); - - prod.send(s.createTextMessage("k")); - - conn.close(); - - subs = listAllSubscribersForTopic("Topic1"); - - ProxyAssertSupport.assertEquals(1, subs.size()); - - ProxyAssertSupport.assertEquals("monicabelucci", subs.get(0)); - - conn = createConnection(); - conn.setClientID("brookeburke"); - - s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageConsumer durable = s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci"); - - conn.start(); - - TextMessage tm = (TextMessage) durable.receive(1000); - ProxyAssertSupport.assertEquals("k", tm.getText()); - - Message m = durable.receive(1000); - ProxyAssertSupport.assertNull(m); - - durable.close(); - - s.unsubscribe("monicabelucci"); - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - /** - * JMS 1.1 6.11.1: A client can change an existing durable subscription by creating a durable - * TopicSubscriber with the same name and a new topic and/or message selector, or NoLocal - * attribute. Changing a durable subscription is equivalent to deleting and recreating it. - *

- * Test with a different topic (a redeployed topic is a different topic). - */ - @Test - public void testDurableSubscriptionOnNewTopic() throws Exception - { - Connection conn = null; - - try - { - conn = createConnection(); - - conn.setClientID("brookeburke"); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); - prod.setDeliveryMode(DeliveryMode.PERSISTENT); - - s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci"); - - prod.send(s.createTextMessage("one")); - - conn.close(); - - conn = createConnection(); - - conn.setClientID("brookeburke"); - - s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageConsumer durable = s.createDurableSubscriber(HornetQServerTestCase.topic2, "monicabelucci"); - - conn.start(); - - Message m = durable.receive(1000); - ProxyAssertSupport.assertNull(m); - - durable.close(); - - s.unsubscribe("monicabelucci"); - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - /** - * JMS 1.1 6.11.1: A client can change an existing durable subscription by creating a durable - * TopicSubscriber with the same name and a new topic and/or message selector, or NoLocal - * attribute. Changing a durable subscription is equivalent to deleting and recreating it. - *

- * Test with a different selector. - */ - @Test - public void testDurableSubscriptionDifferentSelector() throws Exception - { - Connection conn = null; - - try - { - conn = createConnection(); - - conn.setClientID("brookeburke"); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); - prod.setDeliveryMode(DeliveryMode.PERSISTENT); - - MessageConsumer durable = s.createDurableSubscriber(HornetQServerTestCase.topic1, - "monicabelucci", - "color = 'red' AND shape = 'square'", - false); - - TextMessage tm = s.createTextMessage("A red square message"); - tm.setStringProperty("color", "red"); - tm.setStringProperty("shape", "square"); - - prod.send(tm); - - conn.start(); - - TextMessage rm = (TextMessage) durable.receive(5000); - ProxyAssertSupport.assertEquals("A red square message", rm.getText()); - - tm = s.createTextMessage("Another red square message"); - tm.setStringProperty("color", "red"); - tm.setStringProperty("shape", "square"); - prod.send(tm); - - // TODO: when subscriptions/durable subscription will be registered as MBean, use the JMX - // interface to make sure the 'another red square message' is maintained by the - // durable subascription - // http://jira.jboss.org/jira/browse/JBMESSAGING-217 - - conn.close(); - - conn = createConnection(); - - conn.setClientID("brookeburke"); - - s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - // modify the selector - durable = s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci", "color = 'red'", false); - - conn.start(); - - Message m = durable.receive(1000); - - // the durable subscription is destroyed and re-created. The red square message stored by - // the previous durable subscription is lost and (hopefully) garbage collected. - ProxyAssertSupport.assertNull(m); - - durable.close(); - - s.unsubscribe("monicabelucci"); - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - @Test - public void testDurableSubscriptionOnTemporaryTopic() throws Exception - { - Connection conn = null; - - conn = createConnection(); - - try - { - conn.setClientID("doesn't actually matter"); - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - Topic temporaryTopic = s.createTemporaryTopic(); - - try - { - s.createDurableSubscriber(temporaryTopic, "mySubscription"); - ProxyAssertSupport.fail("this should throw exception"); - } - catch (InvalidDestinationException e) - { - // OK - } - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - @Test - public void testUnsubscribeDurableSubscription() throws Exception - { - Connection conn = null; - - try - { - conn = createConnection(); - conn.setClientID("ak47"); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageConsumer cons = s.createDurableSubscriber(HornetQServerTestCase.topic1, "uzzi"); - MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); - prod.setDeliveryMode(DeliveryMode.PERSISTENT); - - prod.send(s.createTextMessage("one")); - - cons.close(); - s.unsubscribe("uzzi"); - - MessageConsumer ds = s.createDurableSubscriber(HornetQServerTestCase.topic1, "uzzi"); - conn.start(); - - ProxyAssertSupport.assertNull(ds.receive(1000)); - - ds.close(); - - s.unsubscribe("uzzi"); - } - finally - { - if (conn != null) - { - conn.close(); - } - } - } - - @Test - public void testInvalidSelectorException() throws Exception - { - Connection c = createConnection(); - c.setClientID("sofiavergara"); - Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE); - - try - { - s.createDurableSubscriber(HornetQServerTestCase.topic1, "mysubscribption", "=TEST 'test'", true); - ProxyAssertSupport.fail("this should fail"); - } - catch (InvalidSelectorException e) - { - // OK - } - } - - // See JMS 1.1. spec sec 6.11 - @Test - public void testUnsubscribeWithActiveConsumer() throws Exception - { - Connection conn = createConnection(); - conn.setClientID("zeke"); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - TopicSubscriber dursub = s.createDurableSubscriber(HornetQServerTestCase.topic1, "dursub0"); - - try - { - s.unsubscribe("dursub0"); - ProxyAssertSupport.fail(); - } - catch (IllegalStateException e) - { - // Ok - it is illegal to ubscribe a subscription if it has active consumers - } - - dursub.close(); - - s.unsubscribe("dursub0"); - } - - @Test - public void testSubscribeWithActiveSubscription() throws Exception - { - Connection conn = createConnection(); - conn.setClientID("zeke"); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - TopicSubscriber dursub1 = s.createDurableSubscriber(HornetQServerTestCase.topic1, "dursub1"); - - try - { - s.createDurableSubscriber(HornetQServerTestCase.topic1, "dursub1"); - ProxyAssertSupport.fail(); - } - catch (IllegalStateException e) - { - // Ok - it is illegal to have more than one active subscriber on a subscrtiption at any one time - } - - dursub1.close(); - - s.unsubscribe("dursub1"); - } - - @Test - public void testDurableSubscriptionWithPeriodsInName() throws Exception - { - Connection conn = createConnection(); - conn.setClientID(".client.id.with.periods."); - - Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - TopicSubscriber subscriber = s.createDurableSubscriber(HornetQServerTestCase.topic1, - ".subscription.name.with.periods."); - - s.createProducer(HornetQServerTestCase.topic1).send(s.createTextMessage("Subscription test")); - - conn.start(); - - Message m = subscriber.receive(1000L); - - ProxyAssertSupport.assertNotNull(m); - ProxyAssertSupport.assertTrue(m instanceof TextMessage); - - subscriber.close(); - - s.unsubscribe(".subscription.name.with.periods."); - } - - @Test - public void testNoLocal() throws Exception - { - internalTestNoLocal(true); - internalTestNoLocal(false); - } - - private void internalTestNoLocal(final boolean noLocal) throws Exception - { - - Connection conn1 = createConnection(); - conn1.setClientID(".client.id.with.periods."); - - Connection conn2 = createConnection(); - conn2.setClientID(".client.id.with.periods2."); - - Session s1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); - Session s2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE); - - TopicSubscriber subscriber1 = s1.createDurableSubscriber(HornetQServerTestCase.topic1, - ".subscription.name.with.periods.", - null, - noLocal); - TopicSubscriber subscriber2 = s2.createDurableSubscriber(HornetQServerTestCase.topic1, - ".subscription.name.with.periods.", - null, - false); - - s1.createProducer(HornetQServerTestCase.topic1).send(s1.createTextMessage("Subscription test")); - - conn1.start(); - - Message m = subscriber1.receive(100L); - - if (noLocal) - { - ProxyAssertSupport.assertNull(m); - } - else - { - ProxyAssertSupport.assertNotNull(m); - } - - conn2.start(); - - m = subscriber2.receive(1000L); - - ProxyAssertSupport.assertNotNull(m); - ProxyAssertSupport.assertTrue(m instanceof TextMessage); - - subscriber1.close(); - subscriber2.close(); - - s1.unsubscribe(".subscription.name.with.periods."); - s2.unsubscribe(".subscription.name.with.periods."); - conn1.close(); - conn2.close(); - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.tests; + +import javax.jms.Connection; +import javax.jms.DeliveryMode; +import javax.jms.IllegalStateException; +import javax.jms.InvalidDestinationException; +import javax.jms.InvalidSelectorException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.TopicSubscriber; +import java.util.List; + +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.junit.Test; + +/** + * Tests focused on durable subscription behavior. More durable subscription tests can be found in + * MessageConsumerTest. + * + * @author Ovidiu Feodorov + * @author Tim Fox + */ +public class DurableSubscriptionTest extends JMSTestCase +{ + // Constants ----------------------------------------------------- + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + @Test + public void testSimplestDurableSubscription() throws Exception + { + Connection conn = null; + + try + { + conn = createConnection(); + + conn.setClientID("brookeburke"); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); + prod.setDeliveryMode(DeliveryMode.PERSISTENT); + + s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci"); + + List subs = listAllSubscribersForTopic("Topic1"); + + ProxyAssertSupport.assertNotNull(subs); + + ProxyAssertSupport.assertEquals(1, subs.size()); + + ProxyAssertSupport.assertEquals("monicabelucci", subs.get(0)); + + prod.send(s.createTextMessage("k")); + + conn.close(); + + subs = listAllSubscribersForTopic("Topic1"); + + ProxyAssertSupport.assertEquals(1, subs.size()); + + ProxyAssertSupport.assertEquals("monicabelucci", subs.get(0)); + + conn = createConnection(); + conn.setClientID("brookeburke"); + + s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageConsumer durable = s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci"); + + conn.start(); + + TextMessage tm = (TextMessage) durable.receive(1000); + ProxyAssertSupport.assertEquals("k", tm.getText()); + + Message m = durable.receive(1000); + ProxyAssertSupport.assertNull(m); + + durable.close(); + + s.unsubscribe("monicabelucci"); + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + /** + * JMS 1.1 6.11.1: A client can change an existing durable subscription by creating a durable + * TopicSubscriber with the same name and a new topic and/or message selector, or NoLocal + * attribute. Changing a durable subscription is equivalent to deleting and recreating it. + *

+ * Test with a different topic (a redeployed topic is a different topic). + */ + @Test + public void testDurableSubscriptionOnNewTopic() throws Exception + { + Connection conn = null; + + try + { + conn = createConnection(); + + conn.setClientID("brookeburke"); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); + prod.setDeliveryMode(DeliveryMode.PERSISTENT); + + s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci"); + + prod.send(s.createTextMessage("one")); + + conn.close(); + + conn = createConnection(); + + conn.setClientID("brookeburke"); + + s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageConsumer durable = s.createDurableSubscriber(HornetQServerTestCase.topic2, "monicabelucci"); + + conn.start(); + + Message m = durable.receive(1000); + ProxyAssertSupport.assertNull(m); + + durable.close(); + + s.unsubscribe("monicabelucci"); + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + /** + * JMS 1.1 6.11.1: A client can change an existing durable subscription by creating a durable + * TopicSubscriber with the same name and a new topic and/or message selector, or NoLocal + * attribute. Changing a durable subscription is equivalent to deleting and recreating it. + *

+ * Test with a different selector. + */ + @Test + public void testDurableSubscriptionDifferentSelector() throws Exception + { + Connection conn = null; + + try + { + conn = createConnection(); + + conn.setClientID("brookeburke"); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); + prod.setDeliveryMode(DeliveryMode.PERSISTENT); + + MessageConsumer durable = s.createDurableSubscriber(HornetQServerTestCase.topic1, + "monicabelucci", + "color = 'red' AND shape = 'square'", + false); + + TextMessage tm = s.createTextMessage("A red square message"); + tm.setStringProperty("color", "red"); + tm.setStringProperty("shape", "square"); + + prod.send(tm); + + conn.start(); + + TextMessage rm = (TextMessage) durable.receive(5000); + ProxyAssertSupport.assertEquals("A red square message", rm.getText()); + + tm = s.createTextMessage("Another red square message"); + tm.setStringProperty("color", "red"); + tm.setStringProperty("shape", "square"); + prod.send(tm); + + // TODO: when subscriptions/durable subscription will be registered as MBean, use the JMX + // interface to make sure the 'another red square message' is maintained by the + // durable subascription + // http://jira.jboss.org/jira/browse/JBMESSAGING-217 + + conn.close(); + + conn = createConnection(); + + conn.setClientID("brookeburke"); + + s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + // modify the selector + durable = s.createDurableSubscriber(HornetQServerTestCase.topic1, "monicabelucci", "color = 'red'", false); + + conn.start(); + + Message m = durable.receive(1000); + + // the durable subscription is destroyed and re-created. The red square message stored by + // the previous durable subscription is lost and (hopefully) garbage collected. + ProxyAssertSupport.assertNull(m); + + durable.close(); + + s.unsubscribe("monicabelucci"); + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + @Test + public void testDurableSubscriptionOnTemporaryTopic() throws Exception + { + Connection conn = null; + + conn = createConnection(); + + try + { + conn.setClientID("doesn't actually matter"); + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + Topic temporaryTopic = s.createTemporaryTopic(); + + try + { + s.createDurableSubscriber(temporaryTopic, "mySubscription"); + ProxyAssertSupport.fail("this should throw exception"); + } + catch (InvalidDestinationException e) + { + // OK + } + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + @Test + public void testUnsubscribeDurableSubscription() throws Exception + { + Connection conn = null; + + try + { + conn = createConnection(); + conn.setClientID("ak47"); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageConsumer cons = s.createDurableSubscriber(HornetQServerTestCase.topic1, "uzzi"); + MessageProducer prod = s.createProducer(HornetQServerTestCase.topic1); + prod.setDeliveryMode(DeliveryMode.PERSISTENT); + + prod.send(s.createTextMessage("one")); + + cons.close(); + s.unsubscribe("uzzi"); + + MessageConsumer ds = s.createDurableSubscriber(HornetQServerTestCase.topic1, "uzzi"); + conn.start(); + + ProxyAssertSupport.assertNull(ds.receive(1000)); + + ds.close(); + + s.unsubscribe("uzzi"); + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + + @Test + public void testInvalidSelectorException() throws Exception + { + Connection c = createConnection(); + c.setClientID("sofiavergara"); + Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE); + + try + { + s.createDurableSubscriber(HornetQServerTestCase.topic1, "mysubscribption", "=TEST 'test'", true); + ProxyAssertSupport.fail("this should fail"); + } + catch (InvalidSelectorException e) + { + // OK + } + } + + // See JMS 1.1. spec sec 6.11 + @Test + public void testUnsubscribeWithActiveConsumer() throws Exception + { + Connection conn = createConnection(); + conn.setClientID("zeke"); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + TopicSubscriber dursub = s.createDurableSubscriber(HornetQServerTestCase.topic1, "dursub0"); + + try + { + s.unsubscribe("dursub0"); + ProxyAssertSupport.fail(); + } + catch (IllegalStateException e) + { + // Ok - it is illegal to ubscribe a subscription if it has active consumers + } + + dursub.close(); + + s.unsubscribe("dursub0"); + } + + @Test + public void testSubscribeWithActiveSubscription() throws Exception + { + Connection conn = createConnection(); + conn.setClientID("zeke"); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + TopicSubscriber dursub1 = s.createDurableSubscriber(HornetQServerTestCase.topic1, "dursub1"); + + try + { + s.createDurableSubscriber(HornetQServerTestCase.topic1, "dursub1"); + ProxyAssertSupport.fail(); + } + catch (IllegalStateException e) + { + // Ok - it is illegal to have more than one active subscriber on a subscrtiption at any one time + } + + dursub1.close(); + + s.unsubscribe("dursub1"); + } + + @Test + public void testDurableSubscriptionWithPeriodsInName() throws Exception + { + Connection conn = createConnection(); + conn.setClientID(".client.id.with.periods."); + + Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + TopicSubscriber subscriber = s.createDurableSubscriber(HornetQServerTestCase.topic1, + ".subscription.name.with.periods."); + + s.createProducer(HornetQServerTestCase.topic1).send(s.createTextMessage("Subscription test")); + + conn.start(); + + Message m = subscriber.receive(1000L); + + ProxyAssertSupport.assertNotNull(m); + ProxyAssertSupport.assertTrue(m instanceof TextMessage); + + subscriber.close(); + + s.unsubscribe(".subscription.name.with.periods."); + } + + @Test + public void testNoLocal() throws Exception + { + internalTestNoLocal(true); + internalTestNoLocal(false); + } + + private void internalTestNoLocal(final boolean noLocal) throws Exception + { + + Connection conn1 = createConnection(); + conn1.setClientID(".client.id.with.periods."); + + Connection conn2 = createConnection(); + conn2.setClientID(".client.id.with.periods2."); + + Session s1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); + Session s2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE); + + TopicSubscriber subscriber1 = s1.createDurableSubscriber(HornetQServerTestCase.topic1, + ".subscription.name.with.periods.", + null, + noLocal); + TopicSubscriber subscriber2 = s2.createDurableSubscriber(HornetQServerTestCase.topic1, + ".subscription.name.with.periods.", + null, + false); + + s1.createProducer(HornetQServerTestCase.topic1).send(s1.createTextMessage("Subscription test")); + + conn1.start(); + + Message m = subscriber1.receive(100L); + + if (noLocal) + { + ProxyAssertSupport.assertNull(m); + } + else + { + ProxyAssertSupport.assertNotNull(m); + } + + conn2.start(); + + m = subscriber2.receive(1000L); + + ProxyAssertSupport.assertNotNull(m); + ProxyAssertSupport.assertTrue(m instanceof TextMessage); + + subscriber1.close(); + subscriber2.close(); + + s1.unsubscribe(".subscription.name.with.periods."); + s2.unsubscribe(".subscription.name.with.periods."); + conn1.close(); + conn2.close(); + } +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/HornetQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/HornetQServerTestCase.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/HornetQServerTestCase.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/HornetQServerTestCase.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTestCase.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JMSTestCase.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTestCase.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JmsTestLogger.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JmsTestLogger.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/JmsTestLogger.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JmsTestLogger.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageConsumerTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageConsumerTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageConsumerTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageProducerTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageProducerTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageProducerTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageWithReadResolveTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageWithReadResolveTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MessageWithReadResolveTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageWithReadResolveTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MiscellaneousTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/MiscellaneousTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MiscellaneousTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/NonDurableSubscriberTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/NonDurableSubscriberTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/NonDurableSubscriberTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/NonDurableSubscriberTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/PersistenceTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/PersistenceTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/PersistenceTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/PersistenceTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueReceiverTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueReceiverTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueReceiverTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueReceiverTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/QueueTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ReferenceableTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ReferenceableTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/ReferenceableTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ReferenceableTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SecurityTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SecurityTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SecurityTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SecurityTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SessionTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/SessionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SessionTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TemporaryDestinationTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TemporaryDestinationTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TemporaryDestinationTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TemporaryDestinationTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TopicTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TopicTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TopicTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TopicTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TransactedSessionTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/TransactedSessionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TransactedSessionTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XARecoveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/XARecoveryTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XARecoveryTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/XARecoveryTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XATest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/XATest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/XATest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/XATest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BodyIsAssignableFromTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BodyIsAssignableFromTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BodyIsAssignableFromTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BodyIsAssignableFromTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BytesMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/BytesMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BytesMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ExpiredMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ExpiredMessageTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ExpiredMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ExpiredMessageTest.java index a4caf9b8c2..bbd12099fd 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ExpiredMessageTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ExpiredMessageTest.java @@ -1,120 +1,120 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ package org.apache.activemq6.jms.tests.message; -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; - -import org.apache.activemq6.jms.tests.JMSTestCase; -import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; -import org.junit.Test; - -/** - * @author Ovidiu Feodorov - */ -public class ExpiredMessageTest extends JMSTestCase -{ - +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; + +import org.apache.activemq6.jms.tests.JMSTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.junit.Test; + +/** + * @author Ovidiu Feodorov + */ +public class ExpiredMessageTest extends JMSTestCase +{ + @Test - public void testSimpleExpiration() throws Exception - { - Connection conn = getConnectionFactory().createConnection(); - - Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageProducer prod = session.createProducer(queue1); - prod.setTimeToLive(1); - - Message m = session.createTextMessage("This message will die"); - - prod.send(m); - - // wait for the message to die - - Thread.sleep(250); - - MessageConsumer cons = session.createConsumer(queue1); - - conn.start(); - - ProxyAssertSupport.assertNull(cons.receive(2000)); - - conn.close(); - } - + public void testSimpleExpiration() throws Exception + { + Connection conn = getConnectionFactory().createConnection(); + + Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageProducer prod = session.createProducer(queue1); + prod.setTimeToLive(1); + + Message m = session.createTextMessage("This message will die"); + + prod.send(m); + + // wait for the message to die + + Thread.sleep(250); + + MessageConsumer cons = session.createConsumer(queue1); + + conn.start(); + + ProxyAssertSupport.assertNull(cons.receive(2000)); + + conn.close(); + } + @Test - public void testExpiredAndLivingMessages() throws Exception - { - Connection conn = getConnectionFactory().createConnection(); - Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer prod = session.createProducer(queue1); - - // sent 2 messages: 1 expiring, 1 living - TextMessage livingMessage = session.createTextMessage("This message will live"); - TextMessage expiringMessage = session.createTextMessage("This message will expire"); - - prod.setTimeToLive(1); - prod.send(expiringMessage); - - prod.setTimeToLive(0); - prod.send(livingMessage); - - // wait for the expiring message to die - Thread.sleep(250); - - MessageConsumer cons = session.createConsumer(queue1); - conn.start(); - - // receive living message - Message receivedMessage = cons.receive(1000); - ProxyAssertSupport.assertNotNull("did not receive living message", receivedMessage); - ProxyAssertSupport.assertTrue(receivedMessage instanceof TextMessage); - ProxyAssertSupport.assertEquals(livingMessage.getText(), ((TextMessage)receivedMessage).getText()); - - // we do not receive the expiring message - ProxyAssertSupport.assertNull(cons.receive(1000)); - - conn.close(); - } - + public void testExpiredAndLivingMessages() throws Exception + { + Connection conn = getConnectionFactory().createConnection(); + Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageProducer prod = session.createProducer(queue1); + + // sent 2 messages: 1 expiring, 1 living + TextMessage livingMessage = session.createTextMessage("This message will live"); + TextMessage expiringMessage = session.createTextMessage("This message will expire"); + + prod.setTimeToLive(1); + prod.send(expiringMessage); + + prod.setTimeToLive(0); + prod.send(livingMessage); + + // wait for the expiring message to die + Thread.sleep(250); + + MessageConsumer cons = session.createConsumer(queue1); + conn.start(); + + // receive living message + Message receivedMessage = cons.receive(1000); + ProxyAssertSupport.assertNotNull("did not receive living message", receivedMessage); + ProxyAssertSupport.assertTrue(receivedMessage instanceof TextMessage); + ProxyAssertSupport.assertEquals(livingMessage.getText(), ((TextMessage)receivedMessage).getText()); + + // we do not receive the expiring message + ProxyAssertSupport.assertNull(cons.receive(1000)); + + conn.close(); + } + @Test - public void testManyExpiredMessagesAtOnce() throws Exception - { - Connection conn = getConnectionFactory().createConnection(); - - Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageProducer prod = session.createProducer(queue1); - prod.setTimeToLive(1); - - Message m = session.createTextMessage("This message will die"); - - final int MESSAGE_COUNT = 100; - - for (int i = 0; i < MESSAGE_COUNT; i++) - { - prod.send(m); - } - - MessageConsumer cons = session.createConsumer(queue1); - conn.start(); - - ProxyAssertSupport.assertNull(cons.receive(2000)); - - conn.close(); - } -} + public void testManyExpiredMessagesAtOnce() throws Exception + { + Connection conn = getConnectionFactory().createConnection(); + + Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageProducer prod = session.createProducer(queue1); + prod.setTimeToLive(1); + + Message m = session.createTextMessage("This message will die"); + + final int MESSAGE_COUNT = 100; + + for (int i = 0; i < MESSAGE_COUNT; i++) + { + prod.send(m); + } + + MessageConsumer cons = session.createConsumer(queue1); + conn.start(); + + ProxyAssertSupport.assertNull(cons.receive(2000)); + + conn.close(); + } +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSCorrelationIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSCorrelationIDHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSCorrelationIDHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSCorrelationIDHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDeliveryModeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDeliveryModeHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDeliveryModeHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDeliveryModeHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDestinationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDestinationHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSDestinationHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDestinationHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSExpirationHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSExpirationHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSExpirationHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSMessageIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSMessageIDHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSMessageIDHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSMessageIDHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSPriorityHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSPriorityHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSPriorityHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSPriorityHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSReplyToHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSReplyToHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSReplyToHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSReplyToHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTimestampHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTimestampHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTimestampHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTimestampHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTypeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTypeHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSTypeHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTypeHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSXDeliveryCountTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/JMSXDeliveryCountTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MapMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MapMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MapMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTestCase.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageBodyTestCase.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTestCase.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTestBase.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageHeaderTestBase.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTestBase.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessagePropertyConversionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessagePropertyConversionTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessagePropertyConversionTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessagePropertyConversionTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageTestBase.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/MessageTestBase.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageTestBase.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageDeliveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageDeliveryTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageDeliveryTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageDeliveryTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/ObjectMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSBytesMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSBytesMessage.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSBytesMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSBytesMessage.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMapMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMapMessage.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMapMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMapMessage.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMessage.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMessage.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSObjectMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSObjectMessage.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSObjectMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSObjectMessage.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSStreamMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSStreamMessage.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSStreamMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSStreamMessage.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSTextMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSTextMessage.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SimpleJMSTextMessage.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSTextMessage.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SomeObject.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SomeObject.java similarity index 95% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SomeObject.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SomeObject.java index 5dd815a4b4..ada07c0e26 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/SomeObject.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SomeObject.java @@ -1,71 +1,71 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.tests.message; - -import java.io.Serializable; - -/** - * ObjectMessageTest needed a simple class to test ClassLoadingIsolations - * @author Clebert Suconic - * - */ -public class SomeObject implements Serializable -{ - - private static final long serialVersionUID = -2939720794544432834L; - - int i; - - int j; - - public SomeObject(final int i, final int j) - { - this.i = i; - this.j = j; - } - - @Override - public boolean equals(final Object o) - { - if (this == o) - { - return true; - } - if (o == null || getClass() != o.getClass()) - { - return false; - } - - SomeObject that = (SomeObject)o; - - if (i != that.i) - { - return false; - } - if (j != that.j) - { - return false; - } - - return true; - } - - @Override - public int hashCode() - { - int result; - result = i; - result = 31 * result + j; - return result; - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.tests.message; + +import java.io.Serializable; + +/** + * ObjectMessageTest needed a simple class to test ClassLoadingIsolations + * @author Clebert Suconic + * + */ +public class SomeObject implements Serializable +{ + + private static final long serialVersionUID = -2939720794544432834L; + + int i; + + int j; + + public SomeObject(final int i, final int j) + { + this.i = i; + this.j = j; + } + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + SomeObject that = (SomeObject)o; + + if (i != that.i) + { + return false; + } + if (j != that.j) + { + return false; + } + + return true; + } + + @Override + public int hashCode() + { + int result; + result = i; + result = 31 * result + j; + return result; + } +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/StreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/StreamMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/StreamMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/StreamMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/TextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/TextMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/TextMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/TextMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignBytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignBytesMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignBytesMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignBytesMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMapMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMapMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMapMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignObjectMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignObjectMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignObjectMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignStreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignStreamMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignStreamMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignStreamMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTestObject.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTestObject.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTestObject.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTestObject.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTextMessageTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/message/foreign/ForeignTextMessageTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTextMessageTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/selector/SelectorTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/selector/SelectorTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/selector/SelectorTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ConcurrentCloseStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/ConcurrentCloseStressTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ConcurrentCloseStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/ConcurrentCloseStressTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/CorruptMessageStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/CorruptMessageStressTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/CorruptMessageStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/CorruptMessageStressTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/JMSStressTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/JMSStressTestBase.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/JMSStressTestBase.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/JMSStressTestBase.java index 860649143f..c0c340d568 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/JMSStressTestBase.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/JMSStressTestBase.java @@ -1,102 +1,102 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ package org.apache.activemq6.jms.tests.stress; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.Topic; -import javax.jms.XASession; - -import org.apache.activemq6.jms.tests.HornetQServerTestCase; -import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; -import org.junit.After; -import org.junit.BeforeClass; - -/** - * - * Base class for stress tests - * - * @author Tim Fox - * -*/ -public abstract class JMSStressTestBase extends HornetQServerTestCase -{ - public static final boolean STRESS_TESTS_ENABLED = false; - - @BeforeClass - public static void stressTestsEnabled() - { - org.junit.Assume.assumeTrue(JMSStressTestBase.STRESS_TESTS_ENABLED); - } - - protected static final int NUM_PERSISTENT_MESSAGES = 4000; - - protected static final int NUM_NON_PERSISTENT_MESSAGES = 6000; - - protected static final int NUM_PERSISTENT_PRESEND = 5000; - - protected static final int NUM_NON_PERSISTENT_PRESEND = 3000; - - protected ConnectionFactory cf; - - protected Destination topic; - - protected Destination destinationQueue1; - protected Destination destinationQueue2; - protected Destination destinationQueue3; - protected Destination destinationQueue4; - - protected Topic topic1; - protected Topic topic2; - protected Topic topic3; - protected Topic topic4; - - @Override - @After - public void tearDown() throws Exception - { - super.tearDown(); - if (checkNoMessageData()) - { - ProxyAssertSupport.fail("Message data still exists"); - } - } - - protected void runRunners(final Runner[] runners) throws Exception - { - Thread[] threads = new Thread[runners.length]; - for (int i = 0; i < runners.length; i++) - { - threads[i] = new Thread(runners[i]); - threads[i].start(); - } - - for (int i = 0; i < runners.length; i++) - { - threads[i].join(); - } - - for (int i = 0; i < runners.length; i++) - { - if (runners[i].isFailed()) - { - ProxyAssertSupport.fail("Runner " + i + " failed"); - log.error("runner failed"); - } - } - } - - protected void tweakXASession(final XASession sess) - { - - } -} +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.Topic; +import javax.jms.XASession; + +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.junit.After; +import org.junit.BeforeClass; + +/** + * + * Base class for stress tests + * + * @author Tim Fox + * +*/ +public abstract class JMSStressTestBase extends HornetQServerTestCase +{ + public static final boolean STRESS_TESTS_ENABLED = false; + + @BeforeClass + public static void stressTestsEnabled() + { + org.junit.Assume.assumeTrue(JMSStressTestBase.STRESS_TESTS_ENABLED); + } + + protected static final int NUM_PERSISTENT_MESSAGES = 4000; + + protected static final int NUM_NON_PERSISTENT_MESSAGES = 6000; + + protected static final int NUM_PERSISTENT_PRESEND = 5000; + + protected static final int NUM_NON_PERSISTENT_PRESEND = 3000; + + protected ConnectionFactory cf; + + protected Destination topic; + + protected Destination destinationQueue1; + protected Destination destinationQueue2; + protected Destination destinationQueue3; + protected Destination destinationQueue4; + + protected Topic topic1; + protected Topic topic2; + protected Topic topic3; + protected Topic topic4; + + @Override + @After + public void tearDown() throws Exception + { + super.tearDown(); + if (checkNoMessageData()) + { + ProxyAssertSupport.fail("Message data still exists"); + } + } + + protected void runRunners(final Runner[] runners) throws Exception + { + Thread[] threads = new Thread[runners.length]; + for (int i = 0; i < runners.length; i++) + { + threads[i] = new Thread(runners[i]); + threads[i].start(); + } + + for (int i = 0; i < runners.length; i++) + { + threads[i].join(); + } + + for (int i = 0; i < runners.length; i++) + { + if (runners[i].isFailed()) + { + ProxyAssertSupport.fail("Runner " + i + " failed"); + log.error("runner failed"); + } + } + } + + protected void tweakXASession(final XASession sess) + { + + } +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ManyConnectionsStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/ManyConnectionsStressTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/ManyConnectionsStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/ManyConnectionsStressTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/OpenCloseStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/OpenCloseStressTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/OpenCloseStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/OpenCloseStressTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/QueueStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/QueueStressTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/QueueStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/QueueStressTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Receiver.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Receiver.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Receiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Receiver.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RecoveringReceiver.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/RecoveringReceiver.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RecoveringReceiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/RecoveringReceiver.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RelayStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/RelayStressTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RelayStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/RelayStressTest.java index 57e11bd6d2..308578edca 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/RelayStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/RelayStressTest.java @@ -1,252 +1,252 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ package org.apache.activemq6.jms.tests.stress; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.Topic; -import javax.naming.InitialContext; - -import org.apache.activemq6.jms.tests.HornetQServerTestCase; -import org.apache.activemq6.jms.tests.JmsTestLogger; -import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Send messages to a topic with selector1, consumer them with multiple consumers and relay them - * back to the topic with a different selector, then consume that with more consumers. - * - * @author Tim Fox - * - * - */ -public class RelayStressTest extends HornetQServerTestCase -{ - @BeforeClass - public static void stressTestsEnabled() - { - org.junit.Assume.assumeTrue(JMSStressTestBase.STRESS_TESTS_ENABLED); - } - - // Constants ----------------------------------------------------- - - private static JmsTestLogger log = JmsTestLogger.LOGGER; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private InitialContext ic; - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - @Override +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.DeliveryMode; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.Topic; +import javax.naming.InitialContext; + +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Send messages to a topic with selector1, consumer them with multiple consumers and relay them + * back to the topic with a different selector, then consume that with more consumers. + * + * @author Tim Fox + * + * + */ +public class RelayStressTest extends HornetQServerTestCase +{ + @BeforeClass + public static void stressTestsEnabled() + { + org.junit.Assume.assumeTrue(JMSStressTestBase.STRESS_TESTS_ENABLED); + } + + // Constants ----------------------------------------------------- + + private static JmsTestLogger log = JmsTestLogger.LOGGER; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private InitialContext ic; + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + @Override @Before - public void setUp() throws Exception - { - super.setUp(); - - // ServerManagement.start("all"); - ic = getInitialContext(); - createTopic("StressTestTopic"); - - RelayStressTest.log.debug("setup done"); - } - - @Override + public void setUp() throws Exception + { + super.setUp(); + + // ServerManagement.start("all"); + ic = getInitialContext(); + createTopic("StressTestTopic"); + + RelayStressTest.log.debug("setup done"); + } + + @Override @After - public void tearDown() throws Exception - { - destroyTopic("StressTestTopic"); - ic.close(); - } - + public void tearDown() throws Exception + { + destroyTopic("StressTestTopic"); + ic.close(); + } + @Test - public void testRelay() throws Exception - { - ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory"); - - Topic topic = (Topic)ic.lookup("/topic/StressTestTopic"); - - final int numMessages = 20000; - - final int numRelayers = 5; - - final int numConsumers = 20; - - Connection conn = cf.createConnection(); - - class Relayer implements MessageListener - { - boolean done; - - boolean failed; - - int count; - - MessageProducer prod; - - Relayer(final MessageProducer prod) - { - this.prod = prod; - } - - public void onMessage(final Message m) - { - try - { - m.clearProperties(); - m.setStringProperty("name", "Tim"); - - prod.send(m); - - count++; - - if (count == numMessages) - { - synchronized (this) - { - done = true; - notify(); - } - } - } - catch (JMSException e) - { - e.printStackTrace(); - synchronized (this) - { - done = true; - failed = true; - notify(); - } - } - } - } - - class Consumer implements MessageListener - { - boolean failed; - - boolean done; - - int count; - - public void onMessage(final Message m) - { - count++; - - if (count == numMessages * numRelayers) - { - synchronized (this) - { - done = true; - notify(); - } - } - } - } - - Relayer[] relayers = new Relayer[numRelayers]; - - Consumer[] consumers = new Consumer[numConsumers]; - - for (int i = 0; i < numRelayers; i++) - { - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageConsumer cons = sess.createConsumer(topic, "name = 'Watt'"); - // MessageConsumer cons = sess.createConsumer(topic); - - MessageProducer prod = sess.createProducer(topic); - - relayers[i] = new Relayer(prod); - - cons.setMessageListener(relayers[i]); - } - - for (int i = 0; i < numConsumers; i++) - { - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageConsumer cons = sess.createConsumer(topic, "name = 'Tim'"); - - consumers[i] = new Consumer(); - - cons.setMessageListener(consumers[i]); - } - - conn.start(); - - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - - MessageProducer prod = sess.createProducer(topic); - - prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT); - - for (int i = 0; i < numMessages; i++) - { - Message m = sess.createMessage(); - - m.setStringProperty("name", "Watt"); - - prod.send(m); - } - - for (int i = 0; i < numRelayers; i++) - { - synchronized (relayers[i]) - { - if (!relayers[i].done) - { - relayers[i].wait(); - } - } - } - - for (int i = 0; i < numConsumers; i++) - { - synchronized (consumers[i]) - { - if (!consumers[i].done) - { - consumers[i].wait(); - } - } - } - - conn.close(); - - for (int i = 0; i < numRelayers; i++) - { - ProxyAssertSupport.assertFalse(relayers[i].failed); - } - - for (int i = 0; i < numConsumers; i++) - { - ProxyAssertSupport.assertFalse(consumers[i].failed); - } - - } -} + public void testRelay() throws Exception + { + ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory"); + + Topic topic = (Topic)ic.lookup("/topic/StressTestTopic"); + + final int numMessages = 20000; + + final int numRelayers = 5; + + final int numConsumers = 20; + + Connection conn = cf.createConnection(); + + class Relayer implements MessageListener + { + boolean done; + + boolean failed; + + int count; + + MessageProducer prod; + + Relayer(final MessageProducer prod) + { + this.prod = prod; + } + + public void onMessage(final Message m) + { + try + { + m.clearProperties(); + m.setStringProperty("name", "Tim"); + + prod.send(m); + + count++; + + if (count == numMessages) + { + synchronized (this) + { + done = true; + notify(); + } + } + } + catch (JMSException e) + { + e.printStackTrace(); + synchronized (this) + { + done = true; + failed = true; + notify(); + } + } + } + } + + class Consumer implements MessageListener + { + boolean failed; + + boolean done; + + int count; + + public void onMessage(final Message m) + { + count++; + + if (count == numMessages * numRelayers) + { + synchronized (this) + { + done = true; + notify(); + } + } + } + } + + Relayer[] relayers = new Relayer[numRelayers]; + + Consumer[] consumers = new Consumer[numConsumers]; + + for (int i = 0; i < numRelayers; i++) + { + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageConsumer cons = sess.createConsumer(topic, "name = 'Watt'"); + // MessageConsumer cons = sess.createConsumer(topic); + + MessageProducer prod = sess.createProducer(topic); + + relayers[i] = new Relayer(prod); + + cons.setMessageListener(relayers[i]); + } + + for (int i = 0; i < numConsumers; i++) + { + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageConsumer cons = sess.createConsumer(topic, "name = 'Tim'"); + + consumers[i] = new Consumer(); + + cons.setMessageListener(consumers[i]); + } + + conn.start(); + + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + + MessageProducer prod = sess.createProducer(topic); + + prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT); + + for (int i = 0; i < numMessages; i++) + { + Message m = sess.createMessage(); + + m.setStringProperty("name", "Watt"); + + prod.send(m); + } + + for (int i = 0; i < numRelayers; i++) + { + synchronized (relayers[i]) + { + if (!relayers[i].done) + { + relayers[i].wait(); + } + } + } + + for (int i = 0; i < numConsumers; i++) + { + synchronized (consumers[i]) + { + if (!consumers[i].done) + { + consumers[i].wait(); + } + } + } + + conn.close(); + + for (int i = 0; i < numRelayers; i++) + { + ProxyAssertSupport.assertFalse(relayers[i].failed); + } + + for (int i = 0; i < numConsumers; i++) + { + ProxyAssertSupport.assertFalse(consumers[i].failed); + } + + } +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Runner.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Runner.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Runner.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Runner.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Sender.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Sender.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Sender.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Sender.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/SeveralClientsStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/SeveralClientsStressTest.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/SeveralClientsStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/SeveralClientsStressTest.java index c9934ad721..f41fbcfa3b 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/SeveralClientsStressTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/SeveralClientsStressTest.java @@ -1,543 +1,543 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ package org.apache.activemq6.jms.tests.stress; -import java.util.HashSet; -import java.util.Random; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.naming.Context; - -import org.apache.activemq6.jms.tests.HornetQServerTestCase; -import org.apache.activemq6.jms.tests.JmsTestLogger; -import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * In order for this test to run, you will need to edit /etc/security/limits.conf and change your max sockets to something bigger than 1024 - * - * It's required to re-login after this change. - * - * For Windows you need also to increase this limit (max opened files) somehow. - * - * -Example of /etc/security/limits.confg: -# -clebert hard nofile 10240 - - - * @author Clebert Suconic - */ -public class SeveralClientsStressTest extends HornetQServerTestCase -{ - @BeforeClass - public static void stressTestsEnabled() - { - org.junit.Assume.assumeTrue(JMSStressTestBase.STRESS_TESTS_ENABLED); - } - - protected boolean info = false; - - protected boolean startServer = true; - - // Static --------------------------------------------------------------------------------------- - - protected static long PRODUCER_ALIVE_FOR = 60000; // one minute - - protected static long CONSUMER_ALIVE_FOR = 60000; // one minutes - - protected static long TEST_ALIVE_FOR = 5 * 60 * 1000; // 5 minutes - - protected static int NUMBER_OF_PRODUCERS = 100; // this should be set to 300 later - - protected static int NUMBER_OF_CONSUMERS = 100; // this should be set to 300 later - - // a producer should have a long wait between each message sent? - protected static boolean LONG_WAIT_ON_PRODUCERS = false; - - protected static AtomicInteger producedMessages = new AtomicInteger(0); - - protected static AtomicInteger readMessages = new AtomicInteger(0); - - protected Context createContext() throws Exception - { - return getInitialContext(); - } - - // Constructors --------------------------------------------------------------------------------- - - // Public --------------------------------------------------------------------------------------- - +import java.util.HashSet; +import java.util.Random; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.DeliveryMode; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.naming.Context; + +import org.apache.activemq6.jms.tests.HornetQServerTestCase; +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.apache.activemq6.jms.tests.util.ProxyAssertSupport; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * In order for this test to run, you will need to edit /etc/security/limits.conf and change your max sockets to something bigger than 1024 + * + * It's required to re-login after this change. + * + * For Windows you need also to increase this limit (max opened files) somehow. + * + * +Example of /etc/security/limits.confg: +# +clebert hard nofile 10240 + + + * @author Clebert Suconic + */ +public class SeveralClientsStressTest extends HornetQServerTestCase +{ + @BeforeClass + public static void stressTestsEnabled() + { + org.junit.Assume.assumeTrue(JMSStressTestBase.STRESS_TESTS_ENABLED); + } + + protected boolean info = false; + + protected boolean startServer = true; + + // Static --------------------------------------------------------------------------------------- + + protected static long PRODUCER_ALIVE_FOR = 60000; // one minute + + protected static long CONSUMER_ALIVE_FOR = 60000; // one minutes + + protected static long TEST_ALIVE_FOR = 5 * 60 * 1000; // 5 minutes + + protected static int NUMBER_OF_PRODUCERS = 100; // this should be set to 300 later + + protected static int NUMBER_OF_CONSUMERS = 100; // this should be set to 300 later + + // a producer should have a long wait between each message sent? + protected static boolean LONG_WAIT_ON_PRODUCERS = false; + + protected static AtomicInteger producedMessages = new AtomicInteger(0); + + protected static AtomicInteger readMessages = new AtomicInteger(0); + + protected Context createContext() throws Exception + { + return getInitialContext(); + } + + // Constructors --------------------------------------------------------------------------------- + + // Public --------------------------------------------------------------------------------------- + @Test - public void testQueue() throws Exception - { - Context ctx = createContext(); - - HashSet threads = new HashSet(); - - // A chhanel of communication between workers and the test method - LinkedBlockingQueue testChannel = new LinkedBlockingQueue(); - - for (int i = 0; i < SeveralClientsStressTest.NUMBER_OF_PRODUCERS; i++) - { - threads.add(new SeveralClientsStressTest.Producer(i, testChannel)); - } - - for (int i = 0; i < SeveralClientsStressTest.NUMBER_OF_CONSUMERS; i++) - { - threads.add(new SeveralClientsStressTest.Consumer(i, testChannel)); - } - - for (Worker worker : threads) - { - worker.start(); - } - - long timeToFinish = System.currentTimeMillis() + SeveralClientsStressTest.TEST_ALIVE_FOR; - - int numberOfProducers = SeveralClientsStressTest.NUMBER_OF_PRODUCERS; - int numberOfConsumers = SeveralClientsStressTest.NUMBER_OF_CONSUMERS; - - while (threads.size() > 0) - { - SeveralClientsStressTest.InternalMessage msg = testChannel.poll(2000, - TimeUnit.MILLISECONDS); - - log.info("Produced:" + SeveralClientsStressTest.producedMessages.get() + - " and Consumed:" + - SeveralClientsStressTest.readMessages.get() + - " messages"); - - if (msg != null) - { - if (info) - { - log.info("Received message " + msg); - } - if (msg instanceof SeveralClientsStressTest.WorkerFailed) - { - ProxyAssertSupport.fail("Worker " + msg.getWorker() + " has failed"); - } - else if (msg instanceof SeveralClientsStressTest.WorkedFinishedMessages) - { - SeveralClientsStressTest.WorkedFinishedMessages finished = (SeveralClientsStressTest.WorkedFinishedMessages)msg; - if (threads.remove(finished.getWorker())) - { - if (System.currentTimeMillis() < timeToFinish) - { - if (finished.getWorker() instanceof SeveralClientsStressTest.Producer) - { - if (info) - { - log.info("Scheduling new Producer " + numberOfProducers); - } - SeveralClientsStressTest.Producer producer = new SeveralClientsStressTest.Producer(numberOfProducers++, - testChannel); - threads.add(producer); - producer.start(); - } - else if (finished.getWorker() instanceof SeveralClientsStressTest.Consumer) - { - if (info) - { - log.info("Scheduling new ClientConsumer " + numberOfConsumers); - } - SeveralClientsStressTest.Consumer consumer = new SeveralClientsStressTest.Consumer(numberOfConsumers++, - testChannel); - threads.add(consumer); - consumer.start(); - } - } - } - else - { - log.warn(finished.getWorker() + " was not available on threads HashSet"); - } - } - } - } - - log.info("Produced:" + SeveralClientsStressTest.producedMessages.get() + - " and Consumed:" + - SeveralClientsStressTest.readMessages.get() + - " messages"); - - clearMessages(); - - log.info("Produced:" + SeveralClientsStressTest.producedMessages.get() + - " and Consumed:" + - SeveralClientsStressTest.readMessages.get() + - " messages"); - - ProxyAssertSupport.assertEquals(SeveralClientsStressTest.producedMessages.get(), - SeveralClientsStressTest.readMessages.get()); - } - - // Package protected ---------------------------------------------------------------------------- - - // Protected ------------------------------------------------------------------------------------ - - protected void clearMessages() throws Exception - { - Context ctx = createContext(); - ConnectionFactory cf = (ConnectionFactory)ctx.lookup("/ClusteredConnectionFactory"); - Connection conn = cf.createConnection(); - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue queue = (Queue)ctx.lookup("queue/testQueue"); - MessageConsumer consumer = sess.createConsumer(queue); - - conn.start(); - - while (consumer.receive(1000) != null) - { - SeveralClientsStressTest.readMessages.incrementAndGet(); - log.info("Received JMS message on clearMessages"); - } - - conn.close(); - } - - @Override + public void testQueue() throws Exception + { + Context ctx = createContext(); + + HashSet threads = new HashSet(); + + // A chhanel of communication between workers and the test method + LinkedBlockingQueue testChannel = new LinkedBlockingQueue(); + + for (int i = 0; i < SeveralClientsStressTest.NUMBER_OF_PRODUCERS; i++) + { + threads.add(new SeveralClientsStressTest.Producer(i, testChannel)); + } + + for (int i = 0; i < SeveralClientsStressTest.NUMBER_OF_CONSUMERS; i++) + { + threads.add(new SeveralClientsStressTest.Consumer(i, testChannel)); + } + + for (Worker worker : threads) + { + worker.start(); + } + + long timeToFinish = System.currentTimeMillis() + SeveralClientsStressTest.TEST_ALIVE_FOR; + + int numberOfProducers = SeveralClientsStressTest.NUMBER_OF_PRODUCERS; + int numberOfConsumers = SeveralClientsStressTest.NUMBER_OF_CONSUMERS; + + while (threads.size() > 0) + { + SeveralClientsStressTest.InternalMessage msg = testChannel.poll(2000, + TimeUnit.MILLISECONDS); + + log.info("Produced:" + SeveralClientsStressTest.producedMessages.get() + + " and Consumed:" + + SeveralClientsStressTest.readMessages.get() + + " messages"); + + if (msg != null) + { + if (info) + { + log.info("Received message " + msg); + } + if (msg instanceof SeveralClientsStressTest.WorkerFailed) + { + ProxyAssertSupport.fail("Worker " + msg.getWorker() + " has failed"); + } + else if (msg instanceof SeveralClientsStressTest.WorkedFinishedMessages) + { + SeveralClientsStressTest.WorkedFinishedMessages finished = (SeveralClientsStressTest.WorkedFinishedMessages)msg; + if (threads.remove(finished.getWorker())) + { + if (System.currentTimeMillis() < timeToFinish) + { + if (finished.getWorker() instanceof SeveralClientsStressTest.Producer) + { + if (info) + { + log.info("Scheduling new Producer " + numberOfProducers); + } + SeveralClientsStressTest.Producer producer = new SeveralClientsStressTest.Producer(numberOfProducers++, + testChannel); + threads.add(producer); + producer.start(); + } + else if (finished.getWorker() instanceof SeveralClientsStressTest.Consumer) + { + if (info) + { + log.info("Scheduling new ClientConsumer " + numberOfConsumers); + } + SeveralClientsStressTest.Consumer consumer = new SeveralClientsStressTest.Consumer(numberOfConsumers++, + testChannel); + threads.add(consumer); + consumer.start(); + } + } + } + else + { + log.warn(finished.getWorker() + " was not available on threads HashSet"); + } + } + } + } + + log.info("Produced:" + SeveralClientsStressTest.producedMessages.get() + + " and Consumed:" + + SeveralClientsStressTest.readMessages.get() + + " messages"); + + clearMessages(); + + log.info("Produced:" + SeveralClientsStressTest.producedMessages.get() + + " and Consumed:" + + SeveralClientsStressTest.readMessages.get() + + " messages"); + + ProxyAssertSupport.assertEquals(SeveralClientsStressTest.producedMessages.get(), + SeveralClientsStressTest.readMessages.get()); + } + + // Package protected ---------------------------------------------------------------------------- + + // Protected ------------------------------------------------------------------------------------ + + protected void clearMessages() throws Exception + { + Context ctx = createContext(); + ConnectionFactory cf = (ConnectionFactory)ctx.lookup("/ClusteredConnectionFactory"); + Connection conn = cf.createConnection(); + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue queue = (Queue)ctx.lookup("queue/testQueue"); + MessageConsumer consumer = sess.createConsumer(queue); + + conn.start(); + + while (consumer.receive(1000) != null) + { + SeveralClientsStressTest.readMessages.incrementAndGet(); + log.info("Received JMS message on clearMessages"); + } + + conn.close(); + } + + @Override @Before - public void setUp() throws Exception - { - super.setUp(); - - if (startServer) - { - // ServerManagement.start("all", true); - createQueue("testQueue"); - } - - clearMessages(); - SeveralClientsStressTest.producedMessages = new AtomicInteger(0); - SeveralClientsStressTest.readMessages = new AtomicInteger(0); - } - - // Private -------------------------------------------------------------------------------------- - - // Inner classes -------------------------------------------------------------------------------- - - private class Worker extends Thread - { - - protected JmsTestLogger log = JmsTestLogger.LOGGER; - - private boolean failed = false; - - private final int workerId; - - private Exception ex; - - LinkedBlockingQueue messageQueue; - - public int getWorkerId() - { - return workerId; - } - - public Exception getException() - { - return ex; - } - - public boolean isFailed() - { - return failed; - } - - protected synchronized void setFailed(final boolean failed, final Exception ex) - { - this.failed = failed; - this.ex = ex; - - log.info("Sending Exception", ex); - - sendInternalMessage(new SeveralClientsStressTest.WorkerFailed(this)); - - } - - protected void sendInternalMessage(final SeveralClientsStressTest.InternalMessage msg) - { - if (info) - { - log.info("Sending message " + msg); - } - try - { - messageQueue.put(msg); - } - catch (Exception e) - { - log.error(e, e); - setFailed(true, e); - } - } - - public Worker(final String name, final int workerId, - final LinkedBlockingQueue messageQueue) - { - super(name); - this.workerId = workerId; - this.messageQueue = messageQueue; - setDaemon(true); - } - - @Override - public String toString() - { - return this.getClass().getName() + ":" + getWorkerId(); - } - } - - final class Producer extends SeveralClientsStressTest.Worker - { - public Producer(final int producerId, - final LinkedBlockingQueue messageQueue) - { - super("Producer:" + producerId, producerId, messageQueue); - } - - Random random = new Random(); - - @Override - public void run() - { - try - { - Context ctx = createContext(); - - ConnectionFactory cf = (ConnectionFactory)ctx.lookup("/ClusteredConnectionFactory"); - - Queue queue = (Queue)ctx.lookup("queue/testQueue"); - - if (info) - { - log.info("Creating connection and producer"); - } - Connection conn = cf.createConnection(); - Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer prod = sess.createProducer(queue); - - if (getWorkerId() % 2 == 0) - { - if (info) - { - log.info("Non Persistent Producer was created"); - } - prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT); - } - else - { - if (info) - { - log.info("Persistent Producer was created"); - } - prod.setDeliveryMode(DeliveryMode.PERSISTENT); - } - - long timeToFinish = System.currentTimeMillis() + SeveralClientsStressTest.PRODUCER_ALIVE_FOR; - - try - { - int messageSent = 0; - while (System.currentTimeMillis() < timeToFinish) - { - prod.send(sess.createTextMessage("Message sent at " + System.currentTimeMillis())); - SeveralClientsStressTest.producedMessages.incrementAndGet(); - messageSent++; - if (messageSent % 50 == 0) - { - if (info) - { - log.info("Sent " + messageSent + " Messages"); - } - } - - if (SeveralClientsStressTest.LONG_WAIT_ON_PRODUCERS) - { - int waitTime = random.nextInt() % 2 + 1; - if (waitTime < 0) - { - waitTime *= -1; - } - Thread.sleep(waitTime * 1000); // wait 1 or 2 seconds - } - else - { - Thread.sleep(100); - } - } - sendInternalMessage(new SeveralClientsStressTest.WorkedFinishedMessages(this)); - } - finally - { - conn.close(); - } - - } - catch (Exception e) - { - log.error(e, e); - setFailed(true, e); - } - } - } - - final class Consumer extends SeveralClientsStressTest.Worker - { - public Consumer(final int consumerId, - final LinkedBlockingQueue messageQueue) - { - super("ClientConsumer:" + consumerId, consumerId, messageQueue); - } - - @Override - public void run() - { - try - { - Context ctx = createContext(); - - ConnectionFactory cf = (ConnectionFactory)ctx.lookup("/ClusteredConnectionFactory"); - - Queue queue = (Queue)ctx.lookup("queue/testQueue"); - - if (info) - { - log.info("Creating connection and consumer"); - } - Connection conn = cf.createConnection(); - Session sess = conn.createSession(true, Session.SESSION_TRANSACTED); - MessageConsumer consumer = sess.createConsumer(queue); - if (info) - { - log.info("ClientConsumer was created"); - } - - conn.start(); - - int msgs = 0; - - int transactions = 0; - - long timeToFinish = System.currentTimeMillis() + SeveralClientsStressTest.CONSUMER_ALIVE_FOR; - - try - { - while (System.currentTimeMillis() < timeToFinish) - { - Message msg = consumer.receive(1000); - if (msg != null) - { - msgs++; - if (msgs >= 50) - { - transactions++; - if (transactions % 2 == 0) - { - if (info) - { - log.info("Commit transaction"); - } - sess.commit(); - SeveralClientsStressTest.readMessages.addAndGet(msgs); - } - else - { - if (info) - { - log.info("Rollback transaction"); - } - sess.rollback(); - } - msgs = 0; - } - } - else - { - break; - } - } - - SeveralClientsStressTest.readMessages.addAndGet(msgs); - sess.commit(); - - sendInternalMessage(new SeveralClientsStressTest.WorkedFinishedMessages(this)); - } - finally - { - conn.close(); - } - - } - catch (Exception e) - { - log.error(e); - setFailed(true, e); - } - } - } - - // Objects used on the communication between Workers and the test - static class InternalMessage - { - SeveralClientsStressTest.Worker worker; - - public InternalMessage(final SeveralClientsStressTest.Worker worker) - { - this.worker = worker; - } - - public SeveralClientsStressTest.Worker getWorker() - { - return worker; - } - - @Override - public String toString() - { - return this.getClass().getName() + " worker-> " + worker.toString(); - } - } - - static class WorkedFinishedMessages extends SeveralClientsStressTest.InternalMessage - { - - public WorkedFinishedMessages(final SeveralClientsStressTest.Worker worker) - { - super(worker); - } - - } - - static class WorkerFailed extends SeveralClientsStressTest.InternalMessage - { - public WorkerFailed(final SeveralClientsStressTest.Worker worker) - { - super(worker); - } - } - -} + public void setUp() throws Exception + { + super.setUp(); + + if (startServer) + { + // ServerManagement.start("all", true); + createQueue("testQueue"); + } + + clearMessages(); + SeveralClientsStressTest.producedMessages = new AtomicInteger(0); + SeveralClientsStressTest.readMessages = new AtomicInteger(0); + } + + // Private -------------------------------------------------------------------------------------- + + // Inner classes -------------------------------------------------------------------------------- + + private class Worker extends Thread + { + + protected JmsTestLogger log = JmsTestLogger.LOGGER; + + private boolean failed = false; + + private final int workerId; + + private Exception ex; + + LinkedBlockingQueue messageQueue; + + public int getWorkerId() + { + return workerId; + } + + public Exception getException() + { + return ex; + } + + public boolean isFailed() + { + return failed; + } + + protected synchronized void setFailed(final boolean failed, final Exception ex) + { + this.failed = failed; + this.ex = ex; + + log.info("Sending Exception", ex); + + sendInternalMessage(new SeveralClientsStressTest.WorkerFailed(this)); + + } + + protected void sendInternalMessage(final SeveralClientsStressTest.InternalMessage msg) + { + if (info) + { + log.info("Sending message " + msg); + } + try + { + messageQueue.put(msg); + } + catch (Exception e) + { + log.error(e, e); + setFailed(true, e); + } + } + + public Worker(final String name, final int workerId, + final LinkedBlockingQueue messageQueue) + { + super(name); + this.workerId = workerId; + this.messageQueue = messageQueue; + setDaemon(true); + } + + @Override + public String toString() + { + return this.getClass().getName() + ":" + getWorkerId(); + } + } + + final class Producer extends SeveralClientsStressTest.Worker + { + public Producer(final int producerId, + final LinkedBlockingQueue messageQueue) + { + super("Producer:" + producerId, producerId, messageQueue); + } + + Random random = new Random(); + + @Override + public void run() + { + try + { + Context ctx = createContext(); + + ConnectionFactory cf = (ConnectionFactory)ctx.lookup("/ClusteredConnectionFactory"); + + Queue queue = (Queue)ctx.lookup("queue/testQueue"); + + if (info) + { + log.info("Creating connection and producer"); + } + Connection conn = cf.createConnection(); + Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageProducer prod = sess.createProducer(queue); + + if (getWorkerId() % 2 == 0) + { + if (info) + { + log.info("Non Persistent Producer was created"); + } + prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT); + } + else + { + if (info) + { + log.info("Persistent Producer was created"); + } + prod.setDeliveryMode(DeliveryMode.PERSISTENT); + } + + long timeToFinish = System.currentTimeMillis() + SeveralClientsStressTest.PRODUCER_ALIVE_FOR; + + try + { + int messageSent = 0; + while (System.currentTimeMillis() < timeToFinish) + { + prod.send(sess.createTextMessage("Message sent at " + System.currentTimeMillis())); + SeveralClientsStressTest.producedMessages.incrementAndGet(); + messageSent++; + if (messageSent % 50 == 0) + { + if (info) + { + log.info("Sent " + messageSent + " Messages"); + } + } + + if (SeveralClientsStressTest.LONG_WAIT_ON_PRODUCERS) + { + int waitTime = random.nextInt() % 2 + 1; + if (waitTime < 0) + { + waitTime *= -1; + } + Thread.sleep(waitTime * 1000); // wait 1 or 2 seconds + } + else + { + Thread.sleep(100); + } + } + sendInternalMessage(new SeveralClientsStressTest.WorkedFinishedMessages(this)); + } + finally + { + conn.close(); + } + + } + catch (Exception e) + { + log.error(e, e); + setFailed(true, e); + } + } + } + + final class Consumer extends SeveralClientsStressTest.Worker + { + public Consumer(final int consumerId, + final LinkedBlockingQueue messageQueue) + { + super("ClientConsumer:" + consumerId, consumerId, messageQueue); + } + + @Override + public void run() + { + try + { + Context ctx = createContext(); + + ConnectionFactory cf = (ConnectionFactory)ctx.lookup("/ClusteredConnectionFactory"); + + Queue queue = (Queue)ctx.lookup("queue/testQueue"); + + if (info) + { + log.info("Creating connection and consumer"); + } + Connection conn = cf.createConnection(); + Session sess = conn.createSession(true, Session.SESSION_TRANSACTED); + MessageConsumer consumer = sess.createConsumer(queue); + if (info) + { + log.info("ClientConsumer was created"); + } + + conn.start(); + + int msgs = 0; + + int transactions = 0; + + long timeToFinish = System.currentTimeMillis() + SeveralClientsStressTest.CONSUMER_ALIVE_FOR; + + try + { + while (System.currentTimeMillis() < timeToFinish) + { + Message msg = consumer.receive(1000); + if (msg != null) + { + msgs++; + if (msgs >= 50) + { + transactions++; + if (transactions % 2 == 0) + { + if (info) + { + log.info("Commit transaction"); + } + sess.commit(); + SeveralClientsStressTest.readMessages.addAndGet(msgs); + } + else + { + if (info) + { + log.info("Rollback transaction"); + } + sess.rollback(); + } + msgs = 0; + } + } + else + { + break; + } + } + + SeveralClientsStressTest.readMessages.addAndGet(msgs); + sess.commit(); + + sendInternalMessage(new SeveralClientsStressTest.WorkedFinishedMessages(this)); + } + finally + { + conn.close(); + } + + } + catch (Exception e) + { + log.error(e); + setFailed(true, e); + } + } + } + + // Objects used on the communication between Workers and the test + static class InternalMessage + { + SeveralClientsStressTest.Worker worker; + + public InternalMessage(final SeveralClientsStressTest.Worker worker) + { + this.worker = worker; + } + + public SeveralClientsStressTest.Worker getWorker() + { + return worker; + } + + @Override + public String toString() + { + return this.getClass().getName() + " worker-> " + worker.toString(); + } + } + + static class WorkedFinishedMessages extends SeveralClientsStressTest.InternalMessage + { + + public WorkedFinishedMessages(final SeveralClientsStressTest.Worker worker) + { + super(worker); + } + + } + + static class WorkerFailed extends SeveralClientsStressTest.InternalMessage + { + public WorkerFailed(final SeveralClientsStressTest.Worker worker) + { + super(worker); + } + } + +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TopicStressTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/TopicStressTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TopicStressTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/TopicStressTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCReceiver.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Transactional2PCReceiver.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCReceiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Transactional2PCReceiver.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCSender.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Transactional2PCSender.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/Transactional2PCSender.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/Transactional2PCSender.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalReceiver.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/TransactionalReceiver.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalReceiver.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/TransactionalReceiver.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalSender.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/TransactionalSender.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/stress/TransactionalSender.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/stress/TransactionalSender.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/ServerManagement.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/ServerManagement.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/ServerManagement.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/ServerManagement.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/WrappedJNDIServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/WrappedJNDIServer.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/WrappedJNDIServer.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/WrappedJNDIServer.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Constants.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Constants.java similarity index 97% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Constants.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Constants.java index 035e359dbe..854167191d 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Constants.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Constants.java @@ -1,41 +1,41 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.tests.tools.container; - -/** - * @author Ovidiu Feodorov - * @version $Revision: 2868 $ - * - */ -public class Constants -{ - // Constants ----------------------------------------------------- - - public static final String SERVER_INDEX_PROPERTY_NAME = "hornetq.test.server.index"; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.tests.tools.container; + +/** + * @author Ovidiu Feodorov + * @version $Revision: 2868 $ + * + */ +public class Constants +{ + // Constants ----------------------------------------------------- + + public static final String SERVER_INDEX_PROPERTY_NAME = "hornetq.test.server.index"; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMContext.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMContext.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMContext.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMContext.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactory.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactory.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactory.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMNameParser.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMNameParser.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/InVMNameParser.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMNameParser.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/LocalTestServer.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/NonSerializableFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/NonSerializableFactory.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/NonSerializableFactory.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/NonSerializableFactory.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Server.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Server.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/tools/container/Server.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Server.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/JNDIUtilTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/JNDIUtilTest.java similarity index 100% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/JNDIUtilTest.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/JNDIUtilTest.java diff --git a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/ProxyAssertSupport.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/ProxyAssertSupport.java similarity index 96% rename from tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/ProxyAssertSupport.java rename to tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/ProxyAssertSupport.java index aaed1045ac..8d4883b1af 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq6/jms/tests/util/ProxyAssertSupport.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/ProxyAssertSupport.java @@ -1,476 +1,476 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq6.jms.tests.util; - -import org.apache.activemq6.jms.tests.JmsTestLogger; -import org.junit.Assert; - -/** - * This class will proxy any JUnit assertions and send then to our log outputs. - * @author Clebert Suconic - */ -public class ProxyAssertSupport -{ - private static JmsTestLogger log = JmsTestLogger.LOGGER; - - public static void assertTrue(final java.lang.String string, final boolean b) - { - try - { - Assert.assertTrue(string, b); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertTrue(final boolean b) - { - try - { - Assert.assertTrue(b); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertFalse(final java.lang.String string, final boolean b) - { - try - { - Assert.assertFalse(string, b); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertFalse(final boolean b) - { - try - { - Assert.assertFalse(b); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void fail(final java.lang.String string) - - { - try - { - Assert.fail(string); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void fail() - { - try - { - Assert.fail(); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, - final java.lang.Object object, - final java.lang.Object object1) - { - try - { - Assert.assertEquals(string, object, object1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.Object object, final java.lang.Object object1) - { - try - { - Assert.assertEquals(object, object1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, - final java.lang.String string1, - final java.lang.String string2) - { - try - { - Assert.assertEquals(string, string1, string2); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final java.lang.String string1) - { - try - { - Assert.assertEquals(string, string1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final double v, final double v1, final double v2) - { - try - { - Assert.assertEquals(string, v, v1, v2); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final double v, final double v1, final double v2) - { - try - { - Assert.assertEquals(v, v1, v2); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final float v, final float v1, final float v2) - { - try - { - Assert.assertEquals(string, v, v1, v2); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final float v, final float v1, final float v2) - { - try - { - Assert.assertEquals(v, v1, v2); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final long l, final long l1) - { - try - { - Assert.assertEquals(string, l, l1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final long l, final long l1) - { - try - { - Assert.assertEquals(l, l1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final boolean b, final boolean b1) - { - try - { - Assert.assertEquals(string, b, b1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final boolean b, final boolean b1) - { - try - { - Assert.assertEquals(b, b1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final byte b, final byte b1) - { - try - { - Assert.assertEquals(string, b, b1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final byte b, final byte b1) - { - try - { - Assert.assertEquals(b, b1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final char c, final char c1) - { - try - { - Assert.assertEquals(string, c, c1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final char c, final char c1) - { - try - { - Assert.assertEquals(c, c1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final short i, final short i1) - { - try - { - Assert.assertEquals(string, i, i1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final short i, final short i1) - { - try - { - Assert.assertEquals(i, i1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final java.lang.String string, final int i, final int i1) - { - try - { - Assert.assertEquals(string, i, i1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertEquals(final int i, final int i1) - { - try - { - Assert.assertEquals(i, i1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertNotNull(final java.lang.Object object) - { - try - { - Assert.assertNotNull(object); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertNotNull(final java.lang.String string, final java.lang.Object object) - { - try - { - Assert.assertNotNull(string, object); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertNull(final java.lang.Object object) - { - try - { - Assert.assertNull(object); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertNull(final java.lang.String string, final java.lang.Object object) - { - try - { - Assert.assertNull(string, object); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertSame(final java.lang.String string, - final java.lang.Object object, - final java.lang.Object object1) - { - try - { - Assert.assertSame(string, object, object1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertSame(final java.lang.Object object, final java.lang.Object object1) - { - try - { - Assert.assertSame(object, object1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertNotSame(final java.lang.String string, - final java.lang.Object object, - final java.lang.Object object1) - { - try - { - Assert.assertNotSame(string, object, object1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } - - public static void assertNotSame(final java.lang.Object object, final java.lang.Object object1) - { - try - { - Assert.assertNotSame(object, object1); - } - catch (AssertionError e) - { - ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); - throw e; - } - } -} +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq6.jms.tests.util; + +import org.apache.activemq6.jms.tests.JmsTestLogger; +import org.junit.Assert; + +/** + * This class will proxy any JUnit assertions and send then to our log outputs. + * @author Clebert Suconic + */ +public class ProxyAssertSupport +{ + private static JmsTestLogger log = JmsTestLogger.LOGGER; + + public static void assertTrue(final java.lang.String string, final boolean b) + { + try + { + Assert.assertTrue(string, b); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertTrue(final boolean b) + { + try + { + Assert.assertTrue(b); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertFalse(final java.lang.String string, final boolean b) + { + try + { + Assert.assertFalse(string, b); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertFalse(final boolean b) + { + try + { + Assert.assertFalse(b); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void fail(final java.lang.String string) + + { + try + { + Assert.fail(string); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void fail() + { + try + { + Assert.fail(); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, + final java.lang.Object object, + final java.lang.Object object1) + { + try + { + Assert.assertEquals(string, object, object1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.Object object, final java.lang.Object object1) + { + try + { + Assert.assertEquals(object, object1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, + final java.lang.String string1, + final java.lang.String string2) + { + try + { + Assert.assertEquals(string, string1, string2); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final java.lang.String string1) + { + try + { + Assert.assertEquals(string, string1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final double v, final double v1, final double v2) + { + try + { + Assert.assertEquals(string, v, v1, v2); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final double v, final double v1, final double v2) + { + try + { + Assert.assertEquals(v, v1, v2); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final float v, final float v1, final float v2) + { + try + { + Assert.assertEquals(string, v, v1, v2); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final float v, final float v1, final float v2) + { + try + { + Assert.assertEquals(v, v1, v2); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final long l, final long l1) + { + try + { + Assert.assertEquals(string, l, l1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final long l, final long l1) + { + try + { + Assert.assertEquals(l, l1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final boolean b, final boolean b1) + { + try + { + Assert.assertEquals(string, b, b1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final boolean b, final boolean b1) + { + try + { + Assert.assertEquals(b, b1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final byte b, final byte b1) + { + try + { + Assert.assertEquals(string, b, b1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final byte b, final byte b1) + { + try + { + Assert.assertEquals(b, b1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final char c, final char c1) + { + try + { + Assert.assertEquals(string, c, c1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final char c, final char c1) + { + try + { + Assert.assertEquals(c, c1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final short i, final short i1) + { + try + { + Assert.assertEquals(string, i, i1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final short i, final short i1) + { + try + { + Assert.assertEquals(i, i1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final java.lang.String string, final int i, final int i1) + { + try + { + Assert.assertEquals(string, i, i1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertEquals(final int i, final int i1) + { + try + { + Assert.assertEquals(i, i1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertNotNull(final java.lang.Object object) + { + try + { + Assert.assertNotNull(object); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertNotNull(final java.lang.String string, final java.lang.Object object) + { + try + { + Assert.assertNotNull(string, object); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertNull(final java.lang.Object object) + { + try + { + Assert.assertNull(object); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertNull(final java.lang.String string, final java.lang.Object object) + { + try + { + Assert.assertNull(string, object); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertSame(final java.lang.String string, + final java.lang.Object object, + final java.lang.Object object1) + { + try + { + Assert.assertSame(string, object, object1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertSame(final java.lang.Object object, final java.lang.Object object1) + { + try + { + Assert.assertSame(object, object1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertNotSame(final java.lang.String string, + final java.lang.Object object, + final java.lang.Object object1) + { + try + { + Assert.assertNotSame(string, object, object1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } + + public static void assertNotSame(final java.lang.Object object, final java.lang.Object object1) + { + try + { + Assert.assertNotSame(object, object1); + } + catch (AssertionError e) + { + ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e); + throw e; + } + } +} diff --git a/tests/joram-tests/src/test/java/org/apache/activemq6/jms/AbstractAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/AbstractAdmin.java similarity index 100% rename from tests/joram-tests/src/test/java/org/apache/activemq6/jms/AbstractAdmin.java rename to tests/joram-tests/src/test/java/org/apache/activemq/jms/AbstractAdmin.java diff --git a/tests/joram-tests/src/test/java/org/apache/activemq6/jms/GenericAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/GenericAdmin.java similarity index 100% rename from tests/joram-tests/src/test/java/org/apache/activemq6/jms/GenericAdmin.java rename to tests/joram-tests/src/test/java/org/apache/activemq/jms/GenericAdmin.java diff --git a/tests/joram-tests/src/test/java/org/apache/activemq6/jms/HornetQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java similarity index 100% rename from tests/joram-tests/src/test/java/org/apache/activemq6/jms/HornetQAdmin.java rename to tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java diff --git a/tests/joram-tests/src/test/java/org/apache/activemq6/jms/JoramAggregationTest.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/JoramAggregationTest.java similarity index 100% rename from tests/joram-tests/src/test/java/org/apache/activemq6/jms/JoramAggregationTest.java rename to tests/joram-tests/src/test/java/org/apache/activemq/jms/JoramAggregationTest.java diff --git a/tests/joram-tests/src/test/java/org/apache/activemq6/jms/SpawnedJMSServer.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java similarity index 100% rename from tests/joram-tests/src/test/java/org/apache/activemq6/jms/SpawnedJMSServer.java rename to tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java diff --git a/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/FakeJournalImplTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/FakeJournalImplTest.java similarity index 100% rename from tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/FakeJournalImplTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/FakeJournalImplTest.java diff --git a/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/JournalImplTestUnit.java b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/JournalImplTestUnit.java similarity index 100% rename from tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/JournalImplTestUnit.java rename to tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/JournalImplTestUnit.java diff --git a/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplAIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplAIOTest.java similarity index 100% rename from tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplAIOTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplAIOTest.java diff --git a/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplNIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplNIOTest.java similarity index 100% rename from tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/journal/RealJournalImplNIOTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplNIOTest.java diff --git a/tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/paging/MeasurePagingMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java similarity index 100% rename from tests/performance-tests/src/test/java/org/apache/activemq6/tests/performance/paging/MeasurePagingMultiThreadTest.java rename to tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientAbstract.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientAbstract.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientAbstract.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientAbstract.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientNonDivertedSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientNonDivertedSoakTest.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientNonDivertedSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientNonDivertedSoakTest.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientSoakTest.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/ClientSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientSoakTest.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Receiver.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Receiver.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Receiver.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Receiver.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Sender.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Sender.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/Sender.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Sender.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/SimpleSendReceiveSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/SimpleSendReceiveSoakTest.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/client/SimpleSendReceiveSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/SimpleSendReceiveSoakTest.java diff --git a/tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/failover/RandomFailoverSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/failover/RandomFailoverSoakTest.java similarity index 100% rename from tests/soak-tests/src/test/java/org/apache/activemq6/tests/soak/failover/RandomFailoverSoakTest.java rename to tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/failover/RandomFailoverSoakTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/chunk/LargeMessageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/chunk/LargeMessageStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/chunk/LargeMessageStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/chunk/LargeMessageStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/client/SendStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/client/SendStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/client/SendStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/client/SendStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/MultiThreadRandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/MultiThreadRandomReattachStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/MultiThreadRandomReattachStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/MultiThreadRandomReattachStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/RandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/RandomReattachStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/failover/RandomReattachStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/RandomReattachStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AIOMultiThreadCompactorStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AddAndRemoveStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AddAndRemoveStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AddAndRemoveStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AddAndRemoveStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/CompactingStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalCleanupCompactStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalRestartStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/JournalRestartStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/LargeJournalStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MixupCompactorTestBase.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MixupCompactorTestBase.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MixupCompactorTestBase.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MixupCompactorTestBase.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/MultiThreadConsumerStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/NIOMultiThreadCompactorStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/XmlImportExportStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/XmlImportExportStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/journal/XmlImportExportStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/XmlImportExportStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/MultipleConsumersPageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/MultipleConsumersPageStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/MultipleConsumersPageStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/MultipleConsumersPageStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageCursorStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/paging/PageStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/remote/PingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/remote/PingStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java diff --git a/tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/stomp/StompStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/stomp/StompStressTest.java similarity index 100% rename from tests/stress-tests/src/test/java/org/apache/activemq6/tests/stress/stomp/StompStressTest.java rename to tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/stomp/StompStressTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/AIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/AIOJournalImplTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/AIOJournalImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/AIOJournalImplTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/FakeJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/FakeJournalImplTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/FakeJournalImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/FakeJournalImplTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/JournalImplTestUnit.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/JournalImplTestUnit.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/JournalImplTestUnit.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/JournalImplTestUnit.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/NIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/NIOJournalImplTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/journal/impl/NIOJournalImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/NIOJournalImplTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/server/impl/QueueImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueImplTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/core/server/impl/QueueImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueImplTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/ReusableLatchTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/ReusableLatchTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/ReusableLatchTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/ReusableLatchTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/TokenBucketLimiterImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/TokenBucketLimiterImplTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/TokenBucketLimiterImplTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/TokenBucketLimiterImplTest.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UTF8Test.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UTF8Test.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java diff --git a/tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UUIDTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UUIDTest.java similarity index 100% rename from tests/timing-tests/src/test/java/org/apache/activemq6/tests/timing/util/UUIDTest.java rename to tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UUIDTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/UnitTestLogger.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/UnitTestLogger.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/UnitTestLogger.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/UnitTestLogger.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AIOTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AIOTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/AsynchronousFileTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/LibaioDependencyCheckTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/LibaioDependencyCheckTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/client/impl/LargeMessageBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/client/impl/LargeMessageBufferTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConfigurationValidationTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConnectorsServiceTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConnectorsServiceTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/ConnectorsServiceTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConnectorsServiceTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/TransportConfigurationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/TransportConfigurationTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/TransportConfigurationTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/TransportConfigurationTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorService.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorService.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorService.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorService.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FakeDeploymentManager.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FakeDeploymentManager.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FakeDeploymentManager.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FakeDeploymentManager.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/SecurityDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/SecurityDeployerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/SecurityDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/SecurityDeployerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/XMLDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/XMLDeployerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/deployers/impl/XMLDeployerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/XMLDeployerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/AlignedJournalImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/AlignedJournalImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/AlignedJournalImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/CleanBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/CleanBufferTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/CleanBufferTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/CleanBufferTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeJournalImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeJournalImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeJournalImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FileFactoryTestBase.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/FileFactoryTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FileFactoryTestBase.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalAsyncTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalAsyncTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalAsyncTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalAsyncTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestBase.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestBase.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/JournalImplTestUnit.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/ReclaimerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/ReclaimerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/ReclaimerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/ReclaimerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/TimedBufferTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/SimpleEncoding.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/journal/impl/fakes/SimpleEncoding.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/message/impl/MessageImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagePositionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagePositionTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagePositionTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagePositionTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PageTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingManagerImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingManagerImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingManagerImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/paging/impl/PagingStoreImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/OperationContextUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/persistence/impl/OperationContextUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/AddressImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/AddressImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/AddressImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/AddressImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/BindingsImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/FakeQueue.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/FakeQueue.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/FakeQueue.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/QueueComparatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/QueueComparatorTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/QueueComparatorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/QueueComparatorTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/HornetQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/HornetQBufferTestBase.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/HornetQBufferTestBase.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/JAASSecurityManagerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/JAASSecurityManagerTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/security/impl/JAASSecurityManagerTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/JAASSecurityManagerTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/FileLockTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/FileLockTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/FileLockTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/FileLockTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/QueueImplTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeConsumer.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeConsumer.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeConsumer.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeConsumer.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeFilter.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeFilter.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeFilter.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeFilter.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeJournalLoader.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeJournalLoader.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakePostOffice.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakePostOffice.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakePostOffice.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakePostOffice.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeQueueFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/core/server/impl/fakes/FakeQueueFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/HornetQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/HornetQDestinationTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/HornetQDestinationTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/HornetQDestinationTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQMapMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/HornetQMapMessageTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQMapMessageTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/HornetQMapMessageTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQStreamMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/HornetQStreamMessageTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/HornetQStreamMessageTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/HornetQStreamMessageTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/JMSExceptionHelperTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/client/SelectorTranslatorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/misc/ManifestTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/BootstrapContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/BootstrapContext.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/BootstrapContext.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/BootstrapContext.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ConnectionFactoryPropertiesTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ConnectionFactoryPropertiesTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ConnectionFactoryPropertiesTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ConnectionFactoryPropertiesTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/HornetQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/HornetQResourceAdapterConfigTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/HornetQResourceAdapterConfigTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/HornetQResourceAdapterConfigTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/MessageEndpointFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/MessageEndpointFactory.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/MessageEndpointFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/MessageEndpointFactory.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/ra/ResourceAdapterTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/FakePagingManager.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/FakePagingManager.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/FakePagingManager.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/FakePagingManager.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/HornetQBufferInputStreamTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/HornetQBufferInputStreamTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/HornetQBufferInputStreamTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMContext.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMContext.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMContext.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNameParser.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNameParser.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNameParser.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNameParser.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNamingContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNamingContext.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/InVMNamingContext.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNamingContext.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/LinkedListTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/LinkedListTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/LinkedListTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/LinkedListTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/MemorySizeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/MemorySizeTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/MemorySizeTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/MemorySizeTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/NonSerializableFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/NonSerializableFactory.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/NonSerializableFactory.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/NonSerializableFactory.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ReusableLatchTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ReusableLatchTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/ReusableLatchTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ReusableLatchTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/SoftValueMapTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/SoftValueMapTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/SoftValueMapTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/SoftValueMapTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UTF8Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UTF8Test.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDGeneratorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDGeneratorTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDGeneratorTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDGeneratorTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/UUIDTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/util/VersionLoaderTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/xa/XAResourceWrapperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/xa/XAResourceWrapperTest.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/unit/xa/XAResourceWrapperTest.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/xa/XAResourceWrapperTest.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/CreateMessage.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/util/CreateMessage.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/CreateMessage.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/util/CreateMessage.java diff --git a/tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/SpawnedVMSupport.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/util/SpawnedVMSupport.java similarity index 100% rename from tests/unit-tests/src/test/java/org/apache/activemq6/tests/util/SpawnedVMSupport.java rename to tests/unit-tests/src/test/java/org/apache/activemq/tests/util/SpawnedVMSupport.java