You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/04/28 18:02:56 UTC
[51/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis
rename
ACTIVEMQ6-1 Artemis rename
Based on the Apache ActiveMQ community vote this project is being
renamed "Artemis."
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/8f52a622
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/8f52a622
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/8f52a622
Branch: refs/heads/master
Commit: 8f52a622d0d883ca5e9f60ba7754ed51de38cc5c
Parents: f509c07
Author: Justin Bertram <jb...@apache.org>
Authored: Mon Apr 27 17:32:30 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Apr 27 17:48:02 2015 -0400
----------------------------------------------------------------------
NOTICE | 2 +-
README.md | 8 +-
artemis-boot/pom.xml | 6 +-
.../apache/activemq/artemis/boot/ActiveMQ.java | 4 +-
artemis-bootstrap/pom.xml | 18 +-
.../org/apache/activemq/artemis/cli/banner.txt | 12 +-
.../apache/activemq/artemis/cli/ActiveMQ.java | 14 +-
.../artemis/cli/ConfigurationException.java | 2 +-
.../activemq/artemis/cli/commands/Action.java | 2 +-
.../artemis/cli/commands/ActionContext.java | 2 +-
.../activemq/artemis/cli/commands/Create.java | 2 +-
.../artemis/cli/commands/HelpAction.java | 2 +-
.../activemq/artemis/cli/commands/Run.java | 22 +-
.../activemq/artemis/cli/commands/Stop.java | 6 +-
.../artemis/components/ExternalComponent.java | 6 +-
.../artemis/factory/BasicSecurityHandler.java | 12 +-
.../activemq/artemis/factory/BrokerFactory.java | 18 +-
.../artemis/factory/BrokerFactoryHandler.java | 4 +-
.../activemq/artemis/factory/BrokerHandler.java | 8 +-
.../artemis/factory/FileBrokerHandler.java | 10 +-
.../artemis/factory/SecurityHandler.java | 6 +-
.../artemis/factory/SecurityManagerFactory.java | 10 +-
.../factory/XmlBrokerFactoryHandler.java | 8 +-
.../activemq/artemis/integration/Broker.java | 4 +-
.../artemis/integration/FileBroker.java | 18 +-
.../bootstrap/ActiveMQBootstrapBundle.java | 2 +-
.../bootstrap/ActiveMQBootstrapLogger.java | 2 +-
.../artemis/broker/security/basic-security | 8 +-
.../apache/activemq/artemis/broker/server/file | 8 +-
.../org/apache/activemq/artemis/broker/xml | 8 +-
.../activemq/artemis/cli/commands/bin/activemq | 8 +-
.../cli/commands/bin/activemq-service.xml | 6 +-
.../artemis/cli/commands/bin/activemq.cmd | 8 +-
.../artemis/cli/commands/etc/logging.properties | 12 +-
.../activemq/artemis/test/FileBrokerTest.java | 12 +-
artemis-commons/pom.xml | 6 +-
.../core/ActiveMQAddressExistsException.java | 8 +-
.../api/core/ActiveMQAddressFullException.java | 8 +-
.../ActiveMQAlreadyReplicatingException.java | 8 +-
.../artemis/api/core/ActiveMQBuffer.java | 2 +-
.../artemis/api/core/ActiveMQBuffers.java | 4 +-
.../core/ActiveMQClusterSecurityException.java | 2 +-
.../ActiveMQConnectionTimedOutException.java | 8 +-
.../api/core/ActiveMQDisconnectedException.java | 8 +-
.../api/core/ActiveMQDuplicateIdException.java | 8 +-
.../ActiveMQDuplicateMetaDataException.java | 8 +-
.../artemis/api/core/ActiveMQException.java | 2 +-
.../artemis/api/core/ActiveMQExceptionType.java | 2 +-
.../api/core/ActiveMQIOErrorException.java | 10 +-
.../api/core/ActiveMQIllegalStateException.java | 8 +-
...tiveMQIncompatibleClientServerException.java | 8 +-
...iveMQInterceptorRejectedPacketException.java | 10 +-
.../core/ActiveMQInternalErrorException.java | 12 +-
.../api/core/ActiveMQInterruptedException.java | 2 +-
...ctiveMQInvalidFilterExpressionException.java | 8 +-
...tiveMQInvalidTransientQueueUseException.java | 8 +-
.../api/core/ActiveMQLargeMessageException.java | 8 +-
...ctiveMQLargeMessageInterruptedException.java | 8 +-
.../artemis/api/core/ActiveMQNativeIOError.java | 2 +-
.../core/ActiveMQNonExistentQueueException.java | 8 +-
.../api/core/ActiveMQNotConnectedException.java | 8 +-
.../api/core/ActiveMQObjectClosedException.java | 8 +-
.../ActiveMQPropertyConversionException.java | 4 +-
.../api/core/ActiveMQQueueExistsException.java | 8 +-
.../api/core/ActiveMQSecurityException.java | 4 +-
.../core/ActiveMQSessionCreationException.java | 8 +-
...iveMQTransactionOutcomeUnknownException.java | 8 +-
.../ActiveMQTransactionRolledBackException.java | 8 +-
.../api/core/ActiveMQUnBlockedException.java | 8 +-
.../ActiveMQUnsupportedPacketException.java | 8 +-
.../apache/activemq/artemis/api/core/Pair.java | 2 +-
.../activemq/artemis/api/core/SimpleString.java | 4 +-
.../core/buffers/impl/ChannelBufferWrapper.java | 10 +-
.../artemis/core/server/ActiveMQComponent.java | 2 +-
.../artemis/logs/ActiveMQUtilBundle.java | 4 +-
.../artemis/logs/ActiveMQUtilLogger.java | 2 +-
.../artemis/logs/AssertionLoggerHandler.java | 2 +-
.../artemis/utils/ActiveMQThreadFactory.java | 2 +-
.../apache/activemq/artemis/utils/Base64.java | 2 +-
.../apache/activemq/artemis/utils/ByteUtil.java | 2 +-
.../artemis/utils/ClassloadingUtil.java | 2 +-
.../artemis/utils/ConcurrentHashSet.java | 2 +-
.../activemq/artemis/utils/ConcurrentSet.java | 2 +-
.../activemq/artemis/utils/DataConstants.java | 2 +-
.../utils/DefaultSensitiveStringCodec.java | 4 +-
.../activemq/artemis/utils/FactoryFinder.java | 2 +-
.../artemis/utils/PasswordMaskingUtil.java | 8 +-
.../artemis/utils/ReferenceCounter.java | 2 +-
.../artemis/utils/ReferenceCounterUtil.java | 2 +-
.../activemq/artemis/utils/ReusableLatch.java | 2 +-
.../artemis/utils/SensitiveDataCodec.java | 2 +-
.../activemq/artemis/utils/TypedProperties.java | 34 +--
.../apache/activemq/artemis/utils/UTF8Util.java | 8 +-
.../org/apache/activemq/artemis/utils/UUID.java | 2 +-
.../activemq/artemis/utils/UUIDGenerator.java | 6 +-
.../activemq/artemis/utils/UUIDTimer.java | 2 +-
.../artemis/utils/uri/SchemaConstants.java | 2 +-
.../activemq/artemis/utils/uri/URIFactory.java | 2 +-
.../activemq/artemis/utils/uri/URISchema.java | 2 +-
.../activemq/artemis/utils/ByteUtilTest.java | 2 +-
.../apache/activemq/artemis/utils/PairTest.java | 4 +-
.../artemis/utils/ReferenceCounterTest.java | 2 +-
.../activemq/artemis/utils/URIParserTest.java | 6 +-
artemis-core-client/pom.xml | 14 +-
.../config/ActiveMQDefaultConfiguration.java | 20 +-
.../artemis/api/core/BaseInterceptor.java | 4 +-
.../artemis/api/core/BroadcastEndpoint.java | 2 +-
.../api/core/BroadcastEndpointFactory.java | 2 +-
.../api/core/BroadcastGroupConfiguration.java | 6 +-
.../core/ChannelBroadcastEndpointFactory.java | 2 +-
.../api/core/DiscoveryGroupConfiguration.java | 6 +-
.../artemis/api/core/FilterConstants.java | 2 +-
.../activemq/artemis/api/core/Interceptor.java | 6 +-
.../api/core/JGroupsBroadcastEndpoint.java | 2 +-
.../core/JGroupsChannelBroadcastEndpoint.java | 2 +-
.../api/core/JGroupsFileBroadcastEndpoint.java | 2 +-
.../JGroupsFileBroadcastEndpointFactory.java | 2 +-
.../JGroupsPropertiesBroadcastEndpoint.java | 2 +-
...roupsPropertiesBroadcastEndpointFactory.java | 2 +-
.../activemq/artemis/api/core/Message.java | 4 +-
.../api/core/TransportConfiguration.java | 16 +-
.../api/core/TransportConfigurationHelper.java | 2 +-
.../api/core/UDPBroadcastEndpointFactory.java | 8 +-
.../artemis/api/core/client/ActiveMQClient.java | 16 +-
.../artemis/api/core/client/ClientConsumer.java | 18 +-
.../artemis/api/core/client/ClientMessage.java | 64 ++---
.../artemis/api/core/client/ClientProducer.java | 24 +-
.../api/core/client/ClientRequestor.java | 6 +-
.../artemis/api/core/client/ClientSession.java | 84 +++---
.../api/core/client/ClientSessionFactory.java | 24 +-
.../core/client/ClusterTopologyListener.java | 2 +-
.../api/core/client/FailoverEventListener.java | 2 +-
.../api/core/client/FailoverEventType.java | 2 +-
.../artemis/api/core/client/MessageHandler.java | 2 +-
.../core/client/SendAcknowledgementHandler.java | 4 +-
.../artemis/api/core/client/ServerLocator.java | 22 +-
.../api/core/client/SessionFailureListener.java | 6 +-
.../artemis/api/core/client/TopologyMember.java | 6 +-
.../ConnectionLoadBalancingPolicy.java | 2 +-
...rstElementConnectionLoadBalancingPolicy.java | 2 +-
.../RandomConnectionLoadBalancingPolicy.java | 4 +-
...ndomStickyConnectionLoadBalancingPolicy.java | 4 +-
...RoundRobinConnectionLoadBalancingPolicy.java | 4 +-
.../core/client/loadbalance/package-info.java | 2 +-
.../artemis/api/core/client/package-info.java | 2 +-
.../api/core/management/AcceptorControl.java | 2 +-
.../management/ActiveMQComponentControl.java | 2 +-
.../core/management/ActiveMQServerControl.java | 12 +-
.../api/core/management/AddressControl.java | 2 +-
.../core/management/AddressSettingsInfo.java | 4 +-
.../api/core/management/BridgeControl.java | 4 +-
.../core/management/BroadcastGroupControl.java | 2 +-
.../management/ClusterConnectionControl.java | 2 +-
.../core/management/CoreNotificationType.java | 2 +-
.../api/core/management/DayCounterInfo.java | 8 +-
.../api/core/management/DivertControl.java | 4 +-
.../api/core/management/ManagementHelper.java | 12 +-
.../api/core/management/NotificationType.java | 2 +-
.../api/core/management/ObjectNameBuilder.java | 12 +-
.../artemis/api/core/management/Operation.java | 2 +-
.../artemis/api/core/management/Parameter.java | 2 +-
.../api/core/management/QueueControl.java | 2 +-
.../api/core/management/ResourceNames.java | 2 +-
.../artemis/api/core/management/RoleInfo.java | 6 +-
.../api/core/management/package-info.java | 2 +-
.../activemq/artemis/api/core/package-info.java | 2 +-
.../impl/ResetLimitWrappedActiveMQBuffer.java | 8 +-
.../core/client/ActiveMQClientLogger.java | 10 +-
.../client/ActiveMQClientMessageBundle.java | 36 +--
.../core/client/impl/ActiveMQXAResource.java | 2 +-
.../core/client/impl/AddressQueryImpl.java | 6 +-
.../impl/AfterConnectInternalListener.java | 2 +-
.../core/client/impl/ClientConsumerImpl.java | 46 +--
.../client/impl/ClientConsumerInternal.java | 16 +-
.../client/impl/ClientLargeMessageImpl.java | 12 +-
.../client/impl/ClientLargeMessageInternal.java | 2 +-
.../core/client/impl/ClientMessageImpl.java | 22 +-
.../core/client/impl/ClientMessageInternal.java | 8 +-
.../impl/ClientProducerCreditManager.java | 6 +-
.../impl/ClientProducerCreditManagerImpl.java | 6 +-
.../core/client/impl/ClientProducerCredits.java | 6 +-
.../client/impl/ClientProducerCreditsImpl.java | 12 +-
.../core/client/impl/ClientProducerImpl.java | 48 ++--
.../client/impl/ClientProducerInternal.java | 4 +-
.../client/impl/ClientSessionFactoryImpl.java | 68 ++---
.../impl/ClientSessionFactoryInternal.java | 12 +-
.../core/client/impl/ClientSessionImpl.java | 48 ++--
.../core/client/impl/ClientSessionInternal.java | 20 +-
.../CompressedLargeMessageControllerImpl.java | 22 +-
.../core/client/impl/DelegatingSession.java | 30 +-
.../client/impl/LargeMessageController.java | 6 +-
.../client/impl/LargeMessageControllerImpl.java | 30 +-
.../core/client/impl/QueueQueryImpl.java | 6 +-
.../core/client/impl/ServerLocatorImpl.java | 56 ++--
.../core/client/impl/ServerLocatorInternal.java | 16 +-
.../artemis/core/client/impl/Topology.java | 10 +-
.../core/client/impl/TopologyMemberImpl.java | 10 +-
.../artemis/core/cluster/DiscoveryEntry.java | 4 +-
.../artemis/core/cluster/DiscoveryGroup.java | 28 +-
.../artemis/core/cluster/DiscoveryListener.java | 2 +-
.../core/exception/ActiveMQXAException.java | 2 +-
.../artemis/core/message/BodyEncoder.java | 6 +-
.../artemis/core/message/impl/MessageImpl.java | 28 +-
.../core/message/impl/MessageInternal.java | 14 +-
.../core/protocol/ClientPacketDecoder.java | 20 +-
.../artemis/core/protocol/core/Channel.java | 24 +-
.../core/protocol/core/ChannelHandler.java | 2 +-
.../core/CommandConfirmationHandler.java | 2 +-
.../protocol/core/CoreRemotingConnection.java | 6 +-
.../artemis/core/protocol/core/Packet.java | 8 +-
.../impl/ActiveMQClientProtocolManager.java | 76 ++---
.../ActiveMQClientProtocolManagerFactory.java | 6 +-
.../core/impl/ActiveMQConsumerContext.java | 4 +-
.../core/impl/ActiveMQSessionContext.java | 186 ++++++------
.../core/impl/BackwardsCompatibilityUtils.java | 8 +-
.../core/protocol/core/impl/ChannelImpl.java | 30 +-
.../core/protocol/core/impl/PacketDecoder.java | 252 ++++++++--------
.../core/protocol/core/impl/PacketImpl.java | 10 +-
.../core/impl/RemotingConnectionImpl.java | 32 +--
.../wireformat/ActiveMQExceptionMessage.java | 10 +-
.../impl/wireformat/CheckFailoverMessage.java | 6 +-
.../wireformat/CheckFailoverReplyMessage.java | 6 +-
.../ClusterTopologyChangeMessage.java | 10 +-
.../ClusterTopologyChangeMessage_V2.java | 8 +-
.../ClusterTopologyChangeMessage_V3.java | 8 +-
.../impl/wireformat/CreateQueueMessage.java | 8 +-
.../impl/wireformat/CreateSessionMessage.java | 6 +-
.../CreateSessionResponseMessage.java | 6 +-
.../wireformat/CreateSharedQueueMessage.java | 8 +-
.../wireformat/DisconnectConsumerMessage.java | 6 +-
.../core/impl/wireformat/DisconnectMessage.java | 8 +-
.../impl/wireformat/DisconnectMessage_V2.java | 6 +-
.../core/impl/wireformat/MessagePacket.java | 8 +-
.../impl/wireformat/NullResponseMessage.java | 4 +-
.../wireformat/PacketsConfirmedMessage.java | 6 +-
.../protocol/core/impl/wireformat/Ping.java | 12 +-
.../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 | 8 +-
.../SessionBindingQueryResponseMessage.java | 8 +-
.../SessionBindingQueryResponseMessage_V2.java | 6 +-
.../impl/wireformat/SessionCloseMessage.java | 4 +-
.../impl/wireformat/SessionCommitMessage.java | 4 +-
.../wireformat/SessionConsumerCloseMessage.java | 6 +-
.../SessionConsumerFlowCreditMessage.java | 6 +-
.../wireformat/SessionContinuationMessage.java | 8 +-
.../SessionCreateConsumerMessage.java | 8 +-
.../wireformat/SessionDeleteQueueMessage.java | 8 +-
.../impl/wireformat/SessionExpireMessage.java | 6 +-
.../SessionForceConsumerDelivery.java | 6 +-
.../SessionIndividualAcknowledgeMessage.java | 6 +-
.../SessionProducerCreditsFailMessage.java | 8 +-
.../SessionProducerCreditsMessage.java | 8 +-
.../wireformat/SessionQueueQueryMessage.java | 8 +-
.../SessionQueueQueryResponseMessage.java | 16 +-
.../SessionQueueQueryResponseMessage_V2.java | 12 +-
.../SessionReceiveClientLargeMessage.java | 8 +-
.../SessionReceiveContinuationMessage.java | 6 +-
.../wireformat/SessionReceiveLargeMessage.java | 8 +-
.../impl/wireformat/SessionReceiveMessage.java | 10 +-
.../SessionRequestProducerCreditsMessage.java | 8 +-
.../SessionSendContinuationMessage.java | 14 +-
.../wireformat/SessionSendLargeMessage.java | 8 +-
.../impl/wireformat/SessionSendMessage.java | 18 +-
.../SessionUniqueAddMetaDataMessage.java | 2 +-
.../wireformat/SessionXAAfterFailedMessage.java | 8 +-
.../impl/wireformat/SessionXACommitMessage.java | 8 +-
.../impl/wireformat/SessionXAEndMessage.java | 8 +-
.../impl/wireformat/SessionXAForgetMessage.java | 8 +-
.../SessionXAGetInDoubtXidsResponseMessage.java | 8 +-
.../SessionXAGetTimeoutResponseMessage.java | 6 +-
.../impl/wireformat/SessionXAJoinMessage.java | 8 +-
.../wireformat/SessionXAPrepareMessage.java | 8 +-
.../wireformat/SessionXAResponseMessage.java | 6 +-
.../impl/wireformat/SessionXAResumeMessage.java | 8 +-
.../wireformat/SessionXARollbackMessage.java | 8 +-
.../wireformat/SessionXASetTimeoutMessage.java | 6 +-
.../SessionXASetTimeoutResponseMessage.java | 6 +-
.../impl/wireformat/SessionXAStartMessage.java | 8 +-
.../SubscribeClusterTopologyUpdatesMessage.java | 6 +-
...ubscribeClusterTopologyUpdatesMessageV2.java | 4 +-
.../artemis/core/remoting/CloseListener.java | 6 +-
.../artemis/core/remoting/FailureListener.java | 4 +-
.../impl/TransportConfigurationUtil.java | 6 +-
.../impl/netty/ActiveMQAMQPFrameDecoder.java | 2 +-
.../impl/netty/ActiveMQChannelHandler.java | 14 +-
.../impl/netty/ActiveMQFrameDecoder2.java | 4 +-
.../remoting/impl/netty/NettyConnection.java | 26 +-
.../remoting/impl/netty/NettyConnector.java | 36 +--
.../impl/netty/NettyConnectorFactory.java | 12 +-
.../netty/PartialPooledByteBufAllocator.java | 2 +-
.../impl/netty/SharedNioEventLoopGroup.java | 6 +-
.../remoting/impl/netty/TransportConstants.java | 4 +-
.../core/remoting/impl/ssl/SSLSupport.java | 4 +-
.../artemis/core/remoting/package-info.java | 2 +-
.../core/security/ActiveMQPrincipal.java | 2 +-
.../activemq/artemis/core/security/Role.java | 2 +-
.../artemis/core/server/QueueQueryResult.java | 4 +-
.../core/server/management/Notification.java | 8 +-
.../server/management/NotificationListener.java | 2 +-
.../server/management/NotificationService.java | 2 +-
.../settings/impl/AddressFullMessagePolicy.java | 2 +-
.../artemis/core/transaction/impl/XidImpl.java | 4 +-
.../activemq/artemis/core/version/Version.java | 2 +-
.../artemis/core/version/impl/VersionImpl.java | 4 +-
.../artemis/reader/BytesMessageUtil.java | 4 +-
.../activemq/artemis/reader/MapMessageUtil.java | 8 +-
.../activemq/artemis/reader/MessageUtil.java | 14 +-
.../artemis/reader/StreamMessageUtil.java | 10 +-
.../artemis/reader/TextMessageUtil.java | 8 +-
.../activemq/artemis/reader/package-info.java | 2 +-
.../protocol/AbstractRemotingConnection.java | 18 +-
.../spi/core/protocol/ConnectionEntry.java | 2 +-
.../spi/core/protocol/RemotingConnection.java | 14 +-
.../spi/core/remoting/AbstractConnector.java | 2 +-
.../spi/core/remoting/BufferDecoder.java | 6 +-
.../spi/core/remoting/BufferHandler.java | 4 +-
.../core/remoting/ClientProtocolManager.java | 10 +-
.../remoting/ClientProtocolManagerFactory.java | 2 +-
.../artemis/spi/core/remoting/Connection.java | 10 +-
.../remoting/ConnectionLifeCycleListener.java | 6 +-
.../artemis/spi/core/remoting/Connector.java | 2 +-
.../spi/core/remoting/ConnectorFactory.java | 6 +-
.../spi/core/remoting/ConsumerContext.java | 2 +-
.../spi/core/remoting/ReadyListener.java | 2 +-
.../spi/core/remoting/SessionContext.java | 40 ++-
.../core/remoting/TopologyResponseHandler.java | 8 +-
.../artemis/spi/core/remoting/package-info.java | 2 +-
.../uri/AbstractServerLocatorSchema.java | 6 +-
.../AbstractTransportConfigurationSchema.java | 6 +-
.../activemq/artemis/uri/ConnectionOptions.java | 2 +-
.../ConnectorTransportConfigurationParser.java | 8 +-
.../artemis/uri/InVMServerLocatorSchema.java | 14 +-
.../uri/InVMTransportConfigurationSchema.java | 8 +-
.../artemis/uri/JGroupsServerLocatorSchema.java | 23 +-
.../artemis/uri/ServerLocatorParser.java | 6 +-
.../artemis/uri/TCPServerLocatorSchema.java | 16 +-
.../uri/TCPTransportConfigurationSchema.java | 10 +-
.../artemis/uri/UDPServerLocatorSchema.java | 14 +-
.../utils/ActiveMQBufferInputStream.java | 4 +-
.../activemq/artemis/utils/BufferHelper.java | 6 +-
.../artemis/utils/ConfigurationHelper.java | 8 +-
.../utils/ConfirmationWindowWarning.java | 2 +-
.../activemq/artemis/utils/DeflaterReader.java | 2 +-
.../activemq/artemis/utils/ExecutorFactory.java | 2 +-
.../activemq/artemis/utils/FutureLatch.java | 2 +-
.../activemq/artemis/utils/IDGenerator.java | 2 +-
.../activemq/artemis/utils/InflaterReader.java | 2 +-
.../activemq/artemis/utils/InflaterWriter.java | 2 +-
.../apache/activemq/artemis/utils/JNDIUtil.java | 2 +-
.../activemq/artemis/utils/LinkedList.java | 2 +-
.../activemq/artemis/utils/LinkedListImpl.java | 2 +-
.../artemis/utils/LinkedListIterator.java | 2 +-
.../activemq/artemis/utils/MemorySize.java | 4 +-
.../utils/ObjectInputStreamWithClassLoader.java | 2 +-
.../artemis/utils/OrderedExecutorFactory.java | 6 +-
.../artemis/utils/PriorityLinkedList.java | 2 +-
.../artemis/utils/PriorityLinkedListImpl.java | 2 +-
.../apache/activemq/artemis/utils/Random.java | 2 +-
.../artemis/utils/SecurityFormatter.java | 4 +-
.../artemis/utils/SimpleIDGenerator.java | 2 +-
.../artemis/utils/SizeFormatterUtil.java | 2 +-
.../artemis/utils/SoftValueHashMap.java | 4 +-
.../utils/TimeAndCounterIDGenerator.java | 2 +-
.../artemis/utils/TokenBucketLimiter.java | 2 +-
.../artemis/utils/TokenBucketLimiterImpl.java | 2 +-
.../activemq/artemis/utils/VersionLoader.java | 8 +-
.../apache/activemq/artemis/utils/XMLUtil.java | 6 +-
.../activemq/artemis/utils/XidCodecSupport.java | 6 +-
.../activemq/artemis/utils/json/JSONArray.java | 2 +-
.../artemis/utils/json/JSONException.java | 2 +-
.../activemq/artemis/utils/json/JSONObject.java | 2 +-
.../activemq/artemis/utils/json/JSONString.java | 2 +-
.../artemis/utils/json/JSONTokener.java | 2 +-
.../activemq/artemis/utils/package-info.java | 2 +-
.../artemis/tests/CoreUnitTestCase.java | 4 +-
.../activemq/artemis/tests/util/RandomUtil.java | 10 +-
.../artemis/tests/util/SilentTestCase.java | 2 +-
.../artemis/util/CompressionUtilTest.java | 8 +-
.../artemis/util/ConcurrentHashSetTest.java | 8 +-
.../util/TimeAndCounterIDGeneratorTest.java | 8 +-
.../util/TypedPropertiesConversionTest.java | 10 +-
.../artemis/util/TypedPropertiesTest.java | 12 +-
.../activemq/artemis/util/XMLUtilTest.java | 82 +++---
artemis-dto/pom.xml | 8 +-
.../org/apache/activemq/artemis/dto/AppDTO.java | 2 +-
.../activemq/artemis/dto/BasicSecurityDTO.java | 2 +-
.../apache/activemq/artemis/dto/BrokerDTO.java | 2 +-
.../activemq/artemis/dto/ComponentDTO.java | 2 +-
.../activemq/artemis/dto/SecurityDTO.java | 2 +-
.../apache/activemq/artemis/dto/ServerDTO.java | 2 +-
.../activemq/artemis/dto/WebServerDTO.java | 4 +-
.../apache/activemq/artemis/dto/XmlUtil.java | 4 +-
.../activemq/artemis/dto/package-info.java | 2 +-
artemis-jms-client/pom.xml | 12 +-
.../artemis/api/jms/ActiveMQJMSClient.java | 24 +-
.../artemis/api/jms/ActiveMQJMSConstants.java | 2 +-
.../artemis/api/jms/JMSFactoryType.java | 2 +-
.../management/ConnectionFactoryControl.java | 132 ++++-----
.../api/jms/management/DestinationControl.java | 6 +-
.../api/jms/management/JMSConnectionInfo.java | 6 +-
.../api/jms/management/JMSConsumerInfo.java | 6 +-
.../api/jms/management/JMSManagementHelper.java | 14 +-
.../api/jms/management/JMSQueueControl.java | 6 +-
.../api/jms/management/JMSServerControl.java | 10 +-
.../api/jms/management/JMSSessionInfo.java | 8 +-
.../api/jms/management/SubscriptionInfo.java | 6 +-
.../api/jms/management/TopicControl.java | 6 +-
.../api/jms/management/package-info.java | 2 +-
.../activemq/artemis/api/jms/package-info.java | 2 +-
.../jms/client/ActiveMQBytesMessage.java | 64 ++---
.../artemis/jms/client/ActiveMQConnection.java | 36 +--
.../jms/client/ActiveMQConnectionFactory.java | 24 +-
.../client/ActiveMQConnectionForContext.java | 2 +-
.../ActiveMQConnectionForContextImpl.java | 8 +-
.../jms/client/ActiveMQConnectionMetaData.java | 4 +-
.../artemis/jms/client/ActiveMQDestination.java | 10 +-
.../jms/client/ActiveMQJMSClientBundle.java | 10 +-
.../jms/client/ActiveMQJMSClientLogger.java | 2 +-
.../client/ActiveMQJMSConnectionFactory.java | 8 +-
.../artemis/jms/client/ActiveMQJMSConsumer.java | 2 +-
.../artemis/jms/client/ActiveMQJMSContext.java | 2 +-
.../artemis/jms/client/ActiveMQJMSProducer.java | 8 +-
.../artemis/jms/client/ActiveMQMapMessage.java | 20 +-
.../artemis/jms/client/ActiveMQMessage.java | 32 +--
.../jms/client/ActiveMQMessageConsumer.java | 14 +-
.../jms/client/ActiveMQMessageProducer.java | 20 +-
.../jms/client/ActiveMQObjectMessage.java | 13 +-
.../artemis/jms/client/ActiveMQQueue.java | 8 +-
.../jms/client/ActiveMQQueueBrowser.java | 12 +-
.../client/ActiveMQQueueConnectionFactory.java | 10 +-
.../artemis/jms/client/ActiveMQSession.java | 22 +-
.../jms/client/ActiveMQStreamMessage.java | 40 +--
.../jms/client/ActiveMQTemporaryQueue.java | 2 +-
.../jms/client/ActiveMQTemporaryTopic.java | 2 +-
.../artemis/jms/client/ActiveMQTextMessage.java | 16 +-
.../artemis/jms/client/ActiveMQTopic.java | 8 +-
.../client/ActiveMQTopicConnectionFactory.java | 10 +-
.../jms/client/ActiveMQXAConnection.java | 4 +-
.../jms/client/ActiveMQXAConnectionFactory.java | 10 +-
.../jms/client/ActiveMQXAJMSContext.java | 2 +-
.../ActiveMQXAQueueConnectionFactory.java | 10 +-
.../artemis/jms/client/ActiveMQXASession.java | 4 +-
.../ActiveMQXATopicConnectionFactory.java | 10 +-
.../artemis/jms/client/JMSExceptionHelper.java | 4 +-
.../jms/client/JMSMessageListenerWrapper.java | 12 +-
.../artemis/jms/client/JmsExceptionUtils.java | 2 +-
.../artemis/jms/client/SelectorTranslator.java | 2 +-
.../artemis/jms/client/ThreadAwareContext.java | 4 +-
.../artemis/jms/client/package-info.java | 2 +-
.../ConnectionFactoryObjectFactory.java | 2 +-
.../referenceable/DestinationObjectFactory.java | 2 +-
.../SerializableObjectRefAddr.java | 2 +-
.../jndi/ActiveMQInitialContextFactory.java | 6 +-
.../artemis/jndi/LazyCreateContext.java | 2 +-
.../activemq/artemis/jndi/NameParserImpl.java | 2 +-
.../activemq/artemis/jndi/ReadOnlyContext.java | 4 +-
.../activemq/artemis/uri/AbstractCFSchema.java | 8 +-
.../artemis/uri/ConnectionFactoryParser.java | 6 +-
.../apache/activemq/artemis/uri/InVMSchema.java | 13 +-
.../activemq/artemis/uri/JGroupsSchema.java | 18 +-
.../artemis/uri/JMSConnectionOptions.java | 4 +-
.../apache/activemq/artemis/uri/TCPSchema.java | 16 +-
.../apache/activemq/artemis/uri/UDPSchema.java | 14 +-
.../artemis/uri/ConnectionFactoryURITest.java | 36 +--
artemis-jms-server/pom.xml | 16 +-
.../jms/bridge/ActiveMQJMSBridgeLogger.java | 2 +-
.../jms/bridge/ConnectionFactoryFactory.java | 2 +-
.../artemis/jms/bridge/DestinationFactory.java | 2 +-
.../activemq/artemis/jms/bridge/JMSBridge.java | 4 +-
.../artemis/jms/bridge/JMSBridgeControl.java | 4 +-
.../jms/bridge/QualityOfServiceMode.java | 2 +-
.../jms/bridge/impl/JMSBridgeControlImpl.java | 10 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 46 +--
.../impl/JNDIConnectionFactoryFactory.java | 6 +-
.../jms/bridge/impl/JNDIDestinationFactory.java | 6 +-
.../jms/bridge/impl/JNDIFactorySupport.java | 2 +-
.../impl/JMSConnectionFactoryControlImpl.java | 18 +-
.../management/impl/JMSQueueControlImpl.java | 32 +--
.../management/impl/JMSServerControlImpl.java | 54 ++--
.../management/impl/JMSTopicControlImpl.java | 32 +--
.../jms/persistence/JMSStorageManager.java | 12 +-
.../persistence/config/PersistedBindings.java | 10 +-
.../config/PersistedConnectionFactory.java | 10 +-
.../config/PersistedDestination.java | 12 +-
.../jms/persistence/config/PersistedType.java | 2 +-
.../journal/JMSJournalStorageManagerImpl.java | 40 +--
.../impl/nullpm/NullJMSStorageManagerImpl.java | 12 +-
.../jms/server/ActiveMQJMSServerBundle.java | 8 +-
.../jms/server/ActiveMQJMSServerLogger.java | 4 +-
.../jms/server/JMSServerConfigParser.java | 8 +-
.../artemis/jms/server/JMSServerManager.java | 18 +-
.../config/ConnectionFactoryConfiguration.java | 6 +-
.../jms/server/config/JMSConfiguration.java | 2 +-
.../server/config/JMSQueueConfiguration.java | 2 +-
.../jms/server/config/TopicConfiguration.java | 2 +-
.../ConnectionFactoryConfigurationImpl.java | 16 +-
.../config/impl/FileJMSConfiguration.java | 26 +-
.../config/impl/JMSConfigurationImpl.java | 12 +-
.../config/impl/JMSQueueConfigurationImpl.java | 4 +-
.../config/impl/TopicConfigurationImpl.java | 4 +-
.../TransportConfigurationEncodingSupport.java | 12 +-
.../jms/server/embedded/EmbeddedJMS.java | 20 +-
.../jms/server/impl/JMSServerManagerImpl.java | 114 ++++----
.../server/management/JMSManagementService.java | 18 +-
.../server/management/JMSNotificationType.java | 6 +-
.../impl/JMSManagementServiceImpl.java | 46 +--
.../jms/transaction/JMSTransactionDetail.java | 20 +-
artemis-journal/pom.xml | 10 +-
.../artemis/core/asyncio/AIOCallback.java | 2 +-
.../artemis/core/asyncio/AsynchronousFile.java | 10 +-
.../artemis/core/asyncio/BufferCallback.java | 2 +-
.../core/asyncio/IOExceptionListener.java | 2 +-
.../core/asyncio/impl/ActiveMQFileLock.java | 4 +-
.../core/asyncio/impl/AsynchronousFileImpl.java | 22 +-
.../artemis/core/journal/EncodingSupport.java | 4 +-
.../artemis/core/journal/IOAsyncTask.java | 6 +-
.../artemis/core/journal/IOCompletion.java | 2 +-
.../core/journal/IOCriticalErrorListener.java | 2 +-
.../activemq/artemis/core/journal/Journal.java | 6 +-
.../core/journal/JournalLoadInformation.java | 2 +-
.../artemis/core/journal/LoaderCallback.java | 2 +-
.../core/journal/PreparedTransactionInfo.java | 2 +-
.../artemis/core/journal/RecordInfo.java | 2 +-
.../artemis/core/journal/SequentialFile.java | 8 +-
.../core/journal/SequentialFileFactory.java | 2 +-
.../artemis/core/journal/TestableJournal.java | 4 +-
.../journal/TransactionFailureCallback.java | 2 +-
.../core/journal/impl/AIOSequentialFile.java | 18 +-
.../journal/impl/AIOSequentialFileFactory.java | 22 +-
.../journal/impl/AbstractJournalUpdateTask.java | 20 +-
.../journal/impl/AbstractSequentialFile.java | 24 +-
.../impl/AbstractSequentialFileFactory.java | 14 +-
.../core/journal/impl/CompactJournal.java | 6 +-
.../core/journal/impl/DummyCallback.java | 4 +-
.../core/journal/impl/FileWrapperJournal.java | 38 +--
.../artemis/core/journal/impl/JournalBase.java | 12 +-
.../core/journal/impl/JournalCompactor.java | 32 +--
.../core/journal/impl/JournalConstants.java | 2 +-
.../artemis/core/journal/impl/JournalFile.java | 4 +-
.../core/journal/impl/JournalFileImpl.java | 4 +-
.../journal/impl/JournalFilesRepository.java | 8 +-
.../artemis/core/journal/impl/JournalImpl.java | 56 ++--
.../journal/impl/JournalReaderCallback.java | 4 +-
.../impl/JournalReaderCallbackAbstract.java | 4 +-
.../core/journal/impl/JournalRecord.java | 4 +-
.../journal/impl/JournalRecordProvider.java | 2 +-
.../core/journal/impl/JournalTransaction.java | 6 +-
.../core/journal/impl/NIOSequentialFile.java | 20 +-
.../journal/impl/NIOSequentialFileFactory.java | 6 +-
.../artemis/core/journal/impl/Reclaimer.java | 4 +-
.../core/journal/impl/SimpleWaitIOCallback.java | 8 +-
.../core/journal/impl/SyncIOCompletion.java | 4 +-
.../core/journal/impl/SyncSpeedTest.java | 10 +-
.../artemis/core/journal/impl/TimedBuffer.java | 16 +-
.../core/journal/impl/TimedBufferObserver.java | 4 +-
.../core/journal/impl/TransactionCallback.java | 6 +-
.../impl/dataformat/ByteArrayEncoding.java | 6 +-
.../impl/dataformat/JournalAddRecord.java | 8 +-
.../impl/dataformat/JournalAddRecordTX.java | 8 +-
.../dataformat/JournalCompleteRecordTX.java | 10 +-
.../impl/dataformat/JournalDeleteRecord.java | 6 +-
.../impl/dataformat/JournalDeleteRecordTX.java | 8 +-
.../impl/dataformat/JournalInternalRecord.java | 6 +-
.../dataformat/JournalRollbackRecordTX.java | 6 +-
.../artemis/journal/ActiveMQJournalBundle.java | 4 +-
.../artemis/journal/ActiveMQJournalLogger.java | 4 +-
artemis-maven-plugin/pom.xml | 10 +-
.../activemq/artemis/maven/ActiveMQClient.java | 2 +-
.../artemis/maven/ActiveMQClientPlugin.java | 2 +-
.../artemis/maven/ActiveMQStartPlugin.java | 10 +-
.../artemis/maven/ActiveMQStopPlugin.java | 2 +-
.../artemis/maven/InVMNodeManagerServer.java | 10 +-
.../activemq/artemis/maven/PluginUtil.java | 2 +-
.../artemis/maven/TestClusterManager.java | 2 +-
.../artemis/maven/TestClusterManagerMBean.java | 2 +-
.../apache/activemq/artemis/maven/TestNode.java | 2 +-
.../artemis/server/ActiveMQBootstrap.java | 42 +--
.../server/SpawnedActiveMQBootstrap.java | 2 +-
.../artemis/server/SpawnedVMSupport.java | 2 +-
artemis-native/pom.xml | 10 +-
.../src/main/c/JNI_AsynchronousFileImpl.cpp | 8 +-
artemis-native/src/main/c/Version.h | 2 +-
.../activemq/artemis/core/libaio/Native.java | 6 +-
artemis-protocols/artemis-amqp-protocol/pom.xml | 17 +-
.../ActiveMQProtonRemotingConnection.java | 12 +-
.../protocol/proton/ProtonProtocolManager.java | 36 +--
.../proton/ProtonProtocolManagerFactory.java | 12 +-
.../proton/converter/ActiveMQJMSVendor.java | 38 +--
.../converter/ProtonMessageConverter.java | 10 +-
.../converter/jms/ServerJMSBytesMessage.java | 56 ++--
.../converter/jms/ServerJMSMapMessage.java | 16 +-
.../proton/converter/jms/ServerJMSMessage.java | 14 +-
.../converter/jms/ServerJMSStreamMessage.java | 38 +--
.../converter/jms/ServerJMSTextMessage.java | 12 +-
.../proton/converter/jms/package-info.java | 2 +-
.../plug/ActiveMQProtonConnectionCallback.java | 14 +-
.../plug/ProtonSessionIntegrationCallback.java | 30 +-
.../core/protocol/proton/plug/package-info.java | 2 +-
.../protocol/proton/sasl/ActiveMQPlainSASL.java | 6 +-
...mis.spi.core.protocol.ProtocolManagerFactory | 1 +
...emq.spi.core.protocol.ProtocolManagerFactory | 1 -
.../core/protocol/proton/TestConversions.java | 24 +-
.../artemis-openwire-protocol/pom.xml | 13 +-
.../protocol/openwire/AMQConnectorImpl.java | 8 +-
.../protocol/openwire/AMQTransactionImpl.java | 12 +-
.../core/protocol/openwire/BrokerState.java | 2 +-
.../protocol/openwire/DataInputWrapper.java | 8 +-
.../openwire/NotEnoughBytesException.java | 2 +-
.../protocol/openwire/OpenWireConnection.java | 50 ++--
.../openwire/OpenWireMessageConverter.java | 62 ++--
.../openwire/OpenWireProtocolManager.java | 50 ++--
.../OpenWireProtocolManagerFactory.java | 12 +-
.../core/protocol/openwire/OpenWireUtil.java | 16 +-
.../core/protocol/openwire/SendingResult.java | 8 +-
.../amq/AMQAbstractDeadLetterStrategy.java | 2 +-
.../openwire/amq/AMQBrokerStoppedException.java | 2 +-
.../openwire/amq/AMQConnectionContext.java | 6 +-
.../protocol/openwire/amq/AMQConnector.java | 4 +-
.../openwire/amq/AMQConnectorStatistics.java | 2 +-
.../core/protocol/openwire/amq/AMQConsumer.java | 14 +-
.../openwire/amq/AMQConsumerBrokerExchange.java | 2 +-
.../openwire/amq/AMQDeadLetterStrategy.java | 2 +-
.../protocol/openwire/amq/AMQDestination.java | 2 +-
.../openwire/amq/AMQDestinationStatistics.java | 2 +-
.../AMQMapTransportConnectionStateRegister.java | 2 +-
.../amq/AMQMessageAuthorizationPolicy.java | 2 +-
.../protocol/openwire/amq/AMQMessageStore.java | 2 +-
.../openwire/amq/AMQPersistenceAdapter.java | 2 +-
.../core/protocol/openwire/amq/AMQProducer.java | 4 +-
.../openwire/amq/AMQProducerBrokerExchange.java | 2 +-
.../openwire/amq/AMQSecurityContext.java | 2 +-
.../openwire/amq/AMQServerConsumer.java | 26 +-
.../protocol/openwire/amq/AMQServerSession.java | 68 ++---
.../openwire/amq/AMQServerSessionFactory.java | 28 +-
.../core/protocol/openwire/amq/AMQSession.java | 32 +--
.../amq/AMQSharedDeadLetterStrategy.java | 2 +-
...QSingleTransportConnectionStateRegister.java | 2 +-
.../openwire/amq/AMQSlowConsumerStrategy.java | 2 +-
.../protocol/openwire/amq/AMQSubscription.java | 2 +-
.../openwire/amq/AMQSubscriptionRecovery.java | 2 +-
.../protocol/openwire/amq/AMQTransaction.java | 2 +-
.../openwire/amq/AMQTransactionFactory.java | 10 +-
.../amq/AMQTransportConnectionState.java | 4 +-
.../AMQTransportConnectionStateRegister.java | 2 +-
.../protocol/openwire/amq/BrowserListener.java | 2 +-
.../core/protocol/openwire/amq/MessageInfo.java | 2 +-
...mis.spi.core.protocol.ProtocolManagerFactory | 1 +
...emq.spi.core.protocol.ProtocolManagerFactory | 1 -
artemis-protocols/artemis-proton-plug/pom.xml | 15 +-
.../artemis-stomp-protocol/pom.xml | 9 +-
.../protocol/stomp/ActiveMQStompException.java | 2 +-
.../stomp/ActiveMQStompProtocolLogger.java | 2 +-
.../ActiveMQStompProtocolMessageBundle.java | 4 +-
.../core/protocol/stomp/FrameEventListener.java | 2 +-
.../core/protocol/stomp/SimpleBytes.java | 2 +-
.../artemis/core/protocol/stomp/Stomp.java | 2 +-
.../core/protocol/stomp/StompCommands.java | 2 +-
.../core/protocol/stomp/StompConnection.java | 44 +--
.../core/protocol/stomp/StompDecoder.java | 6 +-
.../artemis/core/protocol/stomp/StompFrame.java | 6 +-
.../protocol/stomp/StompFrameInterceptor.java | 4 +-
.../protocol/stomp/StompProtocolManager.java | 66 ++---
.../stomp/StompProtocolManagerFactory.java | 10 +-
.../core/protocol/stomp/StompSession.java | 50 ++--
.../core/protocol/stomp/StompSubscription.java | 2 +-
.../artemis/core/protocol/stomp/StompUtils.java | 12 +-
.../core/protocol/stomp/StompVersions.java | 2 +-
.../stomp/VersionedStompFrameHandler.java | 28 +-
.../stomp/v10/StompFrameHandlerV10.java | 20 +-
.../core/protocol/stomp/v10/StompFrameV10.java | 4 +-
.../stomp/v11/StompFrameHandlerV11.java | 24 +-
.../core/protocol/stomp/v11/StompFrameV11.java | 10 +-
.../stomp/v12/StompFrameHandlerV12.java | 30 +-
.../core/protocol/stomp/v12/StompFrameV12.java | 10 +-
...mis.spi.core.protocol.ProtocolManagerFactory | 1 +
...emq.spi.core.protocol.ProtocolManagerFactory | 1 -
artemis-protocols/pom.xml | 15 +-
artemis-ra/pom.xml | 14 +-
.../activemq/artemis/ra/ActiveMQRABundle.java | 4 +-
.../artemis/ra/ActiveMQRABytesMessage.java | 2 +-
.../artemis/ra/ActiveMQRAConnectionFactory.java | 4 +-
.../ra/ActiveMQRAConnectionFactoryImpl.java | 8 +-
.../artemis/ra/ActiveMQRAConnectionManager.java | 4 +-
.../ra/ActiveMQRAConnectionMetaData.java | 2 +-
.../ra/ActiveMQRAConnectionRequestInfo.java | 2 +-
.../artemis/ra/ActiveMQRACredential.java | 2 +-
.../artemis/ra/ActiveMQRAJMSContext.java | 8 +-
.../artemis/ra/ActiveMQRALocalTransaction.java | 2 +-
.../activemq/artemis/ra/ActiveMQRALogger.java | 4 +-
.../artemis/ra/ActiveMQRAMCFProperties.java | 2 +-
.../artemis/ra/ActiveMQRAManagedConnection.java | 16 +-
.../ra/ActiveMQRAManagedConnectionFactory.java | 6 +-
.../artemis/ra/ActiveMQRAMapMessage.java | 2 +-
.../activemq/artemis/ra/ActiveMQRAMessage.java | 2 +-
.../artemis/ra/ActiveMQRAMessageConsumer.java | 2 +-
.../artemis/ra/ActiveMQRAMessageListener.java | 2 +-
.../artemis/ra/ActiveMQRAMessageProducer.java | 2 +-
.../activemq/artemis/ra/ActiveMQRAMetaData.java | 2 +-
.../artemis/ra/ActiveMQRAObjectMessage.java | 2 +-
.../artemis/ra/ActiveMQRAProperties.java | 10 +-
.../artemis/ra/ActiveMQRAQueueReceiver.java | 2 +-
.../artemis/ra/ActiveMQRAQueueSender.java | 2 +-
.../activemq/artemis/ra/ActiveMQRAService.java | 2 +-
.../activemq/artemis/ra/ActiveMQRASession.java | 6 +-
.../artemis/ra/ActiveMQRASessionFactory.java | 2 +-
.../ra/ActiveMQRASessionFactoryImpl.java | 30 +-
.../artemis/ra/ActiveMQRAStreamMessage.java | 2 +-
.../artemis/ra/ActiveMQRATextMessage.java | 2 +-
.../artemis/ra/ActiveMQRATopicPublisher.java | 2 +-
.../artemis/ra/ActiveMQRATopicSubscriber.java | 2 +-
.../artemis/ra/ActiveMQRAXAJMSContext.java | 6 +-
.../artemis/ra/ActiveMQRAXAResource.java | 8 +-
.../activemq/artemis/ra/ActiveMQRaUtils.java | 2 +-
.../artemis/ra/ActiveMQResourceAdapter.java | 38 +--
.../artemis/ra/ConnectionFactoryProperties.java | 2 +-
.../artemis/ra/inflow/ActiveMQActivation.java | 40 +--
.../ra/inflow/ActiveMQActivationSpec.java | 10 +-
.../ra/inflow/ActiveMQMessageHandler.java | 36 +--
.../artemis/ra/recovery/RecoveryManager.java | 16 +-
artemis-rest/pom.xml | 10 +-
.../apache/activemq/artemis/rest/ActiveMQ.java | 6 +-
.../artemis/rest/ActiveMQRestBundle.java | 2 +-
.../artemis/rest/ActiveMQRestLogger.java | 6 +-
.../artemis/rest/HttpHeaderProperty.java | 2 +-
.../org/apache/activemq/artemis/rest/Jms.java | 4 +-
.../rest/MessageServiceConfiguration.java | 2 +-
.../artemis/rest/MessageServiceManager.java | 32 +--
.../activemq/artemis/rest/UnknownMediaType.java | 2 +-
.../artemis/rest/UnmarshalException.java | 2 +-
.../integration/ActiveMQBootstrapListener.java | 4 +-
.../rest/integration/EmbeddedRestActiveMQ.java | 6 +-
.../integration/EmbeddedRestActiveMQJMS.java | 6 +-
.../RestMessagingBootstrapListener.java | 4 +-
.../ServletContextBindingRegistry.java | 4 +-
.../rest/queue/AcknowledgedQueueConsumer.java | 18 +-
.../artemis/rest/queue/Acknowledgement.java | 4 +-
.../artemis/rest/queue/ConsumedHttpMessage.java | 4 +-
.../artemis/rest/queue/ConsumedMessage.java | 10 +-
.../rest/queue/ConsumedObjectMessage.java | 4 +-
.../artemis/rest/queue/ConsumersResource.java | 10 +-
.../artemis/rest/queue/DestinationResource.java | 2 +-
.../rest/queue/DestinationServiceManager.java | 20 +-
.../artemis/rest/queue/DestinationSettings.java | 2 +-
.../artemis/rest/queue/PostMessage.java | 22 +-
.../artemis/rest/queue/PostMessageDupsOk.java | 10 +-
.../artemis/rest/queue/PostMessageNoDups.java | 4 +-
.../artemis/rest/queue/QueueConsumer.java | 20 +-
.../artemis/rest/queue/QueueDeployment.java | 2 +-
.../rest/queue/QueueDestinationsResource.java | 24 +-
.../artemis/rest/queue/QueueResource.java | 10 +-
.../artemis/rest/queue/QueueServiceManager.java | 10 +-
.../rest/queue/push/ActiveMQPushStrategy.java | 6 +-
.../artemis/rest/queue/push/FilePushStore.java | 8 +-
.../artemis/rest/queue/push/PushConsumer.java | 18 +-
.../queue/push/PushConsumerMessageHandler.java | 12 +-
.../rest/queue/push/PushConsumerResource.java | 8 +-
.../artemis/rest/queue/push/PushStore.java | 4 +-
.../artemis/rest/queue/push/PushStrategy.java | 6 +-
.../artemis/rest/queue/push/UriStrategy.java | 14 +-
.../rest/queue/push/UriTemplateStrategy.java | 4 +-
.../rest/queue/push/xml/Authentication.java | 2 +-
.../rest/queue/push/xml/AuthenticationType.java | 2 +-
.../artemis/rest/queue/push/xml/BasicAuth.java | 2 +-
.../artemis/rest/queue/push/xml/DigestAuth.java | 2 +-
.../rest/queue/push/xml/PushRegistration.java | 2 +-
.../rest/queue/push/xml/XmlHttpHeader.java | 2 +-
.../artemis/rest/queue/push/xml/XmlLink.java | 2 +-
.../topic/AcknowledgedSubscriptionResource.java | 10 +-
.../artemis/rest/topic/FileTopicPushStore.java | 6 +-
.../artemis/rest/topic/PushSubscription.java | 16 +-
.../rest/topic/PushSubscriptionsResource.java | 14 +-
.../rest/topic/PushTopicRegistration.java | 4 +-
.../artemis/rest/topic/Subscription.java | 2 +-
.../rest/topic/SubscriptionResource.java | 10 +-
.../rest/topic/SubscriptionsResource.java | 22 +-
.../artemis/rest/topic/TopicDeployment.java | 4 +-
.../rest/topic/TopicDestinationsResource.java | 26 +-
.../artemis/rest/topic/TopicPushStore.java | 4 +-
.../artemis/rest/topic/TopicResource.java | 12 +-
.../artemis/rest/topic/TopicServiceManager.java | 8 +-
.../activemq/artemis/rest/util/Constants.java | 2 +-
.../rest/util/CustomHeaderLinkStrategy.java | 2 +-
.../artemis/rest/util/HttpMessageHelper.java | 10 +-
.../rest/util/LinkHeaderLinkStrategy.java | 2 +-
.../artemis/rest/util/LinkStrategy.java | 2 +-
.../activemq/artemis/rest/util/TimeoutTask.java | 4 +-
.../src/main/resources/schema/activemq-rest.xsd | 119 ++++++++
.../src/main/resources/schema/hornetq-rest.xsd | 119 --------
.../artemis/rest/test/AutoAckQueueTest.java | 24 +-
.../artemis/rest/test/AutoAckTopicTest.java | 26 +-
.../artemis/rest/test/ClientAckQueueTest.java | 94 +++---
.../artemis/rest/test/ClientAckTopicTest.java | 78 ++---
.../rest/test/CreateDestinationTest.java | 34 +--
.../artemis/rest/test/DupQueueTest.java | 38 +--
.../activemq/artemis/rest/test/Embedded.java | 18 +-
.../artemis/rest/test/EmbeddedTest.java | 14 +-
.../artemis/rest/test/FindDestinationTest.java | 24 +-
.../activemq/artemis/rest/test/JMSTest.java | 28 +-
.../artemis/rest/test/MessageTestBase.java | 8 +-
.../test/PersistentPushQueueConsumerTest.java | 24 +-
.../test/PersistentPushTopicConsumerTest.java | 26 +-
.../rest/test/PushQueueConsumerTest.java | 46 +--
.../rest/test/PushTopicConsumerTest.java | 52 ++--
.../activemq/artemis/rest/test/RawAckTest.java | 34 +--
.../artemis/rest/test/RepostingQueueTest.java | 6 +-
.../artemis/rest/test/RepostingTopicTest.java | 150 +++++-----
.../artemis/rest/test/RoundtripTimeTest.java | 12 +-
.../artemis/rest/test/SelectorTest.java | 24 +-
.../activemq/artemis/rest/test/SessionTest.java | 72 ++---
.../artemis/rest/test/TransformTest.java | 34 +--
.../apache/activemq/artemis/rest/test/Util.java | 4 +-
.../activemq/artemis/rest/test/XmlTest.java | 4 +-
artemis-selector/pom.xml | 12 +-
.../selector/filter/ArithmeticExpression.java | 2 +-
.../selector/filter/BinaryExpression.java | 2 +-
.../selector/filter/BooleanExpression.java | 2 +-
.../selector/filter/ComparisonExpression.java | 2 +-
.../selector/filter/ConstantExpression.java | 2 +-
.../artemis/selector/filter/Expression.java | 2 +-
.../selector/filter/FilterException.java | 2 +-
.../artemis/selector/filter/Filterable.java | 2 +-
.../selector/filter/LogicExpression.java | 2 +-
.../selector/filter/PropertyExpression.java | 2 +-
.../selector/filter/UnaryExpression.java | 2 +-
.../selector/filter/XPathExpression.java | 2 +-
.../selector/filter/XQueryExpression.java | 2 +-
.../selector/filter/XalanXPathEvaluator.java | 2 +-
.../artemis/selector/impl/LRUCache.java | 2 +-
.../artemis/selector/impl/SelectorParser.java | 12 +-
.../src/main/javacc/HyphenatedParser.jj | 176 ++++++------
.../src/main/javacc/StrictParser.jj | 176 ++++++------
.../artemis/selector/SelectorParserTest.java | 16 +-
.../activemq/artemis/selector/SelectorTest.java | 10 +-
artemis-server/pom.xml | 16 +-
.../api/core/management/MessageCounterInfo.java | 6 +-
.../artemis/core/config/BackupStrategy.java | 2 +-
.../core/config/BridgeConfiguration.java | 21 +-
.../config/ClusterConnectionConfiguration.java | 20 +-
.../artemis/core/config/Configuration.java | 118 ++++----
.../artemis/core/config/ConfigurationUtils.java | 36 +--
.../config/ConnectorServiceConfiguration.java | 2 +-
.../core/config/CoreQueueConfiguration.java | 2 +-
.../core/config/DivertConfiguration.java | 6 +-
.../core/config/FileDeploymentManager.java | 14 +-
.../core/config/HAPolicyConfiguration.java | 2 +-
.../core/config/ScaleDownConfiguration.java | 4 +-
.../config/ha/ColocatedPolicyConfiguration.java | 6 +-
.../config/ha/LiveOnlyPolicyConfiguration.java | 6 +-
.../config/ha/ReplicaPolicyConfiguration.java | 8 +-
.../ha/ReplicatedPolicyConfiguration.java | 6 +-
.../SharedStoreMasterPolicyConfiguration.java | 6 +-
.../ha/SharedStoreSlavePolicyConfiguration.java | 8 +-
.../core/config/impl/ConfigurationImpl.java | 38 +--
.../core/config/impl/FileConfiguration.java | 12 +-
.../config/impl/FileSecurityConfiguration.java | 6 +-
.../core/config/impl/SecurityConfiguration.java | 8 +-
.../artemis/core/config/impl/Validators.java | 10 +-
.../artemis/core/deployers/Deployable.java | 6 +-
.../deployers/impl/FileConfigurationParser.java | 100 +++----
.../activemq/artemis/core/filter/Filter.java | 6 +-
.../artemis/core/filter/impl/FilterImpl.java | 30 +-
.../core/management/impl/AbstractControl.java | 4 +-
.../management/impl/AcceptorControlImpl.java | 10 +-
.../impl/ActiveMQServerControlImpl.java | 106 +++----
.../management/impl/AddressControlImpl.java | 30 +-
.../core/management/impl/BridgeControlImpl.java | 10 +-
.../impl/BroadcastGroupControlImpl.java | 14 +-
.../impl/ClusterConnectionControlImpl.java | 12 +-
.../core/management/impl/DivertControlImpl.java | 10 +-
.../core/management/impl/MBeanInfoHelper.java | 6 +-
.../core/management/impl/QueueControlImpl.java | 48 ++--
.../core/messagecounter/MessageCounter.java | 4 +-
.../messagecounter/MessageCounterManager.java | 2 +-
.../impl/MessageCounterHelper.java | 8 +-
.../impl/MessageCounterManagerImpl.java | 8 +-
.../core/paging/PageTransactionInfo.java | 16 +-
.../artemis/core/paging/PagedMessage.java | 8 +-
.../artemis/core/paging/PagingManager.java | 12 +-
.../artemis/core/paging/PagingStore.java | 24 +-
.../artemis/core/paging/PagingStoreFactory.java | 10 +-
.../core/paging/cursor/LivePageCache.java | 4 +-
.../artemis/core/paging/cursor/PageCache.java | 6 +-
.../core/paging/cursor/PageCursorProvider.java | 6 +-
.../core/paging/cursor/PageIterator.java | 4 +-
.../core/paging/cursor/PagePosition.java | 2 +-
.../core/paging/cursor/PageSubscription.java | 14 +-
.../paging/cursor/PageSubscriptionCounter.java | 6 +-
.../core/paging/cursor/PagedReference.java | 6 +-
.../core/paging/cursor/PagedReferenceImpl.java | 18 +-
.../paging/cursor/impl/LivePageCacheImpl.java | 10 +-
.../core/paging/cursor/impl/PageCacheImpl.java | 8 +-
.../cursor/impl/PageCursorProviderImpl.java | 34 +--
.../paging/cursor/impl/PagePositionImpl.java | 4 +-
.../impl/PageSubscriptionCounterImpl.java | 24 +-
.../cursor/impl/PageSubscriptionImpl.java | 50 ++--
.../activemq/artemis/core/paging/impl/Page.java | 30 +-
.../artemis/core/paging/impl/PageSyncTimer.java | 8 +-
.../paging/impl/PageTransactionInfoImpl.java | 28 +-
.../core/paging/impl/PagedMessageImpl.java | 18 +-
.../core/paging/impl/PagingManagerImpl.java | 18 +-
.../core/paging/impl/PagingStoreFactoryNIO.java | 28 +-
.../core/paging/impl/PagingStoreImpl.java | 72 ++---
.../artemis/core/persistence/GroupingInfo.java | 4 +-
.../core/persistence/OperationContext.java | 6 +-
.../core/persistence/QueueBindingInfo.java | 4 +-
.../core/persistence/StorageManager.java | 64 ++---
.../config/PersistedAddressSetting.java | 10 +-
.../core/persistence/config/PersistedRoles.java | 8 +-
.../core/persistence/impl/PageCountPending.java | 2 +-
.../impl/journal/AddMessageRecord.java | 4 +-
.../impl/journal/BatchingIDGenerator.java | 14 +-
.../impl/journal/DescribeJournal.java | 110 +++----
.../impl/journal/JournalRecordIds.java | 4 +-
.../impl/journal/JournalStorageManager.java | 186 ++++++------
.../impl/journal/LargeServerMessageImpl.java | 32 +--
.../impl/journal/LargeServerMessageInSync.java | 18 +-
.../impl/journal/OperationContextImpl.java | 18 +-
.../nullpm/NullStorageLargeServerMessage.java | 12 +-
.../impl/nullpm/NullStorageManager.java | 62 ++--
.../artemis/core/postoffice/Address.java | 4 +-
.../artemis/core/postoffice/AddressManager.java | 6 +-
.../artemis/core/postoffice/Binding.java | 16 +-
.../artemis/core/postoffice/BindingType.java | 4 +-
.../artemis/core/postoffice/Bindings.java | 10 +-
.../core/postoffice/BindingsFactory.java | 4 +-
.../core/postoffice/DuplicateIDCache.java | 6 +-
.../artemis/core/postoffice/PostOffice.java | 20 +-
.../artemis/core/postoffice/QueueBinding.java | 4 +-
.../artemis/core/postoffice/QueueInfo.java | 6 +-
.../core/postoffice/impl/AddressImpl.java | 6 +-
.../core/postoffice/impl/BindingsImpl.java | 34 +--
.../core/postoffice/impl/DivertBinding.java | 20 +-
.../postoffice/impl/DuplicateIDCacheImpl.java | 18 +-
.../core/postoffice/impl/LocalQueueBinding.java | 20 +-
.../core/postoffice/impl/PostOfficeImpl.java | 102 +++----
.../postoffice/impl/SimpleAddressManager.java | 24 +-
.../postoffice/impl/WildcardAddressManager.java | 14 +-
.../artemis/core/protocol/ProtocolHandler.java | 26 +-
.../core/protocol/ServerPacketDecoder.java | 108 +++----
.../core/ServerSessionPacketHandler.java | 184 ++++++------
.../core/impl/ActiveMQPacketHandler.java | 50 ++--
.../protocol/core/impl/CoreProtocolManager.java | 70 ++---
.../core/impl/CoreProtocolManagerFactory.java | 14 +-
.../protocol/core/impl/CoreSessionCallback.java | 34 +--
.../wireformat/BackupRegistrationMessage.java | 8 +-
.../BackupReplicationStartFailedMessage.java | 8 +-
.../impl/wireformat/BackupRequestMessage.java | 8 +-
.../impl/wireformat/BackupResponseMessage.java | 6 +-
.../impl/wireformat/ClusterConnectMessage.java | 6 +-
.../wireformat/ClusterConnectReplyMessage.java | 6 +-
.../impl/wireformat/NodeAnnounceMessage.java | 8 +-
.../core/impl/wireformat/QuorumVoteMessage.java | 12 +-
.../impl/wireformat/QuorumVoteReplyMessage.java | 12 +-
.../impl/wireformat/ReplicationAddMessage.java | 10 +-
.../wireformat/ReplicationAddTXMessage.java | 10 +-
.../wireformat/ReplicationCommitMessage.java | 6 +-
.../wireformat/ReplicationDeleteMessage.java | 6 +-
.../wireformat/ReplicationDeleteTXMessage.java | 8 +-
.../ReplicationLargeMessageBeginMessage.java | 6 +-
.../ReplicationLargeMessageEndMessage.java | 6 +-
.../ReplicationLargeMessageWriteMessage.java | 6 +-
.../ReplicationLiveIsStoppingMessage.java | 6 +-
.../wireformat/ReplicationPageEventMessage.java | 8 +-
.../wireformat/ReplicationPageWriteMessage.java | 10 +-
.../wireformat/ReplicationPrepareMessage.java | 8 +-
.../wireformat/ReplicationResponseMessage.java | 4 +-
.../wireformat/ReplicationStartSyncMessage.java | 10 +-
.../wireformat/ReplicationSyncFileMessage.java | 14 +-
.../wireformat/ScaleDownAnnounceMessage.java | 8 +-
.../protocol/stomp/WebSocketServerHandler.java | 2 +-
.../core/registry/JndiBindingRegistry.java | 7 +-
.../core/registry/MapBindingRegistry.java | 4 +-
.../core/remoting/impl/invm/InVMAcceptor.java | 38 +--
.../remoting/impl/invm/InVMAcceptorFactory.java | 14 +-
.../core/remoting/impl/invm/InVMConnection.java | 28 +-
.../core/remoting/impl/invm/InVMConnector.java | 26 +-
.../impl/invm/InVMConnectorFactory.java | 12 +-
.../core/remoting/impl/invm/InVMRegistry.java | 4 +-
.../remoting/impl/invm/TransportConstants.java | 2 +-
.../remoting/impl/netty/ConnectionCreator.java | 2 +-
.../impl/netty/HttpAcceptorHandler.java | 2 +-
.../impl/netty/HttpKeepAliveRunnable.java | 2 +-
.../core/remoting/impl/netty/NettyAcceptor.java | 48 ++--
.../impl/netty/NettyAcceptorFactory.java | 14 +-
.../impl/netty/NettyServerConnection.java | 8 +-
.../core/remoting/server/RemotingService.java | 14 +-
.../server/impl/RemotingServiceImpl.java | 74 ++---
.../core/replication/ReplicatedJournal.java | 74 ++---
.../replication/ReplicatedLargeMessage.java | 18 +-
.../core/replication/ReplicationEndpoint.java | 100 +++----
.../core/replication/ReplicationManager.java | 82 +++---
.../artemis/core/security/CheckType.java | 2 +-
.../artemis/core/security/SecurityStore.java | 6 +-
.../activemq/artemis/core/security/User.java | 2 +-
.../core/security/impl/SecurityStoreImpl.java | 34 +--
.../artemis/core/server/ActivateCallback.java | 2 +-
.../artemis/core/server/ActivationParams.java | 2 +-
.../core/server/ActiveMQMessageBundle.java | 52 ++--
.../artemis/core/server/ActiveMQServer.java | 58 ++--
.../core/server/ActiveMQServerLogger.java | 52 ++--
.../artemis/core/server/ActiveMQServers.java | 10 +-
.../core/server/AutoCreatedQueueManager.java | 6 +-
.../activemq/artemis/core/server/Bindable.java | 2 +-
.../artemis/core/server/BindingQueryResult.java | 4 +-
.../artemis/core/server/ConnectorService.java | 2 +-
.../core/server/ConnectorServiceFactory.java | 6 +-
.../activemq/artemis/core/server/Consumer.java | 4 +-
.../activemq/artemis/core/server/Divert.java | 6 +-
.../artemis/core/server/HandleStatus.java | 2 +-
.../artemis/core/server/JournalType.java | 2 +-
.../artemis/core/server/LargeServerMessage.java | 10 +-
.../artemis/core/server/LiveNodeLocator.java | 14 +-
.../artemis/core/server/MemoryManager.java | 4 +-
.../artemis/core/server/MessageReference.java | 2 +-
.../artemis/core/server/NodeManager.java | 10 +-
.../activemq/artemis/core/server/Queue.java | 14 +-
.../artemis/core/server/QueueCreator.java | 4 +-
.../artemis/core/server/QueueFactory.java | 10 +-
.../artemis/core/server/RouteContextList.java | 2 +-
.../artemis/core/server/RoutingContext.java | 6 +-
.../core/server/ScheduledDeliveryHandler.java | 4 +-
.../artemis/core/server/ServerConsumer.java | 4 +-
.../artemis/core/server/ServerMessage.java | 10 +-
.../artemis/core/server/ServerSession.java | 14 +-
.../core/server/ServerSessionFactory.java | 24 +-
.../core/server/TransientQueueManager.java | 6 +-
...ctiveMQServerSideProtocolManagerFactory.java | 12 +-
.../core/server/cluster/BackupManager.java | 28 +-
.../artemis/core/server/cluster/Bridge.java | 16 +-
.../core/server/cluster/BroadcastGroup.java | 8 +-
.../cluster/ClusterConfigurationUtil.java | 12 +-
.../core/server/cluster/ClusterConnection.java | 16 +-
.../core/server/cluster/ClusterControl.java | 58 ++--
.../core/server/cluster/ClusterController.java | 68 ++---
.../core/server/cluster/ClusterManager.java | 87 +++---
.../core/server/cluster/MessageFlowRecord.java | 4 +-
.../core/server/cluster/RemoteQueueBinding.java | 6 +-
.../core/server/cluster/Transformer.java | 4 +-
.../core/server/cluster/ha/BackupPolicy.java | 6 +-
.../server/cluster/ha/ColocatedHAManager.java | 22 +-
.../core/server/cluster/ha/ColocatedPolicy.java | 10 +-
.../core/server/cluster/ha/HAManager.java | 6 +-
.../core/server/cluster/ha/HAPolicy.java | 6 +-
.../core/server/cluster/ha/LiveOnlyPolicy.java | 8 +-
.../core/server/cluster/ha/ReplicaPolicy.java | 10 +-
.../server/cluster/ha/ReplicatedPolicy.java | 10 +-
.../core/server/cluster/ha/ScaleDownPolicy.java | 22 +-
.../cluster/ha/SharedStoreMasterPolicy.java | 10 +-
.../cluster/ha/SharedStoreSlavePolicy.java | 10 +-
.../server/cluster/ha/StandaloneHAManager.java | 4 +-
.../core/server/cluster/impl/BridgeImpl.java | 74 ++---
.../server/cluster/impl/BroadcastGroupImpl.java | 30 +-
.../cluster/impl/ClusterConnectionBridge.java | 54 ++--
.../cluster/impl/ClusterConnectionImpl.java | 95 +++---
.../core/server/cluster/impl/Redistributor.java | 36 +--
.../cluster/impl/RemoteQueueBindingImpl.java | 24 +-
.../core/server/cluster/qourum/BooleanVote.java | 4 +-
.../core/server/cluster/qourum/Quorum.java | 4 +-
.../server/cluster/qourum/QuorumManager.java | 38 +--
.../core/server/cluster/qourum/QuorumVote.java | 16 +-
.../cluster/qourum/QuorumVoteHandler.java | 6 +-
.../cluster/qourum/QuorumVoteServerConnect.java | 8 +-
.../qourum/SharedNothingBackupQuorum.java | 26 +-
.../core/server/cluster/qourum/Vote.java | 4 +-
.../core/server/embedded/EmbeddedActiveMQ.java | 18 +-
.../core/server/group/GroupingHandler.java | 16 +-
.../core/server/group/UnproposalListener.java | 4 +-
.../core/server/group/impl/GroupBinding.java | 4 +-
.../group/impl/GroupHandlingAbstract.java | 22 +-
.../impl/GroupingHandlerConfiguration.java | 6 +-
.../server/group/impl/LocalGroupingHandler.java | 24 +-
.../core/server/group/impl/Proposal.java | 4 +-
.../group/impl/RemoteGroupingHandler.java | 24 +-
.../core/server/group/impl/Response.java | 4 +-
.../server/impl/AIOFileLockNodeManager.java | 4 +-
.../artemis/core/server/impl/Activation.java | 36 +--
.../core/server/impl/ActiveMQServerImpl.java | 182 ++++++------
.../impl/AnyLiveNodeLocatorForReplication.java | 14 +-
.../impl/AnyLiveNodeLocatorForScaleDown.java | 14 +-
.../impl/AutoCreatedQueueManagerImpl.java | 14 +-
.../impl/BackupRecoveryJournalLoader.java | 42 +--
.../server/impl/BackupTopologyListener.java | 6 +-
.../core/server/impl/ColocatedActivation.java | 44 +--
.../core/server/impl/ConnectorsService.java | 24 +-
.../artemis/core/server/impl/DivertImpl.java | 22 +-
.../core/server/impl/FileLockNodeManager.java | 12 +-
.../core/server/impl/InVMNodeManager.java | 20 +-
.../artemis/core/server/impl/JournalLoader.java | 24 +-
.../core/server/impl/LastValueQueue.java | 36 +--
.../core/server/impl/LiveActivation.java | 2 +-
.../core/server/impl/LiveOnlyActivation.java | 34 +--
.../core/server/impl/MessageReferenceImpl.java | 10 +-
.../NamedLiveNodeLocatorForReplication.java | 16 +-
.../impl/NamedLiveNodeLocatorForScaleDown.java | 16 +-
.../server/impl/NamedNodeIdNodeLocator.java | 12 +-
.../server/impl/PostOfficeJournalLoader.java | 72 ++---
.../core/server/impl/QueueFactoryImpl.java | 22 +-
.../artemis/core/server/impl/QueueImpl.java | 96 +++----
.../artemis/core/server/impl/RefsOperation.java | 20 +-
.../core/server/impl/ReplicationError.java | 26 +-
.../core/server/impl/RoutingContextImpl.java | 12 +-
.../core/server/impl/ScaleDownHandler.java | 70 ++---
.../impl/ScheduledDeliveryHandlerImpl.java | 12 +-
.../core/server/impl/ServerConsumerImpl.java | 64 ++---
.../artemis/core/server/impl/ServerInfo.java | 12 +-
.../core/server/impl/ServerMessageImpl.java | 22 +-
.../core/server/impl/ServerSessionImpl.java | 112 ++++----
.../core/server/impl/ServiceRegistry.java | 10 +-
.../impl/SharedNothingBackupActivation.java | 66 ++---
.../impl/SharedNothingLiveActivation.java | 68 ++---
.../impl/SharedStoreBackupActivation.java | 30 +-
.../server/impl/SharedStoreLiveActivation.java | 8 +-
.../server/impl/TransientQueueManagerImpl.java | 14 +-
.../server/management/ManagementService.java | 58 ++--
.../management/impl/ManagementServiceImpl.java | 105 +++----
.../core/settings/HierarchicalRepository.java | 2 +-
.../HierarchicalRepositoryChangeListener.java | 2 +-
.../artemis/core/settings/Mergeable.java | 2 +-
.../core/settings/impl/AddressSettings.java | 12 +-
.../impl/HierarchicalObjectRepository.java | 10 +-
.../artemis/core/settings/impl/Match.java | 4 +-
.../core/settings/impl/SlowConsumerPolicy.java | 2 +-
.../core/transaction/ResourceManager.java | 4 +-
.../artemis/core/transaction/Transaction.java | 8 +-
.../core/transaction/TransactionDetail.java | 16 +-
.../core/transaction/TransactionFactory.java | 4 +-
.../core/transaction/TransactionOperation.java | 4 +-
.../TransactionOperationAbstract.java | 6 +-
.../transaction/TransactionPropertyIndexes.java | 2 +-
.../impl/BindingsTransactionImpl.java | 8 +-
.../transaction/impl/CoreTransactionDetail.java | 10 +-
.../transaction/impl/ResourceManagerImpl.java | 8 +-
.../core/transaction/impl/TransactionImpl.java | 18 +-
.../spi/core/naming/BindingRegistry.java | 2 +-
.../AbstractProtocolManagerFactory.java | 4 +-
.../spi/core/protocol/MessageConverter.java | 4 +-
.../spi/core/protocol/ProtocolManager.java | 12 +-
.../core/protocol/ProtocolManagerFactory.java | 8 +-
.../spi/core/protocol/SessionCallback.java | 10 +-
.../artemis/spi/core/remoting/Acceptor.java | 10 +-
.../spi/core/remoting/AcceptorFactory.java | 8 +-
.../ServerConnectionLifeCycleListener.java | 2 +-
.../core/security/ActiveMQSecurityManager.java | 6 +-
.../security/ActiveMQSecurityManagerImpl.java | 10 +-
.../spi/core/security/JAASSecurityManager.java | 8 +-
.../artemis/spi/core/security/package-info.java | 2 +-
.../AcceptorTransportConfigurationParser.java | 8 +-
...nVMAcceptorTransportConfigurationSchema.java | 4 +-
...TCPAcceptorTransportConfigurationSchema.java | 4 +-
.../artemis/utils/XMLConfigurationUtil.java | 6 +-
.../resources/schema/activemq-configuration.xsd | 18 +-
.../core/config/impl/ConfigurationImplTest.java | 18 +-
.../impl/DefaultsFileConfigurationTest.java | 12 +-
.../impl/FileConfigurationParserTest.java | 18 +-
.../core/config/impl/FileConfigurationTest.java | 48 ++--
.../config/impl/HAPolicyConfigurationTest.java | 40 +--
.../core/config/impl/ValidatorsTest.java | 6 +-
.../WrongRoleFileConfigurationParserTest.java | 10 +-
.../artemis/core/filter/impl/FilterTest.java | 20 +-
.../core/list/PriorityLinkedListTest.java | 6 +-
.../core/message/impl/MessagePropertyTest.java | 20 +-
.../artemis/core/security/RoleTest.java | 14 +-
.../group/impl/ClusteredResetMockTest.java | 70 ++---
.../core/server/impl/EmbeddedServerTest.java | 14 +-
.../impl/ScheduledDeliveryHandlerTest.java | 42 +--
.../core/settings/AddressSettingsTest.java | 10 +-
.../artemis/core/settings/RepositoryTest.java | 8 +-
.../core/version/impl/VersionImplTest.java | 2 +-
.../tests/util/ColocatedActiveMQServer.java | 22 +-
.../util/CountDownSessionFailureListener.java | 8 +-
.../tests/util/InVMNodeManagerServer.java | 10 +-
.../artemis/tests/util/RemoveFolder.java | 2 +-
.../artemis/tests/util/ServiceTestBase.java | 108 +++----
.../artemis/tests/util/SimpleStringTest.java | 6 +-
.../tests/util/SingleServerTestBase.java | 16 +-
.../artemis/tests/util/UnitTestCase.java | 110 +++----
.../resources/ConfigurationTest-full-config.xml | 48 ++--
.../resources/InvalidConfigurationTest0.xml | 4 +-
.../resources/InvalidConfigurationTest1.xml | 4 +-
.../resources/InvalidConfigurationTest2.xml | 4 +-
.../resources/InvalidConfigurationTest3.xml | 4 +-
.../resources/InvalidConfigurationTest4.xml | 4 +-
.../resources/InvalidConfigurationTest5.xml | 4 +-
.../src/test/resources/logging.properties | 6 +-
artemis-service-extensions/pom.xml | 12 +-
.../ActiveMQServiceExtensionLogger.java | 2 +-
.../service/extensions/ServiceUtils.java | 10 +-
.../transactions/TransactionManagerLocator.java | 2 +-
.../xa/ActiveMQXAResourceWrapper.java | 2 +-
.../xa/ActiveMQXAResourceWrapperFactory.java | 2 +-
.../ActiveMQXAResourceWrapperFactoryImpl.java | 2 +-
.../xa/ActiveMQXAResourceWrapperImpl.java | 10 +-
.../xa/recovery/ActiveMQRegistry.java | 2 +-
.../xa/recovery/ActiveMQRegistryImpl.java | 2 +-
.../xa/recovery/ActiveMQXARecoveryLogger.java | 4 +-
.../xa/recovery/ActiveMQXAResourceRecovery.java | 10 +-
.../xa/recovery/ActiveMQXAResourceWrapper.java | 18 +-
.../xa/recovery/XARecoveryConfig.java | 12 +-
.../DummyTransactionManagerLocator.java | 4 +-
.../TransactionManagerLocatorTest.java | 4 +-
.../xa/ActiveMQXAResourceWrapperImplTest.java | 6 +-
.../xa/MockActiveMQResourceWrapperFactory.java | 6 +-
.../extensions/tests/xa/MockXAResource.java | 2 +-
.../extensions/tests/xa/ServiceUtilsTest.java | 8 +-
...sions.transactions.TransactionManagerLocator | 1 +
...sions.transactions.TransactionManagerLocator | 1 -
artemis-tools/pom.xml | 12 +-
.../artemis/tools/ActiveMQToolsLogger.java | 2 +-
.../apache/activemq/artemis/tools/DataTool.java | 10 +-
.../activemq/artemis/tools/ExportJournal.java | 16 +-
.../activemq/artemis/tools/ImportJournal.java | 14 +-
.../org/apache/activemq/artemis/tools/Main.java | 2 +-
.../activemq/artemis/tools/PrintData.java | 8 +-
.../activemq/artemis/tools/PrintPages.java | 58 ++--
.../activemq/artemis/tools/TransferQueue.java | 24 +-
.../artemis/tools/XmlDataConstants.java | 2 +-
.../activemq/artemis/tools/XmlDataExporter.java | 104 +++----
.../activemq/artemis/tools/XmlDataImporter.java | 47 +--
artemis-web/pom.xml | 12 +-
.../artemis/component/WebServerComponent.java | 10 +-
.../artemis/test/WebServerComponentTest.java | 6 +-
artemis-website/pom.xml | 32 +--
.../src/main/resources/examples/index.html | 8 +-
artemis-website/src/main/resources/index.html | 6 +-
.../src/main/resources/user-manual/index.html | 2 +-
distribution/artemis/pom.xml | 44 +--
distribution/artemis/src/main/assembly/dep.xml | 54 ++--
.../artemis/src/main/resources/README.html | 8 +-
.../artemis/src/main/resources/bin/activemq | 8 +-
.../artemis/src/main/resources/bin/activemq.cmd | 8 +-
.../src/main/resources/licenses/bin/NOTICE | 2 +-
distribution/pom.xml | 8 +-
docs/README.html | 6 +-
docs/quickstart-guide/en/running.md | 2 +-
docs/user-manual/en/README.md | 4 +-
docs/user-manual/en/SUMMARY.md | 4 +-
docs/user-manual/en/aerogear-integration.md | 4 +-
docs/user-manual/en/architecture.md | 64 ++---
docs/user-manual/en/client-classpath.md | 12 +-
docs/user-manual/en/client-reconnection.md | 10 +-
docs/user-manual/en/clusters.md | 72 ++---
docs/user-manual/en/configuration-index.md | 34 +--
docs/user-manual/en/configuring-transports.md | 34 +--
docs/user-manual/en/connection-ttl.md | 30 +-
docs/user-manual/en/core-bridges.md | 10 +-
docs/user-manual/en/diverts.md | 2 +-
docs/user-manual/en/duplicate-detection.md | 8 +-
docs/user-manual/en/embedding-activemq.md | 46 +--
docs/user-manual/en/examples.md | 130 ++++-----
docs/user-manual/en/filter-expressions.md | 8 +-
docs/user-manual/en/flow-control.md | 32 +--
docs/user-manual/en/ha.md | 30 +-
docs/user-manual/en/intercepting-operations.md | 4 +-
docs/user-manual/en/interoperability.md | 78 ++---
docs/user-manual/en/jms-bridge.md | 20 +-
docs/user-manual/en/jms-core-mapping.md | 4 +-
docs/user-manual/en/large-messages.md | 20 +-
docs/user-manual/en/libaio.md | 8 +-
docs/user-manual/en/logging.md | 24 +-
docs/user-manual/en/management.md | 62 ++--
docs/user-manual/en/message-expiry.md | 6 +-
docs/user-manual/en/message-grouping.md | 6 +-
docs/user-manual/en/messaging-concepts.md | 26 +-
docs/user-manual/en/paging.md | 12 +-
docs/user-manual/en/perf-tuning.md | 14 +-
docs/user-manual/en/persistence.md | 42 +--
docs/user-manual/en/pre-acknowledge.md | 6 +-
docs/user-manual/en/preface.md | 14 +-
docs/user-manual/en/project-info.md | 6 +-
docs/user-manual/en/rest.md | 114 ++++----
docs/user-manual/en/security.md | 14 +-
docs/user-manual/en/send-guarantees.md | 16 +-
docs/user-manual/en/slow-consumers.md | 2 +-
docs/user-manual/en/spring-integration.md | 6 +-
docs/user-manual/en/thread-pooling.md | 16 +-
docs/user-manual/en/tools.md | 4 +-
docs/user-manual/en/transaction-config.md | 6 +-
docs/user-manual/en/undelivered-messages.md | 8 +-
docs/user-manual/en/using-core.md | 10 +-
docs/user-manual/en/using-jms.md | 28 +-
docs/user-manual/en/using-server.md | 18 +-
docs/user-manual/en/vertx-integration.md | 10 +-
docs/user-manual/en/wildcard-routing.md | 2 +-
docs/user-manual/en/wildcard-syntax.md | 6 +-
etc/findbugs-exclude.xml | 34 +--
examples/core/embedded-remote/pom.xml | 18 +-
.../core/example/EmbeddedRemoteExample.java | 20 +-
.../artemis/core/example/EmbeddedServer.java | 14 +-
examples/core/embedded/pom.xml | 12 +-
.../artemis/core/example/EmbeddedExample.java | 30 +-
examples/core/perf/pom.xml | 26 +-
.../activemq/artemis/core/example/PerfBase.java | 32 +--
.../artemis/core/example/PerfListener.java | 2 +-
.../artemis/core/example/PerfParams.java | 2 +-
.../artemis/core/example/PerfSender.java | 2 +-
examples/core/pom.xml | 4 +-
examples/core/vertx-connector/pom.xml | 26 +-
examples/core/vertx-connector/readme.html | 20 +-
.../artemis/core/example/ExampleVerticle.java | 4 +-
.../core/example/VertxConnectorExample.java | 4 +-
examples/jms/aerogear/pom.xml | 20 +-
.../artemis/jms/example/AerogearExample.java | 4 +-
.../aerogear/src/main/resources/jndi.properties | 6 +-
examples/jms/application-layer-failover/pom.xml | 18 +-
.../ApplicationLayerFailoverExample.java | 4 +-
.../config/logging.properties | 8 +-
.../config/server.properties | 6 +-
.../jms/artemis-jms-examples-common/pom.xml | 10 +-
.../artemis/common/example/ActiveMQExample.java | 23 +-
.../artemis/common/example/DummyXid.java | 4 +-
examples/jms/artemis-ra-rar/pom.xml | 18 +-
.../artemis-ra-rar/src/main/resources/ra.xml | 20 +-
examples/jms/bridge/pom.xml | 20 +-
.../artemis/jms/example/BridgeExample.java | 4 +-
.../jms/example/HatColourChangeTransformer.java | 8 +-
examples/jms/browser/pom.xml | 18 +-
.../jms/example/QueueBrowserExample.java | 4 +-
.../browser/src/main/resources/jndi.properties | 6 +-
examples/jms/client-kickoff/pom.xml | 20 +-
.../jms/example/ClientKickoffExample.java | 8 +-
.../src/main/resources/jndi.properties | 6 +-
.../jms/client-side-failoverlistener/pom.xml | 18 +-
.../ClientSideFailoverListerExample.java | 10 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/client-side-load-balancing/pom.xml | 18 +-
.../example/ClientSideLoadBalancingExample.java | 10 +-
.../src/main/resources/jndi.properties | 6 +-
.../jms/clustered-durable-subscription/pom.xml | 18 +-
.../ClusteredDurableSubscriptionExample.java | 4 +-
examples/jms/clustered-grouping/pom.xml | 18 +-
.../jms/example/ClusteredGroupingExample.java | 4 +-
examples/jms/clustered-jgroups/pom.xml | 14 +-
.../jms/example/ClusteredJgroupsExample.java | 4 +-
.../activemq/server0/client-jndi.properties | 6 +-
.../activemq/server1/client-jndi.properties | 6 +-
examples/jms/clustered-queue/pom.xml | 14 +-
.../jms/example/ClusteredQueueExample.java | 4 +-
examples/jms/clustered-standalone/pom.xml | 18 +-
.../jms/example/ClusteredStandaloneExample.java | 4 +-
examples/jms/clustered-static-discovery/pom.xml | 18 +-
.../example/StaticClusteredQueueExample.java | 4 +-
examples/jms/clustered-static-oneway/pom.xml | 18 +-
.../jms/example/ClusterStaticOnewayExample.java | 4 +-
examples/jms/clustered-topic/pom.xml | 18 +-
.../jms/example/ClusteredTopicExample.java | 4 +-
.../jms/colocated-failover-scale-down/pom.xml | 14 +-
.../ColocatedFailoverScaleDownExample.java | 4 +-
examples/jms/colocated-failover/pom.xml | 14 +-
.../jms/example/ColocatedFailoverExample.java | 4 +-
examples/jms/consumer-rate-limit/pom.xml | 18 +-
.../jms/example/ConsumerRateLimitExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/dead-letter/pom.xml | 18 +-
.../artemis/jms/example/DeadLetterExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/delayed-redelivery/pom.xml | 18 +-
.../jms/example/DelayedRedeliveryExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/divert/pom.xml | 20 +-
.../example/AddForwardingTimeTransformer.java | 8 +-
.../artemis/jms/example/DivertExample.java | 4 +-
examples/jms/durable-subscription/pom.xml | 18 +-
.../jms/example/DurableSubscriptionExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/embedded-simple/pom.xml | 22 +-
.../artemis/jms/example/EmbeddedExample.java | 14 +-
examples/jms/embedded/pom.xml | 22 +-
.../artemis/jms/example/EmbeddedExample.java | 28 +-
examples/jms/expiry/pom.xml | 18 +-
.../artemis/jms/example/ExpiryExample.java | 4 +-
.../expiry/src/main/resources/jndi.properties | 6 +-
examples/jms/ha-policy-autobackup/pom.xml | 14 +-
.../jms/example/HAPolicyAutoBackupExample.java | 14 +-
examples/jms/http-transport/pom.xml | 18 +-
.../jms/example/HttpTransportExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
.../jms/instantiate-connection-factory/pom.xml | 22 +-
.../InstantiateConnectionFactoryExample.java | 14 +-
examples/jms/interceptor/pom.xml | 20 +-
.../artemis/jms/example/InterceptorExample.java | 4 +-
.../artemis/jms/example/SimpleInterceptor.java | 16 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/jms-auto-closeable/pom.xml | 18 +-
.../jms/example/JMSAutoCloseableExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/jms-bridge/pom.xml | 20 +-
.../artemis/jms/example/JMSBridgeExample.java | 12 +-
examples/jms/jms-completion-listener/pom.xml | 18 +-
.../example/JMSCompletionListenerExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/jms-context/pom.xml | 18 +-
.../artemis/jms/example/JMSContextExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/jms-shared-consumer/pom.xml | 18 +-
.../jms/example/JMSSharedConsumerExample.java | 7 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/jmx/pom.xml | 22 +-
.../artemis/jms/example/JMXExample.java | 8 +-
.../jms/jmx/src/main/resources/jndi.properties | 6 +-
examples/jms/large-message/pom.xml | 18 +-
.../jms/example/LargeMessageExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/last-value-queue/pom.xml | 18 +-
.../jms/example/LastValueQueueExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/management-notifications/pom.xml | 18 +-
.../example/ManagementNotificationExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/management/pom.xml | 18 +-
.../artemis/jms/example/ManagementExample.java | 8 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/message-counters/pom.xml | 20 +-
.../jms/example/MessageCounterExample.java | 10 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/message-group/pom.xml | 18 +-
.../jms/example/MessageGroupExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/message-group2/pom.xml | 18 +-
.../jms/example/MessageGroup2Example.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/message-priority/pom.xml | 18 +-
.../jms/example/MessagePriorityExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/multiple-failover-failback/pom.xml | 18 +-
.../MultipleFailoverFailbackExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/multiple-failover/pom.xml | 18 +-
.../jms/example/MultipleFailoverExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/no-consumer-buffering/pom.xml | 18 +-
.../jms/example/NoConsumerBufferingExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/non-transaction-failover/pom.xml | 14 +-
.../example/NonTransactionFailoverExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/openwire/pom.xml | 20 +-
.../artemis/jms/example/OpenWireExample.java | 4 +-
examples/jms/paging/pom.xml | 18 +-
.../artemis/jms/example/PagingExample.java | 4 +-
.../paging/src/main/resources/jndi.properties | 6 +-
examples/jms/perf/pom.xml | 22 +-
.../activemq/artemis/jms/example/PerfBase.java | 6 +-
.../artemis/jms/example/PerfListener.java | 3 +-
.../artemis/jms/example/PerfParams.java | 2 +-
.../artemis/jms/example/PerfSender.java | 3 +-
.../jms/perf/src/main/resources/jndi.properties | 6 +-
examples/jms/pom.xml | 10 +-
examples/jms/pre-acknowledge/pom.xml | 18 +-
.../jms/example/PreacknowledgeExample.java | 10 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/producer-rate-limit/pom.xml | 18 +-
.../jms/example/ProducerRateLimitExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/proton-cpp/pom.xml | 20 +-
.../artemis/jms/example/ProtonCPPExample.java | 20 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/proton-j/pom.xml | 20 +-
.../artemis/jms/example/ProtonJExample.java | 4 +-
examples/jms/proton-ruby/pom.xml | 20 +-
.../jms/queue-message-redistribution/pom.xml | 18 +-
.../QueueMessageRedistributionExample.java | 4 +-
examples/jms/queue-requestor/pom.xml | 18 +-
.../jms/example/QueueRequestorExample.java | 4 +-
.../jms/example/TextReverserService.java | 2 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/queue-selector/pom.xml | 18 +-
.../jms/example/QueueSelectorExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/queue/pom.xml | 18 +-
.../artemis/jms/example/QueueExample.java | 4 +-
.../queue/src/main/resources/jndi.properties | 6 +-
examples/jms/reattach-node/pom.xml | 18 +-
.../artemis/jms/example/ReattachExample.java | 8 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/replicated-failback-static/pom.xml | 18 +-
.../ReplicatedFailbackStaticExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/replicated-failback/pom.xml | 18 +-
.../jms/example/ReplicatedFailbackExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
.../jms/replicated-multiple-failover/pom.xml | 18 +-
.../ReplicatedMultipleFailoverExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
.../jms/replicated-transaction-failover/pom.xml | 18 +-
.../ReplicatedTransactionFailoverExample.java | 6 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/request-reply/pom.xml | 18 +-
.../jms/example/RequestReplyExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/rest/dup-send/pom.xml | 14 +-
.../rest/dup-send/src/main/java/PostOrder.java | 2 +-
examples/jms/rest/javascript-chat/pom.xml | 14 +-
.../messaging/test/AutoAckTopicTest.java | 2 +-
examples/jms/rest/jms-to-rest/pom.xml | 14 +-
.../jms-to-rest/src/main/java/JmsHelper.java | 18 +-
.../jms-to-rest/src/main/java/JmsReceive.java | 4 +-
.../rest/jms-to-rest/src/main/java/JmsSend.java | 2 +-
examples/jms/rest/pom.xml | 4 +-
examples/jms/rest/push/pom.xml | 14 +-
.../jms/rest/push/src/main/java/JmsHelper.java | 16 +-
.../jms/rest/push/src/main/java/PostOrder.java | 2 +-
.../jms/rest/push/src/main/java/PushReg.java | 8 +-
.../push/src/main/java/ReceiveShipping.java | 4 +-
examples/jms/scale-down/pom.xml | 14 +-
.../artemis/jms/example/ScaleDownExample.java | 4 +-
examples/jms/scheduled-message/pom.xml | 18 +-
.../jms/example/ScheduledMessageExample.java | 6 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/security/pom.xml | 18 +-
.../artemis/jms/example/SecurityExample.java | 4 +-
.../security/src/main/resources/jndi.properties | 6 +-
examples/jms/send-acknowledgements/pom.xml | 18 +-
.../example/SendAcknowledgementsExample.java | 12 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/spring-integration/pom.xml | 20 +-
.../artemis/jms/example/ExampleListener.java | 2 +-
.../artemis/jms/example/MessageSender.java | 2 +-
.../artemis/jms/example/SpringExample.java | 2 +-
.../src/main/resources/spring-jms-beans.xml | 18 +-
examples/jms/ssl-enabled/pom.xml | 18 +-
.../artemis/jms/example/SSLExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/static-selector-jms/pom.xml | 18 +-
.../jms/example/StaticSelectorJMSExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/static-selector/pom.xml | 18 +-
.../jms/example/StaticSelectorExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/stomp-websockets/pom.xml | 20 +-
.../jms/example/StompWebSocketExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/stomp/pom.xml | 20 +-
.../artemis/jms/example/StompExample.java | 4 +-
.../stomp/src/main/resources/jndi.properties | 6 +-
examples/jms/stomp1.1/pom.xml | 20 +-
.../artemis/jms/example/StompExample.java | 4 +-
.../stomp1.1/src/main/resources/jndi.properties | 6 +-
examples/jms/stomp1.2/pom.xml | 20 +-
.../artemis/jms/example/StompExample.java | 4 +-
.../stomp1.2/src/main/resources/jndi.properties | 6 +-
examples/jms/stop-server-failover/pom.xml | 18 +-
.../jms/example/StopServerFailoverExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/symmetric-cluster/pom.xml | 18 +-
.../jms/example/SymmetricClusterExample.java | 12 +-
examples/jms/temp-queue/pom.xml | 18 +-
.../jms/example/TemporaryQueueExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/topic-hierarchies/pom.xml | 18 +-
.../jms/example/TopicHierarchyExample.java | 6 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/topic-selector-example1/pom.xml | 18 +-
.../jms/example/TopicSelectorExample1.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/topic-selector-example2/pom.xml | 18 +-
.../jms/example/TopicSelectorExample2.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/topic/pom.xml | 18 +-
.../artemis/jms/example/TopicExample.java | 4 +-
.../topic/src/main/resources/jndi.properties | 6 +-
examples/jms/transaction-failover/pom.xml | 18 +-
.../jms/example/TransactionFailoverExample.java | 6 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/transactional/pom.xml | 18 +-
.../jms/example/TransactionalExample.java | 4 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/xa-heuristic/pom.xml | 18 +-
.../artemis/jms/example/XAHeuristicExample.java | 10 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/xa-receive/pom.xml | 18 +-
.../artemis/jms/example/XAReceiveExample.java | 8 +-
.../src/main/resources/jndi.properties | 6 +-
examples/jms/xa-send/pom.xml | 18 +-
.../artemis/jms/example/XASendExample.java | 8 +-
.../xa-send/src/main/resources/jndi.properties | 6 +-
examples/pom.xml | 6 +-
examples/soak/normal/pom.xml | 20 +-
.../artemis/jms/soak/example/SoakBase.java | 2 +-
.../artemis/jms/soak/example/SoakParams.java | 2 +-
.../artemis/jms/soak/example/SoakReceiver.java | 2 +-
.../artemis/jms/soak/example/SoakSender.java | 6 +-
examples/soak/pom.xml | 4 +-
.../activemq-aerogear-integration/pom.xml | 8 +-
.../aerogear/ActiveMQAeroGearBundle.java | 4 +-
.../aerogear/ActiveMQAeroGearLogger.java | 2 +-
.../aerogear/AeroGearConnectorService.java | 28 +-
.../AeroGearConnectorServiceFactory.java | 10 +-
.../integration/aerogear/AeroGearConstants.java | 4 +-
integration/activemq-spring-integration/pom.xml | 10 +-
.../spring/SpringBindingRegistry.java | 4 +-
.../integration/spring/SpringJmsBootstrap.java | 4 +-
.../artemis/spring/ActiveMQSpringBundle.java | 2 +-
.../artemis/spring/ActiveMQSpringLogger.java | 2 +-
integration/activemq-vertx-integration/pom.xml | 8 +-
.../integration/vertx/ActiveMQVertxLogger.java | 4 +-
.../vertx/IncomingVertxEventHandler.java | 20 +-
.../vertx/OutgoingVertxEventHandler.java | 28 +-
.../integration/vertx/VertxConstants.java | 2 +-
.../VertxIncomingConnectorServiceFactory.java | 10 +-
.../VertxOutgoingConnectorServiceFactory.java | 10 +-
pom.xml | 187 ++++++------
tests/config/logging.properties | 20 +-
tests/extra-tests/pom.xml | 18 +-
.../artemis/tests/extras/ExtrasTestLogger.java | 2 +-
.../byteman/ActiveMQMessageHandlerTest.java | 28 +-
.../tests/extras/byteman/BMFailoverTest.java | 54 ++--
.../BridgeServerLocatorConfigurationTest.java | 20 +-
.../extras/byteman/ClosingConnectionTest.java | 30 +-
.../extras/byteman/ClusteredGroupingTest.java | 38 +--
.../tests/extras/byteman/GroupingTest.java | 12 +-
.../HierarchicalObjectRepositoryTest.java | 6 +-
.../byteman/JMSBridgeReconnectionTest.java | 26 +-
.../tests/extras/byteman/LatencyTest.java | 12 +-
.../tests/extras/byteman/MessageCopyTest.java | 20 +-
.../extras/byteman/OrphanedConsumerTest.java | 34 +--
.../tests/extras/byteman/PagingLeakTest.java | 36 +--
.../extras/byteman/ReplicationBackupTest.java | 18 +-
.../extras/byteman/ScaleDownFailoverTest.java | 22 +-
.../extras/byteman/ScaleDownFailureTest.java | 14 +-
.../byteman/ScaleDownGroupedFailoverTest.java | 2 +-
.../byteman/ScaleDownGroupedFailureTest.java | 2 +-
.../extras/byteman/StartStopDeadlockTest.java | 26 +-
.../extras/byteman/StompInternalStateTest.java | 32 +--
.../tests/extras/jms/bridge/BridgeTestBase.java | 50 ++--
.../jms/bridge/ClusteredBridgeTestBase.java | 56 ++--
.../jms/bridge/JMSBridgeClusteredTest.java | 12 +-
.../jms/bridge/JMSBridgeReconnectionTest.java | 24 +-
.../tests/extras/jms/bridge/JMSBridgeTest.java | 20 +-
.../bridge/TransactionManagerLocatorImpl.java | 4 +-
.../extras/jms/xa/JMSXDeliveryCountTest.java | 6 +-
.../artemis/tests/extras/jms/xa/XATest.java | 10 +-
...sions.transactions.TransactionManagerLocator | 2 +-
tests/integration-tests/pom.xml | 34 +--
.../integration/DuplicateDetectionTest.java | 42 +--
.../integration/IntegrationTestLogger.java | 2 +-
.../tests/integration/InterceptorTest.java | 58 ++--
.../integration/SimpleNotificationService.java | 8 +-
.../tests/integration/String64KLimitTest.java | 28 +-
.../aerogear/AeroGearBasicServerTest.java | 44 +--
.../integration/client/AckBatchSizeTest.java | 24 +-
.../integration/client/AcknowledgeTest.java | 42 +--
.../integration/client/ActiveMQCrashTest.java | 44 +--
.../integration/client/AddressSettingsTest.java | 26 +-
.../integration/client/AutoCloseCoreTest.java | 10 +-
.../client/AutoCreateJmsQueueTest.java | 14 +-
.../client/AutoDeleteJmsQueueTest.java | 10 +-
.../integration/client/AutogroupIdTest.java | 26 +-
.../integration/client/BlockingSendTest.java | 20 +-
.../integration/client/CommitRollbackTest.java | 26 +-
.../ConcurrentCreateDeleteProduceTest.java | 26 +-
.../integration/client/ConsumerCloseTest.java | 44 +--
.../integration/client/ConsumerFilterTest.java | 24 +-
.../client/ConsumerRoundRobinTest.java | 22 +-
.../integration/client/ConsumerStuckTest.java | 32 +--
.../tests/integration/client/ConsumerTest.java | 38 +--
.../client/ConsumerWindowSizeTest.java | 66 ++---
.../integration/client/CoreClientTest.java | 34 +--
.../client/CreateQueueIdempotentTest.java | 24 +-
.../client/DeadLetterAddressTest.java | 44 +--
.../integration/client/DeliveryOrderTest.java | 24 +-
.../integration/client/DurableQueueTest.java | 22 +-
.../client/ExpireTestOnRestartTest.java | 28 +-
.../integration/client/ExpiryAddressTest.java | 40 +--
.../client/ExpiryLargeMessageTest.java | 30 +-
.../integration/client/FailureDeadlockTest.java | 35 +--
...FlowControlOnIgnoreLargeMessageBodyTest.java | 6 +-
.../integration/client/HangConsumerTest.java | 100 +++----
.../integration/client/HeuristicXATest.java | 32 +--
.../InVMNonPersistentMessageBufferTest.java | 24 +-
.../client/InVMPersistentMessageBufferTest.java | 2 +-
.../client/IncompatibleVersionTest.java | 62 ++--
.../client/InterruptedLargeMessageTest.java | 90 +++---
.../client/JMSMessageCounterTest.java | 8 +-
.../client/JMSPagingFileDeleteTest.java | 12 +-
.../client/JmsNettyNioStressTest.java | 28 +-
.../integration/client/JournalCrashTest.java | 48 ++--
.../LargeMessageAvoidLargeMessagesTest.java | 38 +--
.../client/LargeMessageCompressTest.java | 22 +-
.../integration/client/LargeMessageTest.java | 50 ++--
.../client/LibaioDependencyCheckTest.java | 6 +-
.../client/MessageConcurrencyTest.java | 26 +-
.../client/MessageConsumerRollbackTest.java | 24 +-
.../integration/client/MessageCounterTest.java | 20 +-
.../client/MessageDurabilityTest.java | 30 +-
.../client/MessageExpirationTest.java | 28 +-
.../MessageGroupingConnectionFactoryTest.java | 34 +--
.../integration/client/MessageGroupingTest.java | 38 +--
.../integration/client/MessageHandlerTest.java | 24 +-
.../integration/client/MessagePriorityTest.java | 38 +--
.../integration/client/MessageRateTest.java | 22 +-
.../client/MultipleThreadFilterOneTest.java | 37 +--
.../tests/integration/client/NIOvsOIOTest.java | 42 +--
.../integration/client/NettyConnectorTest.java | 20 +-
.../client/NettyConsumerWindowSizeTest.java | 2 +-
.../NettyNonPersistentMessageBufferTest.java | 2 +-
.../NettyPersistentMessageBufferTest.java | 2 +-
.../client/NettyProducerFlowControlTest.java | 2 +-
.../client/NewDeadLetterAddressTest.java | 32 +--
.../tests/integration/client/OrderTest.java | 20 +-
.../integration/client/PagingOrderTest.java | 54 ++--
.../integration/client/PagingSyncTest.java | 24 +-
.../tests/integration/client/PagingTest.java | 88 +++---
.../integration/client/ProducerCloseTest.java | 28 +-
.../client/ProducerFlowControlTest.java | 44 +--
.../tests/integration/client/ProducerTest.java | 34 +--
.../integration/client/QueueBrowserTest.java | 22 +-
.../client/ReceiveImmediateTest.java | 26 +-
.../tests/integration/client/ReceiveTest.java | 36 +--
.../client/RedeliveryConsumerTest.java | 38 +--
.../tests/integration/client/RequestorTest.java | 48 ++--
.../tests/integration/client/RoutingTest.java | 20 +-
.../client/SelfExpandingBufferTest.java | 30 +-
.../client/ServerLocatorConnectTest.java | 22 +-
.../client/SessionCloseOnGCTest.java | 16 +-
.../integration/client/SessionCloseTest.java | 34 +--
...onClosedOnRemotingConnectionFailureTest.java | 32 +--
.../client/SessionCreateAndDeleteQueueTest.java | 26 +-
.../client/SessionCreateConsumerTest.java | 20 +-
.../client/SessionCreateProducerTest.java | 18 +-
.../integration/client/SessionFactoryTest.java | 32 +--
.../SessionSendAcknowledgementHandlerTest.java | 22 +-
.../client/SessionStopStartTest.java | 24 +-
.../tests/integration/client/SessionTest.java | 38 +--
.../client/SimpleSendMultipleQueuesTest.java | 20 +-
.../integration/client/SlowConsumerTest.java | 40 +--
.../integration/client/TemporaryQueueTest.java | 87 +++---
.../client/TransactionDurabilityTest.java | 26 +-
.../client/TransactionalSendTest.java | 18 +-
.../integration/client/TransientQueueTest.java | 31 +-
.../integration/client/WildCardRoutingTest.java | 30 +-
.../clientcrash/ClientCrashTest.java | 40 ++-
.../integration/clientcrash/ClientExitTest.java | 34 ++-
.../integration/clientcrash/ClientTestBase.java | 8 +-
.../integration/clientcrash/CrashClient.java | 22 +-
.../integration/clientcrash/CrashClient2.java | 22 +-
.../clientcrash/DummyInterceptor.java | 18 +-
.../clientcrash/DummyInterceptorB.java | 12 +-
.../integration/clientcrash/GracefulClient.java | 26 +-
.../cluster/ClusterControllerTest.java | 20 +-
.../integration/cluster/NodeManagerAction.java | 6 +-
.../integration/cluster/NodeManagerTest.java | 30 +-
.../cluster/RealNodeManagerTest.java | 16 +-
.../cluster/bridge/BridgeFailoverTest.java | 24 +-
.../cluster/bridge/BridgeReconnectTest.java | 85 +++---
.../cluster/bridge/BridgeStartTest.java | 42 +--
.../integration/cluster/bridge/BridgeTest.java | 286 +++---------------
.../cluster/bridge/BridgeTestBase.java | 34 +--
.../BridgeWithDiscoveryGroupStartTest.java | 44 +--
.../cluster/bridge/SimpleTransformer.java | 10 +-
.../distribution/ClusterHeadersRemovedTest.java | 14 +-
.../cluster/distribution/ClusterTestBase.java | 100 +++----
.../distribution/ClusterWithBackupTest.java | 6 +-
.../distribution/ClusteredGroupingTest.java | 46 +--
.../ClusteredRequestResponseTest.java | 2 +-
.../LargeMessageRedistributionTest.java | 2 +-
.../distribution/MessageRedistributionTest.java | 87 +++---
.../MessageRedistributionWithDiscoveryTest.java | 20 +-
.../NettyFileStorageSymmetricClusterTest.java | 4 +-
...leStorageSymmetricClusterWithBackupTest.java | 2 +-
...torageSymmetricClusterWithDiscoveryTest.java | 4 +-
.../NettyOneWayChainClusterTest.java | 2 +-
.../NettyOneWayTwoNodeClusterTest.java | 2 +-
.../distribution/NettySymmetricClusterTest.java | 2 +-
.../NettySymmetricClusterWithBackupTest.java | 2 +-
.../NettySymmetricClusterWithDiscoveryTest.java | 2 +-
.../distribution/OneWayChainClusterTest.java | 10 +-
.../distribution/OnewayTwoNodeClusterTest.java | 6 +-
.../SimpleSymmetricClusterTest.java | 4 +-
.../distribution/SymmetricClusterTest.java | 7 +-
.../SymmetricClusterWithBackupTest.java | 8 +-
.../SymmetricClusterWithDiscoveryTest.java | 9 +-
.../distribution/TemporaryQueueClusterTest.java | 8 +-
.../distribution/TwoWayTwoNodeClusterTest.java | 4 +-
.../TwoWayTwoNodeClusterWithDiscoveryTest.java | 2 +-
.../AlmostLargeAsynchronousFailoverTest.java | 6 +-
.../failover/AsynchronousFailoverTest.java | 42 +--
.../AutomaticColocatedQuorumVoteTest.java | 183 ++++++------
.../failover/BackupAuthenticationTest.java | 16 +-
.../cluster/failover/BackupSyncJournalTest.java | 52 ++--
.../failover/BackupSyncLargeMessageTest.java | 20 +-
.../cluster/failover/BackupSyncPagingTest.java | 12 +-
.../ClusterWithBackupFailoverTestBase.java | 14 +-
.../cluster/failover/DelayInterceptor.java | 12 +-
.../cluster/failover/DelayInterceptor2.java | 12 +-
.../cluster/failover/DelayInterceptor3.java | 12 +-
.../DiscoveryClusterWithBackupFailoverTest.java | 2 +-
.../cluster/failover/FailBackAutoTest.java | 65 +++--
.../cluster/failover/FailBackManualTest.java | 53 ++--
.../cluster/failover/FailoverListenerTest.java | 57 ++--
.../failover/FailoverOnFlowControlTest.java | 36 +--
.../cluster/failover/FailoverTest.java | 144 +++++-----
.../cluster/failover/FailoverTestBase.java | 62 ++--
.../GroupingFailoverReplicationTest.java | 2 +-
.../GroupingFailoverSharedServerTest.java | 2 +-
.../failover/GroupingFailoverTestBase.java | 24 +-
.../failover/LargeMessageFailoverTest.java | 8 +-
.../failover/LiveToLiveFailoverTest.java | 46 +--
.../MultipleBackupsFailoverTestBase.java | 41 ++-
...ultipleLivesMultipleBackupsFailoverTest.java | 32 +--
.../MultipleServerFailoverTestBase.java | 44 +--
.../failover/NettyAsynchronousFailoverTest.java | 4 +-
.../failover/NettyAsynchronousReattachTest.java | 10 +-
...yDiscoveryClusterWithBackupFailoverTest.java | 2 +-
.../cluster/failover/NettyFailoverTest.java | 24 +-
...eDiscoveryClusterWithBackupFailoverTest.java | 2 +-
...rageStaticClusterWithBackupFailoverTest.java | 2 +-
.../failover/NettyReplicatedFailoverTest.java | 10 +-
...ettyStaticClusterWithBackupFailoverTest.java | 2 +-
.../cluster/failover/PagingFailoverTest.java | 34 +--
.../cluster/failover/QuorumFailOverTest.java | 18 +-
.../failover/QuorumVoteServerConnectTest.java | 10 +-
.../ReplicatedAsynchronousFailoverTest.java | 2 +-
.../failover/ReplicatedDistributionTest.java | 24 +-
.../failover/ReplicatedFailoverTest.java | 12 +-
...eplicatedFailoverUsingNodeGroupNameTest.java | 6 +-
.../ReplicatedLargeMessageFailoverTest.java | 6 +-
...icatedLargeMessageWithDelayFailoverTest.java | 6 +-
...ltipleServerFailoverNoNodeGroupNameTest.java | 2 +-
...eplicatedManyMultipleServerFailoverTest.java | 2 +-
...dMultipleServerFailoverExtraBackupsTest.java | 33 ++-
...ltipleServerFailoverNoGroupNodeNameTest.java | 2 +-
.../ReplicatedMultipleServerFailoverTest.java | 29 +-
...ReplicatedNettyAsynchronousFailoverTest.java | 2 +-
.../failover/ReplicatedPagedFailoverTest.java | 10 +-
.../failover/ReplicatedPagingFailoverTest.java | 2 +-
.../ReplicatedWithDelayFailoverTest.java | 6 +-
.../cluster/failover/SecurityFailoverTest.java | 20 +-
.../failover/SharedStoreDistributionTest.java | 2 +-
.../SingleLiveMultipleBackupsFailoverTest.java | 32 +--
.../StaticClusterWithBackupFailoverTest.java | 2 +-
.../remote/FailoverWithSharedStoreTest.java | 16 +-
.../ha/HAAutomaticBackupSharedStore.java | 16 +-
.../reattach/MultiThreadRandomReattachTest.java | 8 +-
.../MultiThreadRandomReattachTestBase.java | 37 +--
.../MultiThreadReattachSupportTestBase.java | 24 +-
.../NettyMultiThreadRandomReattachTest.java | 8 +-
.../cluster/reattach/OrderReattachTest.java | 32 +--
.../cluster/reattach/RandomReattachTest.java | 50 ++--
.../cluster/reattach/ReattachTest.java | 48 ++--
.../cluster/restart/ClusterRestartTest.java | 10 +-
.../cluster/topology/HAClientTopologyTest.java | 11 +-
.../HAClientTopologyWithDiscoveryTest.java | 10 +-
.../cluster/topology/IsolatedTopologyTest.java | 28 +-
.../topology/NettyHAClientTopologyTest.java | 2 +-
.../NettyHAClientTopologyWithDiscoveryTest.java | 2 +-
.../cluster/topology/NonHATopologyTest.java | 24 +-
.../topology/TopologyClusterTestBase.java | 84 +++---
.../cluster/util/BackupSyncDelay.java | 30 +-
.../cluster/util/MultiServerTestBase.java | 32 +--
.../cluster/util/RemoteServerConfiguration.java | 4 +-
.../cluster/util/SameProcessActiveMQServer.java | 12 +-
.../cluster/util/TestableServer.java | 10 +-
.../discovery/DiscoveryBaseTest.java | 28 +-
.../discovery/DiscoveryStayAliveTest.java | 20 +-
.../integration/discovery/DiscoveryTest.java | 34 +--
.../tests/integration/divert/DivertTest.java | 30 +-
.../divert/PersistentDivertTest.java | 30 +-
.../integration/embedded/ValidateAIOTest.java | 12 +-
.../http/CoreClientOverHttpTest.java | 32 +--
.../jms/ActiveMQConnectionFactoryTest.java | 32 +--
.../tests/integration/jms/FloodServerTest.java | 30 +-
.../tests/integration/jms/JMSSecurityTest.java | 6 +-
.../tests/integration/jms/JmsProducerTest.java | 16 +-
.../ManualReconnectionToSingleServerTest.java | 30 +-
.../integration/jms/SimpleJNDIClientTest.java | 78 ++---
.../jms/client/AutoGroupingTest.java | 10 +-
.../integration/jms/client/ConnectionTest.java | 4 +-
.../integration/jms/client/CreateQueueTest.java | 8 +-
.../jms/client/ExpiryMessageTest.java | 10 +-
.../integration/jms/client/GroupIDTest.java | 10 +-
.../integration/jms/client/GroupingTest.java | 18 +-
.../jms/client/MessageProducerTest.java | 4 +-
.../integration/jms/client/MessageTest.java | 8 +-
.../jms/client/NewQueueRequestorTest.java | 6 +-
.../jms/client/NoLocalSubscriberTest.java | 12 +-
.../integration/jms/client/PreACKJMSTest.java | 23 +-
.../jms/client/ReSendMessageTest.java | 14 +-
.../jms/client/ReceiveNoWaitTest.java | 5 +-
.../jms/client/RemoteConnectionStressTest.java | 26 +-
...onClosedOnRemotingConnectionFailureTest.java | 20 +-
.../integration/jms/client/SessionTest.java | 6 +-
.../integration/jms/client/StoreConfigTest.java | 8 +-
.../integration/jms/client/TextMessageTest.java | 12 +-
.../jms/client/TopicCleanupTest.java | 18 +-
.../jms/cluster/BindingsClusterTest.java | 28 +-
.../jms/cluster/JMSFailoverListenerTest.java | 58 ++--
.../jms/cluster/JMSFailoverTest.java | 68 ++---
.../jms/cluster/JMSReconnectTest.java | 48 ++--
.../jms/cluster/LargeMessageOverBridgeTest.java | 18 +-
.../jms/cluster/MultipleThreadsOpeningTest.java | 12 +-
.../jms/cluster/ReplicatedJMSFailoverTest.java | 18 +-
.../jms/cluster/TemporaryQueueClusterTest.java | 4 +-
.../jms/cluster/TopicClusterTest.java | 4 +-
.../CloseConnectionFactoryOnGCest.java | 16 +-
.../jms/connection/CloseConnectionOnGCTest.java | 20 +-
.../CloseDestroyedConnectionTest.java | 28 +-
.../connection/ConcurrentSessionCloseTest.java | 12 +-
.../ConnectionFactorySerializationTest.java | 34 +--
...tionFactoryWithJGroupsSerializationTest.java | 16 +-
.../jms/connection/ExceptionListenerTest.java | 36 +--
.../jms/connection/InvalidConnectorTest.java | 14 +-
.../integration/jms/consumer/ConsumerTest.java | 116 ++++----
.../jms/divert/DivertAndACKClientTest.java | 14 +-
.../integration/jms/jms2client/BodyTest.java | 6 +-
.../jms/jms2client/InvalidDestinationTest.java | 4 +-
.../jms/jms2client/JmsContextTest.java | 4 +-
.../JmsProducerCompletionListenerTest.java | 10 +-
.../jms/jms2client/NonExistentQueueTest.java | 12 +-
.../jms/jms2client/SharedConsumerTest.java | 8 +-
.../jms/largemessage/JMSLargeMessageTest.java | 10 +-
.../jms/server/JMSServerDeployerTest.java | 26 +-
.../jms/server/JMSServerStartStopTest.java | 32 +--
.../jms/server/config/JMSConfigurationTest.java | 38 +--
.../config/JMSServerConfigParserTest.java | 16 +-
.../ConnectionFactoryControlTest.java | 60 ++--
.../server/management/JMSMessagingProxy.java | 4 +-
.../server/management/JMSQueueControlTest.java | 70 ++---
.../management/JMSQueueControlUsingJMSTest.java | 18 +-
.../management/JMSServerControl2Test.java | 61 ++--
.../management/JMSServerControlRestartTest.java | 56 ++--
.../server/management/JMSServerControlTest.java | 274 +++++++++---------
.../JMSServerControlUsingJMSTest.java | 81 +++---
.../jms/server/management/JMSUtil.java | 40 +--
.../server/management/NullInitialContext.java | 2 +-
.../management/TopicControlClusterTest.java | 8 +-
.../jms/server/management/TopicControlTest.java | 90 +++---
.../management/TopicControlUsingJMSTest.java | 40 +--
.../journal/AIOImportExportTest.java | 9 +-
.../journal/AIOJournalCompactTest.java | 11 +-
.../integration/journal/AIOJournalImplTest.java | 12 +-
.../journal/AIOSequentialFileFactoryTest.java | 10 +-
.../journal/JournalPerfTuneTest.java | 28 +-
.../journal/NIOBufferedJournalCompactTest.java | 9 +-
.../journal/NIOImportExportTest.java | 17 +-
.../journal/NIOJournalCompactTest.java | 48 ++--
.../integration/journal/NIOJournalImplTest.java | 13 +-
.../journal/NIONoBufferJournalImplTest.java | 10 +-
...NIONonBufferedSequentialFileFactoryTest.java | 8 +-
.../journal/NIOSequentialFileFactoryTest.java | 8 +-
.../integration/journal/OldFormatTest.java | 18 +-
.../journal/ValidateTransactionHealthTest.java | 34 +--
.../largemessage/LargeMessageTestBase.java | 44 +--
.../largemessage/ServerLargeMessageTest.java | 30 +-
.../management/AcceptorControlTest.java | 30 +-
.../AcceptorControlUsingCoreTest.java | 18 +-
.../management/ActiveMQServerControlTest.java | 64 ++---
.../ActiveMQServerControlUsingCoreTest.java | 22 +-
.../management/AddressControlTest.java | 44 +--
.../management/AddressControlUsingCoreTest.java | 30 +-
.../management/BridgeControlTest.java | 34 +--
.../management/BridgeControlUsingCoreTest.java | 34 +--
.../management/BroadcastGroupControlTest.java | 31 +-
.../BroadcastGroupControlUsingCoreTest.java | 12 +-
.../ClusterConnectionControl2Test.java | 35 +--
.../ClusterConnectionControlTest.java | 40 +--
.../ClusterConnectionControlUsingCoreTest.java | 18 +-
.../management/CoreMessagingProxy.java | 12 +-
.../management/DivertControlTest.java | 24 +-
.../management/DivertControlUsingCoreTest.java | 20 +-
.../integration/management/JMXDomainTest.java | 18 +-
.../management/ManagementActivationTest.java | 18 +-
.../management/ManagementControlHelper.java | 30 +-
.../management/ManagementHelperTest.java | 12 +-
.../management/ManagementServiceImplTest.java | 36 +--
.../management/ManagementTestBase.java | 16 +-
.../ManagementWithPagingServerTest.java | 36 +--
.../management/ManagementWithStompTest.java | 44 +--
.../management/NotificationTest.java | 50 ++--
.../management/QueueControlTest.java | 122 ++++----
.../management/QueueControlUsingCoreTest.java | 14 +-
.../management/SecurityManagementTestBase.java | 26 +-
...tyManagementWithConfiguredAdminUserTest.java | 20 +-
...yManagementWithDefaultConfigurationTest.java | 14 +-
...ManagementWithModifiedConfigurationTest.java | 14 +-
.../management/SecurityNotificationTest.java | 46 +--
.../integration/openwire/BasicOpenWireTest.java | 4 +-
.../integration/openwire/BasicSecurityTest.java | 2 +-
.../integration/openwire/OpenWireTestBase.java | 32 +--
.../integration/openwire/OpenWireUtilTest.java | 4 +-
.../openwire/SimpleOpenWireTest.java | 7 +-
.../openwire/amq/JMSConsumer10Test.java | 4 +-
.../openwire/amq/JMSConsumer11Test.java | 4 +-
.../openwire/amq/JMSConsumer12Test.java | 4 +-
.../openwire/amq/JMSConsumer13Test.java | 4 +-
.../openwire/amq/JMSConsumer1Test.java | 4 +-
.../openwire/amq/JMSConsumer2Test.java | 4 +-
.../openwire/amq/JMSConsumer3Test.java | 4 +-
.../openwire/amq/JMSConsumer4Test.java | 4 +-
.../openwire/amq/JMSConsumer5Test.java | 4 +-
.../openwire/amq/JMSConsumer6Test.java | 4 +-
.../openwire/amq/JMSConsumer7Test.java | 4 +-
.../openwire/amq/JMSConsumer8Test.java | 4 +-
.../openwire/amq/JMSConsumer9Test.java | 4 +-
.../amq/JMSDurableTopicRedeliverTest.java | 2 +-
.../openwire/amq/JMSIndividualAckTest.java | 4 +-
.../openwire/amq/JMSMessageTest.java | 4 +-
.../openwire/amq/JMSQueueRedeliverTest.java | 2 +-
.../openwire/amq/JMSUsecase1Test.java | 4 +-
.../openwire/amq/JMSUsecaseTest.java | 4 +-
.../openwire/amq/JmsAutoAckListenerTest.java | 4 +-
.../openwire/amq/JmsAutoAckTest.java | 4 +-
.../openwire/amq/JmsClientAckTest.java | 4 +-
.../amq/JmsConnectionStartStopTest.java | 4 +-
.../amq/JmsConsumerResetActiveListenerTest.java | 4 +-
.../amq/JmsCreateConsumerInOnMessageTest.java | 4 +-
.../JmsDurableQueueWildcardSendReceiveTest.java | 2 +-
.../amq/JmsDurableTopicSelectorTest.java | 2 +-
.../amq/JmsDurableTopicSendReceiveTest.java | 2 +-
.../amq/JmsDurableTopicTransactionTest.java | 2 +-
.../JmsDurableTopicWildcardSendReceiveTest.java | 2 +-
.../openwire/amq/JmsQueueBrowserTest.java | 4 +-
.../openwire/amq/JmsQueueRequestReplyTest.java | 2 +-
.../openwire/amq/JmsResourceProvider.java | 2 +-
.../openwire/amq/JmsSendReceiveTestSupport.java | 4 +-
.../openwire/amq/JmsTopicRedeliverTest.java | 4 +-
.../openwire/amq/JmsTopicRequestReplyTest.java | 4 +-
.../openwire/amq/JmsTopicSelectorTest.java | 4 +-
.../openwire/amq/JmsTopicSendReceiveTest.java | 2 +-
...sTopicSendReceiveWithTwoConnectionsTest.java | 2 +-
.../openwire/amq/JmsTopicTransactionTest.java | 2 +-
.../amq/JmsTopicWildcardSendReceiveTest.java | 2 +-
.../openwire/amq/JmsTransactionTestSupport.java | 4 +-
.../amq/MessageListenerRedeliveryTest.java | 4 +-
.../amq/ProducerFlowControlSendFailTest.java | 8 +-
.../openwire/amq/ProducerFlowControlTest.java | 10 +-
.../amq/ReconnectWithSameClientIDTest.java | 4 +-
.../openwire/amq/RedeliveryPolicyTest.java | 4 +-
.../integration/openwire/amq/TimeStampTest.java | 4 +-
.../openwire/amq/TransactionContextTest.java | 4 +-
.../openwire/interop/GeneralInteropTest.java | 6 +-
.../tests/integration/openwire/util/Wait.java | 2 +-
.../paging/MultipleProducersPagingTest.java | 26 +-
.../integration/paging/NettyPagingSendTest.java | 2 +-
.../paging/PageCountSyncOnNonTXTest.java | 26 +-
.../integration/paging/PageCountSyncServer.java | 8 +-
.../integration/paging/PagingCounterTest.java | 32 +--
.../integration/paging/PagingReceiveTest.java | 28 +-
.../integration/paging/PagingSendTest.java | 36 +--
.../PagingWithFailoverAndCountersTest.java | 22 +-
.../paging/PagingWithFailoverBackup.java | 6 +-
.../paging/PagingWithFailoverServer.java | 6 +-
.../paging/SpawnedServerSupport.java | 36 +--
...AddressSettingsConfigurationStorageTest.java | 12 +-
.../DeleteMessagesOnStartupTest.java | 29 +-
.../persistence/DeleteQueueRestartTest.java | 20 +-
.../persistence/DuplicateCacheTest.java | 21 +-
.../persistence/ExportFormatTest.java | 22 +-
...nnectionFactoryConfigurationStorageTest.java | 18 +-
.../persistence/JMSDynamicConfigTest.java | 10 +-
.../persistence/JMSStorageManagerTest.java | 23 +-
.../integration/persistence/RestartSMTest.java | 24 +-
.../RolesConfigurationStorageTest.java | 6 +-
.../persistence/StorageManagerTestBase.java | 26 +-
...ansportConfigurationEncodingSupportTest.java | 18 +-
.../persistence/XmlImportExportTest.java | 60 ++--
.../tests/integration/proton/ProtonTest.java | 114 ++++----
.../integration/ra/ActiveMQActivationTest.java | 8 +-
.../integration/ra/ActiveMQClusteredTest.java | 20 +-
.../ra/ActiveMQMessageHandlerSecurityTest.java | 14 +-
.../ra/ActiveMQMessageHandlerTest.java | 32 +--
.../ra/ActiveMQMessageHandlerXATest.java | 22 +-
.../ra/ActiveMQRAClusteredTestBase.java | 18 +-
.../integration/ra/ActiveMQRATestBase.java | 18 +-
.../tests/integration/ra/DummyTransaction.java | 2 +-
.../integration/ra/DummyTransactionManager.java | 2 +-
.../tests/integration/ra/JMSContextTest.java | 20 +-
.../integration/ra/OutgoingConnectionTest.java | 32 +--
.../ra/OutgoingConnectionTestJTA.java | 30 +-
.../integration/ra/ResourceAdapterTest.java | 45 +--
.../integration/remoting/BatchDelayTest.java | 29 +-
.../remoting/DestroyConsumerTest.java | 5 +-
.../integration/remoting/DirectDeliverTest.java | 38 +--
.../remoting/NettyNetworkAddressTest.java | 8 +-
.../remoting/NettySynchronousCloseTest.java | 2 +-
.../remoting/NetworkAddressTestBase.java | 22 +-
.../tests/integration/remoting/PingTest.java | 52 ++--
.../integration/remoting/ReconnectTest.java | 18 +-
.../remoting/SynchronousCloseTest.java | 18 +-
.../replication/ReplicationOrderTest.java | 24 +-
.../replication/ReplicationTest.java | 118 ++++----
.../scheduling/DelayedMessageTest.java | 28 +-
.../MultipliedDelayedMessageTest.java | 32 +--
.../scheduling/ScheduledMessageTest.java | 36 +--
.../security/NettySecurityClientTest.java | 12 +-
.../integration/security/SecurityTest.java | 36 +--
.../integration/security/SimpleClient.java | 22 +-
.../server/AIOFileLockTimeoutTest.java | 2 +-
.../server/AddressFullLoggingTest.java | 26 +-
.../integration/server/ExpiryRunnerTest.java | 34 +--
.../integration/server/FakeStorageManager.java | 6 +-
.../integration/server/FileLockTimeoutTest.java | 18 +-
.../server/GracefulShutdownTest.java | 28 +-
.../integration/server/LVQRecoveryTest.java | 36 +--
.../tests/integration/server/LVQTest.java | 36 +--
.../server/NIOFileLockTimeoutTest.java | 2 +-
.../integration/server/PredefinedQueueTest.java | 38 +--
.../integration/server/ScaleDown3NodeTest.java | 40 +--
.../integration/server/ScaleDownDirectTest.java | 26 +-
.../tests/integration/server/ScaleDownTest.java | 32 +--
.../integration/server/SimpleStartStopTest.java | 10 +-
.../server/SuppliedThreadPoolTest.java | 10 +-
.../integration/spring/ExampleListener.java | 4 +-
.../tests/integration/spring/MessageSender.java | 2 +-
.../spring/SpringIntegrationTest.java | 10 +-
.../ssl/CoreClientOverOneWaySSLTest.java | 42 +--
.../ssl/CoreClientOverTwoWaySSLTest.java | 54 ++--
.../integration/stomp/ConcurrentStompTest.java | 4 +-
.../tests/integration/stomp/ExtraStompTest.java | 71 +++--
.../stomp/StompConnectionCleanupTest.java | 16 +-
.../integration/stomp/StompOverHttpTest.java | 2 +-
.../stomp/StompOverWebsocketTest.java | 2 +-
.../tests/integration/stomp/StompTest.java | 14 +-
.../tests/integration/stomp/StompTestBase.java | 42 +--
.../integration/stomp/StompWebSocketTest.java | 30 +-
.../stomp/util/AbstractClientStompFrame.java | 2 +-
.../util/AbstractStompClientConnection.java | 2 +-
.../stomp/util/ClientStompFrame.java | 2 +-
.../stomp/util/ClientStompFrameV10.java | 2 +-
.../stomp/util/ClientStompFrameV11.java | 2 +-
.../stomp/util/ClientStompFrameV12.java | 2 +-
.../stomp/util/StompClientConnection.java | 2 +-
.../util/StompClientConnectionFactory.java | 2 +-
.../stomp/util/StompClientConnectionV10.java | 2 +-
.../stomp/util/StompClientConnectionV11.java | 2 +-
.../stomp/util/StompClientConnectionV12.java | 2 +-
.../stomp/util/StompFrameFactory.java | 2 +-
.../stomp/util/StompFrameFactoryFactory.java | 2 +-
.../stomp/util/StompFrameFactoryV10.java | 2 +-
.../stomp/util/StompFrameFactoryV11.java | 2 +-
.../stomp/util/StompFrameFactoryV12.java | 2 +-
.../integration/stomp/v11/ExtraStompTest.java | 8 +-
.../integration/stomp/v11/StompV11Test.java | 14 +-
.../integration/stomp/v11/StompV11TestBase.java | 40 +--
.../integration/stomp/v12/StompV12Test.java | 288 +++++++++----------
.../integration/tools/TransferMessageTest.java | 41 +--
.../netty/ActiveMQFrameDecoder2Test.java | 6 +-
.../NettyConnectorWithHTTPUpgradeTest.java | 54 ++--
.../vertx/ActiveMQVertxUnitTest.java | 36 +--
.../integration/xa/BasicXaRecoveryTest.java | 42 +--
.../tests/integration/xa/BasicXaTest.java | 38 +--
.../tests/integration/xa/XaTimeoutTest.java | 54 ++--
.../tests/util/JMSClusteredTestBase.java | 32 +--
.../artemis/tests/util/JMSTestBase.java | 28 +-
.../artemis/tests/util/JournalExample.java | 14 +-
.../tests/util/NonSerializableFactory.java | 2 +-
.../tests/util/ReplicatedBackupUtils.java | 10 +-
.../tests/util/TransportConfigurationUtils.java | 10 +-
.../DummyTransactionManagerLocator.java | 4 +-
.../TransactionManagerLocatorTest.java | 4 +-
...sions.transactions.TransactionManagerLocator | 1 +
...sions.transactions.TransactionManagerLocator | 1 -
.../resources/restricted-security-client.policy | 22 +-
.../src/test/resources/spring-jms-beans.xml | 19 +-
tests/jms-tests/pom.xml | 18 +-
.../artemis/jms/tests/AcknowledgementTest.java | 4 +-
.../jms/tests/ActiveMQServerTestCase.java | 24 +-
.../jms/tests/AutoAckMesageListenerTest.java | 2 +-
.../activemq/artemis/jms/tests/BrowserTest.java | 10 +-
.../artemis/jms/tests/CTSMiscellaneousTest.java | 8 +-
.../artemis/jms/tests/ConnectionClosedTest.java | 4 +-
.../jms/tests/ConnectionFactoryTest.java | 8 +-
.../artemis/jms/tests/ConnectionTest.java | 4 +-
.../artemis/jms/tests/ConsumerClosedTest.java | 2 +-
.../artemis/jms/tests/DeliveryOrderTest.java | 4 +-
.../jms/tests/DurableSubscriptionTest.java | 4 +-
.../activemq/artemis/jms/tests/JMSTest.java | 4 +-
.../activemq/artemis/jms/tests/JMSTestCase.java | 12 +-
.../artemis/jms/tests/JmsTestLogger.java | 2 +-
.../artemis/jms/tests/MessageConsumerTest.java | 6 +-
.../artemis/jms/tests/MessageProducerTest.java | 10 +-
.../jms/tests/MessageWithReadResolveTest.java | 4 +-
.../artemis/jms/tests/MiscellaneousTest.java | 4 +-
.../jms/tests/NonDurableSubscriberTest.java | 4 +-
.../artemis/jms/tests/PersistenceTest.java | 4 +-
.../artemis/jms/tests/QueueReceiverTest.java | 4 +-
.../activemq/artemis/jms/tests/QueueTest.java | 4 +-
.../artemis/jms/tests/ReferenceableTest.java | 18 +-
.../artemis/jms/tests/SecurityTest.java | 4 +-
.../activemq/artemis/jms/tests/SessionTest.java | 8 +-
.../jms/tests/TemporaryDestinationTest.java | 4 +-
.../activemq/artemis/jms/tests/TopicTest.java | 4 +-
.../jms/tests/TransactedSessionTest.java | 4 +-
.../tests/message/BodyIsAssignableFromTest.java | 2 +-
.../jms/tests/message/BytesMessageTest.java | 4 +-
.../jms/tests/message/ExpiredMessageTest.java | 6 +-
.../message/JMSCorrelationIDHeaderTest.java | 4 +-
.../message/JMSDeliveryModeHeaderTest.java | 4 +-
.../tests/message/JMSDestinationHeaderTest.java | 4 +-
.../tests/message/JMSExpirationHeaderTest.java | 8 +-
.../tests/message/JMSMessageIDHeaderTest.java | 4 +-
.../tests/message/JMSPriorityHeaderTest.java | 6 +-
.../jms/tests/message/JMSReplyToHeaderTest.java | 4 +-
.../tests/message/JMSTimestampHeaderTest.java | 4 +-
.../jms/tests/message/JMSTypeHeaderTest.java | 4 +-
.../jms/tests/message/MapMessageTest.java | 4 +-
.../jms/tests/message/MessageBodyTest.java | 4 +-
.../jms/tests/message/MessageBodyTestCase.java | 4 +-
.../jms/tests/message/MessageHeaderTest.java | 54 ++--
.../tests/message/MessageHeaderTestBase.java | 20 +-
.../message/MessagePropertyConversionTest.java | 8 +-
.../jms/tests/message/MessageTestBase.java | 6 +-
.../message/ObjectMessageDeliveryTest.java | 6 +-
.../jms/tests/message/ObjectMessageTest.java | 6 +-
.../tests/message/SimpleJMSBytesMessage.java | 2 +-
.../jms/tests/message/SimpleJMSMapMessage.java | 2 +-
.../jms/tests/message/SimpleJMSMessage.java | 2 +-
.../tests/message/SimpleJMSObjectMessage.java | 2 +-
.../tests/message/SimpleJMSStreamMessage.java | 2 +-
.../jms/tests/message/SimpleJMSTextMessage.java | 2 +-
.../artemis/jms/tests/message/SomeObject.java | 2 +-
.../jms/tests/message/StreamMessageTest.java | 4 +-
.../jms/tests/message/TextMessageTest.java | 4 +-
.../foreign/ForeignBytesMessageTest.java | 6 +-
.../message/foreign/ForeignMapMessageTest.java | 6 +-
.../message/foreign/ForeignMessageTest.java | 12 +-
.../foreign/ForeignObjectMessageTest.java | 6 +-
.../foreign/ForeignStreamMessageTest.java | 6 +-
.../message/foreign/ForeignTestObject.java | 2 +-
.../message/foreign/ForeignTextMessageTest.java | 6 +-
.../jms/tests/selector/SelectorTest.java | 10 +-
.../jms/tests/tools/ServerManagement.java | 10 +-
.../jms/tests/tools/container/Constants.java | 2 +-
.../jms/tests/tools/container/InVMContext.java | 4 +-
.../container/InVMInitialContextFactory.java | 4 +-
.../InVMInitialContextFactoryBuilder.java | 4 +-
.../tests/tools/container/InVMNameParser.java | 2 +-
.../tests/tools/container/LocalTestServer.java | 40 +--
.../tools/container/NonSerializableFactory.java | 2 +-
.../jms/tests/tools/container/Server.java | 10 +-
.../artemis/jms/tests/util/JNDIUtilTest.java | 6 +-
.../jms/tests/util/ProxyAssertSupport.java | 4 +-
.../src/test/resources/jndi.properties | 2 +-
tests/joram-tests/pom.xml | 10 +-
.../activemq/artemis/jms/AbstractAdmin.java | 2 +-
.../activemq/artemis/jms/ActiveMQAdmin.java | 30 +-
.../activemq/artemis/jms/GenericAdmin.java | 2 +-
.../artemis/jms/JoramAggregationTest.java | 2 +-
.../activemq/artemis/jms/SpawnedJMSServer.java | 20 +-
.../message/headers/MessageHeaderTest.java | 3 +-
.../jtests/jms/framework/PTPTestCase.java | 2 +-
.../jtests/jms/framework/PubSubTestCase.java | 2 +-
.../jtests/jms/framework/UnifiedTestCase.java | 2 +-
.../src/test/resources/provider.properties | 2 +-
tests/performance-tests/pom.xml | 16 +-
.../journal/FakeJournalImplTest.java | 6 +-
.../journal/JournalImplTestUnit.java | 18 +-
.../journal/RealJournalImplAIOTest.java | 8 +-
.../journal/RealJournalImplNIOTest.java | 8 +-
.../paging/MeasurePagingMultiThreadTest.java | 32 +--
.../sends/AbstractSendReceivePerfTest.java | 12 +-
.../tests/performance/sends/ClientACKPerf.java | 2 +-
.../sends/MeasureCommitPerfTest.java | 2 +-
.../tests/performance/sends/PreACKPerf.java | 4 +-
tests/pom.xml | 6 +-
tests/soak-tests/pom.xml | 16 +-
.../tests/soak/client/ClientAbstract.java | 12 +-
.../soak/client/ClientNonDivertedSoakTest.java | 22 +-
.../tests/soak/client/ClientSoakTest.java | 24 +-
.../artemis/tests/soak/client/Receiver.java | 16 +-
.../artemis/tests/soak/client/Sender.java | 12 +-
.../soak/client/SimpleSendReceiveSoakTest.java | 24 +-
.../soak/failover/RandomFailoverSoakTest.java | 4 +-
tests/stress-tests/pom.xml | 16 +-
.../stress/chunk/LargeMessageStressTest.java | 5 +-
.../tests/stress/client/SendStressTest.java | 20 +-
.../MultiThreadRandomReattachStressTest.java | 4 +-
.../failover/RandomReattachStressTest.java | 4 +-
.../AIOAllPossibilitiesCompactStressTest.java | 8 +-
.../AIOMultiThreadCompactorStressTest.java | 6 +-
.../stress/journal/AddAndRemoveStressTest.java | 18 +-
.../AllPossibilitiesCompactStressTest.java | 2 +-
...ibilitiesCompactWithAddDeleteStressTest.java | 2 +-
.../stress/journal/CompactingStressTest.java | 30 +-
.../JournalCleanupCompactStressTest.java | 36 +--
.../journal/JournalRestartStressTest.java | 20 +-
.../stress/journal/LargeJournalStressTest.java | 26 +-
.../stress/journal/MixupCompactorTestBase.java | 14 +-
.../journal/MultiThreadConsumerStressTest.java | 28 +-
.../NIOMultiThreadCompactorStressTest.java | 46 +--
.../journal/XmlImportExportStressTest.java | 24 +-
.../paging/MultipleConsumersPageStressTest.java | 28 +-
.../stress/paging/PageCursorStressTest.java | 52 ++--
.../tests/stress/paging/PageStressTest.java | 28 +-
.../tests/stress/remote/PingStressTest.java | 34 +--
.../tests/stress/stomp/StompStressTest.java | 24 +-
tests/timing-tests/pom.xml | 14 +-
.../core/journal/impl/AIOJournalImplTest.java | 9 +-
.../core/journal/impl/FakeJournalImplTest.java | 6 +-
.../core/journal/impl/JournalImplTestUnit.java | 12 +-
.../core/journal/impl/NIOJournalImplTest.java | 11 +-
.../core/server/impl/QueueConcurrentTest.java | 22 +-
.../timing/core/server/impl/QueueImplTest.java | 16 +-
.../jms/bridge/impl/JMSBridgeImplTest.java | 44 +--
.../tests/timing/util/ReusableLatchTest.java | 6 +-
.../timing/util/TokenBucketLimiterImplTest.java | 8 +-
.../artemis/tests/timing/util/UTF8Test.java | 10 +-
.../artemis/tests/timing/util/UUIDTest.java | 6 +-
tests/unit-tests/pom.xml | 20 +-
.../artemis/tests/unit/UnitTestLogger.java | 2 +-
.../tests/unit/core/asyncio/AIOTestBase.java | 10 +-
.../unit/core/asyncio/AsynchronousFileTest.java | 88 +++---
.../MultiThreadAsynchronousFileTest.java | 35 ++-
.../client/impl/LargeMessageBufferTest.java | 42 +--
.../impl/ConfigurationValidationTest.java | 10 +-
.../core/config/impl/ConnectorsServiceTest.java | 20 +-
.../config/impl/TransportConfigurationTest.java | 6 +-
.../config/impl/fakes/FakeConnectorService.java | 4 +-
.../impl/fakes/FakeConnectorServiceFactory.java | 10 +-
.../journal/impl/AlignedJournalImplTest.java | 26 +-
.../unit/core/journal/impl/CleanBufferTest.java | 14 +-
.../core/journal/impl/FakeJournalImplTest.java | 6 +-
.../impl/FakeSequentialFileFactoryTest.java | 6 +-
.../core/journal/impl/FileFactoryTestBase.java | 8 +-
.../core/journal/impl/JournalAsyncTest.java | 14 +-
.../core/journal/impl/JournalImplTestBase.java | 22 +-
.../core/journal/impl/JournalImplTestUnit.java | 26 +-
.../unit/core/journal/impl/ReclaimerTest.java | 38 +--
.../impl/SequentialFileFactoryTestBase.java | 14 +-
.../unit/core/journal/impl/TimedBufferTest.java | 14 +-
.../impl/fakes/FakeSequentialFileFactory.java | 46 +--
.../core/journal/impl/fakes/SimpleEncoding.java | 6 +-
.../unit/core/message/impl/MessageImplTest.java | 18 +-
.../unit/core/paging/impl/PagePositionTest.java | 5 +-
.../tests/unit/core/paging/impl/PageTest.java | 28 +-
.../core/paging/impl/PagingManagerImplTest.java | 36 +--
.../core/paging/impl/PagingStoreImplTest.java | 56 ++--
.../impl/BatchIDGeneratorUnitTest.java | 26 +-
.../impl/OperationContextUnitTest.java | 10 +-
.../core/postoffice/impl/AddressImplTest.java | 10 +-
.../core/postoffice/impl/BindingsImplTest.java | 64 ++---
.../impl/DuplicateDetectionUnitTest.java | 36 +--
.../unit/core/postoffice/impl/FakeQueue.java | 28 +-
.../postoffice/impl/QueueComparatorTest.java | 8 +-
.../impl/WildcardAddressManagerUnitTest.java | 26 +-
.../core/remoting/ActiveMQBufferTestBase.java | 10 +-
.../impl/invm/InVMConnectorFactoryTest.java | 8 +-
.../impl/netty/ChannelBufferWrapper2Test.java | 8 +-
.../impl/netty/NettyAcceptorFactoryTest.java | 24 +-
.../remoting/impl/netty/NettyAcceptorTest.java | 22 +-
.../impl/netty/NettyConnectionTest.java | 18 +-
.../impl/netty/NettyConnectorFactoryTest.java | 8 +-
.../remoting/impl/netty/NettyConnectorTest.java | 20 +-
.../core/remoting/impl/ssl/SSLSupportTest.java | 6 +-
.../server/impl/RemotingServiceImplTest.java | 16 +-
.../server/impl/fake/FakeInterceptor.java | 10 +-
.../impl/ActiveMQSecurityManagerImplTest.java | 10 +-
.../impl/ClusterConnectionBridgeTest.java | 8 +-
.../cluster/impl/RemoteQueueBindImplTest.java | 14 +-
.../group/impl/SystemPropertyOverrideTest.java | 8 +-
.../unit/core/server/impl/FileLockTest.java | 10 +-
.../unit/core/server/impl/QueueImplTest.java | 50 ++--
.../core/server/impl/fakes/FakeConsumer.java | 10 +-
.../unit/core/server/impl/fakes/FakeFilter.java | 8 +-
.../server/impl/fakes/FakeJournalLoader.java | 26 +-
.../core/server/impl/fakes/FakePostOffice.java | 32 +--
.../server/impl/fakes/FakeQueueFactory.java | 16 +-
.../tests/unit/jms/ActiveMQDestinationTest.java | 8 +-
.../unit/jms/client/ActiveMQMapMessageTest.java | 8 +-
.../jms/client/ActiveMQStreamMessageTest.java | 8 +-
.../unit/jms/client/JMSExceptionHelperTest.java | 16 +-
.../unit/jms/client/SelectorTranslatorTest.java | 6 +-
.../tests/unit/jms/misc/ManifestTest.java | 12 +-
.../ConnectionFactoryObjectFactoryTest.java | 5 +-
.../DestinationObjectFactoryTest.java | 12 +-
.../ra/ActiveMQResourceAdapterConfigTest.java | 14 +-
.../artemis/tests/unit/ra/BootstrapContext.java | 2 +-
.../ra/ConnectionFactoryPropertiesTest.java | 8 +-
.../tests/unit/ra/MessageEndpointFactory.java | 2 +-
.../tests/unit/ra/ResourceAdapterTest.java | 44 +--
.../util/ActiveMQBufferInputStreamTest.java | 10 +-
.../tests/unit/util/FakePagingManager.java | 22 +-
.../artemis/tests/unit/util/InVMContext.java | 6 +-
.../artemis/tests/unit/util/InVMNameParser.java | 2 +-
.../tests/unit/util/InVMNamingContext.java | 6 +-
.../artemis/tests/unit/util/LinkedListTest.java | 10 +-
.../artemis/tests/unit/util/MemorySizeTest.java | 10 +-
.../tests/unit/util/NonSerializableFactory.java | 2 +-
.../ObjectInputStreamWithClassLoaderTest.java | 10 +-
.../tests/unit/util/ReusableLatchTest.java | 8 +-
.../tests/unit/util/SoftValueMapTest.java | 6 +-
.../artemis/tests/unit/util/UTF8Test.java | 16 +-
.../tests/unit/util/UUIDGeneratorTest.java | 6 +-
.../artemis/tests/unit/util/UUIDTest.java | 8 +-
.../tests/unit/util/VersionLoaderTest.java | 8 +-
.../artemis/tests/util/CreateMessage.java | 10 +-
.../artemis/tests/util/SpawnedVMSupport.java | 4 +-
tests/unit-tests/src/test/resources/beans1.xml | 2 +-
2392 files changed, 18810 insertions(+), 19166 deletions(-)
----------------------------------------------------------------------