ACTIVEMQ6-4 Rename HornetQ* classes to ActiveMQ*
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/034adfbf Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/034adfbf Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/034adfbf Branch: refs/heads/master Commit: 034adfbf9b0dd217dba6bfdccfdb0488565fc189 Parents: e7a3e7d Author: jbertram <jbert...@redhat.com> Authored: Tue Nov 18 10:03:42 2014 -0600 Committer: jbertram <jbert...@redhat.com> Committed: Tue Nov 18 16:53:09 2014 -0600 ---------------------------------------------------------------------- .../org/apache/activemq/cli/commands/Run.java | 16 +- .../factory/SecurityManagerFactory.java | 6 +- .../bootstrap/ActiveMQBootstrapBundle.java | 31 + .../bootstrap/ActiveMQBootstrapLogger.java | 71 + .../bootstrap/HornetQBootstrapBundle.java | 31 - .../bootstrap/HornetQBootstrapLogger.java | 71 - .../activemq/api/core/ActiveMQBuffer.java | 2 +- .../activemq/api/core/ActiveMQBuffers.java | 24 +- .../ActiveMQConnectionTimedOutException.java | 2 +- .../api/core/ActiveMQDisconnectedException.java | 2 +- .../api/core/ActiveMQIllegalStateException.java | 2 +- .../core/ActiveMQInternalErrorException.java | 2 +- .../api/core/ActiveMQNativeIOError.java | 2 +- .../api/core/ActiveMQNotConnectedException.java | 2 +- .../ActiveMQUnsupportedPacketException.java | 2 +- .../apache/activemq/api/core/SimpleString.java | 2 +- .../activemq/core/server/ActiveMQComponent.java | 31 + .../activemq/core/server/HornetQComponent.java | 31 - .../activemq/utils/ActiveMQThreadFactory.java | 68 + .../activemq/utils/ActiveMQUtilBundle.java | 48 + .../activemq/utils/ActiveMQUtilLogger.java | 50 + .../apache/activemq/utils/ClassloadingUtil.java | 2 +- .../activemq/utils/HornetQThreadFactory.java | 68 - .../activemq/utils/HornetQUtilBundle.java | 48 - .../activemq/utils/HornetQUtilLogger.java | 50 - .../activemq/utils/PasswordMaskingUtil.java | 4 +- .../apache/activemq/utils/ReusableLatch.java | 2 +- .../apache/activemq/utils/TypedProperties.java | 2 +- .../org/apache/activemq/utils/UTF8Util.java | 10 +- .../apache/activemq/utils/UUIDGenerator.java | 8 +- .../api/core/DiscoveryGroupConfiguration.java | 6 +- .../activemq/api/core/FilterConstants.java | 30 +- .../apache/activemq/api/core/Interceptor.java | 6 +- .../JGroupsBroadcastGroupConfiguration.java | 8 +- .../org/apache/activemq/api/core/Message.java | 10 +- .../api/core/TransportConfiguration.java | 10 +- .../core/UDPBroadcastGroupConfiguration.java | 8 +- .../api/core/client/ActiveMQClient.java | 209 ++ .../api/core/client/ClientConsumer.java | 6 +- .../activemq/api/core/client/ClientMessage.java | 4 +- .../api/core/client/ClientSessionFactory.java | 2 +- .../activemq/api/core/client/HornetQClient.java | 209 -- .../activemq/api/core/client/ServerLocator.java | 54 +- .../core/client/loadbalance/package-info.java | 4 +- .../activemq/api/core/client/package-info.java | 2 +- .../api/core/management/AcceptorControl.java | 2 +- .../management/ActiveMQComponentControl.java | 36 + .../core/management/ActiveMQServerControl.java | 621 +++++ .../api/core/management/BridgeControl.java | 2 +- .../core/management/BroadcastGroupControl.java | 2 +- .../management/ClusterConnectionControl.java | 2 +- .../management/HornetQComponentControl.java | 36 - .../core/management/HornetQServerControl.java | 621 ----- .../api/core/management/ManagementHelper.java | 14 +- .../api/core/management/NotificationType.java | 6 +- .../api/core/management/ObjectNameBuilder.java | 8 +- .../api/core/management/package-info.java | 4 +- .../apache/activemq/api/core/package-info.java | 2 +- .../impl/ResetLimitWrappedActiveMQBuffer.java | 392 +++ .../impl/ResetLimitWrappedHornetQBuffer.java | 392 --- .../core/client/ActiveMQClientLogger.java | 415 +++ .../client/ActiveMQClientMessageBundle.java | 247 ++ .../core/client/HornetQClientLogger.java | 415 --- .../core/client/HornetQClientMessageBundle.java | 247 -- .../core/client/impl/ActiveMQXAResource.java | 20 + .../core/client/impl/ClientConsumerImpl.java | 50 +- .../client/impl/ClientLargeMessageImpl.java | 10 +- .../core/client/impl/ClientMessageImpl.java | 4 +- .../client/impl/ClientProducerCreditsImpl.java | 8 +- .../core/client/impl/ClientProducerImpl.java | 14 +- .../client/impl/ClientSessionFactoryImpl.java | 96 +- .../core/client/impl/ClientSessionImpl.java | 94 +- .../CompressedLargeMessageControllerImpl.java | 8 +- .../core/client/impl/DelegatingSession.java | 8 +- .../core/client/impl/HornetQXAResource.java | 20 - .../client/impl/LargeMessageControllerImpl.java | 36 +- .../core/client/impl/ServerLocatorImpl.java | 150 +- .../activemq/core/client/impl/Topology.java | 66 +- .../activemq/core/cluster/DiscoveryGroup.java | 32 +- .../core/exception/ActiveMQXAException.java | 39 + .../core/exception/HornetQXAException.java | 39 - .../activemq/core/message/BodyEncoder.java | 10 +- .../activemq/core/message/impl/MessageImpl.java | 12 +- .../protocol/core/CoreRemotingConnection.java | 6 +- .../impl/ActiveMQClientProtocolManager.java | 613 +++++ .../ActiveMQClientProtocolManagerFactory.java | 42 + .../core/impl/ActiveMQConsumerContext.java | 54 + .../core/impl/ActiveMQSessionContext.java | 940 +++++++ .../core/protocol/core/impl/ChannelImpl.java | 40 +- .../core/impl/HornetQClientProtocolManager.java | 613 ----- .../HornetQClientProtocolManagerFactory.java | 42 - .../core/impl/HornetQConsumerContext.java | 54 - .../core/impl/HornetQSessionContext.java | 940 ------- .../core/protocol/core/impl/PacketDecoder.java | 8 +- .../core/impl/RemotingConnectionImpl.java | 20 +- .../wireformat/ActiveMQExceptionMessage.java | 118 + .../wireformat/HornetQExceptionMessage.java | 118 - .../impl/netty/ActiveMQAMQPFrameDecoder.java | 41 + .../impl/netty/ActiveMQChannelHandler.java | 122 + .../impl/netty/ActiveMQFrameDecoder2.java | 39 + .../impl/netty/HornetQAMQPFrameDecoder.java | 41 - .../impl/netty/HornetQChannelHandler.java | 122 - .../impl/netty/HornetQFrameDecoder2.java | 39 - .../remoting/impl/netty/NettyConnection.java | 14 +- .../remoting/impl/netty/NettyConnector.java | 118 +- .../impl/netty/SharedNioEventLoopGroup.java | 4 +- .../remoting/impl/netty/TransportConstants.java | 2 +- .../core/remoting/impl/ssl/SSLSupport.java | 2 +- .../activemq/core/remoting/package-info.java | 2 +- .../core/security/ActiveMQPrincipal.java | 41 + .../core/security/HornetQPrincipal.java | 41 - .../protocol/AbstractRemotingConnection.java | 18 +- .../spi/core/protocol/RemotingConnection.java | 2 +- .../activemq/spi/core/remoting/Connection.java | 6 +- .../remoting/ConnectionLifeCycleListener.java | 6 +- .../spi/core/remoting/package-info.java | 2 +- .../utils/ActiveMQBufferInputStream.java | 181 ++ .../org/apache/activemq/utils/BufferHelper.java | 2 +- .../activemq/utils/ConfigurationHelper.java | 16 +- .../utils/HornetQBufferInputStream.java | 181 -- .../org/apache/activemq/utils/MemorySize.java | 4 +- .../activemq/utils/OrderedExecutorFactory.java | 6 +- .../apache/activemq/utils/SoftValueHashMap.java | 6 +- .../apache/activemq/utils/VersionLoader.java | 26 +- .../java/org/apache/activemq/utils/XMLUtil.java | 32 +- .../org/apache/activemq/utils/package-info.java | 2 +- .../main/resources/activemq-version.properties | 9 + .../main/resources/hornetq-version.properties | 9 - .../apache/activemq/tests/CoreUnitTestCase.java | 4 +- .../java/org/apache/activemq/dto/XmlUtil.java | 2 +- .../org/apache/activemq/dto/package-info.java | 4 +- .../activemq/api/jms/ActiveMQJMSClient.java | 234 ++ .../activemq/api/jms/ActiveMQJMSConstants.java | 38 + .../activemq/api/jms/HornetQJMSClient.java | 234 -- .../activemq/api/jms/HornetQJMSConstants.java | 38 - .../management/ConnectionFactoryControl.java | 2 +- .../api/jms/management/DestinationControl.java | 2 +- .../api/jms/management/JMSManagementHelper.java | 10 +- .../api/jms/management/JMSServerControl.java | 6 +- .../api/jms/management/SubscriptionInfo.java | 2 +- .../api/jms/management/package-info.java | 4 +- .../apache/activemq/api/jms/package-info.java | 4 +- .../jms/client/ActiveMQBytesMessage.java | 436 ++++ .../activemq/jms/client/ActiveMQConnection.java | 862 +++++++ .../jms/client/ActiveMQConnectionFactory.java | 821 ++++++ .../client/ActiveMQConnectionForContext.java | 34 + .../ActiveMQConnectionForContextImpl.java | 91 + .../jms/client/ActiveMQConnectionMetaData.java | 97 + .../jms/client/ActiveMQDestination.java | 376 +++ .../jms/client/ActiveMQJMSClientBundle.java | 97 + .../jms/client/ActiveMQJMSClientLogger.java | 79 + .../client/ActiveMQJMSConnectionFactory.java | 67 + .../jms/client/ActiveMQJMSConsumer.java | 198 ++ .../activemq/jms/client/ActiveMQJMSContext.java | 769 ++++++ .../jms/client/ActiveMQJMSProducer.java | 800 ++++++ .../activemq/jms/client/ActiveMQMapMessage.java | 450 ++++ .../activemq/jms/client/ActiveMQMessage.java | 1089 ++++++++ .../jms/client/ActiveMQMessageConsumer.java | 253 ++ .../jms/client/ActiveMQMessageProducer.java | 601 +++++ .../jms/client/ActiveMQObjectMessage.java | 202 ++ .../activemq/jms/client/ActiveMQQueue.java | 90 + .../jms/client/ActiveMQQueueBrowser.java | 169 ++ .../client/ActiveMQQueueConnectionFactory.java | 69 + .../activemq/jms/client/ActiveMQSession.java | 1276 +++++++++ .../jms/client/ActiveMQStreamMessage.java | 466 ++++ .../jms/client/ActiveMQTemporaryQueue.java | 67 + .../jms/client/ActiveMQTemporaryTopic.java | 53 + .../jms/client/ActiveMQTextMessage.java | 146 ++ .../activemq/jms/client/ActiveMQTopic.java | 85 + .../client/ActiveMQTopicConnectionFactory.java | 70 + .../jms/client/ActiveMQXAConnection.java | 70 + .../jms/client/ActiveMQXAConnectionFactory.java | 76 + .../jms/client/ActiveMQXAJMSContext.java | 23 + .../ActiveMQXAQueueConnectionFactory.java | 71 + .../activemq/jms/client/ActiveMQXASession.java | 47 + .../ActiveMQXATopicConnectionFactory.java | 69 + .../jms/client/HornetQBytesMessage.java | 436 ---- .../activemq/jms/client/HornetQConnection.java | 862 ------- .../jms/client/HornetQConnectionFactory.java | 821 ------ .../jms/client/HornetQConnectionForContext.java | 34 - .../client/HornetQConnectionForContextImpl.java | 91 - .../jms/client/HornetQConnectionMetaData.java | 97 - .../activemq/jms/client/HornetQDestination.java | 376 --- .../jms/client/HornetQJMSClientBundle.java | 97 - .../jms/client/HornetQJMSClientLogger.java | 79 - .../jms/client/HornetQJMSConnectionFactory.java | 67 - .../activemq/jms/client/HornetQJMSConsumer.java | 198 -- .../activemq/jms/client/HornetQJMSContext.java | 769 ------ .../activemq/jms/client/HornetQJMSProducer.java | 800 ------ .../activemq/jms/client/HornetQMapMessage.java | 450 ---- .../activemq/jms/client/HornetQMessage.java | 1089 -------- .../jms/client/HornetQMessageConsumer.java | 253 -- .../jms/client/HornetQMessageProducer.java | 601 ----- .../jms/client/HornetQObjectMessage.java | 202 -- .../activemq/jms/client/HornetQQueue.java | 90 - .../jms/client/HornetQQueueBrowser.java | 169 -- .../client/HornetQQueueConnectionFactory.java | 69 - .../activemq/jms/client/HornetQSession.java | 1276 --------- .../jms/client/HornetQStreamMessage.java | 466 ---- .../jms/client/HornetQTemporaryQueue.java | 67 - .../jms/client/HornetQTemporaryTopic.java | 53 - .../activemq/jms/client/HornetQTextMessage.java | 146 -- .../activemq/jms/client/HornetQTopic.java | 85 - .../client/HornetQTopicConnectionFactory.java | 70 - .../jms/client/HornetQXAConnection.java | 70 - .../jms/client/HornetQXAConnectionFactory.java | 76 - .../jms/client/HornetQXAJMSContext.java | 23 - .../client/HornetQXAQueueConnectionFactory.java | 71 - .../activemq/jms/client/HornetQXASession.java | 47 - .../client/HornetQXATopicConnectionFactory.java | 69 - .../activemq/jms/client/JMSExceptionHelper.java | 2 +- .../jms/client/JMSMessageListenerWrapper.java | 24 +- .../activemq/jms/client/SelectorTranslator.java | 8 +- .../activemq/jms/client/ThreadAwareContext.java | 8 +- .../activemq/jms/client/package-info.java | 2 +- .../ConnectionFactoryObjectFactory.java | 4 +- .../referenceable/DestinationObjectFactory.java | 4 +- .../jms/bridge/ActiveMQJMSBridgeLogger.java | 101 + .../jms/bridge/HornetQJMSBridgeLogger.java | 101 - .../apache/activemq/jms/bridge/JMSBridge.java | 4 +- .../activemq/jms/bridge/JMSBridgeControl.java | 4 +- .../jms/bridge/QualityOfServiceMode.java | 2 +- .../activemq/jms/bridge/impl/JMSBridgeImpl.java | 236 +- .../impl/JMSConnectionFactoryControlImpl.java | 6 +- .../management/impl/JMSQueueControlImpl.java | 18 +- .../management/impl/JMSServerControlImpl.java | 62 +- .../management/impl/JMSTopicControlImpl.java | 34 +- .../jms/persistence/JMSStorageManager.java | 4 +- .../journal/JMSJournalStorageManagerImpl.java | 2 +- .../jms/server/ActiveMQJMSServerBundle.java | 62 + .../jms/server/ActiveMQJMSServerLogger.java | 115 + .../jms/server/HornetQJMSServerBundle.java | 62 - .../jms/server/HornetQJMSServerLogger.java | 115 - .../activemq/jms/server/JMSServerManager.java | 12 +- .../ConnectionFactoryConfigurationImpl.java | 62 +- .../jms/server/embedded/EmbeddedJMS.java | 16 +- .../server/impl/JMSServerConfigParserImpl.java | 72 +- .../jms/server/impl/JMSServerDeployer.java | 6 +- .../jms/server/impl/JMSServerManagerImpl.java | 156 +- .../jms/server/impl/StandaloneNamingServer.java | 16 +- .../server/management/JMSManagementService.java | 12 +- .../impl/JMSManagementServiceImpl.java | 16 +- .../recovery/ActiveMQRecoveryRegistry.java | 250 ++ .../server/recovery/ActiveMQRegistryBase.java | 71 + .../recovery/ActiveMQXAResourceRecovery.java | 231 ++ .../recovery/ActiveMQXAResourceWrapper.java | 531 ++++ .../recovery/HornetQRecoveryRegistry.java | 250 -- .../server/recovery/HornetQRegistryBase.java | 71 - .../recovery/HornetQXAResourceRecovery.java | 231 -- .../recovery/HornetQXAResourceWrapper.java | 531 ---- .../jms/server/recovery/RecoveryDiscovery.java | 24 +- .../jms/server/recovery/XARecoveryConfig.java | 10 +- .../jms/server/recovery/package-info.java | 4 +- .../jms/transaction/JMSTransactionDetail.java | 26 +- .../core/asyncio/impl/ActiveMQFileLock.java | 47 + .../core/asyncio/impl/AsynchronousFileImpl.java | 28 +- .../core/asyncio/impl/HornetQFileLock.java | 47 - .../apache/activemq/core/journal/Journal.java | 4 +- .../journal/impl/AIOSequentialFileFactory.java | 12 +- .../journal/impl/AbstractSequentialFile.java | 16 +- .../impl/AbstractSequentialFileFactory.java | 8 +- .../core/journal/impl/CompactJournal.java | 2 +- .../core/journal/impl/DummyCallback.java | 4 +- .../core/journal/impl/ExportJournal.java | 4 +- .../core/journal/impl/ImportJournal.java | 4 +- .../core/journal/impl/JournalCompactor.java | 12 +- .../journal/impl/JournalFilesRepository.java | 56 +- .../activemq/core/journal/impl/JournalImpl.java | 62 +- .../core/journal/impl/NIOSequentialFile.java | 12 +- .../activemq/core/journal/impl/Reclaimer.java | 6 +- .../core/journal/impl/SimpleWaitIOCallback.java | 4 +- .../core/journal/impl/SyncSpeedTest.java | 6 +- .../activemq/core/journal/impl/TimedBuffer.java | 12 +- .../activemq/journal/ActiveMQJournalBundle.java | 48 + .../activemq/journal/ActiveMQJournalLogger.java | 271 ++ .../activemq/journal/HornetQJournalBundle.java | 48 - .../activemq/journal/HornetQJournalLogger.java | 271 -- .../ActiveMQProtonRemotingConnection.java | 146 ++ .../proton/HornetQProtonRemotingConnection.java | 146 -- .../protocol/proton/ProtonProtocolManager.java | 22 +- .../proton/ProtonProtocolManagerFactory.java | 4 +- .../proton/converter/ActiveMQJMSVendor.java | 155 ++ .../proton/converter/HornetQJMSVendor.java | 155 -- .../converter/ProtonMessageConverter.java | 10 +- .../converter/jms/ServerJMSMapMessage.java | 2 +- .../proton/converter/jms/ServerJMSMessage.java | 14 +- .../converter/jms/ServerJMSStreamMessage.java | 2 +- .../converter/jms/ServerJMSTextMessage.java | 2 +- .../proton/converter/jms/package-info.java | 2 +- .../plug/ActiveMQProtonConnectionCallback.java | 125 + .../plug/HornetQProtonConnectionCallback.java | 125 - .../plug/ProtonSessionIntegrationCallback.java | 10 +- .../protocol/proton/sasl/ActiveMQPlainSASL.java | 50 + .../protocol/proton/sasl/HornetQPlainSASL.java | 50 - ...emq.spi.core.protocol.ProtocolManagerFactory | 1 + ...etq.spi.core.protocol.ProtocolManagerFactory | 1 - .../protocol/openwire/OpenWireConnection.java | 22 +- .../openwire/OpenWireProtocolManager.java | 22 +- .../OpenWireProtocolManagerFactory.java | 4 +- .../core/protocol/openwire/OpenWireUtil.java | 2 +- .../core/protocol/openwire/amq/AMQConsumer.java | 11 +- .../core/protocol/openwire/amq/AMQProducer.java | 2 +- .../openwire/amq/AMQServerConsumer.java | 6 +- .../protocol/openwire/amq/AMQServerSession.java | 24 +- .../openwire/amq/AMQServerSessionFactory.java | 6 +- .../core/protocol/openwire/amq/AMQSession.java | 14 +- ...emq.spi.core.protocol.ProtocolManagerFactory | 1 + ...etq.spi.core.protocol.ProtocolManagerFactory | 1 - .../plug/AMQPClientConnectionContext.java | 4 +- .../proton/plug/AMQPClientSessionContext.java | 6 +- .../org/proton/plug/AMQPSessionContext.java | 4 +- .../plug/context/AbstractConnectionContext.java | 6 +- .../context/AbstractProtonContextSender.java | 12 +- .../context/AbstractProtonReceiverContext.java | 6 +- .../context/AbstractProtonSessionContext.java | 10 +- .../plug/context/ProtonDeliveryHandler.java | 6 +- .../plug/context/ProtonInitializable.java | 12 +- .../plug/context/ProtonTransactionHandler.java | 12 +- .../client/ProtonClientConnectionContext.java | 6 +- .../context/client/ProtonClientContext.java | 4 +- .../client/ProtonClientReceiverContext.java | 4 +- .../client/ProtonClientSessionContext.java | 6 +- .../server/ProtonServerConnectionContext.java | 4 +- .../server/ProtonServerReceiverContext.java | 16 +- .../server/ProtonServerSenderContext.java | 38 +- .../server/ProtonServerSessionContext.java | 8 +- .../plug/exceptions/ActiveMQAMQPException.java | 45 + .../ActiveMQAMQPIllegalStateException.java | 28 + .../ActiveMQAMQPInternalErrorException.java | 33 + .../ActiveMQAMQPInvalidFieldException.java | 28 + .../ActiveMQAMQPNotImplementedException.java | 28 + .../ActiveMQAMQPTimeoutException.java | 29 + .../plug/exceptions/HornetQAMQPException.java | 45 - .../HornetQAMQPIllegalStateException.java | 28 - .../HornetQAMQPInternalErrorException.java | 33 - .../HornetQAMQPInvalidFieldException.java | 28 - .../HornetQAMQPNotImplementedException.java | 28 - .../exceptions/HornetQAMQPTimeoutException.java | 29 - .../ActiveMQAMQPProtocolMessageBundle.java | 83 + .../HornetQAMQPProtocolMessageBundle.java | 83 - .../org/proton/plug/util/ReusableLatch.java | 2 +- .../plug/test/minimalserver/MinimalServer.java | 4 +- .../SimpleServerThreadFactory.java | 2 +- .../protocol/stomp/ActiveMQStompException.java | 134 + .../stomp/ActiveMQStompProtocolLogger.java | 54 + .../ActiveMQStompProtocolMessageBundle.java | 152 ++ .../protocol/stomp/HornetQStompException.java | 134 - .../stomp/HornetQStompProtocolLogger.java | 54 - .../HornetQStompProtocolMessageBundle.java | 152 -- .../core/protocol/stomp/StompConnection.java | 72 +- .../core/protocol/stomp/StompDecoder.java | 20 +- .../core/protocol/stomp/StompFrame.java | 4 +- .../protocol/stomp/StompProtocolManager.java | 58 +- .../stomp/StompProtocolManagerFactory.java | 4 +- .../core/protocol/stomp/StompSession.java | 2 +- .../stomp/VersionedStompFrameHandler.java | 28 +- .../stomp/v10/StompFrameHandlerV10.java | 14 +- .../stomp/v11/StompFrameHandlerV11.java | 30 +- .../core/protocol/stomp/v11/StompFrameV11.java | 2 +- .../stomp/v12/StompFrameHandlerV12.java | 18 +- .../core/protocol/stomp/v12/StompFrameV12.java | 2 +- ...emq.spi.core.protocol.ProtocolManagerFactory | 1 + ...etq.spi.core.protocol.ProtocolManagerFactory | 1 - .../apache/activemq/ra/ActiveMQRABundle.java | 70 + .../activemq/ra/ActiveMQRABytesMessage.java | 455 ++++ .../ra/ActiveMQRAConnectionFactory.java | 65 + .../ra/ActiveMQRAConnectionFactoryImpl.java | 570 +++++ .../ra/ActiveMQRAConnectionManager.java | 90 + .../ra/ActiveMQRAConnectionMetaData.java | 153 ++ .../ra/ActiveMQRAConnectionRequestInfo.java | 306 +++ .../activemq/ra/ActiveMQRACredential.java | 241 ++ .../activemq/ra/ActiveMQRAJMSContext.java | 57 + .../activemq/ra/ActiveMQRALocalTransaction.java | 121 + .../apache/activemq/ra/ActiveMQRALogger.java | 122 + .../activemq/ra/ActiveMQRAMCFProperties.java | 204 ++ .../ra/ActiveMQRAManagedConnection.java | 921 +++++++ .../ra/ActiveMQRAManagedConnectionFactory.java | 805 ++++++ .../activemq/ra/ActiveMQRAMapMessage.java | 452 ++++ .../apache/activemq/ra/ActiveMQRAMessage.java | 897 +++++++ .../activemq/ra/ActiveMQRAMessageConsumer.java | 334 +++ .../activemq/ra/ActiveMQRAMessageListener.java | 65 + .../activemq/ra/ActiveMQRAMessageProducer.java | 473 ++++ .../apache/activemq/ra/ActiveMQRAMetaData.java | 107 + .../activemq/ra/ActiveMQRAObjectMessage.java | 76 + .../activemq/ra/ActiveMQRAProperties.java | 358 +++ .../activemq/ra/ActiveMQRAQueueReceiver.java | 61 + .../activemq/ra/ActiveMQRAQueueSender.java | 138 + .../apache/activemq/ra/ActiveMQRAService.java | 82 + .../apache/activemq/ra/ActiveMQRASession.java | 1903 ++++++++++++++ .../activemq/ra/ActiveMQRASessionFactory.java | 51 + .../ra/ActiveMQRASessionFactoryImpl.java | 1046 ++++++++ .../activemq/ra/ActiveMQRAStreamMessage.java | 408 +++ .../activemq/ra/ActiveMQRATextMessage.java | 74 + .../activemq/ra/ActiveMQRATopicPublisher.java | 211 ++ .../activemq/ra/ActiveMQRATopicSubscriber.java | 77 + .../activemq/ra/ActiveMQRAXAJMSContext.java | 26 + .../activemq/ra/ActiveMQRAXAResource.java | 257 ++ .../org/apache/activemq/ra/ActiveMQRaUtils.java | 354 +++ .../activemq/ra/ActiveMQResourceAdapter.java | 2411 ++++++++++++++++++ .../activemq/ra/ActiveMQXAResourceWrapper.java | 143 ++ .../ra/ConnectionFactoryProperties.java | 122 +- .../org/apache/activemq/ra/HornetQRABundle.java | 70 - .../activemq/ra/HornetQRABytesMessage.java | 455 ---- .../activemq/ra/HornetQRAConnectionFactory.java | 65 - .../ra/HornetQRAConnectionFactoryImpl.java | 570 ----- .../activemq/ra/HornetQRAConnectionManager.java | 90 - .../ra/HornetQRAConnectionMetaData.java | 153 -- .../ra/HornetQRAConnectionRequestInfo.java | 306 --- .../apache/activemq/ra/HornetQRACredential.java | 241 -- .../apache/activemq/ra/HornetQRAJMSContext.java | 57 - .../activemq/ra/HornetQRALocalTransaction.java | 121 - .../org/apache/activemq/ra/HornetQRALogger.java | 122 - .../activemq/ra/HornetQRAMCFProperties.java | 204 -- .../activemq/ra/HornetQRAManagedConnection.java | 921 ------- .../ra/HornetQRAManagedConnectionFactory.java | 805 ------ .../apache/activemq/ra/HornetQRAMapMessage.java | 452 ---- .../apache/activemq/ra/HornetQRAMessage.java | 897 ------- .../activemq/ra/HornetQRAMessageConsumer.java | 334 --- .../activemq/ra/HornetQRAMessageListener.java | 65 - .../activemq/ra/HornetQRAMessageProducer.java | 473 ---- .../apache/activemq/ra/HornetQRAMetaData.java | 107 - .../activemq/ra/HornetQRAObjectMessage.java | 76 - .../apache/activemq/ra/HornetQRAProperties.java | 358 --- .../activemq/ra/HornetQRAQueueReceiver.java | 61 - .../activemq/ra/HornetQRAQueueSender.java | 138 - .../apache/activemq/ra/HornetQRAService.java | 82 - .../apache/activemq/ra/HornetQRASession.java | 1903 -------------- .../activemq/ra/HornetQRASessionFactory.java | 51 - .../ra/HornetQRASessionFactoryImpl.java | 1046 -------- .../activemq/ra/HornetQRAStreamMessage.java | 408 --- .../activemq/ra/HornetQRATextMessage.java | 74 - .../activemq/ra/HornetQRATopicPublisher.java | 211 -- .../activemq/ra/HornetQRATopicSubscriber.java | 77 - .../activemq/ra/HornetQRAXAJMSContext.java | 26 - .../apache/activemq/ra/HornetQRAXAResource.java | 257 -- .../org/apache/activemq/ra/HornetQRaUtils.java | 354 --- .../activemq/ra/HornetQResourceAdapter.java | 2411 ------------------ .../activemq/ra/HornetQXAResourceWrapper.java | 143 -- .../activemq/ra/inflow/ActiveMQActivation.java | 831 ++++++ .../ra/inflow/ActiveMQActivationSpec.java | 945 +++++++ .../ra/inflow/ActiveMQMessageHandler.java | 430 ++++ .../activemq/ra/inflow/HornetQActivation.java | 831 ------ .../ra/inflow/HornetQActivationSpec.java | 945 ------- .../ra/inflow/HornetQMessageHandler.java | 430 ---- .../activemq/ra/recovery/RecoveryManager.java | 20 +- .../java/org/apache/activemq/rest/ActiveMQ.java | 191 ++ .../activemq/rest/ActiveMQRestBundle.java | 31 + .../activemq/rest/ActiveMQRestLogger.java | 85 + .../apache/activemq/rest/HornetQRestBundle.java | 31 - .../apache/activemq/rest/HornetQRestLogger.java | 85 - .../java/org/apache/activemq/rest/Hornetq.java | 191 -- .../activemq/rest/MessageServiceManager.java | 4 +- .../integration/ActiveMQBootstrapListener.java | 55 + .../rest/integration/EmbeddedRestActiveMQ.java | 92 + .../integration/EmbeddedRestActiveMQJMS.java | 36 + .../rest/integration/EmbeddedRestHornetQ.java | 92 - .../integration/EmbeddedRestHornetQJMS.java | 36 - .../integration/HornetqBootstrapListener.java | 55 - .../rest/queue/AcknowledgedQueueConsumer.java | 6 +- .../activemq/rest/queue/ConsumedMessage.java | 4 +- .../activemq/rest/queue/ConsumersResource.java | 12 +- .../rest/queue/DestinationServiceManager.java | 4 +- .../apache/activemq/rest/queue/PostMessage.java | 22 +- .../activemq/rest/queue/PostMessageDupsOk.java | 8 +- .../activemq/rest/queue/PostMessageNoDups.java | 4 +- .../activemq/rest/queue/QueueConsumer.java | 16 +- .../rest/queue/QueueDestinationsResource.java | 16 +- .../activemq/rest/queue/QueueResource.java | 8 +- .../rest/queue/push/ActiveMQPushStrategy.java | 87 + .../activemq/rest/queue/push/FilePushStore.java | 8 +- .../rest/queue/push/HornetQPushStrategy.java | 87 - .../activemq/rest/queue/push/PushConsumer.java | 10 +- .../queue/push/PushConsumerMessageHandler.java | 12 +- .../rest/queue/push/PushConsumerResource.java | 8 +- .../activemq/rest/queue/push/PushStrategy.java | 2 +- .../activemq/rest/queue/push/UriStrategy.java | 16 +- .../activemq/rest/topic/PushSubscription.java | 4 +- .../rest/topic/PushSubscriptionsResource.java | 8 +- .../rest/topic/SubscriptionsResource.java | 18 +- .../rest/topic/TopicDestinationsResource.java | 16 +- .../activemq/rest/topic/TopicResource.java | 8 +- .../activemq/rest/util/HttpMessageHelper.java | 12 +- .../apache/activemq/rest/util/TimeoutTask.java | 6 +- .../rest/test/CreateDestinationTest.java | 4 +- .../org/apache/activemq/rest/test/Embedded.java | 22 +- .../apache/activemq/rest/test/EmbeddedTest.java | 8 +- .../activemq/rest/test/FindDestinationTest.java | 4 +- .../org/apache/activemq/rest/test/JMSTest.java | 12 +- .../activemq/rest/test/MessageTestBase.java | 4 +- .../test/PersistentPushQueueConsumerTest.java | 14 +- .../test/PersistentPushTopicConsumerTest.java | 8 +- .../rest/test/PushQueueConsumerTest.java | 4 +- .../rest/test/PushTopicConsumerTest.java | 4 +- .../apache/activemq/rest/test/RawAckTest.java | 16 +- .../apache/activemq/rest/test/SelectorTest.java | 10 +- .../activemq/rest/test/TransformTest.java | 8 +- .../core/config/BridgeConfiguration.java | 18 +- .../config/ClusterConnectionConfiguration.java | 4 +- .../activemq/core/config/Configuration.java | 14 +- .../core/config/ConfigurationUtils.java | 4 +- .../core/config/impl/ConfigurationImpl.java | 2 +- .../core/config/impl/FileConfiguration.java | 6 +- .../activemq/core/config/impl/Validators.java | 22 +- .../activemq/core/deployers/Deployer.java | 4 +- .../core/deployers/DeploymentManager.java | 4 +- .../impl/BasicUserCredentialsDeployer.java | 18 +- .../deployers/impl/FileConfigurationParser.java | 84 +- .../deployers/impl/FileDeploymentManager.java | 24 +- .../core/deployers/impl/QueueDeployer.java | 6 +- .../core/deployers/impl/SecurityDeployer.java | 2 +- .../core/deployers/impl/XmlDeployer.java | 6 +- .../activemq/core/filter/impl/FilterImpl.java | 28 +- .../impl/ActiveMQServerControlImpl.java | 2187 ++++++++++++++++ .../impl/HornetQServerControlImpl.java | 2187 ---------------- .../core/management/impl/QueueControlImpl.java | 12 +- .../impl/MessageCounterHelper.java | 4 +- .../activemq/core/paging/PagingManager.java | 4 +- .../activemq/core/paging/PagingStore.java | 6 +- .../core/paging/cursor/PagedReferenceImpl.java | 8 +- .../cursor/impl/PageCursorProviderImpl.java | 52 +- .../impl/PageSubscriptionCounterImpl.java | 8 +- .../cursor/impl/PageSubscriptionImpl.java | 30 +- .../apache/activemq/core/paging/impl/Page.java | 24 +- .../paging/impl/PageTransactionInfoImpl.java | 4 +- .../core/paging/impl/PagingManagerImpl.java | 10 +- .../core/paging/impl/PagingStoreFactoryNIO.java | 4 +- .../core/paging/impl/PagingStoreImpl.java | 24 +- .../core/persistence/StorageManager.java | 6 +- .../impl/journal/BatchingIDGenerator.java | 4 +- .../impl/journal/DescribeJournal.java | 6 +- .../impl/journal/JournalStorageManager.java | 98 +- .../impl/journal/LargeServerMessageImpl.java | 16 +- .../impl/journal/LargeServerMessageInSync.java | 4 +- .../impl/journal/OperationContextImpl.java | 4 +- .../activemq/core/postoffice/BindingType.java | 4 +- .../activemq/core/postoffice/PostOffice.java | 4 +- .../activemq/core/postoffice/QueueInfo.java | 8 +- .../core/postoffice/impl/BindingsImpl.java | 20 +- .../postoffice/impl/DuplicateIDCacheImpl.java | 4 +- .../core/postoffice/impl/PostOfficeImpl.java | 64 +- .../postoffice/impl/SimpleAddressManager.java | 10 +- .../activemq/core/protocol/ProtocolHandler.java | 6 +- .../core/ServerSessionPacketHandler.java | 46 +- .../core/impl/ActiveMQPacketHandler.java | 298 +++ .../protocol/core/impl/CoreProtocolManager.java | 39 +- .../core/impl/CoreProtocolManagerFactory.java | 8 +- .../protocol/core/impl/CoreSessionCallback.java | 6 +- .../core/impl/HornetQPacketHandler.java | 298 --- .../wireformat/BackupRegistrationMessage.java | 2 +- .../protocol/stomp/WebSocketServerHandler.java | 2 +- .../core/remoting/impl/invm/InVMAcceptor.java | 22 +- .../core/remoting/impl/invm/InVMConnection.java | 24 +- .../core/remoting/impl/invm/InVMConnector.java | 12 +- .../core/remoting/impl/invm/InVMRegistry.java | 6 +- .../core/remoting/impl/netty/NettyAcceptor.java | 50 +- .../core/remoting/server/RemotingService.java | 4 +- .../server/impl/RemotingServiceImpl.java | 88 +- .../core/replication/ReplicatedJournal.java | 4 +- .../core/replication/ReplicationEndpoint.java | 62 +- .../core/replication/ReplicationManager.java | 22 +- .../core/security/impl/SecurityStoreImpl.java | 24 +- .../core/server/ActiveMQMessageBundle.java | 371 +++ .../activemq/core/server/ActiveMQServer.java | 249 ++ .../core/server/ActiveMQServerLogger.java | 1366 ++++++++++ .../activemq/core/server/ActiveMQServers.java | 123 + .../activemq/core/server/ConnectorService.java | 2 +- .../core/server/HornetQMessageBundle.java | 371 --- .../activemq/core/server/HornetQServer.java | 249 -- .../core/server/HornetQServerLogger.java | 1366 ---------- .../activemq/core/server/HornetQServers.java | 123 - .../activemq/core/server/MemoryManager.java | 12 +- .../activemq/core/server/NodeManager.java | 6 +- .../org/apache/activemq/core/server/Queue.java | 2 +- .../core/server/ServerSessionFactory.java | 4 +- ...ctiveMQServerSideProtocolManagerFactory.java | 55 + .../core/server/cluster/BackupManager.java | 30 +- .../activemq/core/server/cluster/Bridge.java | 4 +- .../core/server/cluster/BroadcastGroup.java | 4 +- .../cluster/ClusterConfigurationUtil.java | 12 +- .../core/server/cluster/ClusterConnection.java | 8 +- .../core/server/cluster/ClusterControl.java | 16 +- .../core/server/cluster/ClusterController.java | 34 +- .../core/server/cluster/ClusterManager.java | 76 +- ...HornetQServerSideProtocolManagerFactory.java | 55 - .../server/cluster/ha/ColocatedHAManager.java | 30 +- .../core/server/cluster/ha/ColocatedPolicy.java | 4 +- .../core/server/cluster/ha/HAManager.java | 8 +- .../core/server/cluster/ha/HAPolicy.java | 4 +- .../core/server/cluster/ha/LiveOnlyPolicy.java | 4 +- .../core/server/cluster/ha/ReplicaPolicy.java | 6 +- .../server/cluster/ha/ReplicatedPolicy.java | 4 +- .../core/server/cluster/ha/ScaleDownPolicy.java | 30 +- .../cluster/ha/SharedStoreMasterPolicy.java | 4 +- .../cluster/ha/SharedStoreSlavePolicy.java | 4 +- .../server/cluster/ha/StandaloneHAManager.java | 6 +- .../core/server/cluster/impl/BridgeImpl.java | 116 +- .../server/cluster/impl/BroadcastGroupImpl.java | 10 +- .../cluster/impl/ClusterConnectionBridge.java | 38 +- .../cluster/impl/ClusterConnectionImpl.java | 116 +- .../core/server/cluster/impl/Redistributor.java | 10 +- .../cluster/impl/RemoteQueueBindingImpl.java | 6 +- .../server/cluster/qourum/QuorumManager.java | 4 +- .../qourum/SharedNothingBackupQuorum.java | 4 +- .../core/server/embedded/EmbeddedActiveMQ.java | 118 + .../core/server/embedded/EmbeddedHornetQ.java | 118 - .../core/server/group/GroupingHandler.java | 4 +- .../group/impl/GroupHandlingAbstract.java | 4 +- .../server/group/impl/LocalGroupingHandler.java | 28 +- .../group/impl/RemoteGroupingHandler.java | 8 +- .../server/impl/AIOFileLockNodeManager.java | 2 +- .../activemq/core/server/impl/Activation.java | 4 +- .../core/server/impl/ActiveMQServerImpl.java | 2345 +++++++++++++++++ .../impl/AnyLiveNodeLocatorForReplication.java | 4 +- .../impl/AnyLiveNodeLocatorForScaleDown.java | 10 +- .../impl/BackupRecoveryJournalLoader.java | 14 +- .../core/server/impl/ColocatedActivation.java | 6 +- .../core/server/impl/ConnectorsService.java | 14 +- .../activemq/core/server/impl/DivertImpl.java | 6 +- .../core/server/impl/FileLockNodeManager.java | 18 +- .../core/server/impl/HornetQServerImpl.java | 2345 ----------------- .../core/server/impl/LastValueQueue.java | 6 +- .../core/server/impl/LiveOnlyActivation.java | 56 +- .../impl/NamedLiveNodeLocatorForScaleDown.java | 10 +- .../server/impl/PostOfficeJournalLoader.java | 28 +- .../activemq/core/server/impl/QueueImpl.java | 158 +- .../core/server/impl/RefsOperation.java | 10 +- .../core/server/impl/ReplicationError.java | 14 +- .../core/server/impl/ScaleDownHandler.java | 18 +- .../impl/ScheduledDeliveryHandlerImpl.java | 22 +- .../core/server/impl/ServerConsumerImpl.java | 84 +- .../activemq/core/server/impl/ServerInfo.java | 6 +- .../core/server/impl/ServerSessionImpl.java | 166 +- .../core/server/impl/ServiceRegistry.java | 2 +- .../impl/SharedNothingBackupActivation.java | 126 +- .../impl/SharedNothingLiveActivation.java | 88 +- .../impl/SharedStoreBackupActivation.java | 80 +- .../server/impl/SharedStoreLiveActivation.java | 40 +- .../server/impl/TransientQueueManagerImpl.java | 16 +- .../server/management/ManagementService.java | 12 +- .../management/impl/ManagementServiceImpl.java | 64 +- .../impl/HierarchicalObjectRepository.java | 6 +- .../activemq/core/settings/impl/Match.java | 6 +- .../core/transaction/ResourceManager.java | 4 +- .../activemq/core/transaction/Transaction.java | 2 +- .../transaction/impl/ResourceManagerImpl.java | 8 +- .../core/transaction/impl/TransactionImpl.java | 12 +- .../spi/core/protocol/ProtocolManager.java | 2 +- .../core/protocol/ProtocolManagerFactory.java | 4 +- .../activemq/spi/core/remoting/Acceptor.java | 10 +- .../core/security/ActiveMQSecurityManager.java | 78 + .../security/ActiveMQSecurityManagerImpl.java | 212 ++ .../core/security/HornetQSecurityManager.java | 78 - .../security/HornetQSecurityManagerImpl.java | 212 -- .../spi/core/security/JAASSecurityManager.java | 14 +- .../spi/core/security/package-info.java | 2 +- .../impl/FileConfigurationParserTest.java | 24 +- .../config/impl/HAPolicyConfigurationTest.java | 30 +- .../WrongRoleFileConfigurationParserTest.java | 24 +- .../activemq/core/filter/impl/FilterTest.java | 2 +- .../core/message/impl/MessagePropertyTest.java | 4 +- .../group/impl/ClusteredResetMockTest.java | 6 +- .../core/server/impl/EmbeddedServerTest.java | 8 +- .../impl/ScheduledDeliveryHandlerTest.java | 4 +- .../core/version/impl/VersionImplTest.java | 8 +- .../tests/util/ColocatedActiveMQServer.java | 96 + .../tests/util/ColocatedHornetQServer.java | 96 - .../tests/util/InVMNodeManagerServer.java | 10 +- .../activemq/tests/util/ServiceTestBase.java | 138 +- .../tests/util/SingleServerTestBase.java | 8 +- .../activemq/tests/util/UnitTestCase.java | 68 +- .../activemq/tools/ActiveMQToolsLogger.java | 42 + .../org/apache/activemq/tools/DataTool.java | 8 +- .../activemq/tools/HornetQToolsLogger.java | 42 - .../org/apache/activemq/tools/PrintData.java | 6 +- .../org/apache/activemq/tools/PrintPages.java | 4 +- .../apache/activemq/tools/TransferQueue.java | 6 +- .../apache/activemq/tools/XmlDataConstants.java | 2 +- .../apache/activemq/tools/XmlDataExporter.java | 30 +- .../apache/activemq/tools/XmlDataImporter.java | 118 +- docs/user-manual/en/using-jms.xml | 4 - .../core/example/EmbeddedRemoteExample.java | 6 +- .../activemq/core/example/EmbeddedServer.java | 6 +- .../activemq/core/example/EmbeddedExample.java | 12 +- .../apache/activemq/core/example/PerfBase.java | 4 +- .../core/example/TwitterConnectorExample.java | 6 +- .../javaee/example/server/SendMessageBean.java | 2 +- .../javaee/example/server2/MDBQueueB.java | 2 +- .../javaee/example/server2/StatelessSender.java | 8 +- .../javaee/example/server/MDBQueue.java | 6 +- .../server/MDBRemoteFailoverStaticExample.java | 6 +- .../server/MDBRemoteFailoverExample.java | 6 +- .../common/example/ActiveMQExample.java | 234 ++ .../activemq/common/example/HornetQExample.java | 234 -- .../activemq/jms/example/AerogearExample.java | 6 +- .../activemq/jms/example/AppletExample.java | 6 +- .../jms/example/HttpStaticFileServer.java | 4 +- .../ApplicationLayerFailoverExample.java | 4 +- .../activemq/jms/example/BridgeExample.java | 4 +- .../jms/example/QueueBrowserExample.java | 4 +- .../jms/example/ClientKickoffExample.java | 16 +- .../ClientSideFailoverListerExample.java | 8 +- .../example/ClientSideLoadBalancingExample.java | 10 +- .../ClusteredDurableSubscriptionExample.java | 4 +- .../jms/example/ClusteredGroupingExample.java | 4 +- .../jms/example/ClusteredJgroupsExample.java | 4 +- .../jms/example/ClusteredQueueExample.java | 4 +- .../jms/example/ClusteredStandaloneExample.java | 4 +- .../example/StaticClusteredQueueExample.java | 4 +- .../jms/example/ClusterStaticOnewayExample.java | 4 +- .../jms/example/ClusteredTopicExample.java | 4 +- .../ColocatedFailoverScaleDownExample.java | 4 +- .../jms/example/ColocatedFailoverExample.java | 4 +- .../jms/example/ConsumerRateLimitExample.java | 4 +- .../activemq/jms/example/DeadLetterExample.java | 6 +- .../jms/example/DelayedRedeliveryExample.java | 6 +- .../activemq/jms/example/DivertExample.java | 6 +- .../jms/example/DurableSubscriptionExample.java | 4 +- .../activemq/jms/example/EmbeddedExample.java | 6 +- .../activemq/jms/example/EmbeddedExample.java | 10 +- .../activemq/jms/example/ExpiryExample.java | 6 +- .../jms/example/HAPolicyAutoBackupExample.java | 10 +- .../jms/example/HttpTransportExample.java | 4 +- .../InstantiateConnectionFactoryExample.java | 10 +- .../jms/example/InterceptorExample.java | 6 +- .../activemq/jms/example/JAASExample.java | 6 +- .../jms/example/JMSAutoCloseableExample.java | 4 +- .../activemq/jms/example/JMSBridgeExample.java | 2 +- .../example/JMSCompletionListenerExample.java | 6 +- .../activemq/jms/example/JMSContextExample.java | 4 +- .../jms/example/JMSSharedConsumerExample.java | 4 +- .../apache/activemq/jms/example/JMXExample.java | 6 +- .../jms/example/LargeMessageExample.java | 6 +- .../jms/example/LastValueQueueExample.java | 4 +- .../example/ManagementNotificationExample.java | 4 +- .../activemq/jms/example/ManagementExample.java | 10 +- .../jms/example/MessageCounterExample.java | 4 +- .../jms/example/MessageGroupExample.java | 4 +- .../jms/example/MessageGroup2Example.java | 4 +- .../jms/example/MessagePriorityExample.java | 4 +- .../MultipleFailoverFailbackExample.java | 4 +- .../jms/example/MultipleFailoverExample.java | 4 +- .../jms/example/NoConsumerBufferingExample.java | 6 +- .../example/NonTransactionFailoverExample.java | 4 +- .../activemq/jms/example/OpenWireExample.java | 4 +- .../activemq/jms/example/PagingExample.java | 8 +- .../jms/example/PreacknowledgeExample.java | 14 +- .../jms/example/ProducerRateLimitExample.java | 4 +- .../activemq/jms/example/ProtonJExample.java | 4 +- .../QueueMessageRedistributionExample.java | 6 +- .../jms/example/QueueRequestorExample.java | 4 +- .../jms/example/QueueSelectorExample.java | 4 +- .../activemq/jms/example/QueueExample.java | 4 +- .../activemq/jms/example/ReattachExample.java | 8 +- .../ReplicatedFailbackStaticExample.java | 4 +- .../jms/example/ReplicatedFailbackExample.java | 4 +- .../ReplicatedMultipleFailoverExample.java | 4 +- .../ReplicatedTransactionFailoverExample.java | 4 +- .../jms/example/RequestReplyExample.java | 4 +- .../rest/dup-send/src/main/java/PostOrder.java | 2 +- .../jms-to-rest/src/main/java/JmsHelper.java | 10 +- .../jms-to-rest/src/main/java/JmsReceive.java | 6 +- .../rest/jms-to-rest/src/main/java/JmsSend.java | 6 +- .../jms/rest/push/src/main/java/JmsHelper.java | 10 +- .../jms/rest/push/src/main/java/PostOrder.java | 6 +- .../push/src/main/java/ReceiveShipping.java | 6 +- .../activemq/jms/example/ScaleDownExample.java | 4 +- .../jms/example/ScheduledMessageExample.java | 4 +- .../activemq/jms/example/SecurityExample.java | 14 +- .../example/SendAcknowledgementsExample.java | 10 +- .../apache/activemq/jms/example/SSLExample.java | 4 +- .../jms/example/StaticSelectorJMSExample.java | 4 +- .../jms/example/StaticSelectorExample.java | 4 +- .../jms/example/StompWebSocketExample.java | 4 +- .../activemq/jms/example/StompExample.java | 4 +- .../activemq/jms/example/StompExample.java | 4 +- .../activemq/jms/example/StompExample.java | 4 +- .../jms/example/StopServerFailoverExample.java | 4 +- .../jms/example/SymmetricClusterExample.java | 18 +- .../jms/example/TemporaryQueueExample.java | 4 +- .../jms/example/TopicHierarchyExample.java | 14 +- .../jms/example/TopicSelectorExample1.java | 4 +- .../jms/example/TopicSelectorExample2.java | 4 +- .../activemq/jms/example/TopicExample.java | 4 +- .../jms/example/TransactionFailoverExample.java | 4 +- .../jms/example/TransactionalExample.java | 4 +- .../jms/example/XAHeuristicExample.java | 6 +- .../activemq/jms/example/XAReceiveExample.java | 4 +- .../activemq/jms/example/XASendExample.java | 4 +- .../activemq/jms/example/XAwithJTAExample.java | 6 +- .../aerogear/ActiveMQAeroGearBundle.java | 46 + .../aerogear/ActiveMQAeroGearLogger.java | 66 + .../aerogear/AeroGearConnectorService.java | 26 +- .../aerogear/HornetQAeroGearBundle.java | 46 - .../aerogear/HornetQAeroGearLogger.java | 66 - .../integration/jboss/ActiveMQJBossBundle.java | 31 + .../integration/jboss/ActiveMQJBossLogger.java | 58 + .../integration/jboss/HornetQJBossBundle.java | 31 - .../integration/jboss/HornetQJBossLogger.java | 58 - .../jboss/security/JBossASSecurityManager.java | 18 +- .../jboss/security/SecurityActions.java | 6 +- .../activemq/spring/ActiveMQSpringBundle.java | 31 + .../activemq/spring/ActiveMQSpringLogger.java | 37 + .../activemq/spring/HornetQSpringBundle.java | 31 - .../activemq/spring/HornetQSpringLogger.java | 37 - .../twitter/impl/IncomingTweetsHandler.java | 12 +- .../twitter/impl/OutgoingTweetsHandler.java | 18 +- .../activemq/twitter/ActiveMQTwitterBundle.java | 31 + .../activemq/twitter/ActiveMQTwitterLogger.java | 54 + .../activemq/twitter/HornetQTwitterBundle.java | 31 - .../activemq/twitter/HornetQTwitterLogger.java | 54 - .../integration/vertx/ActiveMQVertxLogger.java | 53 + .../integration/vertx/HornetQVertxLogger.java | 53 - .../vertx/IncomingVertxEventHandler.java | 8 +- .../vertx/OutgoingVertxEventHandler.java | 14 +- pom.xml | 22 +- .../tests/ActiveMQMessageHandlerTest.java | 430 ++++ .../activemq/byteman/tests/BMFailoverTest.java | 8 +- .../BridgeServerLocatorConfigurationTest.java | 14 +- .../byteman/tests/ClusteredGroupingTest.java | 6 +- .../activemq/byteman/tests/GroupingTest.java | 4 +- .../tests/HornetQMessageHandlerTest.java | 430 ---- .../tests/JMSBridgeReconnectionTest.java | 8 +- .../activemq/byteman/tests/LatencyTest.java | 4 +- .../byteman/tests/OrphanedConsumerTest.java | 8 +- .../activemq/byteman/tests/PagingLeakTest.java | 6 +- .../byteman/tests/ScaleDownFailoverTest.java | 12 +- .../byteman/tests/StartStopDeadlockTest.java | 10 +- .../byteman/tests/StompInternalStateTest.java | 4 +- .../integration/DuplicateDetectionTest.java | 76 +- .../tests/integration/InterceptorTest.java | 4 +- .../tests/integration/String64KLimitTest.java | 8 +- .../aerogear/AeroGearBasicServerTest.java | 34 +- .../integration/client/AckBatchSizeTest.java | 6 +- .../integration/client/AcknowledgeTest.java | 16 +- .../integration/client/ActiveMQCrashTest.java | 158 ++ .../integration/client/AddressSettingsTest.java | 12 +- .../integration/client/AutogroupIdTest.java | 8 +- .../integration/client/BlockingSendTest.java | 4 +- .../integration/client/CommitRollbackTest.java | 12 +- .../ConcurrentCreateDeleteProduceTest.java | 4 +- .../integration/client/ConsumerCloseTest.java | 18 +- .../integration/client/ConsumerFilterTest.java | 4 +- .../client/ConsumerRoundRobinTest.java | 4 +- .../integration/client/ConsumerStuckTest.java | 12 +- .../tests/integration/client/ConsumerTest.java | 4 +- .../client/ConsumerWindowSizeTest.java | 32 +- .../integration/client/CoreClientTest.java | 16 +- .../client/CreateQueueIdempotentTest.java | 8 +- .../client/DeadLetterAddressTest.java | 14 +- .../integration/client/DeliveryOrderTest.java | 4 +- .../integration/client/DurableQueueTest.java | 4 +- .../client/ExpireTestOnRestartTest.java | 4 +- .../integration/client/ExpiryAddressTest.java | 14 +- .../client/ExpiryLargeMessageTest.java | 6 +- .../integration/client/FailureDeadlockTest.java | 28 +- .../integration/client/HangConsumerTest.java | 28 +- .../integration/client/HeuristicXATest.java | 30 +- .../integration/client/HornetQCrashTest.java | 158 -- .../InVMNonPersistentMessageBufferTest.java | 4 +- .../client/IncompatibleVersionTest.java | 24 +- .../client/InterruptedLargeMessageTest.java | 28 +- .../client/JmsNettyNioStressTest.java | 22 +- .../integration/client/JournalCrashTest.java | 8 +- .../LargeMessageAvoidLargeMessagesTest.java | 16 +- .../client/LargeMessageCompressTest.java | 20 +- .../integration/client/LargeMessageTest.java | 72 +- .../client/MessageConcurrencyTest.java | 4 +- .../client/MessageConsumerRollbackTest.java | 8 +- .../integration/client/MessageCounterTest.java | 4 +- .../client/MessageDurabilityTest.java | 8 +- .../client/MessageExpirationTest.java | 4 +- .../MessageGroupingConnectionFactoryTest.java | 14 +- .../integration/client/MessageGroupingTest.java | 22 +- .../integration/client/MessageHandlerTest.java | 4 +- .../integration/client/MessagePriorityTest.java | 12 +- .../integration/client/MessageRateTest.java | 10 +- .../client/MultipleThreadFilterOneTest.java | 4 +- .../tests/integration/client/NIOvsOIOTest.java | 10 +- .../integration/client/NettyConnectorTest.java | 8 +- .../client/NewDeadLetterAddressTest.java | 14 +- .../tests/integration/client/OrderTest.java | 4 +- .../integration/client/PagingOrderTest.java | 32 +- .../integration/client/PagingSyncTest.java | 4 +- .../tests/integration/client/PagingTest.java | 16 +- .../integration/client/ProducerCloseTest.java | 6 +- .../client/ProducerFlowControlTest.java | 4 +- .../tests/integration/client/ProducerTest.java | 4 +- .../integration/client/QueueBrowserTest.java | 4 +- .../client/ReceiveImmediateTest.java | 4 +- .../tests/integration/client/ReceiveTest.java | 4 +- .../client/RedeliveryConsumerTest.java | 8 +- .../tests/integration/client/RequestorTest.java | 18 +- .../tests/integration/client/RoutingTest.java | 4 +- .../client/SelfExpandingBufferTest.java | 4 +- .../client/ServerLocatorConnectTest.java | 18 +- .../client/ServerLocatorSerializationTest.java | 16 +- .../client/SessionCloseOnGCTest.java | 4 +- .../integration/client/SessionCloseTest.java | 46 +- ...onClosedOnRemotingConnectionFailureTest.java | 4 +- .../client/SessionCreateAndDeleteQueueTest.java | 4 +- .../client/SessionCreateConsumerTest.java | 4 +- .../client/SessionCreateProducerTest.java | 4 +- .../integration/client/SessionFactoryTest.java | 100 +- .../SessionSendAcknowledgementHandlerTest.java | 4 +- .../client/SessionStopStartTest.java | 4 +- .../tests/integration/client/SessionTest.java | 4 +- .../client/SimpleSendMultipleQueuesTest.java | 4 +- .../integration/client/SlowConsumerTest.java | 4 +- .../integration/client/TemporaryQueueTest.java | 6 +- .../client/TransactionDurabilityTest.java | 10 +- .../client/TransactionalSendTest.java | 6 +- .../integration/client/WildCardRoutingTest.java | 12 +- .../clientcrash/ClientCrashTest.java | 6 +- .../integration/clientcrash/ClientExitTest.java | 6 +- .../integration/clientcrash/ClientTestBase.java | 8 +- .../integration/clientcrash/CrashClient.java | 8 +- .../integration/clientcrash/CrashClient2.java | 4 +- .../integration/clientcrash/GracefulClient.java | 8 +- .../cluster/ClusterControllerTest.java | 16 +- .../cluster/bridge/BridgeFailoverTest.java | 8 +- .../cluster/bridge/BridgeReconnectTest.java | 48 +- .../cluster/bridge/BridgeStartTest.java | 28 +- .../integration/cluster/bridge/BridgeTest.java | 44 +- .../cluster/bridge/BridgeTestBase.java | 40 +- .../BridgeWithDiscoveryGroupStartTest.java | 10 +- .../cluster/distribution/ClusterTestBase.java | 96 +- .../distribution/OnewayTwoNodeClusterTest.java | 4 +- .../AutomaticColocatedQuorumVoteTest.java | 64 +- .../cluster/failover/BackupSyncPagingTest.java | 4 +- .../ClusterWithBackupFailoverTestBase.java | 8 +- .../cluster/failover/FailBackAutoTest.java | 4 +- .../cluster/failover/FailBackManualTest.java | 4 +- .../cluster/failover/FailoverListenerTest.java | 4 +- .../cluster/failover/FailoverTest.java | 4 +- .../cluster/failover/FailoverTestBase.java | 14 +- .../failover/LiveToLiveFailoverTest.java | 6 +- .../MultipleBackupsFailoverTestBase.java | 8 +- ...ultipleLivesMultipleBackupsFailoverTest.java | 6 +- .../MultipleServerFailoverTestBase.java | 28 +- .../cluster/failover/NettyFailoverTest.java | 4 +- .../failover/NettyReplicatedFailoverTest.java | 4 +- .../cluster/failover/PagingFailoverTest.java | 8 +- .../failover/ReplicatedPagedFailoverTest.java | 4 +- .../cluster/failover/SecurityFailoverTest.java | 8 +- .../SingleLiveMultipleBackupsFailoverTest.java | 6 +- .../remote/FailoverWithSharedStoreTest.java | 4 +- .../ha/HAAutomaticBackupSharedStore.java | 4 +- .../MultiThreadRandomReattachTestBase.java | 16 +- .../cluster/reattach/OrderReattachTest.java | 8 +- .../cluster/reattach/RandomReattachTest.java | 44 +- .../cluster/reattach/ReattachTest.java | 24 +- .../cluster/topology/HAClientTopologyTest.java | 4 +- .../HAClientTopologyWithDiscoveryTest.java | 10 +- .../cluster/topology/IsolatedTopologyTest.java | 12 +- .../cluster/topology/NonHATopologyTest.java | 4 +- .../topology/TopologyClusterTestBase.java | 6 +- .../cluster/util/BackupSyncDelay.java | 8 +- .../cluster/util/MultiServerTestBase.java | 42 +- .../cluster/util/SameProcessActiveMQServer.java | 111 + .../cluster/util/SameProcessHornetQServer.java | 111 - .../cluster/util/TestableServer.java | 8 +- .../core/deployers/impl/QueueDeployerTest.java | 6 +- .../integration/discovery/DiscoveryTest.java | 6 +- .../tests/integration/divert/DivertTest.java | 26 +- .../divert/PersistentDivertTest.java | 12 +- .../integration/embedded/ValidateAIOTest.java | 6 +- .../http/CoreClientOverHttpTest.java | 18 +- .../jms/ActiveMQConnectionFactoryTest.java | 746 ++++++ .../tests/integration/jms/FloodServerTest.java | 52 +- .../jms/HornetQConnectionFactoryTest.java | 746 ------ .../tests/integration/jms/JmsProducerTest.java | 6 +- .../ManualReconnectionToSingleServerTest.java | 4 +- .../integration/jms/bridge/BridgeTestBase.java | 66 +- .../jms/bridge/ClusteredBridgeTestBase.java | 26 +- .../jms/bridge/JMSBridgeReconnectionTest.java | 22 +- .../integration/jms/bridge/JMSBridgeTest.java | 16 +- .../jms/client/AutoGroupingTest.java | 12 +- .../integration/jms/client/CreateQueueTest.java | 10 +- .../integration/jms/client/GroupIDTest.java | 6 +- .../integration/jms/client/GroupingTest.java | 18 +- .../integration/jms/client/MessageTest.java | 14 +- .../integration/jms/client/PreACKJMSTest.java | 48 +- .../jms/client/ReSendMessageTest.java | 54 +- .../jms/client/RemoteConnectionStressTest.java | 14 +- ...onClosedOnRemotingConnectionFailureTest.java | 60 +- .../integration/jms/client/SessionTest.java | 6 +- .../integration/jms/client/TextMessageTest.java | 48 +- .../jms/client/TopicCleanupTest.java | 4 +- .../jms/cluster/BindingsClusterTest.java | 44 +- .../jms/cluster/JMSFailoverListenerTest.java | 50 +- .../jms/cluster/JMSFailoverTest.java | 56 +- .../jms/cluster/JMSReconnectTest.java | 40 +- .../jms/cluster/LargeMessageOverBridgeTest.java | 6 +- .../jms/cluster/MultipleThreadsOpeningTest.java | 6 +- .../jms/cluster/ReplicatedJMSFailoverTest.java | 6 +- .../CloseConnectionFactoryOnGCest.java | 8 +- .../jms/connection/CloseConnectionOnGCTest.java | 8 +- .../CloseDestroyedConnectionTest.java | 28 +- .../connection/ConcurrentSessionCloseTest.java | 10 +- .../ConnectionFactorySerializationTest.java | 10 +- ...tionFactoryWithJGroupsSerializationTest.java | 16 +- .../jms/connection/ExceptionListenerTest.java | 30 +- .../jms/connection/InvalidConnectorTest.java | 54 +- .../integration/jms/consumer/ConsumerTest.java | 76 +- .../jms/divert/DivertAndACKClientTest.java | 48 +- .../integration/jms/jms2client/BodyTest.java | 4 +- .../jms/jms2client/NonExistentQueueTest.java | 8 +- .../jms/server/JMSServerDeployerTest.java | 16 +- .../jms/server/JMSServerStartStopTest.java | 34 +- .../jms/server/config/JMSConfigurationTest.java | 6 +- .../config/JMSServerConfigParserTest.java | 2 +- .../ConnectionFactoryControlTest.java | 16 +- .../server/management/JMSQueueControlTest.java | 54 +- .../management/JMSQueueControlUsingJMSTest.java | 10 +- .../management/JMSServerControl2Test.java | 100 +- .../management/JMSServerControlRestartTest.java | 12 +- .../server/management/JMSServerControlTest.java | 92 +- .../JMSServerControlUsingJMSTest.java | 22 +- .../jms/server/management/JMSUtil.java | 36 +- .../jms/server/management/TopicControlTest.java | 40 +- .../management/TopicControlUsingJMSTest.java | 40 +- .../journal/JournalPerfTuneTest.java | 4 +- .../integration/journal/OldFormatTest.java | 2 +- .../largemessage/LargeMessageTestBase.java | 4 +- .../largemessage/ServerLargeMessageTest.java | 14 +- .../management/AcceptorControlTest.java | 8 +- .../AcceptorControlUsingCoreTest.java | 4 +- .../management/ActiveMQServerControlTest.java | 1099 ++++++++ .../ActiveMQServerControlUsingCoreTest.java | 716 ++++++ .../management/AddressControlTest.java | 12 +- .../management/AddressControlUsingCoreTest.java | 6 +- .../management/BridgeControlTest.java | 12 +- .../management/BridgeControlUsingCoreTest.java | 18 +- .../management/BroadcastGroupControlTest.java | 10 +- .../ClusterConnectionControl2Test.java | 12 +- .../ClusterConnectionControlTest.java | 12 +- .../ClusterConnectionControlUsingCoreTest.java | 4 +- .../management/DivertControlTest.java | 8 +- .../management/DivertControlUsingCoreTest.java | 4 +- .../management/HornetQServerControlTest.java | 1099 -------- .../HornetQServerControlUsingCoreTest.java | 716 ------ .../integration/management/JMXDomainTest.java | 34 +- .../management/ManagementControlHelper.java | 8 +- .../management/ManagementServiceImplTest.java | 14 +- .../ManagementWithPagingServerTest.java | 8 +- .../management/ManagementWithStompTest.java | 8 +- .../management/NotificationTest.java | 12 +- .../management/QueueControlTest.java | 28 +- .../management/SecurityManagementTestBase.java | 14 +- ...tyManagementWithConfiguredAdminUserTest.java | 12 +- ...yManagementWithDefaultConfigurationTest.java | 8 +- ...ManagementWithModifiedConfigurationTest.java | 8 +- .../management/SecurityNotificationTest.java | 22 +- .../integration/openwire/OpenWireTestBase.java | 4 +- .../paging/PageCountSyncOnNonTXTest.java | 4 +- .../integration/paging/PageCountSyncServer.java | 4 +- .../integration/paging/PagingCounterTest.java | 18 +- .../integration/paging/PagingReceiveTest.java | 12 +- .../integration/paging/PagingSendTest.java | 10 +- .../PagingWithFailoverAndCountersTest.java | 6 +- .../paging/PagingWithFailoverServer.java | 8 +- .../paging/SpawnedServerSupport.java | 16 +- .../persistence/DeleteQueueRestartTest.java | 8 +- .../persistence/ExportFormatTest.java | 22 +- .../persistence/StorageManagerTestBase.java | 2 +- .../persistence/XmlImportExportTest.java | 36 +- .../tests/integration/proton/ProtonTest.java | 18 +- .../integration/ra/ActiveMQActivationTest.java | 67 + .../integration/ra/ActiveMQClusteredTest.java | 111 + .../ra/ActiveMQMessageHandlerSecurityTest.java | 93 + .../ra/ActiveMQMessageHandlerTest.java | 908 +++++++ .../ra/ActiveMQMessageHandlerXATest.java | 303 +++ .../ra/ActiveMQRAClusteredTestBase.java | 99 + .../integration/ra/ActiveMQRATestBase.java | 235 ++ .../integration/ra/HornetQActivationTest.java | 67 - .../integration/ra/HornetQClusteredTest.java | 111 - .../ra/HornetQMessageHandlerSecurityTest.java | 93 - .../ra/HornetQMessageHandlerTest.java | 908 ------- .../ra/HornetQMessageHandlerXATest.java | 303 --- .../ra/HornetQRAClusteredTestBase.java | 99 - .../tests/integration/ra/HornetQRATestBase.java | 235 -- .../tests/integration/ra/JMSContextTest.java | 24 +- .../integration/ra/OutgoingConnectionTest.java | 82 +- .../integration/ra/ResourceAdapterTest.java | 148 +- .../integration/remoting/BatchDelayTest.java | 8 +- .../remoting/DestroyConsumerTest.java | 2 +- .../integration/remoting/DirectDeliverTest.java | 8 +- .../remoting/NetworkAddressTestBase.java | 8 +- .../tests/integration/remoting/PingTest.java | 20 +- .../integration/remoting/ReconnectTest.java | 6 +- .../remoting/SynchronousCloseTest.java | 12 +- .../replication/ReplicationOrderTest.java | 6 +- .../replication/ReplicationTest.java | 16 +- .../scheduling/DelayedMessageTest.java | 8 +- .../MultipliedDelayedMessageTest.java | 8 +- .../scheduling/ScheduledMessageTest.java | 10 +- .../security/NettySecurityClientTest.java | 4 +- .../integration/security/SecurityTest.java | 146 +- .../integration/security/SimpleClient.java | 8 +- .../server/AddressFullLoggingTest.java | 8 +- .../integration/server/ExpiryRunnerTest.java | 12 +- .../integration/server/FileLockTimeoutTest.java | 8 +- .../integration/server/LVQRecoveryTest.java | 10 +- .../tests/integration/server/LVQTest.java | 12 +- .../integration/server/PredefinedQueueTest.java | 24 +- .../integration/server/ScaleDown3NodeTest.java | 10 +- .../tests/integration/server/ScaleDownTest.java | 10 +- .../server/SuppliedThreadPoolTest.java | 10 +- .../spring/SpringIntegrationTest.java | 4 +- .../ssl/CoreClientOverOneWaySSLTest.java | 50 +- .../ssl/CoreClientOverTwoWaySSLTest.java | 22 +- .../tests/integration/stomp/ExtraStompTest.java | 40 +- .../stomp/StompConnectionCleanupTest.java | 6 +- .../tests/integration/stomp/StompTestBase.java | 18 +- .../integration/stomp/StompWebSocketTest.java | 8 +- .../integration/stomp/v11/ExtraStompTest.java | 4 +- .../integration/stomp/v11/StompV11Test.java | 2 +- .../integration/stomp/v11/StompV11TestBase.java | 12 +- .../integration/stomp/v12/StompV12Test.java | 2 +- .../netty/ActiveMQFrameDecoder2Test.java | 130 + .../netty/HornetQFrameDecoder2Test.java | 130 - .../NettyConnectorWithHTTPUpgradeTest.java | 30 +- .../tests/integration/twitter/TwitterTest.java | 20 +- .../vertx/ActiveMQVertxUnitTest.java | 866 +++++++ .../integration/vertx/HornetQVertxUnitTest.java | 866 ------- .../integration/xa/BasicXaRecoveryTest.java | 12 +- .../tests/integration/xa/BasicXaTest.java | 42 +- .../tests/integration/xa/XaTimeoutTest.java | 14 +- .../largemessage/LargeMessageTestBase.java | 4 +- .../tests/util/JMSClusteredTestBase.java | 36 +- .../apache/activemq/tests/util/JMSTestBase.java | 8 +- .../tests/util/ReplicatedBackupUtils.java | 4 +- .../activemq-jms-for-JMSServerDeployerTest.xml | 53 + .../activemq-jms-for-JMSServerDeployerTest2.xml | 53 + .../hornetq-jms-for-JMSServerDeployerTest.xml | 53 - .../hornetq-jms-for-JMSServerDeployerTest2.xml | 53 - .../test/resources/spring-activemq-config.xml | 34 + .../src/test/resources/spring-activemq-jms.xml | 19 + .../test/resources/spring-hornetq-config.xml | 34 - .../src/test/resources/spring-hornetq-jms.xml | 19 - .../activemq/jms/tests/AcknowledgementTest.java | 24 +- .../jms/tests/ActiveMQServerTestCase.java | 570 +++++ .../apache/activemq/jms/tests/BrowserTest.java | 4 +- .../jms/tests/CTSMiscellaneousTest.java | 60 +- .../jms/tests/ConnectionClosedTest.java | 12 +- .../jms/tests/ConnectionFactoryTest.java | 46 +- .../activemq/jms/tests/ConnectionTest.java | 2 +- .../jms/tests/DurableSubscriptionTest.java | 42 +- .../jms/tests/HornetQServerTestCase.java | 570 ----- .../apache/activemq/jms/tests/JMSTestCase.java | 172 +- .../activemq/jms/tests/JmsTestLogger.java | 2 +- .../activemq/jms/tests/MessageConsumerTest.java | 130 +- .../activemq/jms/tests/MessageProducerTest.java | 50 +- .../jms/tests/NonDurableSubscriberTest.java | 2 +- .../activemq/jms/tests/PersistenceTest.java | 28 +- .../apache/activemq/jms/tests/QueueTest.java | 2 +- .../activemq/jms/tests/ReferenceableTest.java | 30 +- .../apache/activemq/jms/tests/SecurityTest.java | 8 +- .../apache/activemq/jms/tests/SessionTest.java | 6 +- .../apache/activemq/jms/tests/TopicTest.java | 16 +- .../jms/tests/TransactedSessionTest.java | 28 +- .../activemq/jms/tests/XARecoveryTest.java | 60 +- .../org/apache/activemq/jms/tests/XATest.java | 178 +- .../tests/message/JMSExpirationHeaderTest.java | 4 +- .../tests/message/JMSPriorityHeaderTest.java | 4 +- .../tests/message/JMSXDeliveryCountTest.java | 12 +- .../jms/tests/message/MessageBodyTestCase.java | 4 +- .../jms/tests/message/MessageHeaderTest.java | 44 +- .../tests/message/MessageHeaderTestBase.java | 40 +- .../message/MessagePropertyConversionTest.java | 4 +- .../jms/tests/message/MessageTestBase.java | 8 +- .../message/ObjectMessageDeliveryTest.java | 14 +- .../foreign/ForeignBytesMessageTest.java | 4 +- .../message/foreign/ForeignMessageTest.java | 6 +- .../jms/tests/selector/SelectorTest.java | 28 +- .../tests/stress/ConcurrentCloseStressTest.java | 4 +- .../tests/stress/CorruptMessageStressTest.java | 4 +- .../jms/tests/stress/JMSStressTestBase.java | 4 +- .../tests/stress/ManyConnectionsStressTest.java | 4 +- .../jms/tests/stress/OpenCloseStressTest.java | 4 +- .../jms/tests/stress/RelayStressTest.java | 4 +- .../tests/stress/SeveralClientsStressTest.java | 4 +- .../jms/tests/tools/ServerManagement.java | 2 +- .../jms/tests/tools/container/Constants.java | 2 +- .../tests/tools/container/LocalTestServer.java | 88 +- .../jms/tests/tools/container/Server.java | 6 +- .../activemq/jms/tests/util/JNDIUtilTest.java | 4 +- .../org/apache/activemq/jms/ActiveMQQAdmin.java | 336 +++ .../org/apache/activemq/jms/HornetQAdmin.java | 336 --- .../apache/activemq/jms/SpawnedJMSServer.java | 6 +- .../jms/conform/connection/ConnectionTest.java | 2 +- .../src/test/resources/provider.properties | 2 +- .../journal/JournalImplTestUnit.java | 6 +- .../paging/MeasurePagingMultiThreadTest.java | 4 +- .../tests/soak/client/ClientAbstract.java | 2 +- .../soak/client/ClientNonDivertedSoakTest.java | 4 +- .../tests/soak/client/ClientSoakTest.java | 4 +- .../soak/client/SimpleSendReceiveSoakTest.java | 4 +- .../tests/stress/client/SendStressTest.java | 4 +- .../stress/journal/AddAndRemoveStressTest.java | 22 +- .../stress/journal/CompactingStressTest.java | 4 +- .../JournalCleanupCompactStressTest.java | 8 +- .../journal/JournalRestartStressTest.java | 4 +- .../stress/journal/LargeJournalStressTest.java | 4 +- .../journal/MultiThreadConsumerStressTest.java | 4 +- .../NIOMultiThreadCompactorStressTest.java | 8 +- .../journal/XmlImportExportStressTest.java | 4 +- .../paging/MultipleConsumersPageStressTest.java | 4 +- .../stress/paging/PageCursorStressTest.java | 4 +- .../tests/stress/paging/PageStressTest.java | 10 +- .../tests/stress/remote/PingStressTest.java | 10 +- .../tests/stress/stomp/StompStressTest.java | 10 +- .../jms/bridge/impl/JMSBridgeImplTest.java | 48 +- .../activemq/tests/unit/UnitTestLogger.java | 2 +- .../unit/core/asyncio/AsynchronousFileTest.java | 4 +- .../MultiThreadAsynchronousFileTest.java | 4 +- .../client/impl/LargeMessageBufferTest.java | 12 +- .../impl/ConfigurationValidationTest.java | 2 +- .../impl/AddressSettingsDeployerTest.java | 2 +- .../impl/BasicUserCredentialsDeployerTest.java | 12 +- .../deployers/impl/SecurityDeployerTest.java | 2 +- .../journal/impl/AlignedJournalImplTest.java | 12 +- .../core/journal/impl/JournalImplTestBase.java | 6 +- .../core/journal/impl/JournalImplTestUnit.java | 4 +- .../impl/SequentialFileFactoryTestBase.java | 34 +- .../impl/fakes/FakeSequentialFileFactory.java | 4 +- .../unit/core/postoffice/impl/FakeQueue.java | 4 +- .../core/remoting/ActiveMQBufferTestBase.java | 357 +++ .../core/remoting/HornetQBufferTestBase.java | 357 --- .../impl/netty/ChannelBufferWrapper2Test.java | 4 +- .../impl/netty/NettyAcceptorFactoryTest.java | 4 +- .../remoting/impl/netty/NettyAcceptorTest.java | 6 +- .../impl/netty/NettyConnectionTest.java | 4 +- .../remoting/impl/netty/NettyConnectorTest.java | 24 +- .../impl/ActiveMQSecurityManagerImplTest.java | 181 ++ .../impl/HornetQSecurityManagerImplTest.java | 181 -- .../unit/core/server/impl/QueueImplTest.java | 6 +- .../tests/unit/jms/ActiveMQDestinationTest.java | 102 + .../tests/unit/jms/HornetQDestinationTest.java | 102 - .../unit/jms/client/ActiveMQMapMessageTest.java | 795 ++++++ .../jms/client/ActiveMQStreamMessageTest.java | 1059 ++++++++ .../unit/jms/client/HornetQMapMessageTest.java | 795 ------ .../jms/client/HornetQStreamMessageTest.java | 1059 -------- .../unit/jms/client/JMSExceptionHelperTest.java | 2 +- .../unit/jms/client/SelectorTranslatorTest.java | 88 +- .../tests/unit/jms/misc/ManifestTest.java | 14 +- .../ConnectionFactoryObjectFactoryTest.java | 6 +- .../DestinationObjectFactoryTest.java | 8 +- .../ra/ActiveMQResourceAdapterConfigTest.java | 489 ++++ .../ra/ConnectionFactoryPropertiesTest.java | 14 +- .../ra/HornetQResourceAdapterConfigTest.java | 489 ---- .../tests/unit/ra/ResourceAdapterTest.java | 240 +- .../util/ActiveMQBufferInputStreamTest.java | 69 + .../unit/util/HornetQBufferInputStreamTest.java | 69 - .../tests/unit/util/VersionLoaderTest.java | 12 +- .../tests/unit/xa/XAResourceWrapperTest.java | 8 +- .../activemq/tests/util/CreateMessage.java | 10 +- 1257 files changed, 60313 insertions(+), 60315 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java index 8751f77..36f9d08 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java @@ -17,18 +17,18 @@ import io.airlift.command.Command; import org.apache.activemq.cli.ActiveMQ; import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.dto.BrokerDTO; import org.apache.activemq.factory.BrokerFactory; import org.apache.activemq.factory.CoreFactory; import org.apache.activemq.factory.JmsFactory; import org.apache.activemq.factory.SecurityManagerFactory; -import org.apache.activemq.integration.bootstrap.HornetQBootstrapLogger; +import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger; import org.apache.activemq.jms.server.JMSServerManager; import org.apache.activemq.jms.server.config.JMSConfiguration; import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.jms.server.impl.StandaloneNamingServer; -import org.apache.activemq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import javax.management.MBeanServer; @@ -67,11 +67,11 @@ public class Run implements Action JMSConfiguration jms = JmsFactory.create(broker.jms); - HornetQSecurityManager security = SecurityManagerFactory.create(broker.security); + ActiveMQSecurityManager security = SecurityManagerFactory.create(broker.security); MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); - HornetQServerImpl server = new HornetQServerImpl(core, mBeanServer, security); + ActiveMQServerImpl server = new ActiveMQServerImpl(core, mBeanServer, security); namingServer = new StandaloneNamingServer(server); @@ -85,7 +85,7 @@ public class Run implements Action namingServer.start(); - HornetQBootstrapLogger.LOGGER.startedNamingService(broker.naming.bindAddress, broker.naming.port, broker.naming.rmiBindAddress, broker.naming.rmiPort); + ActiveMQBootstrapLogger.LOGGER.startedNamingService(broker.naming.bindAddress, broker.naming.port, broker.naming.rmiBindAddress, broker.naming.rmiPort); if (jms != null) { @@ -96,7 +96,7 @@ public class Run implements Action jmsServerManager = new JMSServerManagerImpl(server); } - HornetQBootstrapLogger.LOGGER.serverStarting(); + ActiveMQBootstrapLogger.LOGGER.serverStarting(); jmsServerManager.start(); @@ -114,7 +114,7 @@ public class Run implements Action { if (!file.delete()) { - HornetQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath()); + ActiveMQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath()); } } final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java index 1432460..23bfcb9 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java @@ -13,7 +13,7 @@ package org.apache.activemq.factory; import org.apache.activemq.dto.SecurityDTO; -import org.apache.activemq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import org.apache.activemq.utils.FactoryFinder; import javax.xml.bind.annotation.XmlRootElement; @@ -21,12 +21,12 @@ import javax.xml.bind.annotation.XmlRootElement; public class SecurityManagerFactory { - public static HornetQSecurityManager create(SecurityDTO config) throws Exception + public static ActiveMQSecurityManager create(SecurityDTO config) throws Exception { if (config != null) { FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/security/"); - HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); + ActiveMQSecurityManager manager = (ActiveMQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); return manager; } else http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java new file mode 100644 index 0000000..55667e2 --- /dev/null +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java @@ -0,0 +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.activemq.integration.bootstrap; + + +import org.jboss.logging.annotations.MessageBundle; + +/** + * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> + * 3/12/12 + * + * Logger Code 10 + * + * each message id must be 6 digits long starting with 10, the 3rd digit should be 9 + * + * so 109000 to 109999 + */ +@MessageBundle(projectCode = "AMQ") +public class ActiveMQBootstrapBundle +{ +} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java new file mode 100644 index 0000000..810ffaa --- /dev/null +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java @@ -0,0 +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.activemq.integration.bootstrap; + +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Logger; +import org.jboss.logging.annotations.Cause; +import org.jboss.logging.annotations.LogMessage; +import org.jboss.logging.annotations.Message; +import org.jboss.logging.annotations.MessageLogger; + +/** + * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> + * 3/15/12 + * + * Logger Code 10 + * + * each message id must be 6 digits long starting with 10, the 3rd digit donates the level so + * + * INF0 1 + * WARN 2 + * DEBUG 3 + * ERROR 4 + * TRACE 5 + * FATAL 6 + * + * so an INFO message would be 101000 to 101999 + */ +@MessageLogger(projectCode = "AMQ") +public interface ActiveMQBootstrapLogger extends BasicLogger +{ + /** + * The default logger. + */ + ActiveMQBootstrapLogger LOGGER = Logger.getMessageLogger(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName()); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 101000, value = "Starting ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT) + void serverStarting(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 101001, value = "Stopping ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT) + void serverStopping(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 101002, value = "Starting Naming server on {0}:{1,number,#} (rmi {2}:{3,number,#})", format = Message.Format.MESSAGE_FORMAT) + void startedNamingService(String bindAddress, int port, String rmiBindAddress, int rmiPort); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 102000, value = "Error during undeployment: {0}", format = Message.Format.MESSAGE_FORMAT) + void errorDuringUndeployment(@Cause Throwable t, String name); + + @LogMessage(level = Logger.Level.ERROR) + @Message(id = 104000, value = "Failed to delete file {0}", format = Message.Format.MESSAGE_FORMAT) + void errorDeletingFile(String name); + + @LogMessage(level = Logger.Level.ERROR) + @Message(id = 104001, value = "Failed to start server", format = Message.Format.MESSAGE_FORMAT) + void errorStartingServer(@Cause Exception e); +} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java deleted file mode 100644 index 8ccdfff..0000000 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapBundle.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.activemq.integration.bootstrap; - - -import org.jboss.logging.annotations.MessageBundle; - -/** - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> - * 3/12/12 - * - * Logger Code 10 - * - * each message id must be 6 digits long starting with 10, the 3rd digit should be 9 - * - * so 109000 to 109999 - */ -@MessageBundle(projectCode = "HQ") -public class HornetQBootstrapBundle -{ -}
