Merged #14
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/b5039ab8 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/b5039ab8 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/b5039ab8 Branch: refs/heads/master Commit: b5039ab8d5c9eafcf49789c414ae28c6e6b8b3a0 Parents: fdf1a1a 1bf2e41 Author: Martyn Taylor <mtay...@redhat.com> Authored: Tue Nov 18 09:23:13 2014 +0000 Committer: Martyn Taylor <mtay...@redhat.com> Committed: Tue Nov 18 09:23:13 2014 +0000 ---------------------------------------------------------------------- .../core/ActiveMQAddressExistsException.java | 35 + .../api/core/ActiveMQAddressFullException.java | 35 + .../ActiveMQAlreadyReplicatingException.java | 35 + .../activemq/api/core/ActiveMQBuffer.java | 1084 ++++++++++++++++++ .../activemq/api/core/ActiveMQBuffers.java | 96 ++ .../core/ActiveMQClusterSecurityException.java | 32 + .../ActiveMQConnectionTimedOutException.java | 35 + .../api/core/ActiveMQDisconnectedException.java | 35 + .../api/core/ActiveMQDuplicateIdException.java | 35 + .../ActiveMQDuplicateMetaDataException.java | 35 + .../activemq/api/core/ActiveMQException.java | 76 ++ .../api/core/ActiveMQExceptionType.java | 298 +++++ .../api/core/ActiveMQIOErrorException.java | 40 + .../api/core/ActiveMQIllegalStateException.java | 36 + ...tiveMQIncompatibleClientServerException.java | 37 + ...iveMQInterceptorRejectedPacketException.java | 37 + .../core/ActiveMQInternalErrorException.java | 45 + .../api/core/ActiveMQInterruptedException.java | 27 + ...ctiveMQInvalidFilterExpressionException.java | 35 + ...tiveMQInvalidTransientQueueUseException.java | 35 + .../api/core/ActiveMQLargeMessageException.java | 35 + ...ctiveMQLargeMessageInterruptedException.java | 36 + .../api/core/ActiveMQNativeIOError.java | 35 + .../core/ActiveMQNonExistentQueueException.java | 35 + .../api/core/ActiveMQNotConnectedException.java | 35 + .../api/core/ActiveMQObjectClosedException.java | 36 + .../ActiveMQPropertyConversionException.java | 30 + .../api/core/ActiveMQQueueExistsException.java | 35 + .../api/core/ActiveMQSecurityException.java | 35 + .../core/ActiveMQSessionCreationException.java | 36 + ...iveMQTransactionOutcomeUnknownException.java | 35 + .../ActiveMQTransactionRolledBackException.java | 35 + .../api/core/ActiveMQUnBlockedException.java | 35 + .../ActiveMQUnsupportedPacketException.java | 35 + .../api/core/HornetQAddressExistsException.java | 35 - .../api/core/HornetQAddressFullException.java | 35 - .../HornetQAlreadyReplicatingException.java | 35 - .../apache/activemq/api/core/HornetQBuffer.java | 1084 ------------------ .../activemq/api/core/HornetQBuffers.java | 96 -- .../core/HornetQClusterSecurityException.java | 32 - .../HornetQConnectionTimedOutException.java | 35 - .../api/core/HornetQDisconnectedException.java | 35 - .../api/core/HornetQDuplicateIdException.java | 35 - .../core/HornetQDuplicateMetaDataException.java | 35 - .../activemq/api/core/HornetQException.java | 76 -- .../activemq/api/core/HornetQExceptionType.java | 298 ----- .../api/core/HornetQIOErrorException.java | 40 - .../api/core/HornetQIllegalStateException.java | 36 - ...ornetQIncompatibleClientServerException.java | 37 - ...rnetQInterceptorRejectedPacketException.java | 37 - .../api/core/HornetQInternalErrorException.java | 45 - .../api/core/HornetQInterruptedException.java | 27 - ...HornetQInvalidFilterExpressionException.java | 35 - ...ornetQInvalidTransientQueueUseException.java | 35 - .../api/core/HornetQLargeMessageException.java | 35 - ...HornetQLargeMessageInterruptedException.java | 36 - .../activemq/api/core/HornetQNativeIOError.java | 35 - .../core/HornetQNonExistentQueueException.java | 35 - .../api/core/HornetQNotConnectedException.java | 35 - .../api/core/HornetQObjectClosedException.java | 36 - .../HornetQPropertyConversionException.java | 30 - .../api/core/HornetQQueueExistsException.java | 35 - .../api/core/HornetQSecurityException.java | 35 - .../core/HornetQSessionCreationException.java | 36 - ...rnetQTransactionOutcomeUnknownException.java | 35 - .../HornetQTransactionRolledBackException.java | 35 - .../api/core/HornetQUnBlockedException.java | 35 - .../core/HornetQUnsupportedPacketException.java | 35 - .../core/buffers/impl/ChannelBufferWrapper.java | 40 +- .../activemq/utils/HornetQUtilBundle.java | 4 +- .../activemq/utils/PasswordMaskingUtil.java | 8 +- .../apache/activemq/utils/TypedProperties.java | 94 +- .../org/apache/activemq/utils/UTF8Util.java | 6 +- .../apache/activemq/api/core/Interceptor.java | 4 +- .../org/apache/activemq/api/core/Message.java | 72 +- .../api/core/TransportConfiguration.java | 4 +- .../api/core/client/ClientConsumer.java | 38 +- .../activemq/api/core/client/ClientMessage.java | 26 +- .../api/core/client/ClientProducer.java | 26 +- .../activemq/api/core/client/ClientSession.java | 152 +-- .../api/core/client/ClientSessionFactory.java | 34 +- .../activemq/api/core/client/ServerLocator.java | 2 +- .../api/core/client/SessionFailureListener.java | 4 +- .../core/management/HornetQServerControl.java | 6 +- .../impl/ResetLimitWrappedHornetQBuffer.java | 16 +- .../core/client/HornetQClientLogger.java | 4 +- .../core/client/HornetQClientMessageBundle.java | 96 +- .../core/client/impl/ClientConsumerImpl.java | 54 +- .../client/impl/ClientConsumerInternal.java | 20 +- .../client/impl/ClientLargeMessageImpl.java | 22 +- .../core/client/impl/ClientMessageImpl.java | 30 +- .../core/client/impl/ClientProducerCredits.java | 4 +- .../client/impl/ClientProducerCreditsImpl.java | 4 +- .../core/client/impl/ClientProducerImpl.java | 56 +- .../client/impl/ClientSessionFactoryImpl.java | 64 +- .../impl/ClientSessionFactoryInternal.java | 4 +- .../core/client/impl/ClientSessionImpl.java | 152 +-- .../core/client/impl/ClientSessionInternal.java | 18 +- .../CompressedLargeMessageControllerImpl.java | 50 +- .../core/client/impl/DelegatingSession.java | 94 +- .../client/impl/LargeMessageController.java | 12 +- .../client/impl/LargeMessageControllerImpl.java | 82 +- .../core/client/impl/ServerLocatorImpl.java | 52 +- .../core/client/impl/ServerLocatorInternal.java | 8 +- .../activemq/core/cluster/DiscoveryGroup.java | 12 +- .../activemq/core/message/BodyEncoder.java | 12 +- .../activemq/core/message/impl/MessageImpl.java | 92 +- .../core/message/impl/MessageInternal.java | 16 +- .../core/protocol/ClientPacketDecoder.java | 4 +- .../activemq/core/protocol/core/Channel.java | 6 +- .../activemq/core/protocol/core/Packet.java | 8 +- .../core/protocol/core/impl/ChannelImpl.java | 22 +- .../core/impl/HornetQClientProtocolManager.java | 36 +- .../core/impl/HornetQSessionContext.java | 86 +- .../core/protocol/core/impl/PacketDecoder.java | 4 +- .../core/protocol/core/impl/PacketImpl.java | 12 +- .../core/impl/RemotingConnectionImpl.java | 8 +- .../impl/wireformat/CheckFailoverMessage.java | 6 +- .../wireformat/CheckFailoverReplyMessage.java | 6 +- .../ClusterTopologyChangeMessage.java | 6 +- .../ClusterTopologyChangeMessage_V2.java | 6 +- .../ClusterTopologyChangeMessage_V3.java | 6 +- .../impl/wireformat/CreateQueueMessage.java | 6 +- .../impl/wireformat/CreateSessionMessage.java | 6 +- .../CreateSessionResponseMessage.java | 6 +- .../wireformat/CreateSharedQueueMessage.java | 6 +- .../wireformat/DisconnectConsumerMessage.java | 6 +- .../core/impl/wireformat/DisconnectMessage.java | 6 +- .../impl/wireformat/DisconnectMessage_V2.java | 6 +- .../wireformat/HornetQExceptionMessage.java | 18 +- .../wireformat/PacketsConfirmedMessage.java | 6 +- .../protocol/core/impl/wireformat/Ping.java | 6 +- .../impl/wireformat/ReattachSessionMessage.java | 6 +- .../ReattachSessionResponseMessage.java | 6 +- .../core/impl/wireformat/RollbackMessage.java | 6 +- .../wireformat/SessionAcknowledgeMessage.java | 6 +- .../wireformat/SessionAddMetaDataMessage.java | 6 +- .../wireformat/SessionAddMetaDataMessageV2.java | 6 +- .../wireformat/SessionBindingQueryMessage.java | 6 +- .../SessionBindingQueryResponseMessage.java | 6 +- .../wireformat/SessionConsumerCloseMessage.java | 6 +- .../SessionConsumerFlowCreditMessage.java | 6 +- .../wireformat/SessionContinuationMessage.java | 6 +- .../SessionCreateConsumerMessage.java | 6 +- .../wireformat/SessionDeleteQueueMessage.java | 6 +- .../impl/wireformat/SessionExpireMessage.java | 6 +- .../SessionForceConsumerDelivery.java | 6 +- .../SessionIndividualAcknowledgeMessage.java | 6 +- .../SessionProducerCreditsFailMessage.java | 6 +- .../SessionProducerCreditsMessage.java | 6 +- .../wireformat/SessionQueueQueryMessage.java | 6 +- .../SessionQueueQueryResponseMessage.java | 6 +- .../SessionReceiveClientLargeMessage.java | 4 +- .../SessionReceiveContinuationMessage.java | 6 +- .../wireformat/SessionReceiveLargeMessage.java | 6 +- .../impl/wireformat/SessionReceiveMessage.java | 8 +- .../SessionRequestProducerCreditsMessage.java | 6 +- .../SessionSendContinuationMessage.java | 6 +- .../wireformat/SessionSendLargeMessage.java | 6 +- .../impl/wireformat/SessionSendMessage.java | 8 +- .../wireformat/SessionXAAfterFailedMessage.java | 6 +- .../impl/wireformat/SessionXACommitMessage.java | 6 +- .../impl/wireformat/SessionXAEndMessage.java | 6 +- .../impl/wireformat/SessionXAForgetMessage.java | 6 +- .../SessionXAGetInDoubtXidsResponseMessage.java | 6 +- .../SessionXAGetTimeoutResponseMessage.java | 6 +- .../impl/wireformat/SessionXAJoinMessage.java | 6 +- .../wireformat/SessionXAPrepareMessage.java | 6 +- .../wireformat/SessionXAResponseMessage.java | 6 +- .../impl/wireformat/SessionXAResumeMessage.java | 6 +- .../wireformat/SessionXARollbackMessage.java | 6 +- .../wireformat/SessionXASetTimeoutMessage.java | 6 +- .../SessionXASetTimeoutResponseMessage.java | 6 +- .../impl/wireformat/SessionXAStartMessage.java | 6 +- .../SubscribeClusterTopologyUpdatesMessage.java | 6 +- ...ubscribeClusterTopologyUpdatesMessageV2.java | 6 +- .../activemq/core/remoting/FailureListener.java | 6 +- .../impl/netty/HornetQChannelHandler.java | 6 +- .../remoting/impl/netty/NettyConnection.java | 24 +- .../remoting/impl/netty/NettyConnector.java | 4 +- .../apache/activemq/reader/MapMessageUtil.java | 6 +- .../org/apache/activemq/reader/MessageUtil.java | 14 +- .../activemq/reader/StreamMessageUtil.java | 24 +- .../apache/activemq/reader/TextMessageUtil.java | 6 +- .../protocol/AbstractRemotingConnection.java | 16 +- .../spi/core/protocol/RemotingConnection.java | 10 +- .../spi/core/remoting/BufferDecoder.java | 6 +- .../spi/core/remoting/BufferHandler.java | 4 +- .../core/remoting/ClientProtocolManager.java | 8 +- .../activemq/spi/core/remoting/Connection.java | 10 +- .../remoting/ConnectionLifeCycleListener.java | 4 +- .../spi/core/remoting/SessionContext.java | 78 +- .../org/apache/activemq/utils/BufferHelper.java | 24 +- .../activemq/utils/ConfigurationHelper.java | 4 +- .../utils/HornetQBufferInputStream.java | 6 +- .../activemq/utils/OrderedExecutorFactory.java | 4 +- .../apache/activemq/utils/XidCodecSupport.java | 6 +- .../apache/activemq/tests/util/RandomUtil.java | 8 +- .../util/TypedPropertiesConversionTest.java | 20 +- .../activemq/util/TypedPropertiesTest.java | 8 +- .../jms/client/HornetQBytesMessage.java | 8 +- .../activemq/jms/client/HornetQConnection.java | 26 +- .../jms/client/HornetQJMSClientBundle.java | 12 +- .../activemq/jms/client/HornetQJMSProducer.java | 24 +- .../activemq/jms/client/HornetQMapMessage.java | 28 +- .../activemq/jms/client/HornetQMessage.java | 38 +- .../jms/client/HornetQMessageConsumer.java | 8 +- .../jms/client/HornetQMessageProducer.java | 8 +- .../jms/client/HornetQObjectMessage.java | 4 +- .../jms/client/HornetQQueueBrowser.java | 8 +- .../activemq/jms/client/HornetQSession.java | 46 +- .../jms/client/HornetQStreamMessage.java | 4 +- .../activemq/jms/client/HornetQTextMessage.java | 4 +- .../activemq/jms/client/JMSExceptionHelper.java | 4 +- .../jms/client/JMSMessageListenerWrapper.java | 6 +- .../activemq/jms/bridge/impl/JMSBridgeImpl.java | 12 +- .../management/impl/JMSQueueControlImpl.java | 6 +- .../management/impl/JMSTopicControlImpl.java | 4 +- .../config/PersistedConnectionFactory.java | 6 +- .../config/PersistedDestination.java | 6 +- .../jms/persistence/config/PersistedJNDI.java | 6 +- .../journal/JMSJournalStorageManagerImpl.java | 6 +- .../jms/server/HornetQJMSServerBundle.java | 22 +- .../ConnectionFactoryConfigurationImpl.java | 6 +- .../TransportConfigurationEncodingSupport.java | 10 +- .../server/impl/JMSServerConfigParserImpl.java | 4 +- .../jms/server/impl/JMSServerManagerImpl.java | 6 +- .../recovery/HornetQXAResourceWrapper.java | 16 +- .../jms/server/recovery/RecoveryDiscovery.java | 12 +- .../activemq/core/asyncio/AsynchronousFile.java | 20 +- .../core/asyncio/impl/AsynchronousFileImpl.java | 46 +- .../activemq/core/journal/EncodingSupport.java | 6 +- .../activemq/core/journal/SequentialFile.java | 10 +- .../core/journal/impl/AIOSequentialFile.java | 12 +- .../journal/impl/AIOSequentialFileFactory.java | 6 +- .../journal/impl/AbstractJournalUpdateTask.java | 14 +- .../journal/impl/AbstractSequentialFile.java | 30 +- .../impl/AbstractSequentialFileFactory.java | 4 +- .../core/journal/impl/FileWrapperJournal.java | 16 +- .../activemq/core/journal/impl/JournalBase.java | 6 +- .../core/journal/impl/JournalCompactor.java | 6 +- .../activemq/core/journal/impl/JournalImpl.java | 14 +- .../core/journal/impl/JournalTransaction.java | 4 +- .../core/journal/impl/NIOSequentialFile.java | 44 +- .../core/journal/impl/SimpleWaitIOCallback.java | 12 +- .../activemq/core/journal/impl/TimedBuffer.java | 22 +- .../impl/dataformat/ByteArrayEncoding.java | 6 +- .../impl/dataformat/JournalAddRecord.java | 4 +- .../impl/dataformat/JournalAddRecordTX.java | 4 +- .../dataformat/JournalCompleteRecordTX.java | 4 +- .../impl/dataformat/JournalDeleteRecord.java | 4 +- .../impl/dataformat/JournalDeleteRecordTX.java | 4 +- .../impl/dataformat/JournalInternalRecord.java | 4 +- .../dataformat/JournalRollbackRecordTX.java | 4 +- .../activemq/journal/HornetQJournalBundle.java | 10 +- activemq-native/README | 3 +- activemq-native/bin/libactivemqAIO64.so | Bin 0 -> 51692 bytes activemq-native/pom.xml | 4 +- .../src/main/c/JNI_AsynchronousFileImpl.cpp | 38 +- activemq-native/src/main/c/JavaUtilities.cpp | 2 +- .../org/apache/activemq/core/libaio/Native.java | 12 +- .../proton/HornetQProtonRemotingConnection.java | 8 +- .../protocol/proton/ProtonProtocolManager.java | 6 +- .../converter/jms/ServerJMSMapMessage.java | 24 +- .../proton/converter/jms/ServerJMSMessage.java | 4 +- .../converter/jms/ServerJMSStreamMessage.java | 4 +- .../core/protocol/proton/TestConversions.java | 40 +- .../protocol/openwire/DataInputWrapper.java | 4 +- .../protocol/openwire/OpenWireConnection.java | 28 +- .../openwire/OpenWireMessageConverter.java | 10 +- .../openwire/OpenWireProtocolManager.java | 6 +- .../core/protocol/openwire/OpenWireUtil.java | 8 +- .../core/protocol/stomp/StompConnection.java | 22 +- .../core/protocol/stomp/StompDecoder.java | 4 +- .../core/protocol/stomp/StompFrame.java | 12 +- .../protocol/stomp/StompProtocolManager.java | 10 +- .../core/protocol/stomp/StompSession.java | 4 +- .../stomp/VersionedStompFrameHandler.java | 6 +- .../core/protocol/stomp/v11/StompFrameV11.java | 10 +- .../core/protocol/stomp/v12/StompFrameV12.java | 10 +- .../org/apache/activemq/ra/HornetQRABundle.java | 4 +- .../apache/activemq/ra/HornetQRAProperties.java | 4 +- .../apache/activemq/ra/HornetQRAXAResource.java | 4 +- .../activemq/ra/HornetQResourceAdapter.java | 10 +- .../activemq/ra/inflow/HornetQActivation.java | 20 +- .../ra/inflow/HornetQMessageHandler.java | 10 +- .../apache/activemq/rest/HornetQRestLogger.java | 4 +- .../rest/queue/AcknowledgedQueueConsumer.java | 10 +- .../activemq/rest/queue/ConsumersResource.java | 8 +- .../apache/activemq/rest/queue/PostMessage.java | 8 +- .../activemq/rest/queue/PostMessageDupsOk.java | 4 +- .../activemq/rest/queue/QueueConsumer.java | 6 +- .../rest/queue/QueueDestinationsResource.java | 4 +- .../activemq/rest/queue/push/PushConsumer.java | 4 +- .../queue/push/PushConsumerMessageHandler.java | 8 +- .../topic/AcknowledgedSubscriptionResource.java | 4 +- .../activemq/rest/topic/PushSubscription.java | 6 +- .../rest/topic/PushSubscriptionsResource.java | 8 +- .../rest/topic/SubscriptionResource.java | 4 +- .../rest/topic/SubscriptionsResource.java | 18 +- .../rest/topic/TopicDestinationsResource.java | 4 +- .../core/config/ConfigurationUtils.java | 8 +- .../core/deployers/impl/XmlDeployer.java | 6 +- .../activemq/core/filter/impl/FilterImpl.java | 10 +- .../core/management/impl/QueueControlImpl.java | 8 +- .../apache/activemq/core/paging/impl/Page.java | 10 +- .../core/paging/impl/PageSyncTimer.java | 4 +- .../paging/impl/PageTransactionInfoImpl.java | 6 +- .../core/paging/impl/PagedMessageImpl.java | 10 +- .../config/PersistedAddressSetting.java | 6 +- .../core/persistence/config/PersistedRoles.java | 6 +- .../impl/journal/BatchingIDGenerator.java | 8 +- .../impl/journal/DescribeJournal.java | 8 +- .../impl/journal/JournalStorageManager.java | 104 +- .../impl/journal/LargeServerMessageImpl.java | 36 +- .../impl/journal/LargeServerMessageInSync.java | 4 +- .../impl/journal/OperationContextImpl.java | 8 +- .../nullpm/NullStorageLargeServerMessage.java | 4 +- .../core/postoffice/impl/PostOfficeImpl.java | 18 +- .../core/protocol/ServerPacketDecoder.java | 4 +- .../core/ServerSessionPacketHandler.java | 16 +- .../protocol/core/impl/CoreProtocolManager.java | 6 +- .../core/impl/HornetQPacketHandler.java | 18 +- .../wireformat/BackupRegistrationMessage.java | 6 +- .../BackupReplicationStartFailedMessage.java | 6 +- .../impl/wireformat/BackupRequestMessage.java | 6 +- .../impl/wireformat/BackupResponseMessage.java | 6 +- .../impl/wireformat/ClusterConnectMessage.java | 6 +- .../wireformat/ClusterConnectReplyMessage.java | 6 +- .../impl/wireformat/NodeAnnounceMessage.java | 6 +- .../core/impl/wireformat/QuorumVoteMessage.java | 8 +- .../impl/wireformat/QuorumVoteReplyMessage.java | 8 +- .../impl/wireformat/ReplicationAddMessage.java | 6 +- .../wireformat/ReplicationAddTXMessage.java | 6 +- .../wireformat/ReplicationCommitMessage.java | 6 +- .../wireformat/ReplicationDeleteMessage.java | 6 +- .../wireformat/ReplicationDeleteTXMessage.java | 6 +- .../ReplicationLargeMessageBeginMessage.java | 6 +- .../ReplicationLargeMessageEndMessage.java | 6 +- .../ReplicationLargeMessageWriteMessage.java | 6 +- .../ReplicationLiveIsStoppingMessage.java | 6 +- .../wireformat/ReplicationPageEventMessage.java | 6 +- .../wireformat/ReplicationPageWriteMessage.java | 6 +- .../wireformat/ReplicationPrepareMessage.java | 6 +- .../wireformat/ReplicationStartSyncMessage.java | 6 +- .../wireformat/ReplicationSyncFileMessage.java | 6 +- .../wireformat/ScaleDownAnnounceMessage.java | 6 +- .../core/remoting/impl/invm/InVMAcceptor.java | 4 +- .../core/remoting/impl/invm/InVMConnection.java | 20 +- .../core/remoting/impl/invm/InVMConnector.java | 4 +- .../core/remoting/impl/netty/NettyAcceptor.java | 4 +- .../impl/netty/NettyServerConnection.java | 4 +- .../server/impl/RemotingServiceImpl.java | 12 +- .../core/replication/ReplicationEndpoint.java | 10 +- .../core/replication/ReplicationManager.java | 27 +- .../core/server/HornetQMessageBundle.java | 122 +- .../core/server/HornetQServerLogger.java | 4 +- .../core/server/LargeServerMessage.java | 6 +- .../activemq/core/server/LiveNodeLocator.java | 8 +- .../activemq/core/server/NodeManager.java | 4 +- .../core/server/cluster/ClusterControl.java | 18 +- .../core/server/cluster/ClusterController.java | 4 +- .../core/server/cluster/ClusterManager.java | 10 +- .../core/server/cluster/ha/ScaleDownPolicy.java | 4 +- .../core/server/cluster/impl/BridgeImpl.java | 22 +- .../server/cluster/impl/BroadcastGroupImpl.java | 6 +- .../cluster/impl/ClusterConnectionBridge.java | 8 +- .../cluster/impl/ClusterConnectionImpl.java | 4 +- .../core/server/cluster/qourum/BooleanVote.java | 6 +- .../cluster/qourum/QuorumVoteHandler.java | 4 +- .../qourum/SharedNothingBackupQuorum.java | 12 +- .../core/server/cluster/qourum/Vote.java | 6 +- .../activemq/core/server/impl/Activation.java | 4 +- .../impl/AnyLiveNodeLocatorForReplication.java | 6 +- .../impl/AnyLiveNodeLocatorForScaleDown.java | 8 +- .../core/server/impl/ColocatedActivation.java | 8 +- .../core/server/impl/FileLockNodeManager.java | 6 +- .../core/server/impl/InVMNodeManager.java | 4 +- .../core/server/impl/LiveOnlyActivation.java | 4 +- .../NamedLiveNodeLocatorForReplication.java | 6 +- .../impl/NamedLiveNodeLocatorForScaleDown.java | 8 +- .../server/impl/NamedNodeIdNodeLocator.java | 6 +- .../core/server/impl/ReplicationError.java | 8 +- .../core/server/impl/ServerConsumerImpl.java | 14 +- .../core/server/impl/ServerSessionImpl.java | 22 +- .../impl/SharedNothingBackupActivation.java | 12 +- .../impl/SharedNothingLiveActivation.java | 26 +- .../impl/SharedStoreBackupActivation.java | 4 +- .../server/impl/TransientQueueManagerImpl.java | 4 +- .../core/settings/impl/AddressSettings.java | 6 +- .../activemq/core/transaction/Transaction.java | 4 +- .../core/transaction/impl/TransactionImpl.java | 6 +- .../spi/core/protocol/ProtocolManager.java | 6 +- .../activemq/core/filter/impl/FilterTest.java | 12 +- .../impl/ScheduledDeliveryHandlerTest.java | 70 +- .../util/CountDownSessionFailureListener.java | 8 +- .../activemq/tests/util/ServiceTestBase.java | 8 +- .../activemq/tests/util/UnitTestCase.java | 18 +- .../org/apache/activemq/tools/PrintPages.java | 6 +- .../apache/activemq/tools/XmlDataExporter.java | 16 +- activemq6-native/bin/libHornetQAIO32.so | Bin 44803 -> 0 bytes activemq6-native/bin/libHornetQAIO64.so | Bin 51969 -> 0 bytes docs/user-manual/en/ha.xml | 12 +- docs/user-manual/en/intercepting-operations.xml | 6 +- docs/user-manual/zh/ha.xml | 12 +- docs/user-manual/zh/intercepting-operations.xml | 2 +- examples/jms/interceptor/readme.html | 4 +- .../activemq/jms/example/SimpleInterceptor.java | 4 +- .../aerogear/HornetQAeroGearBundle.java | 10 +- .../vertx/IncomingVertxEventHandler.java | 4 +- .../vertx/OutgoingVertxEventHandler.java | 4 +- pom.xml | 8 +- tests/byteman-tests/pom.xml | 4 +- .../activemq/byteman/tests/BMFailoverTest.java | 14 +- .../byteman/tests/ClusteredGroupingTest.java | 10 +- .../activemq/byteman/tests/GroupingTest.java | 4 +- .../activemq/byteman/tests/MessageCopyTest.java | 6 +- tests/concurrent-tests/pom.xml | 2 +- tests/integration-tests/pom.xml | 2 +- .../integration/DuplicateDetectionTest.java | 16 +- .../tests/integration/InterceptorTest.java | 32 +- .../integration/client/AcknowledgeTest.java | 74 +- .../integration/client/AutogroupIdTest.java | 4 +- .../integration/client/CommitRollbackTest.java | 10 +- .../integration/client/ConsumerCloseTest.java | 16 +- .../tests/integration/client/ConsumerTest.java | 12 +- .../integration/client/CoreClientTest.java | 4 +- .../client/CreateQueueIdempotentTest.java | 12 +- .../client/DeadLetterAddressTest.java | 4 +- .../integration/client/DeliveryOrderTest.java | 4 +- .../integration/client/FailureDeadlockTest.java | 6 +- .../integration/client/HangConsumerTest.java | 10 +- .../integration/client/HornetQCrashTest.java | 4 +- .../client/IncompatibleVersionTest.java | 8 +- .../client/InterruptedLargeMessageTest.java | 6 +- .../integration/client/LargeMessageTest.java | 4 +- .../client/MessageDurabilityTest.java | 18 +- .../MessageGroupingConnectionFactoryTest.java | 4 +- .../integration/client/MessageGroupingTest.java | 4 +- .../client/MultipleThreadFilterOneTest.java | 6 +- .../client/NewDeadLetterAddressTest.java | 4 +- .../integration/client/PagingOrderTest.java | 12 +- .../integration/client/PagingSyncTest.java | 4 +- .../tests/integration/client/PagingTest.java | 68 +- .../integration/client/ProducerCloseTest.java | 8 +- .../client/ProducerFlowControlTest.java | 4 +- .../tests/integration/client/ProducerTest.java | 4 +- .../tests/integration/client/ReceiveTest.java | 14 +- .../client/RedeliveryConsumerTest.java | 4 +- .../tests/integration/client/RequestorTest.java | 10 +- .../client/SelfExpandingBufferTest.java | 4 +- .../client/ServerLocatorConnectTest.java | 10 +- .../integration/client/SessionCloseTest.java | 44 +- ...onClosedOnRemotingConnectionFailureTest.java | 16 +- .../client/SessionCreateAndDeleteQueueTest.java | 8 +- .../client/SessionCreateConsumerTest.java | 14 +- .../client/SessionCreateProducerTest.java | 8 +- .../tests/integration/client/SessionTest.java | 12 +- .../integration/client/SlowConsumerTest.java | 18 +- .../integration/client/TemporaryQueueTest.java | 28 +- .../integration/client/TransientQueueTest.java | 10 +- .../integration/client/WildCardRoutingTest.java | 4 +- .../clientcrash/DummyInterceptor.java | 8 +- .../clientcrash/DummyInterceptorB.java | 4 +- .../cluster/ClusterControllerTest.java | 4 +- .../cluster/bridge/BridgeReconnectTest.java | 16 +- .../integration/cluster/bridge/BridgeTest.java | 10 +- .../cluster/bridge/SimpleTransformer.java | 4 +- .../cluster/distribution/ClusterTestBase.java | 6 +- .../distribution/ClusteredGroupingTest.java | 6 +- .../failover/AsynchronousFailoverTest.java | 40 +- .../failover/BackupAuthenticationTest.java | 4 +- .../cluster/failover/BackupSyncJournalTest.java | 8 +- .../failover/BackupSyncLargeMessageTest.java | 8 +- .../cluster/failover/DelayInterceptor.java | 4 +- .../cluster/failover/DelayInterceptor2.java | 4 +- .../cluster/failover/DelayInterceptor3.java | 4 +- .../failover/FailoverOnFlowControlTest.java | 4 +- .../cluster/failover/FailoverTest.java | 78 +- .../cluster/failover/FailoverTestBase.java | 4 +- .../failover/NettyAsynchronousReattachTest.java | 4 +- .../failover/ReplicatedDistributionTest.java | 4 +- .../remote/FailoverWithSharedStoreTest.java | 8 +- .../MultiThreadRandomReattachTestBase.java | 4 +- .../MultiThreadReattachSupportTestBase.java | 4 +- .../cluster/reattach/OrderReattachTest.java | 4 +- .../cluster/reattach/RandomReattachTest.java | 10 +- .../cluster/reattach/ReattachTest.java | 48 +- .../topology/TopologyClusterTestBase.java | 16 +- .../cluster/util/BackupSyncDelay.java | 6 +- .../integration/discovery/DiscoveryTest.java | 4 +- .../jms/bridge/ClusteredBridgeTestBase.java | 6 +- .../jms/bridge/JMSBridgeClusteredTest.java | 12 +- .../integration/jms/client/GroupingTest.java | 4 +- ...onClosedOnRemotingConnectionFailureTest.java | 8 +- .../jms/cluster/BindingsClusterTest.java | 10 +- .../jms/cluster/JMSFailoverTest.java | 4 +- .../jms/cluster/JMSReconnectTest.java | 6 +- .../CloseDestroyedConnectionTest.java | 14 +- .../jms/connection/ExceptionListenerTest.java | 12 +- .../server/management/JMSServerControlTest.java | 8 +- .../jms/server/management/JMSUtil.java | 8 +- .../journal/JournalPerfTuneTest.java | 6 +- .../largemessage/LargeMessageTestBase.java | 20 +- .../management/AcceptorControlTest.java | 6 +- .../ManagementWithPagingServerTest.java | 4 +- .../management/NotificationTest.java | 4 +- .../management/QueueControlTest.java | 4 +- .../management/SecurityNotificationTest.java | 4 +- .../persistence/DeleteQueueRestartTest.java | 4 +- ...nnectionFactoryConfigurationStorageTest.java | 8 +- ...ansportConfigurationEncodingSupportTest.java | 8 +- .../ra/HornetQMessageHandlerTest.java | 8 +- .../tests/integration/remoting/PingTest.java | 22 +- .../integration/remoting/ReconnectTest.java | 22 +- .../replication/ReplicationTest.java | 24 +- .../integration/security/SecurityTest.java | 96 +- .../server/AddressFullLoggingTest.java | 4 +- .../integration/server/ExpiryRunnerTest.java | 4 +- .../integration/server/LVQRecoveryTest.java | 6 +- .../tests/integration/server/LVQTest.java | 8 +- .../integration/server/PredefinedQueueTest.java | 16 +- .../ssl/CoreClientOverOneWaySSLTest.java | 46 +- .../ssl/CoreClientOverTwoWaySSLTest.java | 10 +- .../NettyConnectorWithHTTPUpgradeTest.java | 10 +- .../integration/vertx/HornetQVertxUnitTest.java | 4 +- .../integration/xa/BasicXaRecoveryTest.java | 4 +- .../tests/integration/xa/BasicXaTest.java | 8 +- .../tests/integration/xa/XaTimeoutTest.java | 6 +- .../largemessage/LargeMessageTestBase.java | 20 +- tests/jms-tests/pom.xml | 2 +- .../jms/tests/message/MessageHeaderTest.java | 110 +- tests/joram-tests/pom.xml | 2 +- tests/performance-tests/pom.xml | 2 +- .../paging/MeasurePagingMultiThreadTest.java | 14 +- tests/pom.xml | 2 +- tests/soak-tests/pom.xml | 2 +- tests/stress-tests/pom.xml | 2 +- .../journal/JournalRestartStressTest.java | 2 +- .../NIOMultiThreadCompactorStressTest.java | 12 +- .../stress/paging/PageCursorStressTest.java | 14 +- .../tests/stress/paging/PageStressTest.java | 4 +- .../tests/stress/remote/PingStressTest.java | 4 +- tests/timing-tests/pom.xml | 2 +- .../activemq/tests/timing/util/UTF8Test.java | 8 +- .../tests/unit/core/asyncio/AIOTestBase.java | 4 +- .../unit/core/asyncio/AsynchronousFileTest.java | 10 +- .../MultiThreadAsynchronousFileTest.java | 6 +- .../client/impl/LargeMessageBufferTest.java | 46 +- .../core/journal/impl/JournalImplTestUnit.java | 8 +- .../impl/SequentialFileFactoryTestBase.java | 14 +- .../unit/core/journal/impl/TimedBufferTest.java | 14 +- .../impl/fakes/FakeSequentialFileFactory.java | 18 +- .../core/journal/impl/fakes/SimpleEncoding.java | 6 +- .../unit/core/message/impl/MessageImplTest.java | 6 +- .../tests/unit/core/paging/impl/PageTest.java | 10 +- .../core/paging/impl/PagingStoreImplTest.java | 26 +- .../impl/BatchIDGeneratorUnitTest.java | 6 +- .../impl/OperationContextUnitTest.java | 4 +- .../core/postoffice/impl/BindingsImplTest.java | 4 +- .../core/remoting/HornetQBufferTestBase.java | 6 +- .../impl/netty/ChannelBufferWrapper2Test.java | 8 +- .../impl/netty/NettyAcceptorFactoryTest.java | 8 +- .../remoting/impl/netty/NettyAcceptorTest.java | 8 +- .../impl/netty/NettyConnectionTest.java | 12 +- .../remoting/impl/netty/NettyConnectorTest.java | 28 +- .../server/impl/fake/FakeInterceptor.java | 4 +- .../unit/jms/client/JMSExceptionHelperTest.java | 30 +- .../unit/util/HornetQBufferInputStreamTest.java | 6 +- .../activemq/tests/unit/util/UTF8Test.java | 20 +- 570 files changed, 5870 insertions(+), 5876 deletions(-) ----------------------------------------------------------------------
