activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [51/53] [abbrv] [partial] activemq-artemis git commit: automatic checkstyle change
Date Mon, 10 Aug 2015 15:13:50 GMT
automatic checkstyle change

this is just calling Idea format on all the files using the new style
I am separating manual changes from automatic changes in case I have to repeat the manual changes again


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bac96047
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bac96047
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bac96047

Branch: refs/heads/master
Commit: bac96047f5752647fb0ebf01bacbcfb36f715e06
Parents: 455962a
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Aug 10 09:26:26 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Aug 10 09:26:42 2015 -0400

----------------------------------------------------------------------
 .../apache/activemq/artemis/boot/Artemis.java   |   63 +-
 .../apache/activemq/artemis/cli/Artemis.java    |   70 +-
 .../artemis/cli/ConfigurationException.java     |    7 +-
 .../activemq/artemis/cli/commands/Action.java   |    4 +-
 .../artemis/cli/commands/ActionAbstract.java    |   44 +-
 .../artemis/cli/commands/ActionContext.java     |    9 +-
 .../activemq/artemis/cli/commands/Browse.java   |   25 +-
 .../artemis/cli/commands/Configurable.java      |   57 +-
 .../activemq/artemis/cli/commands/Consumer.java |   28 +-
 .../activemq/artemis/cli/commands/Create.java   |  429 +--
 .../artemis/cli/commands/DestAbstract.java      |    6 +-
 .../artemis/cli/commands/HelpAction.java        |   19 +-
 .../artemis/cli/commands/InputAbstract.java     |   48 +-
 .../activemq/artemis/cli/commands/Kill.java     |    7 +-
 .../activemq/artemis/cli/commands/Producer.java |   30 +-
 .../activemq/artemis/cli/commands/Run.java      |   89 +-
 .../activemq/artemis/cli/commands/Stop.java     |    7 +-
 .../cli/commands/tools/CompactJournal.java      |   25 +-
 .../cli/commands/tools/DataAbstract.java        |   40 +-
 .../cli/commands/tools/DecodeJournal.java       |  176 +-
 .../cli/commands/tools/EncodeJournal.java       |   93 +-
 .../artemis/cli/commands/tools/HelpData.java    |   18 +-
 .../artemis/cli/commands/tools/PrintData.java   |  153 +-
 .../cli/commands/tools/XmlDataConstants.java    |    8 +-
 .../cli/commands/tools/XmlDataExporter.java     |  409 +--
 .../cli/commands/tools/XmlDataImporter.java     |  491 +--
 .../cli/commands/util/ConsumerThread.java       |  231 +-
 .../cli/commands/util/ProducerThread.java       |  223 +-
 .../cli/commands/util/SyncCalculation.java      |   84 +-
 .../artemis/cli/process/ProcessBuilder.java     |   93 +-
 .../artemis/components/ExternalComponent.java   |    4 +-
 .../artemis/factory/BasicSecurityHandler.java   |   19 +-
 .../activemq/artemis/factory/BrokerFactory.java |   37 +-
 .../artemis/factory/BrokerFactoryHandler.java   |    4 +-
 .../activemq/artemis/factory/BrokerHandler.java |    4 +-
 .../artemis/factory/FileBrokerHandler.java      |    7 +-
 .../artemis/factory/SecurityHandler.java        |    4 +-
 .../artemis/factory/SecurityManagerFactory.java |   14 +-
 .../factory/XmlBrokerFactoryHandler.java        |   10 +-
 .../activemq/artemis/integration/Broker.java    |    4 +-
 .../artemis/integration/FileBroker.java         |   39 +-
 .../bootstrap/ActiveMQBootstrapBundle.java      |    5 +-
 .../bootstrap/ActiveMQBootstrapLogger.java      |    4 +-
 .../activemq/artemis/util/ServerUtil.java       |   94 +-
 .../apache/activemq/cli/test/ArtemisTest.java   |   52 +-
 .../activemq/cli/test/FileBrokerTest.java       |   25 +-
 .../activemq/cli/test/StreamClassPathTest.java  |   14 +-
 .../core/ActiveMQAddressExistsException.java    |   10 +-
 .../api/core/ActiveMQAddressFullException.java  |   10 +-
 .../ActiveMQAlreadyReplicatingException.java    |   10 +-
 .../artemis/api/core/ActiveMQBuffer.java        |  457 +--
 .../artemis/api/core/ActiveMQBuffers.java       |   22 +-
 .../core/ActiveMQClusterSecurityException.java  |   10 +-
 .../ActiveMQConnectionTimedOutException.java    |   10 +-
 .../api/core/ActiveMQDisconnectedException.java |   10 +-
 .../api/core/ActiveMQDuplicateIdException.java  |   10 +-
 .../ActiveMQDuplicateMetaDataException.java     |   10 +-
 .../artemis/api/core/ActiveMQException.java     |   28 +-
 .../artemis/api/core/ActiveMQExceptionType.java |  186 +-
 .../api/core/ActiveMQIOErrorException.java      |   13 +-
 .../api/core/ActiveMQIllegalStateException.java |   10 +-
 ...tiveMQIncompatibleClientServerException.java |   10 +-
 ...iveMQInterceptorRejectedPacketException.java |   10 +-
 .../core/ActiveMQInternalErrorException.java    |   16 +-
 .../api/core/ActiveMQInterruptedException.java  |    7 +-
 ...ctiveMQInvalidFilterExpressionException.java |   10 +-
 ...tiveMQInvalidTransientQueueUseException.java |   10 +-
 .../api/core/ActiveMQLargeMessageException.java |   10 +-
 ...ctiveMQLargeMessageInterruptedException.java |   11 +-
 .../artemis/api/core/ActiveMQNativeIOError.java |   14 +-
 .../core/ActiveMQNonExistentQueueException.java |   10 +-
 .../api/core/ActiveMQNotConnectedException.java |   10 +-
 .../api/core/ActiveMQObjectClosedException.java |   10 +-
 .../ActiveMQPropertyConversionException.java    |    6 +-
 .../api/core/ActiveMQQueueExistsException.java  |   10 +-
 .../api/core/ActiveMQSecurityException.java     |   10 +-
 .../core/ActiveMQSessionCreationException.java  |   10 +-
 ...iveMQTransactionOutcomeUnknownException.java |   10 +-
 .../ActiveMQTransactionRolledBackException.java |   10 +-
 .../api/core/ActiveMQUnBlockedException.java    |   10 +-
 .../ActiveMQUnsupportedPacketException.java     |   10 +-
 .../apache/activemq/artemis/api/core/Pair.java  |   45 +-
 .../activemq/artemis/api/core/SimpleString.java |  167 +-
 .../core/buffers/impl/ChannelBufferWrapper.java |  378 +-
 .../artemis/core/server/ActiveMQComponent.java  |    4 +-
 .../artemis/logs/ActiveMQUtilBundle.java        |    7 +-
 .../artemis/logs/ActiveMQUtilLogger.java        |    6 +-
 .../artemis/logs/AssertionLoggerHandler.java    |   58 +-
 .../artemis/utils/ActiveMQThreadFactory.java    |   29 +-
 .../apache/activemq/artemis/utils/Base64.java   | 1197 ++-----
 .../apache/activemq/artemis/utils/ByteUtil.java |   37 +-
 .../artemis/utils/ClassloadingUtil.java         |   67 +-
 .../artemis/utils/ConcurrentHashSet.java        |   33 +-
 .../activemq/artemis/utils/ConcurrentSet.java   |    5 +-
 .../activemq/artemis/utils/DataConstants.java   |    4 +-
 .../utils/DefaultSensitiveStringCodec.java      |   43 +-
 .../activemq/artemis/utils/FactoryFinder.java   |   78 +-
 .../artemis/utils/PasswordMaskingUtil.java      |   30 +-
 .../artemis/utils/ReferenceCounter.java         |    4 +-
 .../artemis/utils/ReferenceCounterUtil.java     |   30 +-
 .../activemq/artemis/utils/ReusableLatch.java   |   81 +-
 .../artemis/utils/SensitiveDataCodec.java       |    4 +-
 .../activemq/artemis/utils/TypedProperties.java |  693 ++--
 .../apache/activemq/artemis/utils/UTF8Util.java |  149 +-
 .../org/apache/activemq/artemis/utils/UUID.java |   74 +-
 .../activemq/artemis/utils/UUIDGenerator.java   |  169 +-
 .../activemq/artemis/utils/UUIDTimer.java       |   61 +-
 .../artemis/utils/uri/SchemaConstants.java      |    4 +-
 .../activemq/artemis/utils/uri/URIFactory.java  |   61 +-
 .../activemq/artemis/utils/uri/URISchema.java   |  176 +-
 .../activemq/artemis/utils/ByteUtilTest.java    |   22 +-
 .../apache/activemq/artemis/utils/PairTest.java |    7 +-
 .../artemis/utils/ReferenceCounterTest.java     |   53 +-
 .../activemq/artemis/utils/URIParserTest.java   |  107 +-
 .../config/ActiveMQDefaultConfiguration.java    |  317 +-
 .../artemis/api/core/BaseInterceptor.java       |    4 +-
 .../artemis/api/core/BroadcastEndpoint.java     |    4 +-
 .../api/core/BroadcastEndpointFactory.java      |    5 +-
 .../api/core/BroadcastGroupConfiguration.java   |   51 +-
 .../core/ChannelBroadcastEndpointFactory.java   |   16 +-
 .../api/core/DiscoveryGroupConfiguration.java   |   55 +-
 .../artemis/api/core/FilterConstants.java       |    7 +-
 .../activemq/artemis/api/core/Interceptor.java  |    4 +-
 .../api/core/JGroupsBroadcastEndpoint.java      |  146 +-
 .../core/JGroupsChannelBroadcastEndpoint.java   |   13 +-
 .../api/core/JGroupsFileBroadcastEndpoint.java  |   13 +-
 .../JGroupsFileBroadcastEndpointFactory.java    |   19 +-
 .../JGroupsPropertiesBroadcastEndpoint.java     |   10 +-
 ...roupsPropertiesBroadcastEndpointFactory.java |   19 +-
 .../activemq/artemis/api/core/Message.java      |    8 +-
 .../api/core/TransportConfiguration.java        |  173 +-
 .../api/core/TransportConfigurationHelper.java  |    4 +-
 .../api/core/UDPBroadcastEndpointFactory.java   |  151 +-
 .../artemis/api/core/client/ActiveMQClient.java |   46 +-
 .../artemis/api/core/client/ClientConsumer.java |   10 +-
 .../artemis/api/core/client/ClientMessage.java  |   13 +-
 .../artemis/api/core/client/ClientProducer.java |    9 +-
 .../api/core/client/ClientRequestor.java        |   23 +-
 .../artemis/api/core/client/ClientSession.java  |   39 +-
 .../api/core/client/ClientSessionFactory.java   |   17 +-
 .../core/client/ClusterTopologyListener.java    |   14 +-
 .../api/core/client/FailoverEventListener.java  |    4 +-
 .../api/core/client/FailoverEventType.java      |    3 +-
 .../artemis/api/core/client/MessageHandler.java |    5 +-
 .../core/client/SendAcknowledgementHandler.java |    4 +-
 .../artemis/api/core/client/ServerLocator.java  |    9 +-
 .../api/core/client/SessionFailureListener.java |    4 +-
 .../artemis/api/core/client/TopologyMember.java |    4 +-
 .../ConnectionLoadBalancingPolicy.java          |    4 +-
 ...rstElementConnectionLoadBalancingPolicy.java |    8 +-
 .../RandomConnectionLoadBalancingPolicy.java    |    8 +-
 ...ndomStickyConnectionLoadBalancingPolicy.java |   10 +-
 ...RoundRobinConnectionLoadBalancingPolicy.java |   16 +-
 .../api/core/management/AcceptorControl.java    |    4 +-
 .../management/ActiveMQComponentControl.java    |    4 +-
 .../core/management/ActiveMQServerControl.java  |   25 +-
 .../api/core/management/AddressControl.java     |   11 +-
 .../core/management/AddressSettingsInfo.java    |   86 +-
 .../api/core/management/BridgeControl.java      |    5 +-
 .../core/management/BroadcastGroupControl.java  |    4 +-
 .../management/ClusterConnectionControl.java    |    5 +-
 .../core/management/CoreNotificationType.java   |    9 +-
 .../api/core/management/DayCounterInfo.java     |   31 +-
 .../api/core/management/DivertControl.java      |    4 +-
 .../api/core/management/ManagementHelper.java   |  165 +-
 .../api/core/management/NotificationType.java   |    4 +-
 .../api/core/management/ObjectNameBuilder.java  |   70 +-
 .../artemis/api/core/management/Operation.java  |    4 +-
 .../artemis/api/core/management/Parameter.java  |    4 +-
 .../api/core/management/QueueControl.java       |    5 +-
 .../api/core/management/ResourceNames.java      |    6 +-
 .../artemis/api/core/management/RoleInfo.java   |   46 +-
 .../impl/ResetLimitWrappedActiveMQBuffer.java   |  150 +-
 .../core/client/ActiveMQClientLogger.java       |   64 +-
 .../client/ActiveMQClientMessageBundle.java     |   62 +-
 .../core/client/impl/ActiveMQXAResource.java    |    4 +-
 .../core/client/impl/AddressQueryImpl.java      |   18 +-
 .../impl/AfterConnectInternalListener.java      |    4 +-
 .../core/client/impl/ClientConsumerImpl.java    |  556 +--
 .../client/impl/ClientConsumerInternal.java     |    6 +-
 .../client/impl/ClientLargeMessageImpl.java     |  107 +-
 .../client/impl/ClientLargeMessageInternal.java |    4 +-
 .../core/client/impl/ClientMessageImpl.java     |  192 +-
 .../core/client/impl/ClientMessageInternal.java |   11 +-
 .../impl/ClientProducerCreditManager.java       |    4 +-
 .../impl/ClientProducerCreditManagerImpl.java   |  111 +-
 .../core/client/impl/ClientProducerCredits.java |    4 +-
 .../client/impl/ClientProducerCreditsImpl.java  |   87 +-
 .../core/client/impl/ClientProducerImpl.java    |  283 +-
 .../client/impl/ClientProducerInternal.java     |    5 +-
 .../client/impl/ClientSessionFactoryImpl.java   |  897 ++---
 .../impl/ClientSessionFactoryInternal.java      |    4 +-
 .../core/client/impl/ClientSessionImpl.java     |  947 ++---
 .../core/client/impl/ClientSessionInternal.java |   13 +-
 .../CompressedLargeMessageControllerImpl.java   |  424 +--
 .../core/client/impl/DelegatingSession.java     |  360 +-
 .../client/impl/LargeMessageController.java     |    5 +-
 .../client/impl/LargeMessageControllerImpl.java |  827 ++---
 .../core/client/impl/QueueQueryImpl.java        |   36 +-
 .../core/client/impl/ServerLocatorImpl.java     | 1078 ++----
 .../core/client/impl/ServerLocatorInternal.java |   20 +-
 .../artemis/core/client/impl/Topology.java      |  357 +-
 .../core/client/impl/TopologyMemberImpl.java    |   60 +-
 .../artemis/core/cluster/DiscoveryEntry.java    |   20 +-
 .../artemis/core/cluster/DiscoveryGroup.java    |  199 +-
 .../artemis/core/cluster/DiscoveryListener.java |    4 +-
 .../core/exception/ActiveMQXAException.java     |   10 +-
 .../artemis/core/message/BodyEncoder.java       |    4 +-
 .../artemis/core/message/impl/MessageImpl.java  |  435 +--
 .../core/message/impl/MessageInternal.java      |    4 +-
 .../core/protocol/ClientPacketDecoder.java      |   22 +-
 .../artemis/core/protocol/core/Channel.java     |   24 +-
 .../core/protocol/core/ChannelHandler.java      |    5 +-
 .../core/CommandConfirmationHandler.java        |    5 +-
 .../protocol/core/CoreRemotingConnection.java   |   19 +-
 .../artemis/core/protocol/core/Packet.java      |    4 +-
 .../impl/ActiveMQClientProtocolManager.java     |  335 +-
 .../ActiveMQClientProtocolManagerFactory.java   |   13 +-
 .../core/impl/ActiveMQConsumerContext.java      |   25 +-
 .../core/impl/ActiveMQSessionContext.java       |  498 +--
 .../core/impl/BackwardsCompatibilityUtils.java  |   18 +-
 .../core/protocol/core/impl/ChannelImpl.java    |  330 +-
 .../core/protocol/core/impl/PacketDecoder.java  |  205 +-
 .../core/protocol/core/impl/PacketImpl.java     |   73 +-
 .../core/impl/RemotingConnectionImpl.java       |  161 +-
 .../wireformat/ActiveMQExceptionMessage.java    |   50 +-
 .../impl/wireformat/CheckFailoverMessage.java   |   19 +-
 .../wireformat/CheckFailoverReplyMessage.java   |   23 +-
 .../ClusterTopologyChangeMessage.java           |  105 +-
 .../ClusterTopologyChangeMessage_V2.java        |   93 +-
 .../ClusterTopologyChangeMessage_V3.java        |   49 +-
 .../impl/wireformat/CreateQueueMessage.java     |   68 +-
 .../impl/wireformat/CreateSessionMessage.java   |   77 +-
 .../CreateSessionResponseMessage.java           |   33 +-
 .../wireformat/CreateSharedQueueMessage.java    |   59 +-
 .../wireformat/DisconnectConsumerMessage.java   |   20 +-
 .../core/impl/wireformat/DisconnectMessage.java |   53 +-
 .../impl/wireformat/DisconnectMessage_V2.java   |   46 +-
 .../core/impl/wireformat/MessagePacket.java     |   10 +-
 .../impl/wireformat/NullResponseMessage.java    |    9 +-
 .../wireformat/PacketsConfirmedMessage.java     |   45 +-
 .../protocol/core/impl/wireformat/Ping.java     |   47 +-
 .../impl/wireformat/ReattachSessionMessage.java |   36 +-
 .../ReattachSessionResponseMessage.java         |   36 +-
 .../core/impl/wireformat/RollbackMessage.java   |   30 +-
 .../wireformat/SessionAcknowledgeMessage.java   |   37 +-
 .../wireformat/SessionAddMetaDataMessage.java   |   39 +-
 .../wireformat/SessionAddMetaDataMessageV2.java |   48 +-
 .../wireformat/SessionBindingQueryMessage.java  |   30 +-
 .../SessionBindingQueryResponseMessage.java     |   46 +-
 .../SessionBindingQueryResponseMessage_V2.java  |   29 +-
 .../impl/wireformat/SessionCloseMessage.java    |   16 +-
 .../impl/wireformat/SessionCommitMessage.java   |    6 +-
 .../wireformat/SessionConsumerCloseMessage.java |   31 +-
 .../SessionConsumerFlowCreditMessage.java       |   35 +-
 .../wireformat/SessionContinuationMessage.java  |   37 +-
 .../SessionCreateConsumerMessage.java           |   58 +-
 .../wireformat/SessionDeleteQueueMessage.java   |   33 +-
 .../impl/wireformat/SessionExpireMessage.java   |   33 +-
 .../SessionForceConsumerDelivery.java           |   38 +-
 .../SessionIndividualAcknowledgeMessage.java    |   38 +-
 .../SessionProducerCreditsFailMessage.java      |   33 +-
 .../SessionProducerCreditsMessage.java          |   33 +-
 .../wireformat/SessionQueueQueryMessage.java    |   30 +-
 .../SessionQueueQueryResponseMessage.java       |   84 +-
 .../SessionQueueQueryResponseMessage_V2.java    |   46 +-
 .../SessionReceiveClientLargeMessage.java       |   12 +-
 .../SessionReceiveContinuationMessage.java      |   43 +-
 .../wireformat/SessionReceiveLargeMessage.java  |   47 +-
 .../impl/wireformat/SessionReceiveMessage.java  |   34 +-
 .../SessionRequestProducerCreditsMessage.java   |   33 +-
 .../SessionSendContinuationMessage.java         |   51 +-
 .../wireformat/SessionSendLargeMessage.java     |   31 +-
 .../impl/wireformat/SessionSendMessage.java     |   33 +-
 .../SessionUniqueAddMetaDataMessage.java        |   11 +-
 .../wireformat/SessionXAAfterFailedMessage.java |   30 +-
 .../impl/wireformat/SessionXACommitMessage.java |   36 +-
 .../impl/wireformat/SessionXAEndMessage.java    |   36 +-
 .../impl/wireformat/SessionXAForgetMessage.java |   30 +-
 .../SessionXAGetInDoubtXidsResponseMessage.java |   39 +-
 .../SessionXAGetTimeoutResponseMessage.java     |   30 +-
 .../impl/wireformat/SessionXAJoinMessage.java   |   30 +-
 .../wireformat/SessionXAPrepareMessage.java     |   30 +-
 .../wireformat/SessionXAResponseMessage.java    |   39 +-
 .../impl/wireformat/SessionXAResumeMessage.java |   29 +-
 .../wireformat/SessionXARollbackMessage.java    |   31 +-
 .../wireformat/SessionXASetTimeoutMessage.java  |   27 +-
 .../SessionXASetTimeoutResponseMessage.java     |   30 +-
 .../impl/wireformat/SessionXAStartMessage.java  |   30 +-
 .../SubscribeClusterTopologyUpdatesMessage.java |   41 +-
 ...ubscribeClusterTopologyUpdatesMessageV2.java |   28 +-
 .../artemis/core/remoting/CloseListener.java    |    4 +-
 .../artemis/core/remoting/FailureListener.java  |    8 +-
 .../impl/TransportConfigurationUtil.java        |   40 +-
 .../impl/netty/ActiveMQAMQPFrameDecoder.java    |   13 +-
 .../impl/netty/ActiveMQChannelHandler.java      |   44 +-
 .../impl/netty/ActiveMQFrameDecoder2.java       |   10 +-
 .../remoting/impl/netty/NettyConnection.java    |  225 +-
 .../remoting/impl/netty/NettyConnector.java     |  623 ++--
 .../impl/netty/NettyConnectorFactory.java       |   13 +-
 .../netty/PartialPooledByteBufAllocator.java    |   65 +-
 .../impl/netty/SharedNioEventLoopGroup.java     |   70 +-
 .../remoting/impl/netty/TransportConstants.java |   17 +-
 .../core/remoting/impl/ssl/SSLSupport.java      |  101 +-
 .../core/security/ActiveMQPrincipal.java        |   13 +-
 .../activemq/artemis/core/security/Role.java    |   90 +-
 .../artemis/core/server/QueueQueryResult.java   |   63 +-
 .../core/server/management/Notification.java    |   20 +-
 .../server/management/NotificationListener.java |    3 +-
 .../server/management/NotificationService.java  |    4 +-
 .../settings/impl/AddressFullMessagePolicy.java |    3 +-
 .../artemis/core/transaction/impl/XidImpl.java  |  102 +-
 .../activemq/artemis/core/version/Version.java  |    4 +-
 .../artemis/core/version/impl/VersionImpl.java  |   75 +-
 .../artemis/reader/BytesMessageUtil.java        |  138 +-
 .../activemq/artemis/reader/MapMessageUtil.java |   14 +-
 .../activemq/artemis/reader/MessageUtil.java    |  106 +-
 .../artemis/reader/StreamMessageUtil.java       |  102 +-
 .../artemis/reader/TextMessageUtil.java         |    9 +-
 .../protocol/AbstractRemotingConnection.java    |   98 +-
 .../spi/core/protocol/ConnectionEntry.java      |   12 +-
 .../spi/core/protocol/RemotingConnection.java   |   11 +-
 .../spi/core/remoting/AbstractConnector.java    |    7 +-
 .../spi/core/remoting/BufferDecoder.java        |    7 +-
 .../spi/core/remoting/BufferHandler.java        |    4 +-
 .../core/remoting/ClientProtocolManager.java    |   10 +-
 .../remoting/ClientProtocolManagerFactory.java  |    3 +-
 .../artemis/spi/core/remoting/Connection.java   |   17 +-
 .../remoting/ConnectionLifeCycleListener.java   |   14 +-
 .../artemis/spi/core/remoting/Connector.java    |    5 +-
 .../spi/core/remoting/ConnectorFactory.java     |    4 +-
 .../spi/core/remoting/ConsumerContext.java      |    4 +-
 .../spi/core/remoting/ReadyListener.java        |    4 +-
 .../spi/core/remoting/SessionContext.java       |   95 +-
 .../core/remoting/TopologyResponseHandler.java  |    4 +-
 .../uri/AbstractServerLocatorSchema.java        |    6 +-
 .../AbstractTransportConfigurationSchema.java   |    4 +-
 .../activemq/artemis/uri/ConnectionOptions.java |   36 +-
 .../ConnectorTransportConfigurationParser.java  |    7 +-
 .../artemis/uri/InVMServerLocatorSchema.java    |   21 +-
 .../uri/InVMTransportConfigurationSchema.java   |   27 +-
 .../artemis/uri/JGroupsServerLocatorSchema.java |   43 +-
 .../artemis/uri/ServerLocatorParser.java        |    7 +-
 .../artemis/uri/TCPServerLocatorSchema.java     |   61 +-
 .../uri/TCPTransportConfigurationSchema.java    |   45 +-
 .../artemis/uri/UDPServerLocatorSchema.java     |   41 +-
 .../utils/ActiveMQBufferInputStream.java        |   73 +-
 .../activemq/artemis/utils/BufferHelper.java    |  107 +-
 .../artemis/utils/ConfigurationHelper.java      |  156 +-
 .../utils/ConfirmationWindowWarning.java        |    7 +-
 .../activemq/artemis/utils/DeflaterReader.java  |   55 +-
 .../activemq/artemis/utils/ExecutorFactory.java |    4 +-
 .../activemq/artemis/utils/FutureLatch.java     |   27 +-
 .../activemq/artemis/utils/IDGenerator.java     |    4 +-
 .../activemq/artemis/utils/InflaterReader.java  |   58 +-
 .../activemq/artemis/utils/InflaterWriter.java  |   42 +-
 .../apache/activemq/artemis/utils/JNDIUtil.java |   46 +-
 .../activemq/artemis/utils/LinkedList.java      |    4 +-
 .../activemq/artemis/utils/LinkedListImpl.java  |  222 +-
 .../artemis/utils/LinkedListIterator.java       |    5 +-
 .../activemq/artemis/utils/MemorySize.java      |   54 +-
 .../utils/ObjectInputStreamWithClassLoader.java |  113 +-
 .../artemis/utils/OrderedExecutorFactory.java   |   57 +-
 .../artemis/utils/PriorityLinkedList.java       |    5 +-
 .../artemis/utils/PriorityLinkedListImpl.java   |  128 +-
 .../apache/activemq/artemis/utils/Random.java   |   10 +-
 .../artemis/utils/SecurityFormatter.java        |   35 +-
 .../artemis/utils/SimpleIDGenerator.java        |   19 +-
 .../artemis/utils/SizeFormatterUtil.java        |   15 +-
 .../artemis/utils/SoftValueHashMap.java         |  185 +-
 .../utils/TimeAndCounterIDGenerator.java        |   60 +-
 .../artemis/utils/TokenBucketLimiter.java       |    6 +-
 .../artemis/utils/TokenBucketLimiterImpl.java   |   61 +-
 .../activemq/artemis/utils/VersionLoader.java   |  127 +-
 .../apache/activemq/artemis/utils/XMLUtil.java  |  241 +-
 .../activemq/artemis/utils/XidCodecSupport.java |   12 +-
 .../activemq/artemis/utils/json/JSONArray.java  |  557 ++-
 .../artemis/utils/json/JSONException.java       |   18 +-
 .../activemq/artemis/utils/json/JSONObject.java |  992 +++---
 .../activemq/artemis/utils/json/JSONString.java |    4 +-
 .../artemis/utils/json/JSONTokener.java         |  209 +-
 .../activemq/artemis/tests/util/RandomUtil.java |   74 +-
 .../artemis/tests/util/SilentTestCase.java      |   11 +-
 .../artemis/util/CompressionUtilTest.java       |   47 +-
 .../artemis/util/ConcurrentHashSetTest.java     |   33 +-
 .../util/TimeAndCounterIDGeneratorTest.java     |   61 +-
 .../util/TypedPropertiesConversionTest.java     |  132 +-
 .../artemis/util/TypedPropertiesTest.java       |   68 +-
 .../activemq/artemis/util/XMLUtilTest.java      |  112 +-
 .../org/apache/activemq/artemis/dto/AppDTO.java |    5 +-
 .../activemq/artemis/dto/BasicSecurityDTO.java  |    4 +-
 .../apache/activemq/artemis/dto/BrokerDTO.java  |    4 +-
 .../activemq/artemis/dto/ComponentDTO.java      |    4 +-
 .../activemq/artemis/dto/SecurityDTO.java       |    4 +-
 .../apache/activemq/artemis/dto/ServerDTO.java  |   25 +-
 .../activemq/artemis/dto/WebServerDTO.java      |    7 +-
 .../apache/activemq/artemis/dto/XmlUtil.java    |   33 +-
 .../activemq/artemis/dto/package-info.java      |    5 +-
 .../artemis/api/jms/ActiveMQJMSClient.java      |  111 +-
 .../artemis/api/jms/ActiveMQJMSConstants.java   |    7 +-
 .../artemis/api/jms/JMSFactoryType.java         |   15 +-
 .../management/ConnectionFactoryControl.java    |    6 +-
 .../api/jms/management/DestinationControl.java  |    3 +-
 .../api/jms/management/JMSConnectionInfo.java   |   34 +-
 .../api/jms/management/JMSConsumerInfo.java     |   56 +-
 .../api/jms/management/JMSManagementHelper.java |   85 +-
 .../api/jms/management/JMSQueueControl.java     |    6 +-
 .../api/jms/management/JMSServerControl.java    |   12 +-
 .../api/jms/management/JMSSessionInfo.java      |   22 +-
 .../api/jms/management/SubscriptionInfo.java    |   42 +-
 .../api/jms/management/TopicControl.java        |    9 +-
 .../jms/client/ActiveMQBytesMessage.java        |  208 +-
 .../artemis/jms/client/ActiveMQConnection.java  |  423 +--
 .../jms/client/ActiveMQConnectionFactory.java   |  547 +--
 .../client/ActiveMQConnectionForContext.java    |    5 +-
 .../ActiveMQConnectionForContextImpl.java       |   33 +-
 .../jms/client/ActiveMQConnectionMetaData.java  |   30 +-
 .../artemis/jms/client/ActiveMQDestination.java |  188 +-
 .../jms/client/ActiveMQJMSClientBundle.java     |   25 +-
 .../jms/client/ActiveMQJMSClientLogger.java     |   20 +-
 .../client/ActiveMQJMSConnectionFactory.java    |   22 +-
 .../artemis/jms/client/ActiveMQJMSConsumer.java |  112 +-
 .../artemis/jms/client/ActiveMQJMSContext.java  |  435 +--
 .../artemis/jms/client/ActiveMQJMSProducer.java |  439 +--
 .../artemis/jms/client/ActiveMQMapMessage.java  |  213 +-
 .../artemis/jms/client/ActiveMQMessage.java     |  589 ++-
 .../jms/client/ActiveMQMessageConsumer.java     |   96 +-
 .../jms/client/ActiveMQMessageProducer.java     |  357 +-
 .../jms/client/ActiveMQObjectMessage.java       |   80 +-
 .../artemis/jms/client/ActiveMQQueue.java       |   27 +-
 .../jms/client/ActiveMQQueueBrowser.java        |   72 +-
 .../client/ActiveMQQueueConnectionFactory.java  |   25 +-
 .../artemis/jms/client/ActiveMQSession.java     |  715 ++--
 .../jms/client/ActiveMQStreamMessage.java       |  274 +-
 .../jms/client/ActiveMQTemporaryQueue.java      |   11 +-
 .../jms/client/ActiveMQTemporaryTopic.java      |    7 +-
 .../artemis/jms/client/ActiveMQTextMessage.java |   46 +-
 .../artemis/jms/client/ActiveMQTopic.java       |   23 +-
 .../client/ActiveMQTopicConnectionFactory.java  |   25 +-
 .../jms/client/ActiveMQXAConnection.java        |   32 +-
 .../jms/client/ActiveMQXAConnectionFactory.java |   27 +-
 .../jms/client/ActiveMQXAJMSContext.java        |    7 +-
 .../ActiveMQXAQueueConnectionFactory.java       |   25 +-
 .../artemis/jms/client/ActiveMQXASession.java   |    6 +-
 .../ActiveMQXATopicConnectionFactory.java       |   25 +-
 .../jms/client/DefaultConnectionProperties.java |   25 +-
 .../artemis/jms/client/JMSExceptionHelper.java  |    9 +-
 .../jms/client/JMSMessageListenerWrapper.java   |   61 +-
 .../artemis/jms/client/JmsExceptionUtils.java   |   41 +-
 .../artemis/jms/client/SelectorTranslator.java  |   50 +-
 .../artemis/jms/client/ThreadAwareContext.java  |   57 +-
 .../ConnectionFactoryObjectFactory.java         |   15 +-
 .../referenceable/DestinationObjectFactory.java |   15 +-
 .../SerializableObjectRefAddr.java              |   20 +-
 .../jndi/ActiveMQInitialContextFactory.java     |   75 +-
 .../artemis/jndi/LazyCreateContext.java         |   16 +-
 .../activemq/artemis/jndi/NameParserImpl.java   |    7 +-
 .../activemq/artemis/jndi/ReadOnlyContext.java  |  281 +-
 .../activemq/artemis/uri/AbstractCFSchema.java  |    9 +-
 .../artemis/uri/ConnectionFactoryParser.java    |    7 +-
 .../apache/activemq/artemis/uri/InVMSchema.java |   19 +-
 .../activemq/artemis/uri/JGroupsSchema.java     |   36 +-
 .../artemis/uri/JMSConnectionOptions.java       |   35 +-
 .../apache/activemq/artemis/uri/TCPSchema.java  |   26 +-
 .../apache/activemq/artemis/uri/UDPSchema.java  |   25 +-
 .../artemis/uri/ConnectionFactoryURITest.java   |  157 +-
 .../jms/bridge/ActiveMQJMSBridgeLogger.java     |   31 +-
 .../jms/bridge/ConnectionFactoryFactory.java    |    4 +-
 .../artemis/jms/bridge/DestinationFactory.java  |    4 +-
 .../activemq/artemis/jms/bridge/JMSBridge.java  |    4 +-
 .../artemis/jms/bridge/JMSBridgeControl.java    |    4 +-
 .../jms/bridge/QualityOfServiceMode.java        |   21 +-
 .../jms/bridge/impl/JMSBridgeControlImpl.java   |  117 +-
 .../artemis/jms/bridge/impl/JMSBridgeImpl.java  | 1202 +++----
 .../impl/JNDIConnectionFactoryFactory.java      |    9 +-
 .../jms/bridge/impl/JNDIDestinationFactory.java |   12 +-
 .../jms/bridge/impl/JNDIFactorySupport.java     |   25 +-
 .../impl/JMSConnectionFactoryControlImpl.java   |  232 +-
 .../management/impl/JMSQueueControlImpl.java    |  218 +-
 .../management/impl/JMSServerControlImpl.java   |  539 +--
 .../management/impl/JMSTopicControlImpl.java    |  210 +-
 .../jms/persistence/JMSStorageManager.java      |    3 +-
 .../persistence/config/PersistedBindings.java   |   51 +-
 .../config/PersistedConnectionFactory.java      |   30 +-
 .../config/PersistedDestination.java            |   50 +-
 .../jms/persistence/config/PersistedType.java   |   15 +-
 .../journal/JMSJournalStorageManagerImpl.java   |  134 +-
 .../impl/nullpm/NullJMSStorageManagerImpl.java  |   45 +-
 .../jms/server/ActiveMQJMSServerBundle.java     |   11 +-
 .../jms/server/ActiveMQJMSServerLogger.java     |   37 +-
 .../jms/server/JMSServerConfigParser.java       |    6 +-
 .../artemis/jms/server/JMSServerManager.java    |  110 +-
 .../config/ConnectionFactoryConfiguration.java  |    4 +-
 .../jms/server/config/JMSConfiguration.java     |    4 +-
 .../server/config/JMSQueueConfiguration.java    |    4 +-
 .../jms/server/config/TopicConfiguration.java   |    4 +-
 .../ConnectionFactoryConfigurationImpl.java     |  261 +-
 .../config/impl/FileJMSConfiguration.java       |   72 +-
 .../config/impl/JMSConfigurationImpl.java       |   30 +-
 .../config/impl/JMSQueueConfigurationImpl.java  |   31 +-
 .../config/impl/TopicConfigurationImpl.java     |   19 +-
 .../TransportConfigurationEncodingSupport.java  |   58 +-
 .../jms/server/embedded/EmbeddedJMS.java        |   51 +-
 .../jms/server/impl/JMSServerManagerImpl.java   |  886 ++---
 .../server/management/JMSManagementService.java |    8 +-
 .../server/management/JMSNotificationType.java  |    9 +-
 .../impl/JMSManagementServiceImpl.java          |   61 +-
 .../jms/transaction/JMSTransactionDetail.java   |   24 +-
 .../artemis/core/io/AbstractSequentialFile.java |  208 +-
 .../core/io/AbstractSequentialFileFactory.java  |  115 +-
 .../activemq/artemis/core/io/DummyCallback.java |   19 +-
 .../activemq/artemis/core/io/IOCallback.java    |   10 +-
 .../core/io/IOCriticalErrorListener.java        |    4 +-
 .../artemis/core/io/IOExceptionListener.java    |    4 +-
 .../artemis/core/io/SequentialFile.java         |   22 +-
 .../artemis/core/io/SequentialFileFactory.java  |   23 +-
 .../artemis/core/io/aio/AIOSequentialFile.java  |  134 +-
 .../core/io/aio/AIOSequentialFileFactory.java   |  253 +-
 .../artemis/core/io/aio/ActiveMQFileLock.java   |   14 +-
 .../artemis/core/io/buffer/TimedBuffer.java     |  203 +-
 .../core/io/buffer/TimedBufferObserver.java     |    8 +-
 .../artemis/core/io/nio/NIOSequentialFile.java  |  202 +-
 .../core/io/nio/NIOSequentialFileFactory.java   |   87 +-
 .../artemis/core/journal/EncodingSupport.java   |    4 +-
 .../artemis/core/journal/IOCompletion.java      |    4 +-
 .../activemq/artemis/core/journal/Journal.java  |   29 +-
 .../core/journal/JournalLoadInformation.java    |   49 +-
 .../artemis/core/journal/LoaderCallback.java    |    4 +-
 .../core/journal/PreparedTransactionInfo.java   |    7 +-
 .../artemis/core/journal/RecordInfo.java        |   26 +-
 .../artemis/core/journal/TestableJournal.java   |    5 +-
 .../journal/TransactionFailureCallback.java     |    9 +-
 .../journal/impl/AbstractJournalUpdateTask.java |   78 +-
 .../core/journal/impl/FileWrapperJournal.java   |  162 +-
 .../artemis/core/journal/impl/JournalBase.java  |  152 +-
 .../core/journal/impl/JournalCompactor.java     |  341 +-
 .../core/journal/impl/JournalConstants.java     |    7 +-
 .../artemis/core/journal/impl/JournalFile.java  |   18 +-
 .../core/journal/impl/JournalFileImpl.java      |   94 +-
 .../journal/impl/JournalFilesRepository.java    |  375 +-
 .../artemis/core/journal/impl/JournalImpl.java  | 1395 +++-----
 .../journal/impl/JournalReaderCallback.java     |    4 +-
 .../impl/JournalReaderCallbackAbstract.java     |   35 +-
 .../core/journal/impl/JournalRecord.java        |   33 +-
 .../journal/impl/JournalRecordProvider.java     |    4 +-
 .../core/journal/impl/JournalTransaction.java   |  217 +-
 .../artemis/core/journal/impl/Reclaimer.java    |   56 +-
 .../core/journal/impl/SimpleWaitIOCallback.java |   31 +-
 .../core/journal/impl/SyncIOCompletion.java     |    3 +-
 .../core/journal/impl/TransactionCallback.java  |   37 +-
 .../impl/dataformat/ByteArrayEncoding.java      |   15 +-
 .../impl/dataformat/JournalAddRecord.java       |   18 +-
 .../impl/dataformat/JournalAddRecordTX.java     |   18 +-
 .../dataformat/JournalCompleteRecordTX.java     |   43 +-
 .../impl/dataformat/JournalDeleteRecord.java    |   12 +-
 .../impl/dataformat/JournalDeleteRecordTX.java  |   15 +-
 .../impl/dataformat/JournalInternalRecord.java  |   32 +-
 .../dataformat/JournalRollbackRecordTX.java     |   13 +-
 .../artemis/journal/ActiveMQJournalBundle.java  |   13 +-
 .../artemis/journal/ActiveMQJournalLogger.java  |   70 +-
 .../artemis/core/io/aio/CallbackOrderTest.java  |   38 +-
 .../artemis/maven/ArtemisAbstractPlugin.java    |   17 +-
 .../artemis/maven/ArtemisCLIPlugin.java         |   65 +-
 .../artemis/maven/ArtemisClientPlugin.java      |   15 +-
 .../artemis/maven/ArtemisCreatePlugin.java      |  131 +-
 .../activemq/artemis/jlibaio/LibaioContext.java |  196 +-
 .../activemq/artemis/jlibaio/LibaioFile.java    |   42 +-
 .../activemq/artemis/jlibaio/NativeLogger.java  |    5 +-
 .../activemq/artemis/jlibaio/SubmitInfo.java    |    4 +-
 .../artemis/jlibaio/util/CallbackCache.java     |   46 +-
 .../jlibaio/test/CallbackCachelTest.java        |   53 +-
 .../artemis/jlibaio/test/LibaioTest.java        |  333 +-
 .../ActiveMQProtonRemotingConnection.java       |   58 +-
 .../protocol/proton/ProtonProtocolManager.java  |   56 +-
 .../proton/ProtonProtocolManagerFactory.java    |   18 +-
 .../proton/converter/ActiveMQJMSVendor.java     |   61 +-
 .../converter/ProtonMessageConverter.java       |   22 +-
 .../converter/jms/ServerJMSBytesMessage.java    |   98 +-
 .../converter/jms/ServerJMSMapMessage.java      |  173 +-
 .../proton/converter/jms/ServerJMSMessage.java  |  221 +-
 .../converter/jms/ServerJMSStreamMessage.java   |  231 +-
 .../converter/jms/ServerJMSTextMessage.java     |   35 +-
 .../plug/ActiveMQProtonConnectionCallback.java  |   56 +-
 .../plug/ProtonSessionIntegrationCallback.java  |  197 +-
 .../protocol/proton/sasl/ActiveMQPlainSASL.java |   16 +-
 .../core/protocol/proton/TestConversions.java   |  368 +-
 .../HQPropertiesConversionInterceptor.java      |   33 +-
 .../hornetq/HornetQProtocolManager.java         |   19 +-
 .../hornetq/HornetQProtocolManagerFactory.java  |   16 +-
 .../core/protocol/mqtt/MQTTConnection.java      |  109 +-
 .../protocol/mqtt/MQTTConnectionManager.java    |  108 +-
 .../core/protocol/mqtt/MQTTFailureListener.java |   13 +-
 .../artemis/core/protocol/mqtt/MQTTLogger.java  |    4 +-
 .../core/protocol/mqtt/MQTTMessageInfo.java     |   19 +-
 .../core/protocol/mqtt/MQTTProtocolHandler.java |  168 +-
 .../core/protocol/mqtt/MQTTProtocolManager.java |   65 +-
 .../mqtt/MQTTProtocolManagerFactory.java        |   18 +-
 .../core/protocol/mqtt/MQTTPublishManager.java  |  138 +-
 .../protocol/mqtt/MQTTRetainMessageManager.java |   49 +-
 .../artemis/core/protocol/mqtt/MQTTSession.java |   63 +-
 .../core/protocol/mqtt/MQTTSessionCallback.java |   52 +-
 .../core/protocol/mqtt/MQTTSessionState.java    |  118 +-
 .../protocol/mqtt/MQTTSubscriptionManager.java  |   69 +-
 .../artemis/core/protocol/mqtt/MQTTUtil.java    |   82 +-
 .../protocol/openwire/AMQConnectorImpl.java     |   49 +-
 .../protocol/openwire/AMQTransactionImpl.java   |   35 +-
 .../core/protocol/openwire/BrokerState.java     |    3 +-
 .../protocol/openwire/DataInputWrapper.java     |  109 +-
 .../openwire/NotEnoughBytesException.java       |    4 +-
 .../protocol/openwire/OpenWireConnection.java   |  881 ++---
 .../openwire/OpenWireMessageConverter.java      |  274 +-
 .../openwire/OpenWireProtocolManager.java       |  447 +--
 .../OpenWireProtocolManagerFactory.java         |   18 +-
 .../core/protocol/openwire/OpenWireUtil.java    |   30 +-
 .../core/protocol/openwire/SendingResult.java   |   25 +-
 .../amq/AMQAbstractDeadLetterStrategy.java      |   49 +-
 .../openwire/amq/AMQBrokerStoppedException.java |   15 +-
 .../amq/AMQCompositeConsumerBrokerExchange.java |   24 +-
 .../openwire/amq/AMQConnectionContext.java      |  189 +-
 .../protocol/openwire/amq/AMQConnector.java     |    8 +-
 .../openwire/amq/AMQConnectorStatistics.java    |   55 +-
 .../core/protocol/openwire/amq/AMQConsumer.java |  261 +-
 .../openwire/amq/AMQConsumerBrokerExchange.java |   43 +-
 .../openwire/amq/AMQDeadLetterStrategy.java     |    4 +-
 .../protocol/openwire/amq/AMQDestination.java   |   35 +-
 .../openwire/amq/AMQDestinationStatistics.java  |  110 +-
 .../amq/AMQMessageAuthorizationPolicy.java      |    3 +-
 .../protocol/openwire/amq/AMQMessageStore.java  |    3 +-
 .../openwire/amq/AMQPersistenceAdapter.java     |   14 +-
 .../core/protocol/openwire/amq/AMQProducer.java |   13 +-
 .../openwire/amq/AMQProducerBrokerExchange.java |  140 +-
 .../openwire/amq/AMQSecurityContext.java        |   37 +-
 .../openwire/amq/AMQServerConsumer.java         |  108 +-
 .../protocol/openwire/amq/AMQServerSession.java |  298 +-
 .../openwire/amq/AMQServerSessionFactory.java   |   41 +-
 .../core/protocol/openwire/amq/AMQSession.java  |  295 +-
 .../amq/AMQSharedDeadLetterStrategy.java        |   26 +-
 .../amq/AMQSingleConsumerBrokerExchange.java    |   16 +-
 .../openwire/amq/AMQSlowConsumerStrategy.java   |   12 +-
 .../protocol/openwire/amq/AMQSubscription.java  |   17 +-
 .../openwire/amq/AMQSubscriptionRecovery.java   |    5 +-
 .../protocol/openwire/amq/AMQTransaction.java   |  144 +-
 .../openwire/amq/AMQTransactionFactory.java     |    7 +-
 .../protocol/openwire/amq/BrowserListener.java  |    4 +-
 .../core/protocol/openwire/amq/MessageInfo.java |   16 +-
 .../plug/AMQPClientConnectionContext.java       |    4 +-
 .../proton/plug/AMQPClientReceiverContext.java  |    4 +-
 .../proton/plug/AMQPClientSenderContext.java    |    4 +-
 .../proton/plug/AMQPClientSessionContext.java   |    4 +-
 .../org/proton/plug/AMQPConnectionCallback.java |    4 +-
 .../org/proton/plug/AMQPConnectionContext.java  |    4 +-
 .../plug/AMQPConnectionContextFactory.java      |    9 +-
 .../plug/AMQPServerConnectionContext.java       |    4 +-
 .../org/proton/plug/AMQPSessionCallback.java    |   12 +-
 .../org/proton/plug/AMQPSessionContext.java     |    4 +-
 .../main/java/org/proton/plug/ClientSASL.java   |    4 +-
 .../main/java/org/proton/plug/SASLResult.java   |    4 +-
 .../main/java/org/proton/plug/ServerSASL.java   |    4 +-
 .../org/proton/plug/context/AMQPConstants.java  |    8 +-
 .../plug/context/AbstractConnectionContext.java |  139 +-
 .../context/AbstractProtonContextSender.java    |   59 +-
 .../context/AbstractProtonReceiverContext.java  |   27 +-
 .../context/AbstractProtonSessionContext.java   |   86 +-
 .../plug/context/ProtonDeliveryHandler.java     |    6 +-
 .../plug/context/ProtonInitializable.java       |   39 +-
 .../proton/plug/context/ProtonPlugSender.java   |    4 +-
 .../plug/context/ProtonTransactionHandler.java  |   51 +-
 .../client/ProtonClientConnectionContext.java   |   37 +-
 .../ProtonClientConnectionContextFactory.java   |   16 +-
 .../context/client/ProtonClientContext.java     |   35 +-
 .../client/ProtonClientReceiverContext.java     |   31 +-
 .../client/ProtonClientSessionContext.java      |   21 +-
 .../server/ProtonServerConnectionContext.java   |   31 +-
 .../ProtonServerConnectionContextFactory.java   |   23 +-
 .../server/ProtonServerReceiverContext.java     |   68 +-
 .../server/ProtonServerSenderContext.java       |  136 +-
 .../server/ProtonServerSessionContext.java      |   43 +-
 .../plug/exceptions/ActiveMQAMQPException.java  |   12 +-
 .../ActiveMQAMQPIllegalStateException.java      |    7 +-
 .../ActiveMQAMQPInternalErrorException.java     |   10 +-
 .../ActiveMQAMQPInvalidFieldException.java      |    7 +-
 .../ActiveMQAMQPNotImplementedException.java    |    7 +-
 .../ActiveMQAMQPTimeoutException.java           |    7 +-
 .../org/proton/plug/handler/EventHandler.java   |    3 +-
 .../java/org/proton/plug/handler/Events.java    |   12 +-
 .../org/proton/plug/handler/ProtonHandler.java  |   12 +-
 .../plug/handler/impl/DefaultEventHandler.java  |   74 +-
 .../plug/handler/impl/ProtonHandlerImpl.java    |  192 +-
 .../ActiveMQAMQPProtocolMessageBundle.java      |    5 +-
 .../proton/plug/sasl/AnonymousServerSASL.java   |   13 +-
 .../org/proton/plug/sasl/ClientSASLPlain.java   |   20 +-
 .../org/proton/plug/sasl/PlainSASLResult.java   |   16 +-
 .../org/proton/plug/sasl/ServerSASLPlain.java   |   26 +-
 .../java/org/proton/plug/util/ByteUtil.java     |   72 +-
 .../java/org/proton/plug/util/CodecCache.java   |   19 +-
 .../org/proton/plug/util/CreditsSemaphore.java  |   71 +-
 .../java/org/proton/plug/util/DebugInfo.java    |    4 +-
 .../java/org/proton/plug/util/DeliveryUtil.java |   13 +-
 .../org/proton/plug/util/FutureRunnable.java    |   31 +-
 .../org/proton/plug/util/NettyWritable.java     |   46 +-
 .../proton/plug/util/ProtonServerMessage.java   |  283 +-
 .../org/proton/plug/util/ReusableLatch.java     |   75 +-
 .../context/AbstractConnectionContextTest.java  |   43 +-
 .../org/proton/plug/test/AbstractJMSTest.java   |   70 +-
 .../java/org/proton/plug/test/Constants.java    |    4 +-
 .../java/org/proton/plug/test/ProtonTest.java   |  120 +-
 .../plug/test/invm/InVMTestConnector.java       |   10 +-
 .../proton/plug/test/invm/ProtonINVMSPI.java    |  111 +-
 .../plug/test/minimalclient/AMQPClientSPI.java  |   51 +-
 .../plug/test/minimalclient/Connector.java      |    4 +-
 .../test/minimalclient/SimpleAMQPConnector.java |   42 +-
 .../plug/test/minimalserver/DumbServer.java     |   22 +-
 .../minimalserver/MinimalConnectionSPI.java     |   72 +-
 .../plug/test/minimalserver/MinimalServer.java  |   69 +-
 .../test/minimalserver/MinimalSessionSPI.java   |   99 +-
 .../SimpleServerThreadFactory.java              |   34 +-
 .../proton/plug/test/sasl/PlainSASLTest.java    |    7 +-
 .../plug/test/util/CreditsSemaphoreTest.java    |   42 +-
 .../plug/test/util/ReusableLatchTest.java       |  123 +-
 .../test/util/SimpleServerAbstractTest.java     |   29 +-
 .../protocol/stomp/ActiveMQStompException.java  |   59 +-
 .../stomp/ActiveMQStompProtocolLogger.java      |    4 +-
 .../ActiveMQStompProtocolMessageBundle.java     |    4 +-
 .../core/protocol/stomp/FrameEventListener.java |    3 +-
 .../core/protocol/stomp/SimpleBytes.java        |   21 +-
 .../artemis/core/protocol/stomp/Stomp.java      |   56 +-
 .../core/protocol/stomp/StompConnection.java    |  457 +--
 .../core/protocol/stomp/StompDecoder.java       |  272 +-
 .../artemis/core/protocol/stomp/StompFrame.java |  132 +-
 .../protocol/stomp/StompFrameInterceptor.java   |    4 +-
 .../protocol/stomp/StompProtocolManager.java    |  293 +-
 .../stomp/StompProtocolManagerFactory.java      |   18 +-
 .../core/protocol/stomp/StompSession.java       |  174 +-
 .../core/protocol/stomp/StompSubscription.java  |   15 +-
 .../artemis/core/protocol/stomp/StompUtils.java |   51 +-
 .../core/protocol/stomp/StompVersions.java      |    9 +-
 .../stomp/VersionedStompFrameHandler.java       |  207 +-
 .../stomp/v10/StompFrameHandlerV10.java         |   73 +-
 .../core/protocol/stomp/v10/StompFrameV10.java  |    7 +-
 .../stomp/v11/StompFrameHandlerV11.java         |  472 +--
 .../core/protocol/stomp/v11/StompFrameV11.java  |   25 +-
 .../stomp/v12/StompFrameHandlerV12.java         |  180 +-
 .../core/protocol/stomp/v12/StompFrameV12.java  |   10 +-
 .../activemq/artemis/ra/ActiveMQRABundle.java   |    9 +-
 .../artemis/ra/ActiveMQRABytesMessage.java      |  317 +-
 .../artemis/ra/ActiveMQRAConnectionFactory.java |    5 +-
 .../ra/ActiveMQRAConnectionFactoryImpl.java     |  241 +-
 .../artemis/ra/ActiveMQRAConnectionManager.java |   46 +-
 .../ra/ActiveMQRAConnectionMetaData.java        |   68 +-
 .../ra/ActiveMQRAConnectionRequestInfo.java     |  176 +-
 .../artemis/ra/ActiveMQRACredential.java        |  132 +-
 .../artemis/ra/ActiveMQRAJMSContext.java        |   24 +-
 .../artemis/ra/ActiveMQRALocalTransaction.java  |   73 +-
 .../activemq/artemis/ra/ActiveMQRALogger.java   |    4 +-
 .../artemis/ra/ActiveMQRAMCFProperties.java     |   76 +-
 .../artemis/ra/ActiveMQRAManagedConnection.java |  369 +-
 .../ra/ActiveMQRAManagedConnectionFactory.java  |  382 +-
 .../artemis/ra/ActiveMQRAMapMessage.java        |  318 +-
 .../activemq/artemis/ra/ActiveMQRAMessage.java  |  332 +-
 .../artemis/ra/ActiveMQRAMessageConsumer.java   |  214 +-
 .../artemis/ra/ActiveMQRAMessageListener.java   |   31 +-
 .../artemis/ra/ActiveMQRAMessageProducer.java   |  340 +-
 .../activemq/artemis/ra/ActiveMQRAMetaData.java |   62 +-
 .../artemis/ra/ActiveMQRAObjectMessage.java     |   38 +-
 .../artemis/ra/ActiveMQRAProperties.java        |  120 +-
 .../artemis/ra/ActiveMQRAQueueReceiver.java     |   29 +-
 .../artemis/ra/ActiveMQRAQueueSender.java       |   95 +-
 .../activemq/artemis/ra/ActiveMQRAService.java  |   24 +-
 .../activemq/artemis/ra/ActiveMQRASession.java  |  838 ++---
 .../artemis/ra/ActiveMQRASessionFactory.java    |   11 +-
 .../ra/ActiveMQRASessionFactoryImpl.java        |  469 +--
 .../artemis/ra/ActiveMQRAStreamMessage.java     |  282 +-
 .../artemis/ra/ActiveMQRATextMessage.java       |   38 +-
 .../artemis/ra/ActiveMQRATopicPublisher.java    |  164 +-
 .../artemis/ra/ActiveMQRATopicSubscriber.java   |   40 +-
 .../artemis/ra/ActiveMQRAXAJMSContext.java      |    7 +-
 .../artemis/ra/ActiveMQRAXAResource.java        |  148 +-
 .../activemq/artemis/ra/ActiveMQRaUtils.java    |  123 +-
 .../artemis/ra/ActiveMQResourceAdapter.java     | 1186 ++-----
 .../artemis/ra/ConnectionFactoryProperties.java |  439 +--
 .../artemis/ra/inflow/ActiveMQActivation.java   |  390 +-
 .../ra/inflow/ActiveMQActivationSpec.java       |  388 +-
 .../ra/inflow/ActiveMQMessageHandler.java       |  216 +-
 .../artemis/ra/recovery/RecoveryManager.java    |   66 +-
 .../apache/activemq/artemis/rest/ActiveMQ.java  |   64 +-
 .../artemis/rest/ActiveMQRestBundle.java        |    5 +-
 .../artemis/rest/ActiveMQRestLogger.java        |    4 +-
 .../artemis/rest/HttpHeaderProperty.java        |   13 +-
 .../org/apache/activemq/artemis/rest/Jms.java   |   82 +-
 .../rest/MessageServiceConfiguration.java       |   70 +-
 .../artemis/rest/MessageServiceManager.java     |   85 +-
 .../activemq/artemis/rest/UnknownMediaType.java |    7 +-
 .../artemis/rest/UnmarshalException.java        |   10 +-
 .../integration/ActiveMQBootstrapListener.java  |   25 +-
 .../rest/integration/EmbeddedRestActiveMQ.java  |   40 +-
 .../integration/EmbeddedRestActiveMQJMS.java    |   16 +-
 .../RestMessagingBootstrapListener.java         |   25 +-
 .../ServletContextBindingRegistry.java          |   19 +-
 .../rest/queue/AcknowledgedQueueConsumer.java   |  156 +-
 .../artemis/rest/queue/Acknowledgement.java     |   31 +-
 .../artemis/rest/queue/ConsumedHttpMessage.java |   19 +-
 .../artemis/rest/queue/ConsumedMessage.java     |   31 +-
 .../rest/queue/ConsumedObjectMessage.java       |   25 +-
 .../artemis/rest/queue/ConsumersResource.java   |  164 +-
 .../artemis/rest/queue/DestinationResource.java |   22 +-
 .../rest/queue/DestinationServiceManager.java   |   91 +-
 .../artemis/rest/queue/DestinationSettings.java |   25 +-
 .../artemis/rest/queue/PostMessage.java         |  158 +-
 .../artemis/rest/queue/PostMessageDupsOk.java   |   39 +-
 .../artemis/rest/queue/PostMessageNoDups.java   |    6 +-
 .../artemis/rest/queue/QueueConsumer.java       |  151 +-
 .../artemis/rest/queue/QueueDeployment.java     |   16 +-
 .../rest/queue/QueueDestinationsResource.java   |   85 +-
 .../artemis/rest/queue/QueueResource.java       |   83 +-
 .../artemis/rest/queue/QueueServiceManager.java |   55 +-
 .../rest/queue/push/ActiveMQPushStrategy.java   |   39 +-
 .../artemis/rest/queue/push/FilePushStore.java  |   67 +-
 .../artemis/rest/queue/push/PushConsumer.java   |   83 +-
 .../queue/push/PushConsumerMessageHandler.java  |   37 +-
 .../rest/queue/push/PushConsumerResource.java   |   64 +-
 .../artemis/rest/queue/push/PushStore.java      |    4 +-
 .../artemis/rest/queue/push/PushStrategy.java   |    4 +-
 .../artemis/rest/queue/push/UriStrategy.java    |   92 +-
 .../rest/queue/push/UriTemplateStrategy.java    |    7 +-
 .../rest/queue/push/xml/Authentication.java     |   17 +-
 .../rest/queue/push/xml/AuthenticationType.java |    4 +-
 .../artemis/rest/queue/push/xml/BasicAuth.java  |   19 +-
 .../artemis/rest/queue/push/xml/DigestAuth.java |    4 +-
 .../rest/queue/push/xml/PushRegistration.java   |   85 +-
 .../rest/queue/push/xml/XmlHttpHeader.java      |   25 +-
 .../artemis/rest/queue/push/xml/XmlLink.java    |   49 +-
 .../topic/AcknowledgedSubscriptionResource.java |   31 +-
 .../artemis/rest/topic/FileTopicPushStore.java  |   18 +-
 .../artemis/rest/topic/PushSubscription.java    |   35 +-
 .../rest/topic/PushSubscriptionsResource.java   |  125 +-
 .../rest/topic/PushTopicRegistration.java       |   10 +-
 .../artemis/rest/topic/Subscription.java        |    4 +-
 .../rest/topic/SubscriptionResource.java        |   31 +-
 .../rest/topic/SubscriptionsResource.java       |  297 +-
 .../artemis/rest/topic/TopicDeployment.java     |   16 +-
 .../rest/topic/TopicDestinationsResource.java   |   80 +-
 .../artemis/rest/topic/TopicPushStore.java      |    4 +-
 .../artemis/rest/topic/TopicResource.java       |   87 +-
 .../artemis/rest/topic/TopicServiceManager.java |   61 +-
 .../activemq/artemis/rest/util/Constants.java   |    4 +-
 .../rest/util/CustomHeaderLinkStrategy.java     |   19 +-
 .../artemis/rest/util/HttpMessageHelper.java    |   79 +-
 .../rest/util/LinkHeaderLinkStrategy.java       |   10 +-
 .../artemis/rest/util/LinkStrategy.java         |    4 +-
 .../activemq/artemis/rest/util/TimeoutTask.java |  105 +-
 .../artemis/rest/test/AutoAckQueueTest.java     |    7 +-
 .../artemis/rest/test/AutoAckTopicTest.java     |   57 +-
 .../artemis/rest/test/ClientAckQueueTest.java   |   37 +-
 .../artemis/rest/test/ClientAckTopicTest.java   |   49 +-
 .../rest/test/CreateDestinationTest.java        |   23 +-
 .../artemis/rest/test/DupQueueTest.java         |   10 +-
 .../activemq/artemis/rest/test/Embedded.java    |   39 +-
 .../artemis/rest/test/EmbeddedTest.java         |   32 +-
 .../artemis/rest/test/FindDestinationTest.java  |   10 +-
 .../activemq/artemis/rest/test/JMSTest.java     |   84 +-
 .../artemis/rest/test/MessageTestBase.java      |   38 +-
 .../test/PersistentPushQueueConsumerTest.java   |   36 +-
 .../test/PersistentPushTopicConsumerTest.java   |   55 +-
 .../rest/test/PushQueueConsumerTest.java        |  128 +-
 .../rest/test/PushTopicConsumerTest.java        |   71 +-
 .../activemq/artemis/rest/test/RawAckTest.java  |   37 +-
 .../artemis/rest/test/RepostingQueueTest.java   |   38 +-
 .../artemis/rest/test/RepostingTopicTest.java   |   53 +-
 .../artemis/rest/test/RoundtripTimeTest.java    |   14 +-
 .../artemis/rest/test/SelectorTest.java         |   90 +-
 .../activemq/artemis/rest/test/SessionTest.java |   21 +-
 .../artemis/rest/test/TransformTest.java        |   82 +-
 .../apache/activemq/artemis/rest/test/Util.java |   16 +-
 .../activemq/artemis/rest/test/XmlTest.java     |   25 +-
 .../selector/filter/ArithmeticExpression.java   |  145 +-
 .../selector/filter/BinaryExpression.java       |   47 +-
 .../selector/filter/BooleanExpression.java      |    4 +-
 .../selector/filter/ComparisonExpression.java   |  376 +-
 .../selector/filter/ConstantExpression.java     |   91 +-
 .../artemis/selector/filter/Expression.java     |    4 +-
 .../selector/filter/FilterException.java        |   15 +-
 .../artemis/selector/filter/Filterable.java     |    3 +-
 .../selector/filter/LogicExpression.java        |   43 +-
 .../selector/filter/PropertyExpression.java     |   25 +-
 .../selector/filter/UnaryExpression.java        |  180 +-
 .../selector/filter/XPathExpression.java        |   41 +-
 .../selector/filter/XQueryExpression.java       |   17 +-
 .../selector/filter/XalanXPathEvaluator.java    |   31 +-
 .../artemis/selector/impl/LRUCache.java         |   28 +-
 .../artemis/selector/impl/SelectorParser.java   |   54 +-
 .../artemis/selector/SelectorParserTest.java    |   21 +-
 .../activemq/artemis/selector/SelectorTest.java |  155 +-
 .../api/core/management/MessageCounterInfo.java |   51 +-
 .../artemis/core/config/BackupStrategy.java     |    4 +-
 .../core/config/BridgeConfiguration.java        |  190 +-
 .../config/ClusterConnectionConfiguration.java  |  179 +-
 .../artemis/core/config/Configuration.java      |   13 +-
 .../artemis/core/config/ConfigurationUtils.java |   91 +-
 .../config/ConnectorServiceConfiguration.java   |   34 +-
 .../core/config/CoreQueueConfiguration.java     |   48 +-
 .../core/config/DivertConfiguration.java        |   81 +-
 .../core/config/FileDeploymentManager.java      |   38 +-
 .../core/config/HAPolicyConfiguration.java      |    7 +-
 .../core/config/ScaleDownConfiguration.java     |   37 +-
 .../config/ha/ColocatedPolicyConfiguration.java |   64 +-
 .../config/ha/LiveOnlyPolicyConfiguration.java  |   19 +-
 .../config/ha/ReplicaPolicyConfiguration.java   |   52 +-
 .../ha/ReplicatedPolicyConfiguration.java       |   28 +-
 .../SharedStoreMasterPolicyConfiguration.java   |   22 +-
 .../ha/SharedStoreSlavePolicyConfiguration.java |   40 +-
 .../core/config/impl/ConfigurationImpl.java     |  684 ++--
 .../core/config/impl/FileConfiguration.java     |   22 +-
 .../config/impl/FileSecurityConfiguration.java  |   57 +-
 .../core/config/impl/SecurityConfiguration.java |   56 +-
 .../artemis/core/config/impl/Validators.java    |  135 +-
 .../artemis/core/deployers/Deployable.java      |    9 +-
 .../deployers/impl/FileConfigurationParser.java |  932 ++---
 .../activemq/artemis/core/filter/Filter.java    |    4 +-
 .../artemis/core/filter/impl/FilterImpl.java    |  135 +-
 .../core/management/impl/AbstractControl.java   |   34 +-
 .../management/impl/AcceptorControlImpl.java    |   63 +-
 .../impl/ActiveMQServerControlImpl.java         | 1183 ++-----
 .../management/impl/AddressControlImpl.java     |  140 +-
 .../core/management/impl/BridgeControlImpl.java |  144 +-
 .../impl/BroadcastGroupControlImpl.java         |  120 +-
 .../impl/ClusterConnectionControlImpl.java      |  156 +-
 .../core/management/impl/DivertControlImpl.java |   73 +-
 .../core/management/impl/MBeanInfoHelper.java   |   66 +-
 .../core/management/impl/QueueControlImpl.java  |  560 +--
 .../core/messagecounter/MessageCounter.java     |  227 +-
 .../messagecounter/MessageCounterManager.java   |    4 +-
 .../impl/MessageCounterHelper.java              |   80 +-
 .../impl/MessageCounterManagerImpl.java         |  106 +-
 .../core/paging/PageTransactionInfo.java        |   10 +-
 .../artemis/core/paging/PagedMessage.java       |    8 +-
 .../artemis/core/paging/PagingManager.java      |   26 +-
 .../artemis/core/paging/PagingStore.java        |    5 +-
 .../artemis/core/paging/PagingStoreFactory.java |    4 +-
 .../core/paging/cursor/LivePageCache.java       |    3 +-
 .../artemis/core/paging/cursor/PageCache.java   |    5 +-
 .../core/paging/cursor/PageCursorProvider.java  |    3 +-
 .../core/paging/cursor/PageIterator.java        |    4 +-
 .../core/paging/cursor/PagePosition.java        |    5 +-
 .../core/paging/cursor/PageSubscription.java    |   19 +-
 .../paging/cursor/PageSubscriptionCounter.java  |    8 +-
 .../core/paging/cursor/PagedReference.java      |    4 +-
 .../core/paging/cursor/PagedReferenceImpl.java  |  108 +-
 .../paging/cursor/impl/LivePageCacheImpl.java   |   56 +-
 .../core/paging/cursor/impl/PageCacheImpl.java  |   54 +-
 .../cursor/impl/PageCursorProviderImpl.java     |  366 +-
 .../paging/cursor/impl/PagePositionImpl.java    |   66 +-
 .../impl/PageSubscriptionCounterImpl.java       |  202 +-
 .../cursor/impl/PageSubscriptionImpl.java       |  772 ++--
 .../activemq/artemis/core/paging/impl/Page.java |  171 +-
 .../artemis/core/paging/impl/PageSyncTimer.java |   44 +-
 .../paging/impl/PageTransactionInfoImpl.java    |  181 +-
 .../core/paging/impl/PagedMessageImpl.java      |   52 +-
 .../core/paging/impl/PagingManagerImpl.java     |  165 +-
 .../core/paging/impl/PagingStoreFactoryNIO.java |   85 +-
 .../core/paging/impl/PagingStoreImpl.java       |  591 ++--
 .../artemis/core/persistence/GroupingInfo.java  |    4 +-
 .../core/persistence/OperationContext.java      |   10 +-
 .../core/persistence/QueueBindingInfo.java      |    5 +-
 .../core/persistence/StorageManager.java        |   35 +-
 .../config/PersistedAddressSetting.java         |   43 +-
 .../core/persistence/config/PersistedRoles.java |  133 +-
 .../core/persistence/impl/PageCountPending.java |    6 +-
 .../impl/journal/AddMessageRecord.java          |   16 +-
 .../impl/journal/BatchingIDGenerator.java       |   99 +-
 .../impl/journal/DescribeJournal.java           |  325 +-
 .../impl/journal/JournalRecordIds.java          |    5 +-
 .../impl/journal/JournalStorageManager.java     | 2059 ++++-------
 .../impl/journal/LargeServerMessageImpl.java    |  260 +-
 .../impl/journal/LargeServerMessageInSync.java  |   70 +-
 .../impl/journal/OperationContextImpl.java      |  217 +-
 .../nullpm/NullStorageLargeServerMessage.java   |   54 +-
 .../impl/nullpm/NullStorageManager.java         |  339 +-
 .../artemis/core/postoffice/Address.java        |    4 +-
 .../artemis/core/postoffice/AddressManager.java |    5 +-
 .../artemis/core/postoffice/Binding.java        |    4 +-
 .../artemis/core/postoffice/BindingType.java    |   18 +-
 .../artemis/core/postoffice/Bindings.java       |    4 +-
 .../core/postoffice/BindingsFactory.java        |    4 +-
 .../core/postoffice/DuplicateIDCache.java       |    6 +-
 .../artemis/core/postoffice/PostOffice.java     |   28 +-
 .../artemis/core/postoffice/QueueBinding.java   |    4 +-
 .../artemis/core/postoffice/QueueInfo.java      |   94 +-
 .../core/postoffice/impl/AddressImpl.java       |   88 +-
 .../core/postoffice/impl/BindingsImpl.java      |  341 +-
 .../core/postoffice/impl/DivertBinding.java     |   92 +-
 .../postoffice/impl/DuplicateIDCacheImpl.java   |  158 +-
 .../core/postoffice/impl/LocalQueueBinding.java |   89 +-
 .../core/postoffice/impl/PostOfficeImpl.java    |  680 ++--
 .../postoffice/impl/SimpleAddressManager.java   |   89 +-
 .../postoffice/impl/WildcardAddressManager.java |  130 +-
 .../artemis/core/protocol/ProtocolHandler.java  |  101 +-
 .../core/protocol/ServerPacketDecoder.java      |   94 +-
 .../core/ServerSessionPacketHandler.java        |  370 +-
 .../core/impl/ActiveMQPacketHandler.java        |  137 +-
 .../protocol/core/impl/CoreProtocolManager.java |  186 +-
 .../core/impl/CoreProtocolManagerFactory.java   |   19 +-
 .../protocol/core/impl/CoreSessionCallback.java |   50 +-
 .../wireformat/BackupRegistrationMessage.java   |   48 +-
 .../BackupReplicationStartFailedMessage.java    |   54 +-
 .../impl/wireformat/BackupRequestMessage.java   |   42 +-
 .../impl/wireformat/BackupResponseMessage.java  |   26 +-
 .../impl/wireformat/ClusterConnectMessage.java  |   24 +-
 .../wireformat/ClusterConnectReplyMessage.java  |   26 +-
 .../impl/wireformat/NodeAnnounceMessage.java    |  137 +-
 .../core/impl/wireformat/QuorumVoteMessage.java |   25 +-
 .../impl/wireformat/QuorumVoteReplyMessage.java |   28 +-
 .../impl/wireformat/ReplicationAddMessage.java  |   53 +-
 .../wireformat/ReplicationAddTXMessage.java     |   55 +-
 .../wireformat/ReplicationCommitMessage.java    |   44 +-
 .../wireformat/ReplicationDeleteMessage.java    |   36 +-
 .../wireformat/ReplicationDeleteTXMessage.java  |   46 +-
 .../ReplicationLargeMessageBeginMessage.java    |   28 +-
 .../ReplicationLargeMessageEndMessage.java      |   28 +-
 .../ReplicationLargeMessageWriteMessage.java    |   27 +-
 .../ReplicationLiveIsStoppingMessage.java       |   28 +-
 .../wireformat/ReplicationPageEventMessage.java |   40 +-
 .../wireformat/ReplicationPageWriteMessage.java |   33 +-
 .../wireformat/ReplicationPrepareMessage.java   |   58 +-
 .../wireformat/ReplicationResponseMessage.java  |    6 +-
 .../wireformat/ReplicationStartSyncMessage.java |   87 +-
 .../wireformat/ReplicationSyncFileMessage.java  |  146 +-
 .../wireformat/ScaleDownAnnounceMessage.java    |   22 +-
 .../protocol/stomp/WebSocketServerHandler.java  |   82 +-
 .../core/registry/JndiBindingRegistry.java      |   77 +-
 .../core/registry/MapBindingRegistry.java       |   16 +-
 .../core/remoting/impl/invm/InVMAcceptor.java   |  133 +-
 .../remoting/impl/invm/InVMAcceptorFactory.java |    7 +-
 .../core/remoting/impl/invm/InVMConnection.java |  143 +-
 .../core/remoting/impl/invm/InVMConnector.java  |  117 +-
 .../impl/invm/InVMConnectorFactory.java         |   13 +-
 .../core/remoting/impl/invm/InVMRegistry.java   |   25 +-
 .../remoting/impl/invm/TransportConstants.java  |    6 +-
 .../remoting/impl/netty/ConnectionCreator.java  |    8 +-
 .../impl/netty/HttpAcceptorHandler.java         |  120 +-
 .../impl/netty/HttpKeepAliveRunnable.java       |   31 +-
 .../core/remoting/impl/netty/NettyAcceptor.java |  432 +--
 .../impl/netty/NettyAcceptorFactory.java        |    7 +-
 .../impl/netty/NettyServerConnection.java       |   14 +-
 .../core/remoting/server/RemotingService.java   |    4 +-
 .../server/impl/RemotingServiceImpl.java        |  383 +-
 .../core/replication/ReplicatedJournal.java     |  241 +-
 .../replication/ReplicatedLargeMessage.java     |    4 +-
 .../core/replication/ReplicationEndpoint.java   |  442 +--
 .../core/replication/ReplicationManager.java    |  338 +-
 .../artemis/core/security/CheckType.java        |   45 +-
 .../artemis/core/security/SecurityStore.java    |    4 +-
 .../activemq/artemis/core/security/User.java    |   36 +-
 .../core/security/impl/SecurityStoreImpl.java   |   80 +-
 .../artemis/core/server/ActivateCallback.java   |    4 +-
 .../artemis/core/server/ActivationParams.java   |    4 +-
 .../core/server/ActiveMQMessageBundle.java      |   24 +-
 .../artemis/core/server/ActiveMQServer.java     |   27 +-
 .../core/server/ActiveMQServerLogger.java       |  225 +-
 .../artemis/core/server/ActiveMQServers.java    |   41 +-
 .../core/server/AutoCreatedQueueManager.java    |    4 +-
 .../activemq/artemis/core/server/Bindable.java  |    4 +-
 .../artemis/core/server/BindingQueryResult.java |   18 +-
 .../artemis/core/server/ConnectorService.java   |    4 +-
 .../core/server/ConnectorServiceFactory.java    |    7 +-
 .../activemq/artemis/core/server/Consumer.java  |   16 +-
 .../activemq/artemis/core/server/Divert.java    |    4 +-
 .../artemis/core/server/HandleStatus.java       |    4 +-
 .../artemis/core/server/JournalType.java        |    3 +-
 .../artemis/core/server/LargeServerMessage.java |    7 +-
 .../artemis/core/server/LiveNodeLocator.java    |   25 +-
 .../artemis/core/server/MemoryManager.java      |   66 +-
 .../artemis/core/server/MessageReference.java   |    6 +-
 .../artemis/core/server/NodeManager.java        |   94 +-
 .../activemq/artemis/core/server/Queue.java     |   10 +-
 .../artemis/core/server/QueueCreator.java       |    6 +-
 .../artemis/core/server/QueueFactory.java       |    6 +-
 .../artemis/core/server/RouteContextList.java   |    3 +-
 .../artemis/core/server/RoutingContext.java     |    4 +-
 .../core/server/ScheduledDeliveryHandler.java   |    4 +-
 .../artemis/core/server/ServerConsumer.java     |    8 +-
 .../artemis/core/server/ServerMessage.java      |   13 +-
 .../artemis/core/server/ServerSession.java      |   17 +-
 .../core/server/ServerSessionFactory.java       |   34 +-
 .../artemis/core/server/ServiceRegistry.java    |   13 +-
 .../core/server/TransientQueueManager.java      |    4 +-
 ...ctiveMQServerSideProtocolManagerFactory.java |   20 +-
 .../core/server/cluster/BackupManager.java      |  213 +-
 .../artemis/core/server/cluster/Bridge.java     |    4 +-
 .../core/server/cluster/BroadcastGroup.java     |    4 +-
 .../cluster/ClusterConfigurationUtil.java       |   48 +-
 .../core/server/cluster/ClusterConnection.java  |   13 +-
 .../core/server/cluster/ClusterControl.java     |   89 +-
 .../core/server/cluster/ClusterController.java  |  206 +-
 .../core/server/cluster/ClusterManager.java     |  445 +--
 .../core/server/cluster/MessageFlowRecord.java  |    4 +-
 .../core/server/cluster/RemoteQueueBinding.java |    4 +-
 .../core/server/cluster/Transformer.java        |    4 +-
 .../core/server/cluster/ha/BackupPolicy.java    |   26 +-
 .../server/cluster/ha/ColocatedHAManager.java   |  144 +-
 .../core/server/cluster/ha/ColocatedPolicy.java |   80 +-
 .../core/server/cluster/ha/HAManager.java       |    4 +-
 .../core/server/cluster/ha/HAPolicy.java        |    9 +-
 .../core/server/cluster/ha/LiveOnlyPolicy.java  |   40 +-
 .../core/server/cluster/ha/ReplicaPolicy.java   |   67 +-
 .../server/cluster/ha/ReplicatedPolicy.java     |   76 +-
 .../core/server/cluster/ha/ScaleDownPolicy.java |   81 +-
 .../cluster/ha/SharedStoreMasterPolicy.java     |   54 +-
 .../cluster/ha/SharedStoreSlavePolicy.java      |   53 +-
 .../server/cluster/ha/StandaloneHAManager.java  |   16 +-
 .../core/server/cluster/impl/BridgeImpl.java    |  609 ++--
 .../server/cluster/impl/BroadcastGroupImpl.java |  102 +-
 .../cluster/impl/ClusterConnectionBridge.java   |  179 +-
 .../cluster/impl/ClusterConnectionImpl.java     |  716 ++--
 .../cluster/impl/MessageLoadBalancingType.java  |    9 +-
 .../core/server/cluster/impl/Redistributor.java |  133 +-
 .../cluster/impl/RemoteQueueBindingImpl.java    |  192 +-
 .../core/server/cluster/qourum/BooleanVote.java |   22 +-
 .../core/server/cluster/qourum/Quorum.java      |   24 +-
 .../server/cluster/qourum/QuorumManager.java    |  168 +-
 .../core/server/cluster/qourum/QuorumVote.java  |   11 +-
 .../cluster/qourum/QuorumVoteHandler.java       |    4 +-
 .../cluster/qourum/QuorumVoteServerConnect.java |   47 +-
 .../qourum/SharedNothingBackupQuorum.java       |  120 +-
 .../core/server/cluster/qourum/Vote.java        |    8 +-
 .../core/server/embedded/EmbeddedActiveMQ.java  |   43 +-
 .../core/server/group/GroupingHandler.java      |    4 +-
 .../core/server/group/UnproposalListener.java   |    4 +-
 .../core/server/group/impl/GroupBinding.java    |   31 +-
 .../group/impl/GroupHandlingAbstract.java       |   54 +-
 .../impl/GroupingHandlerConfiguration.java      |   66 +-
 .../server/group/impl/LocalGroupingHandler.java |  268 +-
 .../core/server/group/impl/Proposal.java        |   16 +-
 .../group/impl/RemoteGroupingHandler.java       |  144 +-
 .../core/server/group/impl/Response.java        |   46 +-
 .../server/impl/AIOFileLockNodeManager.java     |   39 +-
 .../artemis/core/server/impl/Activation.java    |   55 +-
 .../core/server/impl/ActiveMQServerImpl.java    | 1195 ++-----
 .../impl/AnyLiveNodeLocatorForReplication.java  |   88 +-
 .../impl/AnyLiveNodeLocatorForScaleDown.java    |   93 +-
 .../impl/AutoCreatedQueueManagerImpl.java       |   37 +-
 .../impl/BackupRecoveryJournalLoader.java       |   27 +-
 .../server/impl/BackupTopologyListener.java     |   21 +-
 .../core/server/impl/ColocatedActivation.java   |  165 +-
 .../core/server/impl/ConnectorsService.java     |   55 +-
 .../artemis/core/server/impl/DivertImpl.java    |   66 +-
 .../core/server/impl/FileLockNodeManager.java   |  167 +-
 .../core/server/impl/InVMNodeManager.java       |   66 +-
 .../artemis/core/server/impl/JournalLoader.java |   20 +-
 .../core/server/impl/LastValueQueue.java        |  174 +-
 .../core/server/impl/LiveActivation.java        |    4 +-
 .../core/server/impl/LiveOnlyActivation.java    |  101 +-
 .../core/server/impl/MessageReferenceImpl.java  |   98 +-
 .../NamedLiveNodeLocatorForReplication.java     |   68 +-
 .../impl/NamedLiveNodeLocatorForScaleDown.java  |   96 +-
 .../server/impl/NamedNodeIdNodeLocator.java     |   28 +-
 .../server/impl/PostOfficeJournalLoader.java    |  227 +-
 .../core/server/impl/QueueFactoryImpl.java      |   54 +-
 .../artemis/core/server/impl/QueueImpl.java     | 1704 +++------
 .../artemis/core/server/impl/RefsOperation.java |  103 +-
 .../core/server/impl/ReplicationError.java      |   19 +-
 .../core/server/impl/RoutingContextImpl.java    |   69 +-
 .../core/server/impl/ScaleDownHandler.java      |  308 +-
 .../impl/ScheduledDeliveryHandlerImpl.java      |  177 +-
 .../core/server/impl/ServerConsumerImpl.java    |  620 ++--
 .../artemis/core/server/impl/ServerInfo.java    |   27 +-
 .../core/server/impl/ServerMessageImpl.java     |  183 +-
 .../core/server/impl/ServerSessionImpl.java     | 1006 ++----
 .../core/server/impl/ServiceRegistryImpl.java   |  122 +-
 .../impl/SharedNothingBackupActivation.java     |  230 +-
 .../impl/SharedNothingLiveActivation.java       |  259 +-
 .../impl/SharedStoreBackupActivation.java       |  163 +-
 .../server/impl/SharedStoreLiveActivation.java  |   40 +-
 .../server/impl/TransientQueueManagerImpl.java  |   37 +-
 .../server/management/ManagementService.java    |   30 +-
 .../management/impl/ManagementServiceImpl.java  |  406 +--
 .../core/settings/HierarchicalRepository.java   |   11 +-
 .../HierarchicalRepositoryChangeListener.java   |    4 +-
 .../artemis/core/settings/Mergeable.java        |    4 +-
 .../core/settings/impl/AddressSettings.java     |  303 +-
 .../impl/HierarchicalObjectRepository.java      |  217 +-
 .../artemis/core/settings/impl/Match.java       |   54 +-
 .../settings/impl/ResourceLimitSettings.java    |  122 +-
 .../core/settings/impl/SlowConsumerPolicy.java  |    3 +-
 .../core/transaction/ResourceManager.java       |    4 +-
 .../artemis/core/transaction/Transaction.java   |    7 +-
 .../core/transaction/TransactionDetail.java     |   30 +-
 .../core/transaction/TransactionFactory.java    |    4 +-
 .../core/transaction/TransactionOperation.java  |    5 +-
 .../TransactionOperationAbstract.java           |   29 +-
 .../transaction/TransactionPropertyIndexes.java |    3 +-
 .../impl/BindingsTransactionImpl.java           |   21 +-
 .../transaction/impl/CoreTransactionDetail.java |   18 +-
 .../transaction/impl/ResourceManagerImpl.java   |  125 +-
 .../core/transaction/impl/TransactionImpl.java  |  269 +-
 .../spi/core/naming/BindingRegistry.java        |    4 +-
 .../AbstractProtocolManagerFactory.java         |   18 +-
 .../spi/core/protocol/MessageConverter.java     |    4 +-
 .../spi/core/protocol/ProtocolManager.java      |    4 +-
 .../core/protocol/ProtocolManagerFactory.java   |   10 +-
 .../spi/core/protocol/SessionCallback.java      |   13 +-
 .../artemis/spi/core/remoting/Acceptor.java     |    9 +-
 .../spi/core/remoting/AcceptorFactory.java      |    4 +-
 .../ServerConnectionLifeCycleListener.java      |   10 +-
 .../core/security/ActiveMQSecurityManager.java  |   13 +-
 .../security/ActiveMQSecurityManagerImpl.java   |   43 +-
 .../spi/core/security/JAASSecurityManager.java  |  105 +-
 .../AcceptorTransportConfigurationParser.java   |    7 +-
 ...nVMAcceptorTransportConfigurationSchema.java |    7 +-
 ...TCPAcceptorTransportConfigurationSchema.java |   10 +-
 .../artemis/utils/XMLConfigurationUtil.java     |   79 +-
 .../core/config/impl/ConfigurationImplTest.java |   54 +-
 .../impl/DefaultsFileConfigurationTest.java     |   28 +-
 .../impl/FileConfigurationParserTest.java       |   94 +-
 .../core/config/impl/FileConfigurationTest.java |   96 +-
 .../config/impl/HAPolicyConfigurationTest.java  |  136 +-
 .../core/config/impl/ValidatorsTest.java        |   43 +-
 .../WrongRoleFileConfigurationParserTest.java   |   90 +-
 .../artemis/core/filter/impl/FilterTest.java    |  159 +-
 .../core/list/PriorityLinkedListTest.java       |   57 +-
 .../core/message/impl/MessagePropertyTest.java  |   32 +-
 .../artemis/core/security/RoleTest.java         |   15 +-
 .../group/impl/ClusteredResetMockTest.java      |  190 +-
 .../core/server/impl/EmbeddedServerTest.java    |   31 +-
 .../impl/ScheduledDeliveryHandlerTest.java      |  734 ++--
 .../core/settings/AddressSettingsTest.java      |   23 +-
 .../artemis/core/settings/RepositoryTest.java   |   72 +-
 .../core/version/impl/VersionImplTest.java      |   32 +-
 .../artemis/tests/util/ActiveMQTestBase.java    | 1689 +++------
 .../tests/util/ColocatedActiveMQServer.java     |   49 +-
 .../util/CountDownSessionFailureListener.java   |   25 +-
 .../tests/util/InVMNodeManagerServer.java       |   22 +-
 .../artemis/tests/util/RemoveFolder.java        |   10 +-
 .../artemis/tests/util/SimpleStringTest.java    |  153 +-
 .../tests/util/SingleServerTestBase.java        |   11 +-
 .../ActiveMQServiceExtensionLogger.java         |    4 +-
 .../service/extensions/ServiceUtils.java        |   40 +-
 .../transactions/TransactionManagerLocator.java |    4 +-
 .../xa/ActiveMQXAResourceWrapper.java           |    4 +-
 .../xa/ActiveMQXAResourceWrapperFactory.java    |    4 +-
 .../ActiveMQXAResourceWrapperFactoryImpl.java   |    6 +-
 .../xa/ActiveMQXAResourceWrapperImpl.java       |   49 +-
 .../xa/recovery/ActiveMQRegistry.java           |    4 +-
 .../xa/recovery/ActiveMQRegistryImpl.java       |   22 +-
 .../xa/recovery/ActiveMQXARecoveryLogger.java   |   34 +-
 .../xa/recovery/ActiveMQXAResourceRecovery.java |   87 +-
 .../xa/recovery/ActiveMQXAResourceWrapper.java  |  299 +-
 .../xa/recovery/XARecoveryConfig.java           |   75 +-
 .../DummyTransactionManagerLocator.java         |   34 +-
 .../TransactionManagerLocatorTest.java          |    7 +-
 .../xa/ActiveMQXAResourceWrapperImplTest.java   |    7 +-
 .../xa/MockActiveMQResourceWrapperFactory.java  |    7 +-
 .../extensions/tests/xa/MockXAResource.java     |   34 +-
 .../extensions/tests/xa/ServiceUtilsTest.java   |   10 +-
 .../artemis/component/WebServerComponent.java   |   32 +-
 .../cli/test/WebServerComponentTest.java        |   34 +-
 .../core/example/EmbeddedRemoteExample.java     |   24 +-
 .../artemis/core/example/EmbeddedServer.java    |   14 +-
 .../artemis/core/example/EmbeddedExample.java   |   22 +-
 .../activemq/artemis/core/example/PerfBase.java |  218 +-
 .../artemis/core/example/PerfListener.java      |   19 +-
 .../artemis/core/example/PerfParams.java        |  167 +-
 .../artemis/core/example/PerfSender.java        |   19 +-
 .../artemis/core/example/ExampleVerticle.java   |   37 +-
 .../core/example/VertxConnectorExample.java     |   49 +-
 .../artemis/jms/example/AerogearExample.java    |   23 +-
 .../ApplicationLayerFailoverExample.java        |   84 +-
 .../artemis/jms/example/BridgeExample.java      |   57 +-
 .../jms/example/HatColourChangeTransformer.java |    7 +-
 .../jms/example/QueueBrowserExample.java        |   33 +-
 .../jms/example/ClientKickoffExample.java       |   35 +-
 .../ClientSideFailoverListerExample.java        |   38 +-
 .../example/ClientSideLoadBalancingExample.java |   46 +-
 .../ClusteredDurableSubscriptionExample.java    |   29 +-
 .../jms/example/ClusteredGroupingExample.java   |   39 +-
 .../jms/example/ClusteredJgroupsExample.java    |   41 +-
 .../jms/example/ClusteredQueueExample.java      |   29 +-
 .../example/StaticClusteredQueueExample.java    |   46 +-
 .../jms/example/ClusterStaticOnewayExample.java |   40 +-
 .../jms/example/ClusteredTopicExample.java      |   35 +-
 .../ColocatedFailoverScaleDownExample.java      |   42 +-
 .../jms/example/ColocatedFailoverExample.java   |   48 +-
 .../jms/example/ConsumerRateLimitExample.java   |   36 +-
 .../artemis/jms/example/DeadLetterExample.java  |   41 +-
 .../jms/example/DelayedRedeliveryExample.java   |   44 +-
 .../example/AddForwardingTimeTransformer.java   |    7 +-
 .../artemis/jms/example/DivertExample.java      |   46 +-
 .../jms/example/DurableSubscriptionExample.java |   27 +-
 .../artemis/jms/example/EmbeddedExample.java    |   16 +-
 .../artemis/jms/example/EmbeddedExample.java    |   26 +-
 .../artemis/jms/example/ExpiryExample.java      |   31 +-
 .../jms/example/HAPolicyAutoBackupExample.java  |   44 +-
 .../jms/example/HttpTransportExample.java       |   18 +-
 .../InstantiateConnectionFactoryExample.java    |   19 +-
 .../artemis/jms/example/InterceptorExample.java |   33 +-
 .../artemis/jms/example/SimpleInterceptor.java  |   11 +-
 .../jms/example/JMSAutoCloseableExample.java    |   10 +-
 .../artemis/jms/example/JMSBridgeExample.java   |   75 +-
 .../example/JMSCompletionListenerExample.java   |   28 +-
 .../artemis/jms/example/JMSContextExample.java  |   10 +-
 .../jms/example/JMSSharedConsumerExample.java   |   28 +-
 .../artemis/jms/example/JMXExample.java         |   30 +-
 .../jms/example/LargeMessageExample.java        |   41 +-
 .../jms/example/LastValueQueueExample.java      |   25 +-
 .../example/ManagementNotificationExample.java  |   48 +-
 .../artemis/jms/example/ManagementExample.java  |   34 +-
 .../jms/example/MessageCounterExample.java      |   44 +-
 .../jms/example/MessageGroupExample.java        |   43 +-
 .../jms/example/MessageGroup2Example.java       |   50 +-
 .../jms/example/MessagePriorityExample.java     |   52 +-
 .../MultipleFailoverFailbackExample.java        |   64 +-
 .../jms/example/MultipleFailoverExample.java    |   64 +-
 .../jms/example/NoConsumerBufferingExample.java |   34 +-
 .../example/NonTransactionFailoverExample.java  |   53 +-
 .../artemis/jms/example/PagingExample.java      |   44 +-
 .../activemq/artemis/jms/example/PerfBase.java  |  216 +-
 .../artemis/jms/example/PerfListener.java       |   19 +-
 .../artemis/jms/example/PerfParams.java         |   82 +-
 .../artemis/jms/example/PerfSender.java         |   19 +-
 .../activemq/artemis/jms/example/Server.java    |    7 +-
 .../jms/example/PreacknowledgeExample.java      |   28 +-
 .../jms/example/ProducerRateLimitExample.java   |   29 +-
 .../artemis/jms/example/ProtonCPPExample.java   |   36 +-
 .../artemis/jms/example/ProtonJExample.java     |   19 +-
 .../QueueMessageRedistributionExample.java      |   34 +-
 .../jms/example/QueueRequestorExample.java      |   31 +-
 .../jms/example/TextReverserService.java        |   32 +-
 .../jms/example/QueueSelectorExample.java       |   52 +-
 .../artemis/jms/example/QueueExample.java       |   25 +-
 .../artemis/jms/example/ReattachExample.java    |   43 +-
 .../ReplicatedFailbackStaticExample.java        |   58 +-
 .../jms/example/ReplicatedFailbackExample.java  |   58 +-
 .../ReplicatedMultipleFailoverExample.java      |   60 +-
 .../ReplicatedTransactionFailoverExample.java   |   53 +-
 .../jms/example/RequestReplyExample.java        |   50 +-
 .../jms/rest/dup-send/src/main/java/Order.java  |   42 +-
 .../rest/dup-send/src/main/java/PostOrder.java  |   23 +-
 .../dup-send/src/main/java/PostOrderWithId.java |   15 +-
 .../dup-send/src/main/java/ReceiveOrder.java    |   20 +-
 .../messaging/test/AutoAckTopicTest.java        |   10 +-
 .../jms-to-rest/src/main/java/JmsHelper.java    |    8 +-
 .../jms-to-rest/src/main/java/JmsReceive.java   |   33 +-
 .../rest/jms-to-rest/src/main/java/JmsSend.java |   14 +-
 .../rest/jms-to-rest/src/main/java/Order.java   |   42 +-
 .../jms-to-rest/src/main/java/RestReceive.java  |   25 +-
 .../jms-to-rest/src/main/java/RestSend.java     |   11 +-
 .../jms/rest/push/src/main/java/JmsHelper.java  |    8 +-
 examples/jms/rest/push/src/main/java/Order.java |   42 +-
 .../jms/rest/push/src/main/java/PostOrder.java  |   14 +-
 .../jms/rest/push/src/main/java/PushReg.java    |    8 +-
 .../push/src/main/java/ReceiveShipping.java     |   33 +-
 .../artemis/jms/example/ScaleDownExample.java   |   40 +-
 .../jms/example/ScheduledMessageExample.java    |   25 +-
 .../artemis/jms/example/SecurityExample.java    |  151 +-
 .../example/SendAcknowledgementsExample.java    |   36 +-
 .../artemis/jms/example/ExampleListener.java    |   15 +-
 .../artemis/jms/example/MessageSender.java      |   37 +-
 .../artemis/jms/example/SpringExample.java      |   11 +-
 .../artemis/jms/example/SSLExample.java         |   25 +-
 .../jms/example/StaticSelectorExample.java      |   51 +-
 .../jms/example/StompWebSocketExample.java      |   25 +-
 .../artemis/jms/example/StompExample.java       |   56 +-
 .../artemis/jms/example/StompExample.java       |   60 +-
 .../artemis/jms/example/StompExample.java       |   60 +-
 .../jms/example/StopServerFailoverExample.java  |   47 +-
 .../jms/example/SymmetricClusterExample.java    |   54 +-
 .../jms/example/TemporaryQueueExample.java      |   29 +-
 .../jms/example/TopicHierarchyExample.java      |   28 +-
 .../jms/example/TopicSelectorExample1.java      |   69 +-
 .../jms/example/TopicSelectorExample2.java      |   52 +-
 .../artemis/jms/example/TopicExample.java       |   27 +-
 .../jms/example/TransactionFailoverExample.java |   55 +-
 .../jms/example/TransactionalExample.java       |   38 +-
 .../activemq/artemis/jms/example/DummyXid.java  |  100 +-
 .../artemis/jms/example/XAHeuristicExample.java |   83 +-
 .../activemq/artemis/jms/example/DummyXid.java  |  100 +-
 .../artemis/jms/example/XAReceiveExample.java   |   47 +-
 .../activemq/artemis/jms/example/DummyXid.java  |  100 +-
 .../artemis/jms/example/XASendExample.java      |   61 +-
 .../artemis/jms/soak/example/SoakBase.java      |   28 +-
 .../artemis/jms/soak/example/SoakParams.java    |   83 +-
 .../artemis/jms/soak/example/SoakReceiver.java  |  116 +-
 .../artemis/jms/soak/example/SoakSender.java    |  108 +-
 .../aerogear/ActiveMQAeroGearBundle.java        |   14 +-
 .../aerogear/ActiveMQAeroGearLogger.java        |    4 +-
 .../aerogear/AeroGearConnectorService.java      |  168 +-
 .../AeroGearConnectorServiceFactory.java        |   16 +-
 .../integration/aerogear/AeroGearConstants.java |    8 +-
 .../spring/SpringBindingRegistry.java           |   25 +-
 .../integration/spring/SpringJmsBootstrap.java  |    7 +-
 .../artemis/spring/ActiveMQSpringBundle.java    |    5 +-
 .../artemis/spring/ActiveMQSpringLogger.java    |    4 +-
 .../integration/vertx/ActiveMQVertxLogger.java  |    4 +-
 .../vertx/IncomingVertxEventHandler.java        |  137 +-
 .../vertx/OutgoingVertxEventHandler.java        |  118 +-
 .../integration/vertx/VertxConstants.java       |    8 +-
 .../VertxIncomingConnectorServiceFactory.java   |   19 +-
 .../VertxOutgoingConnectorServiceFactory.java   |   19 +-
 .../activemq/ActiveMQConnectionFactory.java     |  152 +-
 .../artemiswrapper/ArtemisBrokerHelper.java     |   36 +-
 .../apache/activemq/broker/BrokerService.java   |  429 +--
 .../activemq/broker/FakeTransportConnector.java |    8 +-
 .../activemq/broker/SslBrokerService.java       |   52 +-
 .../artemiswrapper/ArtemisBrokerBase.java       | 1141 +++---
 .../artemiswrapper/ArtemisBrokerWrapper.java    |  103 +-
 .../broker/artemiswrapper/InVMNameParser.java   |   13 +-
 .../artemiswrapper/InVMNamingContext.java       |  192 +-
 .../artemiswrapper/NonSerializableFactory.java  |  100 +-
 .../broker/region/policy/PolicyMap.java         |   24 +-
 .../transport/tcp/TcpTransportFactory.java      |   27 +-
 .../org/apache/activemq/usage/SystemUsage.java  |   16 +-
 .../activemq/ActiveMQConnectionFactoryTest.java |  458 +--
 .../activemq/ActiveMQInputStreamTest.java       |  224 +-
 .../activemq/ActiveMQMessageAuditTest.java      |  274 +-
 .../ActiveMQSslConnectionFactoryTest.java       |  448 +--
 .../ActiveMQXAConnectionFactoryTest.java        | 1051 +++---
 .../org/apache/activemq/ClientTestSupport.java  |  257 +-
 .../apache/activemq/CombinationTestSupport.java |  488 +--
 .../apache/activemq/ConnectionCleanupTest.java  |   66 +-
 ...nectionCloseMultipleTimesConcurrentTest.java |  127 +-
 .../ConnectionCloseMultipleTimesTest.java       |   60 +-
 .../ConsumerReceiveWithTimeoutTest.java         |   91 +-
 ...nsumerButDontStartConnectionWarningTest.java |   30 +-
 .../EmbeddedBrokerAndConnectionTestSupport.java |   31 +-
 .../activemq/EmbeddedBrokerTestSupport.java     |  221 +-
 ...ExclusiveConsumerStartupDestinationTest.java |  278 +-
 .../apache/activemq/ExclusiveConsumerTest.java  |  470 +--
 .../java/org/apache/activemq/ExpiryHogTest.java |   76 +-
 .../org/apache/activemq/JMSConsumerTest.java    | 1646 +++++----
 .../activemq/JMSDurableTopicRedeliverTest.java  |   88 +-
 .../activemq/JMSExclusiveConsumerTest.java      |  236 +-
 .../apache/activemq/JMSIndividualAckTest.java   |  256 +-
 .../org/apache/activemq/JMSMessageTest.java     |  996 +++---
 .../apache/activemq/JMSQueueRedeliverTest.java  |   11 +-
 .../org/apache/activemq/JMSUsecaseTest.java     |  204 +-
 .../org/apache/activemq/JMSXAConsumerTest.java  |   35 +-
 .../apache/activemq/JmsAutoAckListenerTest.java |   82 +-
 .../org/apache/activemq/JmsAutoAckTest.java     |   87 +-
 .../java/org/apache/activemq/JmsBenchmark.java  |  285 +-
 .../activemq/JmsClientAckListenerTest.java      |  199 +-
 .../org/apache/activemq/JmsClientAckTest.java   |  238 +-
 .../activemq/JmsConnectionStartStopTest.java    |  232 +-
 .../JmsConsumerResetActiveListenerTest.java     |  225 +-
 .../JmsCreateConsumerInOnMessageTest.java       |  129 +-
 .../JmsDurableQueueWildcardSendReceiveTest.java |   46 +-
 .../activemq/JmsDurableTopicSelectorTest.java   |   11 +-
 .../JmsDurableTopicSendReceiveTest.java         |  103 +-
 .../JmsDurableTopicTransactionTest.java         |   24 +-
 .../JmsDurableTopicWildcardSendReceiveTest.java |   50 +-
 .../apache/activemq/JmsMessageConsumerTest.java |  253 +-
 .../activemq/JmsMultipleBrokersTestSupport.java | 1147 +++---
 .../activemq/JmsMultipleClientsTestSupport.java |  544 +--
 .../apache/activemq/JmsQueueBrowserTest.java    |  797 +++--
 .../JmsQueueCompositeSendReceiveTest.java       |  142 +-
 .../activemq/JmsQueueRequestReplyTest.java      |   20 +-
 .../apache/activemq/JmsQueueSelectorTest.java   |   11 +-
 .../activemq/JmsQueueSendReceiveTest.java       |   20 +-
 ...eiveTwoConnectionsStartBeforeBrokerTest.java |   99 +-
 .../JmsQueueSendReceiveTwoConnectionsTest.java  |   20 +-
 ...JmsQueueSendReceiveUsingTwoSessionsTest.java |   20 +-
 .../JmsQueueTopicCompositeSendReceiveTest.java  |  108 +-
 .../JmsQueueWildcardSendReceiveTest.java        |  278 +-
 .../org/apache/activemq/JmsRedeliveredTest.java | 1043 +++---
 .../activemq/JmsRollbackRedeliveryTest.java     |  594 ++--
 .../activemq/JmsSendReceiveTestSupport.java     |  376 +-
 ...JmsSendReceiveWithMessageExpirationTest.java |  418 +--
 .../activemq/JmsSendWithAsyncCallbackTest.java  |  174 +-
 .../apache/activemq/JmsSessionRecoverTest.java  |  493 ++-
 .../apache/activemq/JmsTempDestinationTest.java |  648 ++--
 .../org/apache/activemq/JmsTestSupport.java     |  281 +-
 .../JmsTopicCompositeSendReceiveTest.java       |  108 +-
 .../apache/activemq/JmsTopicRedeliverTest.java  |  249 +-
 .../activemq/JmsTopicRequestReplyTest.java      |  342 +-
 .../apache/activemq/JmsTopicSelectorTest.java   |  340 +-
 .../JmsTopicSendReceiveSubscriberTest.java      |   20 +-
 .../activemq/JmsTopicSendReceiveTest.java       |   92 +-
 ...sTopicSendReceiveWithTwoConnectionsTest.java |  119 +-
 ...endReceiveWithTwoConnectionsWithJMXTest.java |   13 +-
 .../activemq/JmsTopicSendSameMessageTest.java   |   33 +-
 .../activemq/JmsTopicTransactionTest.java       |   23 +-
 .../JmsTopicWildcardSendReceiveTest.java        |  347 +-
 .../activemq/LargeMessageTestSupport.java       |  307 +-
 .../org/apache/activemq/LargeStreamletTest.java |  214 +-
 .../org/apache/activemq/LoadTestBurnIn.java     |  227 +-
 .../apache/activemq/MessageEvictionTest.java    |  458 +--
 .../activemq/MessageListenerRedeliveryTest.java |  628 ++--
 .../activemq/MessageTransformationTest.java     |  102 +-
 .../activemq/OnePrefetchAsyncConsumerTest.java  |  336 +-
 .../org/apache/activemq/OptimizedAckTest.java   |  277 +-
 .../activemq/PerDestinationStoreLimitTest.java  |  303 +-
 .../ProducerFlowControlSendFailTest.java        |  270 +-
 .../activemq/ProducerFlowControlTest.java       |  606 ++--
 .../activemq/QueueConsumerPriorityTest.java     |  121 +-
 .../activemq/ReconnectWithSameClientIDTest.java |  161 +-
 .../apache/activemq/RedeliveryPolicyTest.java   | 1559 ++++----
 .../apache/activemq/RemoveDestinationTest.java  |  234 +-
 .../org/apache/activemq/SpringTestSupport.java  |   52 +-
 .../java/org/apache/activemq/TestSupport.java   |  339 +-
 .../java/org/apache/activemq/TimeStampTest.java |  123 +-
 .../apache/activemq/TransactionContextTest.java |  205 +-
 .../activemq/ZeroPrefetchConsumerTest.java      |  714 ++--
 .../advisory/AdvisoryTempDestinationTests.java  |  365 +-
 .../apache/activemq/advisory/AdvisoryTests.java |  380 +-
 .../activemq/advisory/ConsumerListenerTest.java |  227 +-
 .../advisory/DestinationListenerTest.java       |  175 +-
 .../activemq/advisory/ProducerListenerTest.java |  226 +-
 .../activemq/advisory/TempDestDeleteTest.java   |  212 +-
 .../activemq/advisory/TempDestLoadTest.java     |  153 +-
 .../activemq/advisory/TempQueueMemoryTest.java  |  265 +-
 .../blob/BlobTransferPolicyUriTest.java         |   16 +-
 .../blob/FTPBlobDownloadStrategyTest.java       |  159 +-
 .../org/apache/activemq/blob/FTPBlobTest.java   |   69 +-
 .../blob/FTPBlobUploadStrategyTest.java         |   74 +-
 .../apache/activemq/blob/FTPTestSupport.java    |  162 +-
 .../activemq/blob/FilesystemBlobTest.java       |  130 +-
 .../org/apache/activemq/broker/AMQ4351Test.java |  420 +--
 .../apache/activemq/broker/BrokerBenchmark.java |  295 +-
 .../activemq/broker/BrokerRedeliveryTest.java   |  296 +-
 .../broker/BrokerRestartTestSupport.java        |   72 +-
 .../activemq/broker/BrokerServiceTest.java      |   98 +-
 .../org/apache/activemq/broker/BrokerTest.java  | 3343 +++++++++---------
 .../activemq/broker/BrokerTestSupport.java      |  601 ++--
 .../broker/ConcurrentConnectSimulationTest.java |   60 +-
 ...CreateDestinationsOnStartupViaXBeanTest.java |   68 +-
 .../broker/DedicatedTaskRunnerBrokerTest.java   |   24 +-
 .../activemq/broker/DoubleSubscriptionTest.java |  157 +-
 .../DurablePersistentFalseRestartTest.java      |   84 +-
 .../broker/JdbcXARecoveryBrokerTest.java        |  122 +-
 .../java/org/apache/activemq/broker/Main.java   |   97 +-
 .../activemq/broker/MarshallingBrokerTest.java  |   64 +-
 .../activemq/broker/MessageExpirationTest.java  |  473 +--
 .../broker/NioQueueSubscriptionTest.java        |  161 +-
 .../activemq/broker/OutOfOrderXMLTest.java      |   12 +-
 .../apache/activemq/broker/ProgressPrinter.java |   36 +-
 .../activemq/broker/QueueMbeanRestartTest.java  |  165 +-
 .../activemq/broker/QueueSubscriptionTest.java  |  316 +-
 .../broker/ReconnectWithJMXEnabledTest.java     |   96 +-
 .../activemq/broker/RecoveryBrokerTest.java     | 1077 +++---
 .../activemq/broker/RedeliveryRestartTest.java  |  500 ++-
 .../RedeliveryRestartWithExceptionTest.java     |  814 +++--
 .../org/apache/activemq/broker/SpringTest.java  |  141 +-
 .../org/apache/activemq/broker/StubBroker.java  |   68 +-
 .../apache/activemq/broker/StubConnection.java  |  246 +-
 .../activemq/broker/TopicSubscriptionTest.java  |  249 +-
 .../activemq/broker/XARecoveryBrokerTest.java   | 2353 ++++++------
 .../broker/advisory/AdvisoryBrokerTest.java     |  589 ++-
 .../AdvisoryDuplexNetworkBridgeTest.java        |   38 +-
 .../broker/advisory/AdvisoryJmxTest.java        |   84 +-
 .../advisory/AdvisoryNetworkBridgeTest.java     |  143 +-
 ...artJDBCQueueMasterSlaveLeaseQuiesceTest.java |   90 +-
 .../DbRestartJDBCQueueMasterSlaveLeaseTest.java |   57 +-
 .../ft/DbRestartJDBCQueueMasterSlaveTest.java   |  208 +-
 .../broker/ft/DbRestartJDBCQueueTest.java       |  238 +-
 .../broker/ft/JDBCQueueMasterSlaveTest.java     |  135 +-
 .../ft/QueueMasterSlaveSingleUrlTest.java       |  112 +-
 .../broker/ft/QueueMasterSlaveTestSupport.java  |  227 +-
 ...QueueMasterSlaveTestUsingSharedFileTest.java |   44 +-
 .../broker/ft/SyncCreateDataSource.java         |  112 +-
 .../ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java |  148 +-
 .../broker/ft/mKahaDbQueueMasterSlaveTest.java  |  108 +-
 .../jmx/BrokerViewSlowStoreStartupTest.java     |  645 ++--
 .../broker/jmx/HealthViewMBeanTest.java         |  158 +-
 .../activemq/broker/jmx/Log4JConfigTest.java    |  320 +-
 .../broker/jmx/MBeanOperationTimeoutTest.java   |  183 +-
 .../apache/activemq/broker/jmx/MBeanTest.java   | 2503 +++++++------
 .../apache/activemq/broker/jmx/PurgeTest.java   |  406 +--
 .../broker/jmx/TransportConnectorMBeanTest.java |  199 +-
 .../broker/mKahaDBXARecoveryBrokerTest.java     |   49 +-
 .../broker/mLevelDBXARecoveryBrokerTest.java    |   62 +-
 .../security/MessageAuthenticationTest.java     |   91 +-
 .../partition/SpringPartitionBrokerTest.java    |   47 +-
 .../policy/AbortSlowAckConsumer0Test.java       |  272 +-
 .../policy/AbortSlowAckConsumer1Test.java       |   64 +-
 .../policy/AbortSlowAckConsumer2Test.java       |   64 +-
 .../broker/policy/AbortSlowConsumer0Test.java   |  366 +-
 .../broker/policy/AbortSlowConsumer1Test.java   |  106 +-
 .../broker/policy/AbortSlowConsumer2Test.java   |   39 +-
 .../broker/policy/AbortSlowConsumerBase.java    |   78 +-
 .../activemq/broker/policy/DeadLetterTest.java  |  123 +-
 .../broker/policy/DeadLetterTestSupport.java    |  334 +-
 .../policy/DestinationCursorConfigTest.java     |   73 +-
 .../policy/DiscardingDeadLetterPolicyTest.java  |   65 +-
 .../broker/policy/IndividualDeadLetterTest.java |  137 +-
 .../policy/IndividualDeadLetterViaXmlTest.java  |   26 +-
 .../broker/policy/MessageGroupConfigTest.java   |  114 +-
 .../policy/MessageListenerDeadLetterTest.java   |  212 +-
 .../broker/policy/NoConsumerDeadLetterTest.java |  143 +-
 .../broker/policy/NoRetryDeadLetterTest.java    |   16 +-
 .../PerDurableConsumerDeadLetterTest.java       |   58 +-
 .../PriorityNetworkDispatchPolicyTest.java      |   68 +-
 .../policy/RoundRobinDispatchPolicyTest.java    |  180 +-
 .../activemq/broker/policy/SecureDLQTest.java   |  192 +-
 .../broker/policy/SimpleDispatchPolicyTest.java |   85 +-
 .../policy/StrictOrderDispatchPolicyTest.java   |  143 +-
 .../broker/region/DestinationGCTest.java        |  148 +-
 .../region/DestinationRemoveRestartTest.java    |  181 +-
 .../region/QueueDuplicatesFromStoreTest.java    |  679 ++--
 .../QueueOptimizedDispatchExceptionTest.java    |  412 ++-
 .../activemq/broker/region/QueuePurgeTest.java  |  323 +-
 .../region/QueueResendDuringShutdownTest.java   |  411 +--
 .../region/SubscriptionAddRemoveQueueTest.java  |  549 ++-
 ...iquePropertyMessageEvictionStrategyTest.java |  139 +-
 .../region/cursors/CursorDurableTest.java       |   45 +-
 .../region/cursors/CursorQueueStoreTest.java    |   68 +-
 .../broker/region/cursors/CursorSupport.java    |  293 +-
 .../FilePendingMessageCursorTestSupport.java    |  108 +-
 .../region/cursors/NegativeQueueTest.java       |  699 ++--
 .../region/cursors/OrderPendingListTest.java    |  759 ++--
 .../cursors/PrioritizedPendingListTest.java     |  522 +--
 .../region/cursors/StoreBasedCursorTest.java    |  238 +-
 .../StoreQueueCursorJDBCNoDuplicateTest.java    |   14 +-
 .../StoreQueueCursorKahaDBNoDuplicateTest.java  |   18 +-
 .../StoreQueueCursorLevelDBNoDuplicateTest.java |   19 +-
 .../StoreQueueCursorMemoryNoDuplicateTest.java  |   14 +-
 .../StoreQueueCursorNoDuplicateTest.java        |  182 +-
 .../cursors/StoreQueueCursorOrderTest.java      |  926 +++--
 .../group/MessageGroupHashBucketTest.java       |    9 +-
 .../region/group/MessageGroupMapTest.java       |  153 +-
 .../broker/region/group/MessageGroupTest.java   |  292 +-
 .../broker/scheduler/JmsCronSchedulerTest.java  |  141 +-
 .../broker/scheduler/JmsSchedulerTest.java      |  484 +--
 .../JobSchedulerBrokerShutdownTest.java         |   70 +-
 .../JobSchedulerJmxManagementTests.java         |  220 +-
 .../scheduler/JobSchedulerManagementTest.java   |  728 ++--
 .../JobSchedulerStoreCheckpointTest.java        |  170 +-
 .../broker/scheduler/JobSchedulerStoreTest.java |   76 +-
 .../broker/scheduler/JobSchedulerTest.java      |  516 +--
 .../scheduler/JobSchedulerTestSupport.java      |  148 +-
 .../broker/scheduler/JobSchedulerTxTest.java    |  138 +-
 .../KahaDBSchedulerIndexRebuildTest.java        |  296 +-
 .../KahaDBSchedulerMissingJournalLogsTest.java  |  307 +-
 .../scheduler/LostScheduledMessagesTest.java    |  214 +-
 .../scheduler/SchedulerDBVersionTest.java       |  232 +-
 .../memory/InMemeoryJmsSchedulerTest.java       |   24 +-
 .../memory/InMemoryJmsCronSchedulerTest.java    |    8 +-
 .../InMemoryJobSchedulerJmxManagementTests.java |    8 +-
 .../InMemoryJobSchedulerManagementTest.java     |    8 +-
 .../memory/InMemoryJobSchedulerStoreTest.java   |   66 +-
 .../memory/InMemoryJobSchedulerTest.java        |   16 +-
 .../memory/InMemoryJobSchedulerTxTest.java      |    8 +-
 .../broker/store/DefaultStoreBrokerTest.java    |   32 +-
 .../store/DefaultStoreRecoveryBrokerTest.java   |   34 +-
 .../activemq/broker/store/LoadTester.java       |  123 +-
 .../store/RecoverExpiredMessagesTest.java       |  195 +-
 .../broker/util/DestinationsPluginTest.java     |   93 +-
 .../activemq/broker/util/PluginBrokerTest.java  |  102 +-
 .../broker/util/RedeliveryPluginTest.java       |   83 +-
 .../util/TimeStampingBrokerPluginTest.java      |  315 +-
 .../broker/util/TraceBrokerPathPluginTest.java  |  174 +-
 .../broker/virtual/CompositeQueueTest.java      |  180 +-
 .../broker/virtual/CompositeTopicTest.java      |   28 +-
 .../DestinationInterceptorDurableSubTest.java   |  443 ++-
 .../broker/virtual/FilteredQueueTest.java       |   20 +-
 .../MirroredQueueCorrectMemoryUsageTest.java    |  188 +-
 .../broker/virtual/MirroredQueueTest.java       |  154 +-
 ...MirroredQueueUsingVirtualTopicQueueTest.java |   12 +-
 .../broker/virtual/VirtualDestPerfTest.java     |  292 +-
 .../broker/virtual/VirtualTopicDLQTest.java     |  692 ++--
 .../VirtualTopicDisconnectSelectorTest.java     |  256 +-
 .../broker/virtual/VirtualTopicPubSubTest.java  |  164 +-
 .../VirtualTopicPubSubUsingXBeanTest.java       |   44 +-
 .../virtual/VirtualTopicSelectorTest.java       |  134 +-
 .../VirtualTopicsAndDurableSubsTest.java        |  152 +-
 .../java/org/apache/activemq/bugs/AMQ1282.java  |  328 +-
 .../org/apache/activemq/bugs/AMQ1687Test.java   |  134 +-
 .../org/apache/activemq/bugs/AMQ1853Test.java   |  528 +--
 .../java/org/apache/activemq/bugs/AMQ1866.java  |  320 +-
 .../org/apache/activemq/bugs/AMQ1893Test.java   |  217 +-
 .../org/apache/activemq/bugs/AMQ1917Test.java   |  360 +-
 .../org/apache/activemq/bugs/AMQ1936Test.java   |  510 +--
 .../org/apache/activemq/bugs/AMQ2021Test.java   |  410 +--
 .../org/apache/activemq/bugs/AMQ2084Test.java   |  259 +-
 .../org/apache/activemq/bugs/AMQ2103Test.java   |  186 +-
 .../activemq/bugs/AMQ2149LevelDBTest.java       |   12 +-
 .../org/apache/activemq/bugs/AMQ2149Test.java   | 1027 +++---
 .../org/apache/activemq/bugs/AMQ2171Test.java   |  218 +-
 .../org/apache/activemq/bugs/AMQ2200Test.java   |  104 +-
 .../org/apache/activemq/bugs/AMQ2213Test.java   |  115 +-
 .../org/apache/activemq/bugs/AMQ2314Test.java   |  259 +-
 .../org/apache/activemq/bugs/AMQ2356Test.java   |  256 +-
 .../org/apache/activemq/bugs/AMQ2364Test.java   |   96 +-
 .../org/apache/activemq/bugs/AMQ2383Test.java   |   54 +-
 .../org/apache/activemq/bugs/AMQ2401Test.java   |  375 +-
 .../org/apache/activemq/bugs/AMQ2413Test.java   |  568 +--
 .../org/apache/activemq/bugs/AMQ2439Test.java   |  114 +-
 .../org/apache/activemq/bugs/AMQ2489Test.java   |  336 +-
 .../org/apache/activemq/bugs/AMQ2512Test.java   |  256 +-
 .../org/apache/activemq/bugs/AMQ2513Test.java   |  102 +-
 .../org/apache/activemq/bugs/AMQ2528Test.java   |   79 +-
 .../org/apache/activemq/bugs/AMQ2571Test.java   |  158 +-
 .../org/apache/activemq/bugs/AMQ2580Test.java   |  314 +-
 .../activemq/bugs/AMQ2584ConcurrentDlqTest.java |  418 ++-
 .../org/apache/activemq/bugs/AMQ2584Test.java   |  336 +-
 .../org/apache/activemq/bugs/AMQ2585Test.java   |   97 +-
 .../org/apache/activemq/bugs/AMQ2616Test.java   |  136 +-
 .../org/apache/activemq/bugs/AMQ2645Test.java   |  142 +-
 .../org/apache/activemq/bugs/AMQ2736Test.java   |  124 +-
 .../org/apache/activemq/bugs/AMQ2751Test.java   |   88 +-
 .../org/apache/activemq/bugs/AMQ2801Test.java   |  298 +-
 .../org/apache/activemq/bugs/AMQ2832Test.java   |  525 ++-
 .../org/apache/activemq/bugs/AMQ2870Test.java   |  333 +-
 .../org/apache/activemq/bugs/AMQ2902Test.java   |   98 +-
 .../org/apache/activemq/bugs/AMQ2910Test.java   |  177 +-
 .../org/apache/activemq/bugs/AMQ2982Test.java   |  270 +-
 .../org/apache/activemq/bugs/AMQ2983Test.java   |  229 +-
 .../org/apache/activemq/bugs/AMQ3014Test.java   |  312 +-
 .../org/apache/activemq/bugs/AMQ3120Test.java   |  205 +-
 .../org/apache/activemq/bugs/AMQ3140Test.java   |  193 +-
 .../org/apache/activemq/bugs/AMQ3141Test.java   |  110 +-
 .../org/apache/activemq/bugs/AMQ3145Test.java   |  158 +-
 .../org/apache/activemq/bugs/AMQ3157Test.java   |  253 +-
 .../org/apache/activemq/bugs/AMQ3167Test.java   |  739 ++--
 .../org/apache/activemq/bugs/AMQ3274Test.java   | 1203 ++++---
 .../org/apache/activemq/bugs/AMQ3324Test.java   |  200 +-
 .../org/apache/activemq/bugs/AMQ3352Test.java   |   67 +-
 .../org/apache/activemq/bugs/AMQ3405Test.java   |  455 +--
 .../org/apache/activemq/bugs/AMQ3436Test.java   |  304 +-
 .../org/apache/activemq/bugs/AMQ3445Test.java   |  220 +-
 .../org/apache/activemq/bugs/AMQ3454Test.java   |   67 +-
 .../org/apache/activemq/bugs/AMQ3465Test.java   |  264 +-
 .../org/apache/activemq/bugs/AMQ3529Test.java   |  268 +-
 .../org/apache/activemq/bugs/AMQ3537Test.java   |  107 +-
 .../org/apache/activemq/bugs/AMQ3567Test.java   |  314 +-
 .../org/apache/activemq/bugs/AMQ3622Test.java   |  110 +-
 .../org/apache/activemq/bugs/AMQ3625Test.java   |  140 +-
 .../org/apache/activemq/bugs/AMQ3674Test.java   |  158 +-
 .../org/apache/activemq/bugs/AMQ3675Test.java   |  235 +-
 .../org/apache/activemq/bugs/AMQ3678Test.java   |  291 +-
 .../org/apache/activemq/bugs/AMQ3732Test.java   |  252 +-
 .../org/apache/activemq/bugs/AMQ3779Test.java   |   65 +-
 .../org/apache/activemq/bugs/AMQ3841Test.java   |  159 +-
 .../org/apache/activemq/bugs/AMQ3879Test.java   |  139 +-
 .../org/apache/activemq/bugs/AMQ3903Test.java   |  175 +-
 .../org/apache/activemq/bugs/AMQ3932Test.java   |  225 +-
 .../org/apache/activemq/bugs/AMQ3934Test.java   |  111 +-
 .../org/apache/activemq/bugs/AMQ3961Test.java   |  274 +-
 .../org/apache/activemq/bugs/AMQ3992Test.java   |   99 +-
 .../org/apache/activemq/bugs/AMQ4062Test.java   |  426 +--
 .../org/apache/activemq/bugs/AMQ4083Test.java   |  723 ++--
 .../org/apache/activemq/bugs/AMQ4092Test.java   |  353 +-
 .../org/apache/activemq/bugs/AMQ4116Test.java   |  148 +-
 .../org/apache/activemq/bugs/AMQ4126Test.java   |  271 +-
 .../org/apache/activemq/bugs/AMQ4133Test.java   |  138 +-
 .../org/apache/activemq/bugs/AMQ4147Test.java   |  321 +-
 .../org/apache/activemq/bugs/AMQ4148Test.java   |  106 +-
 .../org/apache/activemq/bugs/AMQ4157Test.java   |  255 +-
 .../org/apache/activemq/bugs/AMQ4160Test.java   |  659 ++--
 .../org/apache/activemq/bugs/AMQ4212Test.java   |  607 ++--
 .../org/apache/activemq/bugs/AMQ4213Test.java   |   81 +-
 .../org/apache/activemq/bugs/AMQ4220Test.java   |  159 +-
 .../org/apache/activemq/bugs/AMQ4221Test.java   |  412 +--
 .../org/apache/activemq/bugs/AMQ4222Test.java   |  261 +-
 .../org/apache/activemq/bugs/AMQ4323Test.java   |  207 +-
 .../org/apache/activemq/bugs/AMQ4356Test.java   |  206 +-
 .../org/apache/activemq/bugs/AMQ4361Test.java   |  215 +-
 .../org/apache/activemq/bugs/AMQ4368Test.java   |  394 ++-
 .../org/apache/activemq/bugs/AMQ4407Test.java   |  253 +-
 .../org/apache/activemq/bugs/AMQ4413Test.java   |  370 +-
 .../org/apache/activemq/bugs/AMQ4469Test.java   |  125 +-
 .../org/apache/activemq/bugs/AMQ4472Test.java   |   95 +-
 .../org/apache/activemq/bugs/AMQ4475Test.java   |  563 +--
 .../bugs/AMQ4485LowLimitLevelDBTest.java        |   23 +-
 .../activemq/bugs/AMQ4485LowLimitTest.java      |  761 ++--
 ...XBrokersWithNDestsFanoutTransactionTest.java |  556 +--
 .../org/apache/activemq/bugs/AMQ4485Test.java   |  279 +-
 .../org/apache/activemq/bugs/AMQ4487Test.java   |  184 +-
 .../org/apache/activemq/bugs/AMQ4504Test.java   |   83 +-
 .../org/apache/activemq/bugs/AMQ4513Test.java   |  199 +-
 .../org/apache/activemq/bugs/AMQ4517Test.java   |  151 +-
 .../org/apache/activemq/bugs/AMQ4518Test.java   |  151 +-
 .../org/apache/activemq/bugs/AMQ4530Test.java   |  117 +-
 .../org/apache/activemq/bugs/AMQ4531Test.java   |  198 +-
 .../org/apache/activemq/bugs/AMQ4554Test.java   |  114 +-
 .../org/apache/activemq/bugs/AMQ4582Test.java   |   98 +-
 .../org/apache/activemq/bugs/AMQ4595Test.java   |  226 +-
 .../org/apache/activemq/bugs/AMQ4607Test.java   |  415 +--
 .../org/apache/activemq/bugs/AMQ4636Test.java   |  395 +--
 .../org/apache/activemq/bugs/AMQ4656Test.java   |  152 +-
 .../org/apache/activemq/bugs/AMQ4671Test.java   |   82 +-
 .../org/apache/activemq/bugs/AMQ4677Test.java   |  260 +-
 .../org/apache/activemq/bugs/AMQ4853Test.java   |  472 +--
 .../org/apache/activemq/bugs/AMQ4887Test.java   |  239 +-
 .../org/apache/activemq/bugs/AMQ4893Test.java   |   90 +-
 .../org/apache/activemq/bugs/AMQ4899Test.java   |  283 +-
 .../org/apache/activemq/bugs/AMQ4930Test.java   |  211 +-
 .../org/apache/activemq/bugs/AMQ4950Test.java   |  265 +-
 .../org/apache/activemq/bugs/AMQ4952Test.java   |  738 ++--
 .../org/apache/activemq/bugs/AMQ5035Test.java   |   76 +-
 .../org/apache/activemq/bugs/AMQ5136Test.java   |  111 +-
 .../org/apache/activemq/bugs/AMQ5212Test.java   |  348 +-
 .../activemq/bugs/AMQ5266SingleDestTest.java    |  781 ++--
 .../bugs/AMQ5266StarvedConsumerTest.java        |  842 ++---
 .../org/apache/activemq/bugs/AMQ5266Test.java   |  772 ++--
 .../org/apache/activemq/bugs/AMQ5274Test.java   |  174 +-
 .../org/apache/activemq/bugs/AMQ5381Test.java   |  268 +-
 .../org/apache/activemq/bugs/AMQ5421Test.java   |  148 +-
 .../org/apache/activemq/bugs/AMQ5450Test.java   |  300 +-
 .../org/apache/activemq/bugs/AMQ5567Test.java   |  339 +-
 .../bugs/ActiveMQSlowConsumerManualTest.java    |  386 +-
 .../activemq/bugs/ConnectionPerMessageTest.java |  136 +-
 .../org/apache/activemq/bugs/CraigsBugTest.java |   58 +-
 .../apache/activemq/bugs/DoubleExpireTest.java  |  208 +-
 .../activemq/bugs/DurableConsumerTest.java      |  788 +++--
 .../bugs/JMSDurableTopicNoLocalTest.java        |   89 +-
 .../bugs/JmsDurableTopicSlowReceiveTest.java    |  259 +-
 .../apache/activemq/bugs/JmsTimeoutTest.java    |  235 +-
 .../bugs/MemoryUsageBlockResumeTest.java        |  337 +-
 .../activemq/bugs/MemoryUsageBrokerTest.java    |  103 +-
 .../activemq/bugs/MemoryUsageCleanupTest.java   |  359 +-
 .../bugs/MessageExpirationReaperTest.java       |  284 +-
 .../org/apache/activemq/bugs/MessageSender.java |   40 +-
 .../activemq/bugs/MissingDataFileTest.java      |  542 +--
 .../OptimizeAcknowledgeWithExpiredMsgsTest.java |  513 ++-
 .../activemq/bugs/OutOfOrderTestCase.java       |  184 +-
 .../activemq/bugs/QueueWorkerPrefetchTest.java  |  415 +--
 .../bugs/RawRollbackSharedConsumerTests.java    |  180 +-
 .../apache/activemq/bugs/RawRollbackTests.java  |  180 +-
 .../java/org/apache/activemq/bugs/Receiver.java |    3 +-
 .../bugs/RedeliveryPluginHeaderTest.java        |  231 +-
 .../apache/activemq/bugs/SlowConsumerTest.java  |  234 +-
 ...ReplayAfterStoreCleanupLevelDBStoreTest.java |   14 +-
 .../bugs/TempQueueDeleteOnCloseTest.java        |   36 +-
 .../bugs/TempStorageBlockedBrokerTest.java      |  406 +--
 .../bugs/TempStorageConfigBrokerTest.java       |  324 +-
 .../activemq/bugs/TempStoreDataCleanupTest.java |  387 +-
 .../TransactedStoreUsageSuspendResumeTest.java  |  283 +-
 .../bugs/TransactionNotStartedErrorTest.java    |  463 +--
 .../bugs/TrapMessageInJDBCStoreTest.java        |  329 +-
 .../activemq/bugs/VMTransportClosureTest.java   |  189 +-
 .../activemq/bugs/VerifySteadyEnqueueRate.java  |  225 +-
 .../activemq/bugs/amq1095/ActiveMQTestCase.java |  210 +-
 .../bugs/amq1095/MessageSelectorTest.java       |  291 +-
 .../activemq/bugs/amq1974/TryJmsClient.java     |  176 +-
 .../activemq/bugs/amq1974/TryJmsManager.java    |  154 +-
 .../bugs/embedded/EmbeddedActiveMQ.java         |  156 +-
 .../activemq/bugs/embedded/ThreadExplorer.java  |  262 +-
 .../command/ActiveMQBytesMessageTest.java       |  921 ++---
 .../command/ActiveMQDestinationTest.java        |  207 +-
 .../command/ActiveMQMapMessageTest.java         |  931 ++---
 .../activemq/command/ActiveMQMessageTest.java   | 1970 ++++++-----
 .../command/ActiveMQObjectMessageTest.java      |  194 +-
 .../command/ActiveMQStreamMessageTest.java      | 2047 ++++++-----
 .../command/ActiveMQTextMessageTest.java        |  253 +-
 .../command/DataStructureTestSupport.java       |  240 +-
 .../command/MessageCompressionTest.java         |  207 +-
 .../activemq/command/MessageSendTest.java       |   81 +-
 .../apache/activemq/command/MessageTest.java    |  149 +-
 .../activemq/config/BrokerPropertiesTest.java   |   60 +-
 .../config/BrokerXmlConfigFromJNDITest.java     |   41 +-
 .../activemq/config/BrokerXmlConfigTest.java    |   33 +-
 .../org/apache/activemq/config/ConfigTest.java  |  742 ++--
 .../config/ConfigUsingDestinationOptions.java   |   67 +-
 .../apache/activemq/config/JDBCConfigTest.java  |  127 +-
 .../activemq/console/command/AMQ3410Test.java   |  288 +-
 .../activemq/console/command/AMQ3411Test.java   |  299 +-
 .../console/command/DummyConnectionFactory.java |   31 +-
 .../command/LowercasingPasswordFactory.java     |    9 +-
 .../console/command/PurgeCommandTest.java       |  644 ++--
 .../activemq/conversions/AmqpAndMqttTest.java   |  163 +-
 .../activemq/demo/DefaultQueueSender.java       |  103 +-
 .../apache/activemq/demo/SimpleConsumer.java    |  125 +-
 .../apache/activemq/demo/SimpleProducer.java    |  130 +-
 .../activemq/demo/SimpleQueueReceiver.java      |  128 +-
 .../apache/activemq/demo/SimpleQueueSender.java |  134 +-
 .../activemq/filter/DestinationFilterTest.java  |   64 +-
 .../filter/DestinationMapMemoryTest.java        |   50 +-
 .../DestinationMapTempDestinationTest.java      |   32 +-
 .../activemq/filter/DestinationMapTest.java     |  727 ++--
 .../activemq/filter/DestinationPathTest.java    |   24 +-
 .../org/apache/activemq/filter/DummyPolicy.java |   22 +-
 .../activemq/filter/DummyPolicyEntry.java       |   31 +-
 .../apache/activemq/filter/DummyPolicyTest.java |   18 +-
 .../apache/activemq/jmx/JmxCreateNCTest.java    |   46 +-
 .../activemq/jmx/OpenTypeSupportTest.java       |  129 +-
 .../jndi/ActiveMQInitialContextFactoryTest.java |   62 +-
 .../ActiveMQWASInitialContextFactoryTest.java   |   30 +-
 .../jndi/CustomConnectionFactoryNameTest.java   |   48 +-
 .../jndi/DestinationNameWithSlashTest.java      |   20 +-
 .../activemq/jndi/InitialContextTest.java       |   85 +-
 .../apache/activemq/jndi/JNDITestSupport.java   |  125 +-
 .../apache/activemq/jndi/ObjectFactoryTest.java |  110 +-
 .../activemq/jndi/XAConnectionFactoryTest.java  |   18 +-
 .../activemq/joramtests/ActiveMQAdmin.java      |  230 +-
 .../activemq/joramtests/JoramJmsTest.java       |   50 +-
 .../leveldb/LevelDBStoreBrokerTest.java         |   57 +-
 .../leveldb/LevelDBXARecoveryBrokerTest.java    |   59 +-
 .../org/apache/activemq/load/LoadClient.java    |  358 +-
 .../apache/activemq/load/LoadController.java    |  125 +-
 .../java/org/apache/activemq/load/LoadTest.java |  239 +-
 .../management/BoundaryStatisticTest.java       |   29 +-
 .../management/BoundedRangeStatisticTest.java   |   27 +-
 .../activemq/management/CountStatisticTest.java |   51 +-
 .../activemq/management/RangeStatisticTest.java |   89 +-
 .../management/StatisticTestSupport.java        |   44 +-
 .../activemq/management/TimeStatisticTest.java  |   78 +-
 .../activemq/memory/MemoryPropertyTest.java     |   81 +-
 .../activemq/memory/buffer/DummyMessage.java    |   25 +-
 .../memory/buffer/MemoryBufferTestSupport.java  |   59 +-
 .../buffer/OrderBasedMemoryBufferTest.java      |   84 +-
 .../buffer/SizeBasedMessageBufferTest.java      |   58 +-
 .../BrokerNetworkWithStuckMessagesTest.java     | 1088 +++---
 .../CheckDuplicateMessagesOnDuplexTest.java     |  578 +--
 .../network/CompressionOverNetworkTest.java     |  536 +--
 .../DemandForwardingBridgeFilterTest.java       |  241 +-
 .../network/DemandForwardingBridgeTest.java     |  277 +-
 .../network/DuplexNetworkMBeanTest.java         |  269 +-
 .../activemq/network/DuplexNetworkTest.java     |   58 +-
 ...lyIncludedDestinationsDuplexNetworkTest.java |  151 +-
 .../network/FailoverStaticNetworkTest.java      |  804 ++---
 .../activemq/network/ForwardingBridgeTest.java  |  236 +-
 .../MQTTNetworkOfBrokersFailoverTest.java       |  396 +--
 .../activemq/network/MulticastNetworkTest.java  |   24 +-
 .../network/NetworkBrokerDetachTest.java        |  498 ++-
 .../network/NetworkConnectionsTest.java         |  428 +--
 .../network/NetworkDestinationFilterTest.java   |   26 +-
 .../activemq/network/NetworkFailoverTest.java   |  352 +-
 .../activemq/network/NetworkLoadTest.java       |  545 ++-
 .../activemq/network/NetworkLoopBackTest.java   |   61 +-
 .../activemq/network/NetworkReconnectTest.java  |  458 +--
 .../NetworkRemovesSubscriptionsTest.java        |  303 +-
 .../network/NetworkRestartPlainTest.java        |    9 +-
 .../activemq/network/NetworkRestartTest.java    |  294 +-
 .../activemq/network/NetworkRouteTest.java      |  590 ++--
 .../activemq/network/NetworkTestSupport.java    |  278 +-
 .../network/SSHTunnelNetworkReconnectTest.java  |  105 +-
 .../activemq/network/SimpleNetworkTest.java     |  470 +--
 .../jms/QueueBridgeStandaloneReconnectTest.java |  612 ++--
 .../activemq/network/jms/QueueBridgeTest.java   |  137 +-
 .../network/jms/QueueBridgeXBeanTest.java       |   11 +-
 .../jms/QueueOutboundBridgeReconnectTest.java   |  573 +--
 .../network/jms/TopicBridgeSpringTest.java      |  114 +-
 .../jms/TopicBridgeStandaloneReconnectTest.java |  620 ++--
 .../network/jms/TopicBridgeXBeanTest.java       |   10 +-
 .../jms/TopicOutboundBridgeReconnectTest.java   |  549 +--
 .../activemq/openwire/BooleanStreamTest.java    |  233 +-
 .../activemq/openwire/BrokerInfoData.java       |   20 +-
 .../activemq/openwire/DataFileGenerator.java    |  218 +-
 .../openwire/DataFileGeneratorTestSupport.java  |  543 +--
 .../openwire/ItStillMarshallsTheSameTest.java   |    8 +-
 .../NumberRangesWhileMarshallingTest.java       |  215 +-
 .../activemq/openwire/WireFormatInfoData.java   |   14 +-
 .../openwire/v1/ActiveMQBytesMessageTest.java   |   26 +-
 .../v1/ActiveMQDestinationTestSupport.java      |   16 +-
 .../openwire/v1/ActiveMQMapMessageTest.java     |   26 +-
 .../openwire/v1/ActiveMQMessageTest.java        |   26 +-
 .../openwire/v1/ActiveMQObjectMessageTest.java  |   26 +-
 .../activemq/openwire/v1/ActiveMQQueueTest.java |   22 +-
 .../openwire/v1/ActiveMQStreamMessageTest.java  |   22 +-
 .../v1/ActiveMQTempDestinationTestSupport.java  |   10 +-
 .../openwire/v1/ActiveMQTempQueueTest.java      |   22 +-
 .../openwire/v1/ActiveMQTempTopicTest.java      |   22 +-
 .../openwire/v1/ActiveMQTextMessageTest.java    |   22 +-
 .../activemq/openwire/v1/ActiveMQTopicTest.java |   22 +-
 .../openwire/v1/BaseCommandTestSupport.java     |   14 +-
 .../activemq/openwire/v1/BrokerIdTest.java      |   28 +-
 .../activemq/openwire/v1/BrokerInfoTest.java    |   48 +-
 .../openwire/v1/ConnectionControlTest.java      |   36 +-
 .../openwire/v1/ConnectionErrorTest.java        |   30 +-
 .../activemq/openwire/v1/ConnectionIdTest.java  |   28 +-
 .../openwire/v1/ConnectionInfoTest.java         |   48 +-
 .../openwire/v1/ConsumerControlTest.java        |   32 +-
 .../activemq/openwire/v1/ConsumerIdTest.java    |   32 +-
 .../activemq/openwire/v1/ConsumerInfoTest.java  |   68 +-
 .../openwire/v1/ControlCommandTest.java         |   28 +-
 .../openwire/v1/DataArrayResponseTest.java      |   36 +-
 .../activemq/openwire/v1/DataResponseTest.java  |   28 +-
 .../openwire/v1/DestinationInfoTest.java        |   44 +-
 .../openwire/v1/DiscoveryEventTest.java         |   30 +-
 .../openwire/v1/ExceptionResponseTest.java      |   28 +-
 .../activemq/openwire/v1/FlushCommandTest.java  |   26 +-
 .../openwire/v1/IntegerResponseTest.java        |   28 +-
 .../openwire/v1/JournalQueueAckTest.java        |   30 +-
 .../openwire/v1/JournalTopicAckTest.java        |   38 +-
 .../activemq/openwire/v1/JournalTraceTest.java  |   28 +-
 .../openwire/v1/JournalTransactionTest.java     |   32 +-
 .../activemq/openwire/v1/KeepAliveInfoTest.java |   26 +-
 .../openwire/v1/LastPartialCommandTest.java     |   26 +-
 .../openwire/v1/LocalTransactionIdTest.java     |   30 +-
 .../activemq/openwire/v1/MessageAckTest.java    |   40 +-
 .../v1/MessageDispatchNotificationTest.java     |   34 +-
 .../openwire/v1/MessageDispatchTest.java        |   34 +-
 .../activemq/openwire/v1/MessageIdTest.java     |   32 +-
 .../openwire/v1/MessageTestSupport.java         |  100 +-
 .../openwire/v1/NetworkBridgeFilterTest.java    |   30 +-
 .../openwire/v1/PartialCommandTest.java         |   30 +-
 .../activemq/openwire/v1/ProducerIdTest.java    |   32 +-
 .../activemq/openwire/v1/ProducerInfoTest.java  |   40 +-
 .../activemq/openwire/v1/RemoveInfoTest.java    |   28 +-
 .../openwire/v1/RemoveSubscriptionInfoTest.java |   32 +-
 .../activemq/openwire/v1/ReplayCommandTest.java |   30 +-
 .../activemq/openwire/v1/ResponseTest.java      |   28 +-
 .../activemq/openwire/v1/SessionIdTest.java     |   30 +-
 .../activemq/openwire/v1/SessionInfoTest.java   |   28 +-
 .../activemq/openwire/v1/ShutdownInfoTest.java  |   26 +-
 .../openwire/v1/SubscriptionInfoTest.java       |   34 +-
 .../openwire/v1/TransactionIdTestSupport.java   |   14 +-
 .../openwire/v1/TransactionInfoTest.java        |   32 +-
 .../openwire/v1/WireFormatInfoTest.java         |   32 +-
 .../openwire/v1/XATransactionIdTest.java        |   32 +-
 .../openwire/v2/ActiveMQBytesMessageTest.java   |   26 +-
 .../v2/ActiveMQDestinationTestSupport.java      |   16 +-
 .../openwire/v2/ActiveMQMapMessageTest.java     |   26 +-
 .../openwire/v2/ActiveMQMessageTest.java        |   26 +-
 .../openwire/v2/ActiveMQObjectMessageTest.java  |   26 +-
 .../activemq/openwire/v2/ActiveMQQueueTest.java |   26 +-
 .../openwire/v2/ActiveMQStreamMessageTest.java  |   26 +-
 .../v2/ActiveMQTempDestinationTestSupport.java  |   14 +-
 .../openwire/v2/ActiveMQTempQueueTest.java      |   26 +-
 .../openwire/v2/ActiveMQTempTopicTest.java      |   26 +-
 .../openwire/v2/ActiveMQTextMessageTest.java    |   26 +-
 .../activemq/openwire/v2/ActiveMQTopicTest.java |   26 +-
 .../openwire/v2/BaseCommandTestSupport.java     |   14 +-
 .../activemq/openwire/v2/BrokerIdTest.java      |   32 +-
 .../activemq/openwire/v2/BrokerInfoTest.java    |   54 +-
 .../openwire/v2/ConnectionControlTest.java      |   40 +-
 .../openwire/v2/ConnectionErrorTest.java        |   34 +-
 .../activemq/openwire/v2/ConnectionIdTest.java  |   32 +-
 .../openwire/v2/ConnectionInfoTest.java         |   50 +-
 .../openwire/v2/ConsumerControlTest.java        |   48 +-
 .../activemq/openwire/v2/ConsumerIdTest.java    |   36 +-
 .../activemq/openwire/v2/ConsumerInfoTest.java  |   68 +-
 .../openwire/v2/ControlCommandTest.java         |   32 +-
 .../openwire/v2/DataArrayResponseTest.java      |   36 +-
 .../activemq/openwire/v2/DataResponseTest.java  |   32 +-
 .../openwire/v2/DestinationInfoTest.java        |   44 +-
 .../openwire/v2/DiscoveryEventTest.java         |   34 +-
 .../openwire/v2/ExceptionResponseTest.java      |   32 +-
 .../activemq/openwire/v2/FlushCommandTest.java  |   30 +-
 .../openwire/v2/IntegerResponseTest.java        |   32 +-
 .../openwire/v2/JournalQueueAckTest.java        |   34 +-
 .../openwire/v2/JournalTopicAckTest.java        |   48 +-
 .../activemq/openwire/v2/JournalTraceTest.java  |   32 +-
 .../openwire/v2/JournalTransactionTest.java     |   36 +-
 .../activemq/openwire/v2/KeepAliveInfoTest.java |   30 +-
 .../openwire/v2/LastPartialCommandTest.java     |   30 +-
 .../openwire/v2/LocalTransactionIdTest.java     |   34 +-
 .../activemq/openwire/v2/MessageAckTest.java    |   50 +-
 .../v2/MessageDispatchNotificationTest.java     |   38 +-
 .../openwire/v2/MessageDispatchTest.java        |   38 +-
 .../activemq/openwire/v2/MessageIdTest.java     |   36 +-
 .../activemq/openwire/v2/MessagePullTest.java   |   36 +-
 .../openwire/v2/MessageTestSupport.java         |  102 +-
 .../openwire/v2/NetworkBridgeFilterTest.java    |   34 +-
 .../openwire/v2/PartialCommandTest.java         |   34 +-
 .../activemq/openwire/v2/ProducerIdTest.java    |   36 +-
 .../activemq/openwire/v2/ProducerInfoTest.java  |   42 +-
 .../activemq/openwire/v2/RemoveInfoTest.java    |   32 +-
 .../openwire/v2/RemoveSubscriptionInfoTest.java |   36 +-
 .../activemq/openwire/v2/ReplayCommandTest.java |   34 +-
 .../activemq/openwire/v2/ResponseTest.java      |   32 +-
 .../activemq/openwire/v2/SessionIdTest.java     |   34 +-
 .../activemq/openwire/v2/SessionInfoTest.java   |   32 +-
 .../activemq/openwire/v2/ShutdownInfoTest.java  |   30 +-
 .../openwire/v2/SubscriptionInfoTest.java       |   38 +-
 .../openwire/v2/TransactionIdTestSupport.java   |   18 +-
 .../openwire/v2/TransactionInfoTest.java        |   36 +-
 .../openwire/v2/WireFormatInfoTest.java         |   32 +-
 .../openwire/v2/XATransactionIdTest.java        |   36 +-
 .../openwire/v3/BaseCommandTestSupport.java     |   18 +-
 .../activemq/openwire/v3/BrokerIdTest.java      |   32 +-
 .../activemq/openwire/v3/BrokerInfoTest.java    |   58 +-
 .../openwire/v3/ConnectionControlTest.java      |   40 +-
 .../openwire/v3/ConnectionErrorTest.java        |   34 +-
 .../activemq/openwire/v3/ConnectionIdTest.java  |   32 +-
 .../openwire/v3/ConnectionInfoTest.java         |   50 +-
 .../openwire/v3/ConsumerControlTest.java        |   48 +-
 .../activemq/openwire/v3/ConsumerIdTest.java    |   36 +-
 .../activemq/openwire/v3/ConsumerInfoTest.java  |   68 +-
 .../openwire/v3/ControlCommandTest.java         |   32 +-
 .../openwire/v3/DataArrayResponseTest.java      |   36 +-
 .../activemq/openwire/v3/DataResponseTest.java  |   32 +-
 .../openwire/v3/DestinationInfoTest.java        |   44 +-
 .../openwire/v3/DiscoveryEventTest.java         |   34 +-
 .../openwire/v3/ExceptionResponseTest.java      |   32 +-
 .../activemq/openwire/v3/FlushCommandTest.java  |   30 +-
 .../openwire/v3/IntegerResponseTest.java        |   32 +-
 .../openwire/v3/JournalQueueAckTest.java        |   34 +-
 .../openwire/v3/JournalTopicAckTest.java        |   48 +-
 .../activemq/openwire/v3/JournalTraceTest.java  |   32 +-
 .../openwire/v3/JournalTransactionTest.java     |   36 +-
 .../activemq/openwire/v3/KeepAliveInfoTest.java |   30 +-
 .../openwire/v3/LastPartialCommandTest.java     |   30 +-
 .../openwire/v3/LocalTransactionIdTest.java     |   34 +-
 .../activemq/openwire/v3/MessageAckTest.java    |   50 +-
 .../v3/MessageDispatchNotificationTest.java     |   38 +-
 .../openwire/v3/MessageDispatchTest.java        |   38 +-
 .../activemq/openwire/v3/MessageIdTest.java     |   36 +-
 .../activemq/openwire/v3/MessagePullTest.java   |   40 +-
 .../openwire/v3/MessageTestSupport.java         |  104 +-
 .../openwire/v3/NetworkBridgeFilterTest.java    |   34 +-
 .../openwire/v3/PartialCommandTest.java         |   34 +-
 .../activemq/openwire/v3/ProducerAckTest.java   |   34 +-
 .../activemq/openwire/v3/ProducerIdTest.java    |   36 +-
 .../activemq/openwire/v3/ProducerInfoTest.java  |   44 +-
 .../activemq/openwire/v3/RemoveInfoTest.java    |   32 +-
 .../openwire/v3/RemoveSubscriptionInfoTest.java |   36 +-
 .../activemq/openwire/v3/ReplayCommandTest.java |   34 +-
 .../activemq/openwire/v3/ResponseTest.java      |   32 +-
 .../activemq/openwire/v3/SessionIdTest.java     |   34 +-
 .../activemq/openwire/v3/SessionInfoTest.java   |   32 +-
 .../activemq/openwire/v3/ShutdownInfoTest.java  |   30 +-
 .../openwire/v3/SubscriptionInfoTest.java       |   40 +-
 .../openwire/v3/TransactionIdTestSupport.java   |   18 +-
 .../openwire/v3/TransactionInfoTest.java        |   36 +-
 .../openwire/v3/XATransactionIdTest.java        |   36 +-
 .../openwire/v4/BaseCommandTestSupport.java     |   14 +-
 .../activemq/openwire/v4/BrokerIdTest.java      |   32 +-
 .../activemq/openwire/v4/BrokerInfoTest.java    |   66 +-
 .../openwire/v4/ConnectionControlTest.java      |   40 +-
 .../openwire/v4/ConnectionErrorTest.java        |   34 +-
 .../activemq/openwire/v4/ConnectionIdTest.java  |   32 +-
 .../openwire/v4/ConnectionInfoTest.java         |   58 +-
 .../openwire/v4/ConsumerControlTest.java        |   48 +-
 .../activemq/openwire/v4/ConsumerIdTest.java    |   36 +-
 .../activemq/openwire/v4/ConsumerInfoTest.java  |   90 +-
 .../openwire/v4/ControlCommandTest.java         |   32 +-
 .../openwire/v4/DataArrayResponseTest.java      |   50 +-
 .../activemq/openwire/v4/DataResponseTest.java  |   32 +-
 .../openwire/v4/DestinationInfoTest.java        |   58 +-
 .../openwire/v4/DiscoveryEventTest.java         |   34 +-
 .../openwire/v4/ExceptionResponseTest.java      |   32 +-
 .../activemq/openwire/v4/FlushCommandTest.java  |   30 +-
 .../openwire/v4/IntegerResponseTest.java        |   32 +-
 .../openwire/v4/JournalQueueAckTest.java        |   34 +-
 .../openwire/v4/JournalTopicAckTest.java        |   48 +-
 .../activemq/openwire/v4/JournalTraceTest.java  |   32 +-
 .../openwire/v4/JournalTransactionTest.java     |   36 +-
 .../activemq/openwire/v4/KeepAliveInfoTest.java |   30 +-
 .../openwire/v4/LastPartialCommandTest.java     |   30 +-
 .../openwire/v4/LocalTransactionIdTest.java     |   34 +-
 .../activemq/openwire/v4/MessageAckTest.java    |   50 +-
 .../v4/MessageDispatchNotificationTest.java     |   38 +-
 .../openwire/v4/MessageDispatchTest.java        |   38 +-
 .../activemq/openwire/v4/MessageIdTest.java     |   36 +-
 .../activemq/openwire/v4/MessagePullTest.java   |   40 +-
 .../openwire/v4/MessageTestSupport.java         |  112 +-
 .../openwire/v4/NetworkBridgeFilterTest.java    |   34 +-
 .../openwire/v4/PartialCommandTest.java         |   34 +-
 .../activemq/openwire/v4/ProducerAckTest.java   |   34 +-
 .../activemq/openwire/v4/ProducerIdTest.java    |   36 +-
 .../activemq/openwire/v4/ProducerInfoTest.java  |   58 +-
 .../activemq/openwire/v4/RemoveInfoTest.java    |   32 +-
 .../openwire/v4/RemoveSubscriptionInfoTest.java |   36 +-
 .../activemq/openwire/v4/ReplayCommandTest.java |   34 +-
 .../activemq/openwire/v4/ResponseTest.java      |   32 +-
 .../activemq/openwire/v4/SessionIdTest.java     |   34 +-
 .../activemq/openwire/v4/SessionInfoTest.java   |   32 +-
 .../activemq/openwire/v4/ShutdownInfoTest.java  |   30 +-
 .../openwire/v4/SubscriptionInfoTest.java       |   40 +-
 .../openwire/v4/TransactionIdTestSupport.java   |   18 +-
 .../openwire/v4/TransactionInfoTest.java        |   36 +-
 .../openwire/v4/XATransactionIdTest.java        |   36 +-
 .../openwire/v5/BaseCommandTestSupport.java     |   13 +-
 .../activemq/openwire/v5/BrokerIdTest.java      |   32 +-
 .../activemq/openwire/v5/BrokerInfoTest.java    |   66 +-
 .../openwire/v5/ConnectionControlTest.java      |   40 +-
 .../openwire/v5/ConnectionErrorTest.java        |   34 +-
 .../activemq/openwire/v5/ConnectionIdTest.java  |   32 +-
 .../openwire/v5/ConnectionInfoTest.java         |   58 +-
 .../openwire/v5/ConsumerControlTest.java        |   48 +-
 .../activemq/openwire/v5/ConsumerIdTest.java    |   36 +-
 .../activemq/openwire/v5/ConsumerInfoTest.java  |   90 +-
 .../openwire/v5/ControlCommandTest.java         |   32 +-
 .../openwire/v5/DataArrayResponseTest.java      |   50 +-
 .../activemq/openwire/v5/DataResponseTest.java  |   32 +-
 .../openwire/v5/DestinationInfoTest.java        |   58 +-
 .../openwire/v5/DiscoveryEventTest.java         |   34 +-
 .../openwire/v5/ExceptionResponseTest.java      |   32 +-
 .../activemq/openwire/v5/FlushCommandTest.java  |   30 +-
 .../openwire/v5/IntegerResponseTest.java        |   32 +-
 .../openwire/v5/JournalQueueAckTest.java        |   34 +-
 .../openwire/v5/JournalTopicAckTest.java        |   48 +-
 .../activemq/openwire/v5/JournalTraceTest.java  |   32 +-
 .../openwire/v5/JournalTransactionTest.java     |   36 +-
 .../activemq/openwire/v5/KeepAliveInfoTest.java |   30 +-
 .../openwire/v5/LastPartialCommandTest.java     |   30 +-
 .../openwire/v5/LocalTransactionIdTest.java     |   34 +-
 .../activemq/openwire/v5/MessageAckTest.java    |   50 +-
 .../v5/MessageDispatchNotificationTest.java     |   38 +-
 .../openwire/v5/MessageDispatchTest.java        |   38 +-
 .../activemq/openwire/v5/MessageIdTest.java     |   36 +-
 .../activemq/openwire/v5/MessagePullTest.java   |   40 +-
 .../openwire/v5/MessageTestSupport.java         |  112 +-
 .../openwire/v5/NetworkBridgeFilterTest.java    |   34 +-
 .../openwire/v5/PartialCommandTest.java         |   34 +-
 .../activemq/openwire/v5/ProducerAckTest.java   |   34 +-
 .../activemq/openwire/v5/ProducerIdTest.java    |   36 +-
 .../activemq/openwire/v5/ProducerInfoTest.java  |   58 +-
 .../activemq/openwire/v5/RemoveInfoTest.java    |   34 +-
 .../openwire/v5/RemoveSubscriptionInfoTest.java |   36 +-
 .../activemq/openwire/v5/ReplayCommandTest.java |   34 +-
 .../activemq/openwire/v5/ResponseTest.java      |   32 +-
 .../activemq/openwire/v5/SessionIdTest.java     |   34 +-
 .../activemq/openwire/v5/SessionInfoTest.java   |   32 +-
 .../activemq/openwire/v5/ShutdownInfoTest.java  |   30 +-
 .../openwire/v5/SubscriptionInfoTest.java       |   40 +-
 .../openwire/v5/TransactionIdTestSupport.java   |   18 +-
 .../openwire/v5/TransactionInfoTest.java        |   36 +-
 .../openwire/v5/XATransactionIdTest.java        |   36 +-
 .../openwire/v6/BaseCommandTestSupport.java     |   13 +-
 .../activemq/openwire/v6/BrokerIdTest.java      |   32 +-
 .../activemq/openwire/v6/BrokerInfoTest.java    |   66 +-
 .../openwire/v6/ConnectionControlTest.java      |   52 +-
 .../openwire/v6/ConnectionErrorTest.java        |   34 +-
 .../activemq/openwire/v6/ConnectionIdTest.java  |   32 +-
 .../openwire/v6/ConnectionInfoTest.java         |   62 +-
 .../openwire/v6/ConsumerControlTest.java        |   50 +-
 .../activemq/openwire/v6/ConsumerIdTest.java    |   36 +-
 .../activemq/openwire/v6/ConsumerInfoTest.java  |   90 +-
 .../openwire/v6/ControlCommandTest.java         |   32 +-
 .../openwire/v6/DataArrayResponseTest.java      |   50 +-
 .../activemq/openwire/v6/DataResponseTest.java  |   32 +-
 .../openwire/v6/DestinationInfoTest.java        |   58 +-
 .../openwire/v6/DiscoveryEventTest.java         |   34 +-
 .../openwire/v6/ExceptionResponseTest.java      |   32 +-
 .../activemq/openwire/v6/FlushCommandTest.java  |   30 +-
 .../openwire/v6/IntegerResponseTest.java        |   32 +-
 .../openwire/v6/JournalQueueAckTest.java        |   34 +-
 .../openwire/v6/JournalTopicAckTest.java        |   48 +-
 .../activemq/openwire/v6/JournalTraceTest.java  |   32 +-
 .../openwire/v6/JournalTransactionTest.java     |   36 +-
 .../activemq/openwire/v6/KeepAliveInfoTest.java |   30 +-
 .../openwire/v6/LastPartialCommandTest.java     |   30 +-
 .../openwire/v6/LocalTransactionIdTest.java     |   34 +-
 .../activemq/openwire/v6/MessageAckTest.java    |   50 +-
 .../v6/MessageDispatchNotificationTest.java     |   38 +-
 .../openwire/v6/MessageDispatchTest.java        |   38 +-
 .../activemq/openwire/v6/MessageIdTest.java     |   36 +-
 .../activemq/openwire/v6/MessagePullTest.java   |   40 +-
 .../openwire/v6/MessageTestSupport.java         |  112 +-
 .../openwire/v6/NetworkBridgeFilterTest.java    |   34 +-
 .../openwire/v6/PartialCommandTest.java         |   34 +-
 .../activemq/openwire/v6/ProducerAckTest.java   |   34 +-
 .../activemq/openwire/v6/ProducerIdTest.java    |   36 +-
 .../activemq/openwire/v6/ProducerInfoTest.java  |   58 +-
 .../activemq/openwire/v6/RemoveInfoTest.java    |   34 +-
 .../openwire/v6/RemoveSubscriptionInfoTest.java |   36 +-
 .../activemq/openwire/v6/ReplayCommandTest.java |   34 +-
 .../activemq/openwire/v6/ResponseTest.java      |   32 +-
 .../activemq/openwire/v6/SessionIdTest.java     |   34 +-
 .../activemq/openwire/v6/SessionInfoTest.java   |   32 +-
 .../activemq/openwire/v6/ShutdownInfoTest.java  |   30 +-
 .../openwire/v6/SubscriptionInfoTest.java       |   40 +-
 .../openwire/v6/TransactionIdTestSupport.java   |   18 +-
 .../openwire/v6/TransactionInfoTest.java        |   36 +-
 .../openwire/v6/XATransactionIdTest.java        |   36 +-
 .../openwire/v7/BaseCommandTestSupport.java     |   13 +-
 .../activemq/openwire/v7/BrokerIdTest.java      |    2 +-
 .../activemq/openwire/v7/BrokerInfoTest.java    |    2 +-
 .../openwire/v7/ConnectionControlTest.java      |    2 +-
 .../openwire/v7/ConnectionErrorTest.java        |    2 +-
 .../activemq/openwire/v7/ConnectionIdTest.java  |    2 +-
 .../openwire/v7/ConnectionInfoTest.java         |    2 +-
 .../openwire/v7/ConsumerControlTest.java        |    2 +-
 .../activemq/openwire/v7/ConsumerIdTest.java    |    2 +-
 .../activemq/openwire/v7/ConsumerInfoTest.java  |    2 +-
 .../openwire/v7/ControlCommandTest.java         |    2 +-
 .../openwire/v7/DataArrayResponseTest.java      |    2 +-
 .../activemq/openwire/v7/DataResponseTest.java  |    2 +-
 .../openwire/v7/DestinationInfoTest.java        |    2 +-
 .../openwire/v7/DiscoveryEventTest.java         |    2 +-
 .../openwire/v7/ExceptionResponseTest.java      |    2 +-
 .../activemq/openwire/v7/FlushCommandTest.java  |    2 +-
 .../openwire/v7/IntegerResponseTest.java        |    2 +-
 .../openwire/v7/JournalQueueAckTest.java        |    2 +-
 .../openwire/v7/JournalTopicAckTest.java        |    2 +-
 .../activemq/openwire/v7/JournalTraceTest.java  |    2 +-
 .../openwire/v7/JournalTransactionTest.java     |    2 +-
 .../activemq/openwire/v7/KeepAliveInfoTest.java |    2 +-
 .../openwire/v7/LastPartialCommandTest.java     |    2 +-
 .../openwire/v7/LocalTransactionIdTest.java     |    2 +-
 .../activemq/openwire/v7/MessageAckTest.java    |    2 +-
 .../v7/MessageDispatchNotificationTest.java     |    2 +-
 .../openwire/v7/MessageDispatchTest.java        |    2 +-
 .../activemq/openwire/v7/MessageIdTest.java     |    2 +-
 .../activemq/openwire/v7/MessagePullTest.java   |    2 +-
 .../openwire/v7/MessageTestSupport.java         |    2 +-
 .../openwire/v7/NetworkBridgeFilterTest.java    |    2 +-
 .../openwire/v7/PartialCommandTest.java         |    2 +-
 .../activemq/openwire/v7/ProducerAckTest.java   |    2 +-
 .../activemq/openwire/v7/ProducerIdTest.java    |    2 +-
 .../activemq/openwire/v7/ProducerInfoTest.java  |    2 +-
 .../activemq/openwire/v7/RemoveInfoTest.java    |    2 +-
 .../openwire/v7/RemoveSubscriptionInfoTest.java |    2 +-
 .../activemq/openwire/v7/ReplayCommandTest.java |    2 +-
 .../activemq/openwire/v7/ResponseTest.java      |    2 +-
 .../activemq/openwire/v7/SessionIdTest.java     |    2 +-
 .../activemq/openwire/v7/SessionInfoTest.java   |    2 +-
 .../activemq/openwire/v7/ShutdownInfoTest.java  |    2 +-
 .../openwire/v7/SubscriptionInfoTest.java       |    2 +-
 .../openwire/v7/TransactionIdTestSupport.java   |    2 +-
 .../openwire/v7/TransactionInfoTest.java        |    2 +-
 .../openwire/v7/XATransactionIdTest.java        |    2 +-
 .../openwire/v8/BaseCommandTestSupport.java     |   13 +-
 .../activemq/openwire/v8/BrokerIdTest.java      |    2 +-
 .../activemq/openwire/v8/BrokerInfoTest.java    |    2 +-
 .../openwire/v8/ConnectionControlTest.java      |    2 +-
 .../openwire/v8/ConnectionErrorTest.java        |    2 +-
 .../activemq/openwire/v8/ConnectionIdTest.java  |    2 +-
 .../openwire/v8/ConnectionInfoTest.java         |    2 +-
 .../openwire/v8/ConsumerControlTest.java        |    2 +-
 .../activemq/openwire/v8/ConsumerIdTest.java    |    2 +-
 .../activemq/openwire/v8/ConsumerInfoTest.java  |    2 +-
 .../openwire/v8/ControlCommandTest.java         |    2 +-
 .../openwire/v8/DataArrayResponseTest.java      |    2 +-
 .../activemq/openwire/v8/DataResponseTest.java  |    2 +-
 .../openwire/v8/DestinationInfoTest.java        |    2 +-
 .../openwire/v8/DiscoveryEventTest.java         |    2 +-
 .../openwire/v8/ExceptionResponseTest.java      |    2 +-
 .../activemq/openwire/v8/FlushCommandTest.java  |    2 +-
 .../openwire/v8/IntegerResponseTest.java        |    2 +-
 .../openwire/v8/JournalQueueAckTest.java        |    2 +-
 .../openwire/v8/JournalTopicAckTest.java        |    2 +-
 .../activemq/openwire/v8/JournalTraceTest.java  |    2 +-
 .../openwire/v8/JournalTransactionTest.java     |    2 +-
 .../activemq/openwire/v8/KeepAliveInfoTest.java |    2 +-
 .../openwire/v8/LastPartialCommandTest.java     |    2 +-
 .../openwire/v8/LocalTransactionIdTest.java     |    2 +-
 .../activemq/openwire/v8/MessageAckTest.java    |    2 +-
 .../v8/MessageDispatchNotificationTest.java     |    2 +-
 .../openwire/v8/MessageDispatchTest.java        |    2 +-
 .../activemq/openwire/v8/MessageIdTest.java     |    2 +-
 .../activemq/openwire/v8/MessagePullTest.java   |    2 +-
 .../openwire/v8/MessageTestSupport.java         |    2 +-
 .../openwire/v8/NetworkBridgeFilterTest.java    |    2 +-
 .../openwire/v8/PartialCommandTest.java         |    2 +-
 .../activemq/openwire/v8/ProducerAckTest.java   |    2 +-
 .../activemq/openwire/v8/ProducerIdTest.java    |    2 +-
 .../activemq/openwire/v8/ProducerInfoTest.java  |    2 +-
 .../activemq/openwire/v8/RemoveInfoTest.java    |    2 +-
 .../openwire/v8/RemoveSubscriptionInfoTest.java |    2 +-
 .../activemq/openwire/v8/ReplayCommandTest.java |    2 +-
 .../activemq/openwire/v8/ResponseTest.java      |    2 +-
 .../activemq/openwire/v8/SessionIdTest.java     |    2 +-
 .../activemq/openwire/v8/SessionInfoTest.java   |    2 +-
 .../activemq/openwire/v8/ShutdownInfoTest.java  |    2 +-
 .../openwire/v8/SubscriptionInfoTest.java       |    2 +-
 .../openwire/v8/TransactionIdTestSupport.java   |    2 +-
 .../openwire/v8/TransactionInfoTest.java        |    2 +-
 .../openwire/v8/XATransactionIdTest.java        |    2 +-
 .../openwire/v9/BaseCommandTestSupport.java     |   13 +-
 .../activemq/openwire/v9/BrokerIdTest.java      |    2 +-
 .../activemq/openwire/v9/BrokerInfoTest.java    |    2 +-
 .../openwire/v9/ConnectionControlTest.java      |    2 +-
 .../openwire/v9/ConnectionErrorTest.java        |    2 +-
 .../activemq/openwire/v9/ConnectionIdTest.java  |    2 +-
 .../openwire/v9/ConnectionInfoTest.java         |    2 +-
 .../openwire/v9/ConsumerControlTest.java        |    2 +-
 .../activemq/openwire/v9/ConsumerIdTest.java    |    2 +-
 .../activemq/openwire/v9/ConsumerInfoTest.java  |    2 +-
 .../openwire/v9/ControlCommandTest.java         |    2 +-
 .../openwire/v9/DataArrayResponseTest.java      |    2 +-
 .../activemq/openwire/v9/DataResponseTest.java  |    2 +-
 .../openwire/v9/DestinationInfoTest.java        |    2 +-
 .../openwire/v9/DiscoveryEventTest.java         |    2 +-
 .../openwire/v9/ExceptionResponseTest.java      |    2 +-
 .../activemq/openwire/v9/FlushCommandTest.java  |    2 +-
 .../openwire/v9/IntegerResponseTest.java        |    2 +-
 .../openwire/v9/JournalQueueAckTest.java        |    2 +-
 .../openwire/v9/JournalTopicAckTest.java        |    2 +-
 .../activemq/openwire/v9/JournalTraceTest.java  |    2 +-
 .../openwire/v9/JournalTransactionTest.java     |    2 +-
 .../activemq/openwire/v9/KeepAliveInfoTest.java |    2 +-
 .../openwire/v9/LastPartialCommandTest.java     |    2 +-
 .../openwire/v9/LocalTransactionIdTest.java     |    2 +-
 .../activemq/openwire/v9/MessageAckTest.java    |    2 +-
 .../v9/MessageDispatchNotificationTest.java     |    2 +-
 .../openwire/v9/MessageDispatchTest.java        |    2 +-
 .../activemq/openwire/v9/MessageIdTest.java     |    2 +-
 .../activemq/openwire/v9/MessagePullTest.java   |    2 +-
 .../openwire/v9/MessageTestSupport.java         |    2 +-
 .../openwire/v9/NetworkBridgeFilterTest.java    |    2 +-
 .../openwire/v9/PartialCommandTest.java         |    2 +-
 .../activemq/openwire/v9/ProducerAckTest.java   |    2 +-
 .../activemq/openwire/v9/ProducerIdTest.java    |    2 +-
 .../activemq/openwire/v9/ProducerInfoTest.java  |    2 +-
 .../activemq/openwire/v9/RemoveInfoTest.java    |    2 +-
 .../openwire/v9/RemoveSubscriptionInfoTest.java |    2 +-
 .../activemq/openwire/v9/ReplayCommandTest.java |    2 +-
 .../activemq/openwire/v9/ResponseTest.java      |    2 +-
 .../activemq/openwire/v9/SessionIdTest.java     |    2 +-
 .../activemq/openwire/v9/SessionInfoTest.java   |    2 +-
 .../activemq/openwire/v9/ShutdownInfoTest.java  |    2 +-
 .../openwire/v9/SubscriptionInfoTest.java       |    2 +-
 .../openwire/v9/TransactionIdTestSupport.java   |    2 +-
 .../openwire/v9/TransactionInfoTest.java        |    2 +-
 .../openwire/v9/XATransactionIdTest.java        |    2 +-
 .../activemq/perf/ConnectionChurnTest.java      |  117 +-
 .../activemq/perf/InactiveDurableTopicTest.java |  237 +-
 .../apache/activemq/perf/InactiveQueueTest.java |  115 +-
 .../activemq/perf/KahaDBDurableTopicTest.java   |   52 +-
 .../perf/KahaDBDurableTransactedTopicTest.java  |   29 +-
 .../apache/activemq/perf/KahaDBQueueTest.java   |   72 +-
 .../org/apache/activemq/perf/KahaQueueTest.java |   22 +-
 .../activemq/perf/LevelDBDurableTopicTest.java  |   20 +-
 .../activemq/perf/LevelDBStoreQueueTest.java    |   18 +-
 .../activemq/perf/MemoryAllocationTest.java     |  153 +-
 .../apache/activemq/perf/NetworkedSyncTest.java |  486 +--
 .../activemq/perf/NumberOfDestinationsTest.java |  179 +-
 .../org/apache/activemq/perf/PerfConsumer.java  |  210 +-
 .../org/apache/activemq/perf/PerfProducer.java  |  197 +-
 .../java/org/apache/activemq/perf/PerfRate.java |  102 +-
 .../perf/QueueConnectionMemoryTest.java         |   85 +-
 .../org/apache/activemq/perf/RunBroker.java     |   69 +-
 .../perf/SimpleDurableTopicNetworkTest.java     |   39 +-
 .../activemq/perf/SimpleDurableTopicTest.java   |   82 +-
 .../apache/activemq/perf/SimpleNetworkTest.java |  215 +-
 .../SimpleNonPersistentQueueNetworkTest.java    |   97 +-
 .../perf/SimpleNonPersistentQueueTest.java      |   89 +-
 .../perf/SimpleNonPersistentTopicTest.java      |   15 +-
 .../apache/activemq/perf/SimpleQueueTest.java   |   49 +-
 .../apache/activemq/perf/SimpleTopicTest.java   |  339 +-
 .../org/apache/activemq/perf/SlowConsumer.java  |   36 +-
 .../activemq/perf/SlowConsumerTopicTest.java    |   75 +-
 .../perf/SlowDurableConsumerTopicTest.java      |   12 +-
 .../TemporaryTopicMemoryAllocationTest.java     |   13 +-
 .../plugin/BrokerStatisticsPluginTest.java      |  296 +-
 ...veTwoConnectionsWithSenderUsingPoolTest.java |   29 +-
 .../org/apache/activemq/proxy/AMQ4889Test.java  |  177 +-
 .../activemq/proxy/ProxyConnectorTest.java      |  142 +-
 .../activemq/proxy/ProxyFailoverTest.java       |  111 +-
 .../apache/activemq/proxy/ProxyTestSupport.java |  204 +-
 ...actCachedLDAPAuthorizationMapLegacyTest.java |  609 ++--
 ...stractCachedLDAPAuthorizationModuleTest.java |   65 +-
 .../activemq/security/AuthorizationMapTest.java |  321 +-
 ...APAuthorizationModuleLegacyOpenLDAPTest.java |  114 +-
 ...CachedLDAPAuthorizationModuleLegacyTest.java |   54 +-
 ...chedLDAPAuthorizationModuleOpenLDAPTest.java |  129 +-
 .../CachedLDAPAuthorizationModuleTest.java      |   62 +-
 .../security/CachedLDAPSecurityLegacyTest.java  |  168 +-
 .../security/CachedLDAPSecurityTest.java        |   23 +-
 .../org/apache/activemq/security/DoSTest.java   |  112 +-
 ...JaasCertificateAuthenticationBrokerTest.java |  253 +-
 .../JaasDualAuthenticationBrokerTest.java       |  322 +-
 .../activemq/security/JaasNetworkTest.java      |   90 +-
 .../security/LDAPAuthenticationTest.java        |   62 +-
 .../security/LDAPAuthorizationMapTest.java      |  203 +-
 .../activemq/security/LDAPSecurityTest.java     |  206 +-
 .../activemq/security/SecurityJMXTest.java      |  121 +-
 .../activemq/security/SecurityTestSupport.java  |  453 +--
 .../security/SimpleAnonymousPluginTest.java     |  174 +-
 ...SimpleAuthenticationPluginSeparatorTest.java |  186 +-
 .../SimpleAuthenticationPluginTest.java         |  206 +-
 .../security/SimpleAuthorizationMapTest.java    |   12 +-
 .../SimpleSecurityBrokerSystemTest.java         |  269 +-
 .../security/StubDoNothingCallbackHandler.java  |    4 +-
 .../security/StubDualJaasConfiguration.java     |   38 +-
 .../security/StubJaasConfiguration.java         |   19 +-
 .../activemq/security/StubLoginModule.java      |  131 +-
 .../activemq/security/StubSecurityContext.java  |   13 +-
 .../activemq/security/XBeanSecurityTest.java    |   34 +-
 ...nSecurityWithGuestNoCredentialsOnlyTest.java |  199 +-
 .../security/XBeanSecurityWithGuestTest.java    |  194 +-
 .../activemq/security/XBeanSslContextTest.java  |   20 +-
 .../activemq/selector/SelectorParserTest.java   |   88 +-
 .../apache/activemq/selector/SelectorTest.java  |  640 ++--
 .../selector/UnknownHandlingSelectorTest.java   |  297 +-
 ...ctiveMQConnectionFactoryFactoryBeanTest.java |  131 +-
 .../apache/activemq/spring/ConsumerBean.java    |  277 +-
 .../spring/Spring2XmlNamespacesTest.java        |    7 +-
 ...ng2XmlNamespacesWithoutRemoteSchemaTest.java |    7 +-
 .../apache/activemq/spring/SpringConsumer.java  |  161 +-
 .../apache/activemq/spring/SpringProducer.java  |   79 +-
 .../org/apache/activemq/spring/SpringTest.java  |  138 +-
 .../activemq/spring/SpringTestSupport.java      |  125 +-
 .../store/AutoStorePerDestinationTest.java      |   29 +-
 .../store/LevelDBStorePerDestinationTest.java   |   27 +-
 .../activemq/store/MessagePriorityTest.java     | 1063 +++---
 .../apache/activemq/store/StoreOrderTest.java   |  440 +--
 .../activemq/store/StorePerDestinationTest.java |  503 +--
 .../store/jdbc/BrokenPersistenceAdapter.java    |   34 +-
 .../store/jdbc/DatabaseLockerConfigTest.java    |   52 +-
 .../store/jdbc/JDBCCommitExceptionTest.java     |  255 +-
 .../jdbc/JDBCIOExceptionHandlerMockeryTest.java |  139 +-
 .../store/jdbc/JDBCIOExceptionHandlerTest.java  |  541 +--
 .../store/jdbc/JDBCLockTablePrefixTest.java     |   25 +-
 .../store/jdbc/JDBCMessagePriorityTest.java     |  794 +++--
 .../store/jdbc/JDBCNegativeQueueTest.java       |  106 +-
 .../store/jdbc/JDBCNetworkBrokerDetachTest.java |   22 +-
 .../store/jdbc/JDBCPersistenceAdapterTest.java  |   75 +-
 .../store/jdbc/JDBCStoreAutoCommitTest.java     |  881 ++---
 .../store/jdbc/JDBCStoreBrokerTest.java         |   65 +-
 .../activemq/store/jdbc/JDBCStoreOrderTest.java |   53 +-
 .../store/jdbc/JDBCTablePrefixAssignedTest.java |  167 +-
 .../activemq/store/jdbc/JDBCTestMemory.java     |  237 +-
 .../store/jdbc/JDBCXACommitExceptionTest.java   |  200 +-
 .../store/jdbc/LeaseDatabaseLockerTest.java     |  435 +--
 .../activemq/store/kahadb/CustomLockerTest.java |   13 +-
 .../store/kahadb/KahaDBFastEnqueueTest.java     |  386 +-
 .../store/kahadb/KahaDBIndexLocationTest.java   |  235 +-
 .../store/kahadb/KahaDBMessagePriorityTest.java |   25 +-
 .../kahadb/KahaDBPersistenceAdapterTest.java    |   19 +-
 .../store/kahadb/KahaDBStoreBrokerTest.java     |   65 +-
 .../store/kahadb/KahaDBStoreOrderTest.java      |   17 +-
 .../kahadb/KahaDBStoreRecoveryBrokerTest.java   |  340 +-
 .../kahadb/KahaDBStoreRecoveryExpiryTest.java   |  118 +-
 .../activemq/store/kahadb/KahaDBStoreTest.java  |  128 +-
 .../activemq/store/kahadb/KahaDBTest.java       |  400 +--
 .../store/kahadb/KahaDBVersionTest.java         |  273 +-
 .../activemq/store/kahadb/NoSpaceIOTest.java    |  158 +-
 .../activemq/store/kahadb/PBMesssagesTest.java  |   42 +-
 .../store/kahadb/TempKahaDBStoreBrokerTest.java |   51 +-
 .../store/kahadb/perf/KahaBulkLoadingTest.java  |  202 +-
 .../kahadb/perf/KahaStoreDurableTopicTest.java  |   28 +-
 .../store/kahadb/perf/KahaStoreQueueTest.java   |   28 +-
 .../kahadb/perf/TempKahaStoreQueueTest.java     |   27 +-
 .../KahaDBFilePendingMessageCursorTest.java     |   99 +-
 .../activemq/store/kahadb/plist/PListTest.java  | 1209 +++----
 .../store/leveldb/LevelDBNegativeQueueTest.java |   20 +-
 .../store/leveldb/LevelDBStoreBrokerTest.java   |   66 +-
 .../activemq/streams/JMSInputStreamTest.java    |  469 +--
 .../test/JmsSendReceiveTestSupport.java         |  422 +--
 .../activemq/test/JmsTopicSendReceiveTest.java  |  177 +-
 ...dReceiveWithEmbeddedBrokerAndUserIDTest.java |  157 +-
 ...veWithTwoConnectionsAndByteSelectorTest.java |   15 +-
 ...WithTwoConnectionsAndEmbeddedBrokerTest.java |   74 +-
 ...sTopicSendReceiveWithTwoConnectionsTest.java |  201 +-
 .../TemporaryDestinationToFromNameTest.java     |   36 +-
 .../message/NestedMapAndListPropertyTest.java   |  117 +-
 .../test/message/NestedMapMessageTest.java      |  120 +-
 .../test/retroactive/DummyMessageQuery.java     |   31 +-
 ...sumerTestWithDestinationBasedBufferTest.java |    9 +-
 ...TestWithLastImagePolicyWithWildcardTest.java |   31 +-
 ...veConsumerTestWithSimpleMessageListTest.java |  171 +-
 ...troactiveConsumerTestWithTimePolicyTest.java |    9 +-
 ...RetroactiveConsumerWithMessageQueryTest.java |  145 +-
 .../CloseRollbackRedeliveryQueueTest.java       |  198 +-
 .../DelegatingTransactionalMessageListener.java |   72 +-
 .../RollbacksWhileConsumingLargeQueueTest.java  |  281 +-
 .../activemq/transport/QueueClusterTest.java    |   16 +-
 .../transport/SoWriteTimeoutClientTest.java     |  136 +-
 .../activemq/transport/SoWriteTimeoutTest.java  |  253 +-
 .../transport/StubCompositeTransport.java       |   41 +-
 .../activemq/transport/StubTransport.java       |   42 +-
 .../transport/StubTransportListener.java        |   56 +-
 .../activemq/transport/TopicClusterTest.java    |  259 +-
 .../transport/TransportBrokerTestSupport.java   |   79 +-
 .../DiscoveryNetworkReconnectTest.java          |  358 +-
 .../discovery/DiscoveryTransportBrokerTest.java |  235 +-
 .../DiscoveryTransportNoBrokerTest.java         |  276 +-
 .../transport/discovery/DiscoveryUriTest.java   |   65 +-
 .../ZeroconfDiscoverTransportTest.java          |    8 +-
 .../transport/failover/AMQ1925Test.java         |  660 ++--
 .../transport/failover/BadConnectionTest.java   |   68 +-
 .../failover/ConnectionHangOnStartupTest.java   |  141 +-
 .../failover/FailoverBackupLeakTest.java        |  189 +-
 .../transport/failover/FailoverClusterTest.java |  254 +-
 .../failover/FailoverClusterTestSupport.java    |  317 +-
 .../failover/FailoverComplexClusterTest.java    |  707 ++--
 .../FailoverConsumerOutstandingCommitTest.java  |  626 ++--
 .../FailoverConsumerUnconsumedTest.java         |  622 ++--
 .../failover/FailoverDuplicateTest.java         |  400 ++-
 .../failover/FailoverPrefetchZeroTest.java      |  225 +-
 .../failover/FailoverPriorityTest.java          |  350 +-
 .../transport/failover/FailoverRandomTest.java  |   93 +-
 .../FailoverRedeliveryTransactionTest.java      |  123 +-
 .../transport/failover/FailoverTimeoutTest.java |  185 +-
 .../failover/FailoverTransactionTest.java       | 2179 ++++++------
 .../failover/FailoverTransportBackupsTest.java  |  376 +-
 .../failover/FailoverTransportBrokerTest.java   |  269 +-
 .../failover/FailoverTransportTest.java         |  201 +-
 .../FailoverTransportUriHandlingTest.java       |  148 +-
 .../failover/FailoverUpdateURIsTest.java        |  232 +-
 .../transport/failover/FailoverUriTest.java     |   38 +-
 .../failover/InitalReconnectDelayTest.java      |  292 +-
 .../transport/failover/ReconnectTest.java       |  356 +-
 .../transport/failover/SlowConnectionTest.java  |  120 +-
 .../failover/TwoBrokerFailoverClusterTest.java  |  146 +-
 .../activemq/transport/fanout/FanoutTest.java   |  126 +-
 .../fanout/FanoutTransportBrokerTest.java       |  312 +-
 .../multicast/MulticastTransportTest.java       |   65 +-
 .../nio/NIOJmsDurableTopicSendReceiveTest.java  |   65 +-
 .../transport/nio/NIOJmsSendAndReceiveTest.java |   67 +-
 .../nio/NIOPersistentSendAndReceiveTest.java    |   25 +-
 .../activemq/transport/nio/NIOSSLBasicTest.java |  154 +-
 .../transport/nio/NIOSSLConcurrencyTest.java    |  416 +--
 .../activemq/transport/nio/NIOSSLLoadTest.java  |  163 +-
 .../nio/NIOSSLTransportBrokerTest.java          |   66 +-
 .../transport/nio/NIOSSLWindowSizeTest.java     |  149 +-
 .../transport/nio/NIOTransportBrokerTest.java   |   19 +-
 .../transport/peer/PeerTransportTest.java       |  214 +-
 .../transport/reliable/DropCommandStrategy.java |   12 +-
 .../reliable/ReliableTransportTest.java         |  152 +-
 .../UnreliableCommandDatagramChannel.java       |   48 +-
 .../UnreliableCommandDatagramSocket.java        |   58 +-
 .../reliable/UnreliableUdpTransport.java        |   49 +-
 .../reliable/UnreliableUdpTransportTest.java    |  113 +-
 .../transport/tcp/InactivityMonitorTest.java    |  392 +-
 .../tcp/QualityOfServiceUtilsTest.java          |  286 +-
 .../transport/tcp/ServerSocketTstFactory.java   |   58 +-
 .../transport/tcp/SocketTstFactory.java         |  292 +-
 .../transport/tcp/SslBrokerServiceTest.java     |  292 +-
 .../tcp/SslContextBrokerServiceTest.java        |   46 +-
 .../tcp/SslContextNBrokerServiceTest.java       |  207 +-
 .../activemq/transport/tcp/SslSocketHelper.java |   27 +-
 .../transport/tcp/SslTransportBrokerTest.java   |   70 +-
 .../transport/tcp/SslTransportFactoryTest.java  |  191 +-
 .../transport/tcp/SslTransportServerTest.java   |   99 +-
 .../transport/tcp/SslTransportTest.java         |   86 +-
 .../transport/tcp/StubSSLServerSocket.java      |  145 +-
 .../activemq/transport/tcp/StubSSLSession.java  |  208 +-
 .../activemq/transport/tcp/StubSSLSocket.java   |  142 +-
 .../transport/tcp/StubSSLSocketFactory.java     |   40 +-
 .../transport/tcp/StubSslTransport.java         |   41 +-
 .../transport/tcp/StubX509Certificate.java      |  162 +-
 .../transport/tcp/TcpFaultyTransport.java       |   25 +-
 .../tcp/TcpFaultyTransportFactory.java          |   99 +-
 .../transport/tcp/TcpFaultyTransportServer.java |   25 +-
 .../transport/tcp/TcpTransportBindTest.java     |   81 +-
 .../transport/tcp/TcpTransportBrokerTest.java   |   27 +-
 .../transport/tcp/TcpTransportServerTest.java   |   75 +-
 ...nsportConnectorInvalidSocketOptionsTest.java |   70 +-
 .../transport/tcp/TransportUriTest.java         |  332 +-
 .../tcp/WireformatNegociationTest.java          |  333 +-
 ...eWithTwoConnectionsAndLargeMessagesTest.java |   12 +-
 .../UdpSendReceiveWithTwoConnectionsTest.java   |   56 +-
 .../activemq/transport/udp/UdpTestSupport.java  |  446 +--
 .../transport/udp/UdpTransportTest.java         |   54 +-
 .../udp/UdpTransportUsingServerTest.java        |   55 +-
 .../transport/udp/UpdTransportBindTest.java     |   31 +-
 .../transport/vm/VMTransportBrokerNameTest.java |   38 +-
 .../transport/vm/VMTransportBrokerTest.java     |   20 +-
 .../vm/VMTransportEmbeddedBrokerTest.java       |  115 +-
 .../transport/vm/VMTransportThreadSafeTest.java | 1355 +++----
 .../transport/vm/VMTransportWaitForTest.java    |  196 +-
 .../vm/VmTransportNetworkBrokerTest.java        |  228 +-
 .../usage/CompositeMessageCursorUsageTest.java  |  110 +-
 .../usage/JobSchedulerStoreUsageTest.java       |  102 +-
 .../activemq/usage/StoreUsageLimitsTest.java    |   74 +-
 .../apache/activemq/usage/StoreUsageTest.java   |   60 +-
 .../apache/activemq/usecases/AMQ2927Test.java   |  133 +-
 .../activemq/usecases/AMQStackOverFlowTest.java |  154 +-
 ...rWildcardIncludedDestinationTestSupport.java |  225 +-
 .../usecases/AdvisoryTopicCleanUpTest.java      |  244 +-
 .../usecases/AdvisoryTopicDeletionTest.java     |  182 +-
 .../AuthorizationFromAdminViewTest.java         |   58 +-
 .../usecases/BacklogNetworkCrossTalkTest.java   |   99 +-
 .../BatchedMessagePriorityConsumerTest.java     |   72 +-
 .../BrokerQueueNetworkWithDisconnectTest.java   |  426 +--
 .../apache/activemq/usecases/BrowseDLQTest.java |  122 +-
 .../usecases/BrowseOverNetworkTest.java         |  391 +-
 .../usecases/ChangeSentMessageTest.java         |   63 +-
 .../usecases/ChangeSessionDeliveryModeTest.java |   51 +-
 .../activemq/usecases/ClientRebalanceTest.java  |  116 +-
 .../activemq/usecases/CompositeConsumeTest.java |   67 +-
 .../activemq/usecases/CompositePublishTest.java |  230 +-
 .../ConcurrentDestinationCreationTest.java      |  230 +-
 .../ConcurrentProducerDurableConsumerTest.java  |  792 +++--
 .../ConcurrentProducerQueueConsumerTest.java    |  705 ++--
 .../usecases/ConsumeQueuePrefetchTest.java      |   62 +-
 .../usecases/ConsumeTopicPrefetchTest.java      |  234 +-
 ...onsumeUncompressedCompressedMessageTest.java |  210 +-
 .../CreateLotsOfTemporaryQueuesTest.java        |   60 +-
 .../CreateTemporaryQueueBeforeStartTest.java    |  189 +-
 .../DiscriminatingConsumerLoadTest.java         |  523 +--
 .../usecases/DispatchMultipleConsumersTest.java |  380 +-
 ...DurableConsumerCloseAndReconnectTcpTest.java |  311 +-
 .../DurableConsumerCloseAndReconnectTest.java   |  394 ++-
 .../DurableSubDelayedUnsubscribeTest.java       | 1312 +++----
 .../usecases/DurableSubInBrokerNetworkTest.java |  282 +-
 ...ConcurrentCommitActivateNoDuplicateTest.java | 1587 ++++-----
 .../DurableSubProcessMultiRestartTest.java      |  630 ++--
 .../usecases/DurableSubProcessTest.java         | 1232 +++----
 .../DurableSubProcessWithRestartTest.java       | 1414 ++++----
 .../usecases/DurableSubSelectorDelayTest.java   |  440 +--
 .../DurableSubSelectorDelayWithRestartTest.java |  483 ++-
 ...neSelectorConcurrentConsumeIndexUseTest.java |  376 +-
 .../DurableSubsOfflineSelectorIndexUseTest.java |  326 +-
 ...rableSubscriberNonPersistentMessageTest.java |  527 +--
 ...ableSubscriberWithNetworkDisconnectTest.java |  383 +-
 ...DurableSubscriberWithNetworkRestartTest.java |  372 +-
 .../DurableSubscriptionActivationTest.java      |  174 +-
 .../DurableSubscriptionHangTestCase.java        |  163 +-
 .../DurableSubscriptionOffline1Test.java        |  412 +--
 .../DurableSubscriptionOffline2Test.java        |  250 +-
 .../DurableSubscriptionOffline3Test.java        |  755 ++--
 .../DurableSubscriptionOffline4Test.java        |  175 +-
 .../DurableSubscriptionOfflineTest.java         | 1638 +++++----
 .../DurableSubscriptionOfflineTestBase.java     |  342 +-
 .../DurableSubscriptionReactivationTest.java    |  120 +-
 .../DurableSubscriptionRemoveOfflineTest.java   |  168 +-
 .../DurableSubscriptionSelectorTest.java        |  264 +-
 .../DurableSubscriptionTestSupport.java         |  934 ++---
 .../DurableSubscriptionUnsubscribeTest.java     |  571 ++-
 .../usecases/DurableUnsubscribeTest.java        |  167 +-
 .../usecases/ExceptionListenerTest.java         |  125 +-
 .../activemq/usecases/ExpiredMessagesTest.java  |  522 ++-
 .../ExpiredMessagesWithNoConsumerTest.java      | 1072 +++---
 .../usecases/JDBCDurableSubscriptionTest.java   |   20 +-
 .../JMXRemoveQueueThenSendIgnoredTest.java      |  220 +-
 .../usecases/JdbcDurableSubDupTest.java         |  482 +--
 .../JournalDurableSubscriptionTest.java         |   18 +-
 .../usecases/KahaDBDurableSubscriptionTest.java |    7 +-
 .../usecases/LargeQueueSparseDeleteTest.java    |  302 +-
 .../LevelDBDurableSubscriptionTest.java         |   14 +-
 .../ManagedDurableSubscriptionTest.java         |  172 +-
 .../activemq/usecases/MemoryLimitTest.java      |  312 +-
 .../usecases/MessageGroupCloseTest.java         |  382 +-
 .../usecases/MessageGroupDelayedTest.java       |  406 +--
 .../usecases/MessageGroupLateArrivalsTest.java  |  505 +--
 .../usecases/MessageGroupNewConsumerTest.java   |  265 +-
 .../MessageGroupReconnectDistributionTest.java  |  328 +-
 .../activemq/usecases/MessageReroutingTest.java |  105 +-
 .../usecases/MultiBrokersMultiClientsTest.java  |  256 +-
 .../MultiBrokersMultiClientsUsingTcpTest.java   |   89 +-
 .../MulticastDiscoveryOnFaultyNetworkTest.java  |  189 +-
 .../org/apache/activemq/usecases/MyObject.java  |   62 +-
 .../usecases/NetworkAsyncStartTest.java         |  179 +-
 .../NetworkBridgeProducerFlowControlTest.java   |  523 ++-
 .../usecases/NetworkOfTwentyBrokersTest.java    |  371 +-
 .../NewConsumerCreatesDestinationTest.java      |   41 +-
 .../usecases/NoDuplicateOnTopicNetworkTest.java |  617 ++--
 .../NonBlockingConsumerRedeliveryTest.java      |  791 ++---
 .../ObjectMessageNotSerializableTest.java       |  457 +--
 .../usecases/ProducerConsumerTestSupport.java   |   46 +-
 ...ublishOnDurableTopicConsumedMessageTest.java |   10 +-
 ...OnQueueConsumedMessageInTransactionTest.java |  284 +-
 .../PublishOnQueueConsumedMessageTest.java      |   10 +-
 ...ueueConsumedMessageUsingActivemqXMLTest.java |   95 +-
 ...lishOnTemporaryQueueConsumedMessageTest.java |   12 +-
 .../PublishOnTopicConsumedMessageTest.java      |   54 +-
 ...opicConsumerMessageUsingActivemqXMLTest.java |   95 +-
 .../usecases/QueueBrowsingLevelDBTest.java      |   16 +-
 .../usecases/QueueBrowsingLimitTest.java        |  139 +-
 .../activemq/usecases/QueueBrowsingTest.java    |  333 +-
 .../QueueConsumerCloseAndReconnectTest.java     |    9 +-
 .../activemq/usecases/QueueDuplicatesTest.java  |  223 +-
 .../QueueMemoryFullMultiBrokersTest.java        |  125 +-
 .../activemq/usecases/QueueRedeliverTest.java   |   10 +-
 .../activemq/usecases/QueueRepeaterTest.java    |  151 +-
 .../usecases/ReliableReconnectTest.java         |  272 +-
 .../RequestReplyNoAdvisoryNetworkTest.java      |  447 ++-
 ...estReplyTempDestRemovalAdvisoryRaceTest.java |  826 +++--
 ...uestReplyToTopicViaThreeNetworkHopsTest.java | 1681 ++++-----
 ...tualDestinationsWithWildcardLevelDBTest.java |   14 +-
 ...okerVirtualDestinationsWithWildcardTest.java |  185 +-
 .../usecases/StartAndStopBrokerTest.java        |   91 +-
 ...AndBrokerDoesNotLeaveThreadsRunningTest.java |   92 +-
 .../activemq/usecases/StaticNetworkTest.java    |   58 +-
 .../SubscribeClosePublishThenConsumeTest.java   |  148 +-
 .../TempTopicProducerFlowControlTest.java       |   29 +-
 ...kerConnectionDuplexExcludedDestinations.java |  241 +-
 .../apache/activemq/usecases/TestSupport.java   |  224 +-
 .../usecases/ThreeBrokerQueueNetworkTest.java   | 1237 ++++---
 .../ThreeBrokerQueueNetworkUsingTcpTest.java    |   63 +-
 .../ThreeBrokerStompTemporaryQueueTest.java     |  283 +-
 ...erTempDestDemandSubscriptionCleanupTest.java |  340 +-
 .../ThreeBrokerTempQueueNetworkTest.java        |  163 +-
 .../usecases/ThreeBrokerTopicNetworkTest.java   |  740 ++--
 .../ThreeBrokerTopicNetworkUsingTcpTest.java    |   63 +-
 ...reeBrokerVirtualTopicNetworkLevelDBTest.java |   15 +-
 .../ThreeBrokerVirtualTopicNetworkTest.java     |  294 +-
 .../usecases/TopicDurableConnectStatsTest.java  |  423 +--
 .../usecases/TopicProducerFlowControlTest.java  |  289 +-
 .../activemq/usecases/TopicRedeliverTest.java   |  475 +--
 .../activemq/usecases/TopicReplicationTest.java |  170 +-
 .../TopicSubscriptionSlowConsumerTest.java      |  167 +-
 .../TopicSubscriptionZeroPrefetchTest.java      |  162 +-
 .../usecases/TransactionRollbackOrderTest.java  |  231 +-
 .../activemq/usecases/TransactionTest.java      |  154 +-
 .../usecases/TransientQueueRedeliverTest.java   |   12 +-
 ...essageNotSentToRemoteWhenNoConsumerTest.java |  151 +-
 .../usecases/TwoBrokerMulticastQueueTest.java   |  453 +--
 ...dcardDynamicallyIncludedDestinationTest.java |   20 +-
 ...ldcardStaticallyIncludedDestinationTest.java |   20 +-
 .../TwoBrokerNetworkLoadBalanceTest.java        |   93 +-
 .../TwoBrokerQueueClientsReconnectTest.java     |  962 ++---
 .../usecases/TwoBrokerQueueSendReceiveTest.java |   66 +-
 .../TwoBrokerTempQueueAdvisoryTest.java         |  277 +-
 ...icSendReceiveLotsOfMessagesUsingTcpTest.java |   11 +-
 .../usecases/TwoBrokerTopicSendReceiveTest.java |  130 +-
 ...icSendReceiveUsingJavaConfigurationTest.java |   91 +-
 .../TwoBrokerTopicSendReceiveUsingTcpTest.java  |   84 +-
 ...rVirtualDestDinamicallyIncludedDestTest.java |  379 +-
 .../TwoBrokerVirtualTopicForwardingTest.java    |  231 +-
 ...castDiscoveryBrokerTopicSendReceiveTest.java |   26 +-
 .../TwoSecureBrokerRequestReplyTest.java        |  107 +-
 .../activemq/usecases/UnlimitedEnqueueTest.java |  178 +-
 .../VerifyNetworkConsumersDisconnectTest.java   |  447 +--
 ...tualTopicNetworkClusterReactivationTest.java |  274 +-
 .../apache/activemq/util/ConsumerThread.java    |   92 +-
 .../activemq/util/DefaultTestAppender.java      |   84 +-
 .../apache/activemq/util/LinkedNodeTest.java    |  295 +-
 .../org/apache/activemq/util/MessageIdList.java |  464 ++-
 .../apache/activemq/util/ProducerThread.java    |   95 +-
 .../activemq/util/ReflectionSupportTest.java    |  165 +-
 .../org/apache/activemq/util/SimplePojo.java    |  129 +-
 .../xbean/ConnectorXBeanConfigTest.java         |  336 +-
 .../JDBCPersistenceAdapterXBeanConfigTest.java  |   46 +-
 .../xbean/JDBCPersistenceXBeanConfigTest.java   |   44 +-
 .../xbean/ManagementContextXBeanConfigTest.java |  106 +-
 ...stsWithEmbeddedBrokerAndPersistenceTest.java |    8 +-
 .../MultipleTestsWithEmbeddedBrokerTest.java    |   41 +-
 .../MultipleTestsWithSpringFactoryBeanTest.java |   90 +-
 ...ipleTestsWithSpringXBeanFactoryBeanTest.java |   26 +-
 .../MultipleTestsWithXBeanFactoryBeanTest.java  |   15 +-
 .../apache/activemq/xbean/XBeanConfigTest.java  |  159 +-
 .../activemq/xbean/XBeanStartFalseTest.java     |   10 +-
 .../org/apache/activemq/xbean/XBeanXmlTest.java |    6 +-
 .../artemis/tests/extras/ExtrasTestLogger.java  |    4 +-
 .../byteman/ActiveMQMessageHandlerTest.java     |  189 +-
 .../tests/extras/byteman/BMFailoverTest.java    |  227 +-
 .../BridgeServerLocatorConfigurationTest.java   |   69 +-
 .../extras/byteman/ClosingConnectionTest.java   |   85 +-
 .../extras/byteman/ClusteredGroupingTest.java   |  255 +-
 .../tests/extras/byteman/GroupingTest.java      |   81 +-
 .../HierarchicalObjectRepositoryTest.java       |   64 +-
 .../byteman/InterruptedMessageHandlerTest.java  |  174 +-
 .../byteman/JMSBridgeReconnectionTest.java      |  103 +-
 .../tests/extras/byteman/LatencyTest.java       |   41 +-
 .../tests/extras/byteman/MessageCopyTest.java   |  134 +-
 .../extras/byteman/OrphanedConsumerTest.java    |  176 +-
 .../tests/extras/byteman/PagingLeakTest.java    |  114 +-
 .../extras/byteman/ReplicationBackupTest.java   |   55 +-
 .../extras/byteman/ScaleDownFailoverTest.java   |   60 +-
 .../extras/byteman/ScaleDownFailureTest.java    |   35 +-
 .../byteman/ScaleDownGroupedFailoverTest.java   |    7 +-
 .../byteman/ScaleDownGroupedFailureTest.java    |    7 +-
 .../extras/byteman/StartStopDeadlockTest.java   |   88 +-
 .../extras/byteman/StompInternalStateTest.java  |   66 +-
 .../tests/extras/jms/bridge/BridgeTestBase.java |  227 +-
 .../jms/bridge/ClusteredBridgeTestBase.java     |  118 +-
 .../jms/bridge/JMSBridgeClusteredTest.java      |  106 +-
 .../jms/bridge/JMSBridgeReconnectionTest.java   |  234 +-
 .../tests/extras/jms/bridge/JMSBridgeTest.java  | 1206 ++-----
 .../bridge/TransactionManagerLocatorImpl.java   |   10 +-
 .../extras/jms/xa/JMSXDeliveryCountTest.java    |  258 +-
 .../artemis/tests/extras/jms/xa/XATest.java     |  460 +--
 .../protocols/hornetq/HornetQProtocolTest.java  |   32 +-
 .../integration/DuplicateDetectionTest.java     |  238 +-
 .../integration/IntegrationTestLogger.java      |    4 +-
 .../tests/integration/InterceptorTest.java      |  326 +-
 .../integration/SimpleNotificationService.java  |   27 +-
 .../artemis/tests/integration/SimpleTest.java   |   10 +-
 .../integration/SingleServerSimpleTest.java     |    7 +-
 .../tests/integration/String64KLimitTest.java   |   37 +-
 .../aerogear/AeroGearBasicServerTest.java       |   97 +-
 .../integration/client/AckBatchSizeTest.java    |   36 +-
 .../integration/client/AcknowledgeTest.java     |  368 +-
 .../integration/client/ActiveMQCrashTest.java   |   52 +-
 .../integration/client/AddressSettingsTest.java |   65 +-
 .../integration/client/AutoCloseCoreTest.java   |   10 +-
 .../client/AutoCreateJmsQueueTest.java          |   70 +-
 .../client/AutoDeleteJmsQueueTest.java          |   13 +-
 .../integration/client/AutogroupIdTest.java     |   44 +-
 .../integration/client/BlockingSendTest.java    |    9 +-
 .../integration/client/CommitRollbackTest.java  |   94 +-
 .../ConcurrentCreateDeleteProduceTest.java      |   61 +-
 .../integration/client/ConsumerCloseTest.java   |   85 +-
 .../integration/client/ConsumerFilterTest.java  |   41 +-
 .../client/ConsumerRoundRobinTest.java          |   16 +-
 .../integration/client/ConsumerStuckTest.java   |  127 +-
 .../tests/integration/client/ConsumerTest.java  |  233 +-
 .../client/ConsumerWindowSizeTest.java          |  501 +--
 .../integration/client/CoreClientTest.java      |   25 +-
 .../client/CreateQueueIdempotentTest.java       |   66 +-
 .../client/DeadLetterAddressTest.java           |  128 +-
 .../integration/client/DeliveryOrderTest.java   |   62 +-
 .../integration/client/DurableQueueTest.java    |   19 +-
 .../client/ExpireTestOnRestartTest.java         |   37 +-
 .../integration/client/ExpiryAddressTest.java   |   42 +-
 .../client/ExpiryLargeMessageTest.java          |   88 +-
 .../integration/client/FailureDeadlockTest.java |   57 +-
 ...FlowControlOnIgnoreLargeMessageBodyTest.java |  205 +-
 .../integration/client/HangConsumerTest.java    |  288 +-
 .../integration/client/HeuristicXATest.java     |  136 +-
 .../InVMNonPersistentMessageBufferTest.java     |   70 +-
 .../client/InVMPersistentMessageBufferTest.java |   10 +-
 .../client/IncompatibleVersionTest.java         |  147 +-
 .../client/InterruptedLargeMessageTest.java     |  245 +-
 .../client/JMSMessageCounterTest.java           |   12 +-
 .../client/JMSPagingFileDeleteTest.java         |   70 +-
 .../client/JmsNettyNioStressTest.java           |  116 +-
 .../integration/client/JournalCrashTest.java    |  102 +-
 .../LargeMessageAvoidLargeMessagesTest.java     |  106 +-
 .../client/LargeMessageCompressTest.java        |   81 +-
 .../integration/client/LargeMessageTest.java    | 1764 +++------
 .../client/LibaioDependencyCheckTest.java       |    9 +-
 .../client/MessageConcurrencyTest.java          |   69 +-
 .../client/MessageConsumerRollbackTest.java     |   68 +-
 .../integration/client/MessageCounterTest.java  |   20 +-
 .../client/MessageDurabilityTest.java           |   45 +-
 .../client/MessageExpirationTest.java           |   40 +-
 .../MessageGroupingConnectionFactoryTest.java   |   47 +-
 .../integration/client/MessageGroupingTest.java |  226 +-
 .../integration/client/MessageHandlerTest.java  |  112 +-
 .../integration/client/MessagePriorityTest.java |   65 +-
 .../integration/client/MessageRateTest.java     |   49 +-
 .../client/MultipleThreadFilterOneTest.java     |  125 +-
 .../tests/integration/client/NIOvsOIOTest.java  |  105 +-
 .../integration/client/NettyConnectorTest.java  |   10 +-
 .../client/NettyConsumerWindowSizeTest.java     |    6 +-
 .../NettyNonPersistentMessageBufferTest.java    |   10 +-
 .../NettyPersistentMessageBufferTest.java       |   10 +-
 .../client/NettyProducerFlowControlTest.java    |    7 +-
 .../client/NewDeadLetterAddressTest.java        |   15 +-
 .../tests/integration/client/OrderTest.java     |   88 +-
 .../integration/client/PagingOrderTest.java     |  263 +-
 .../integration/client/PagingSyncTest.java      |   24 +-
 .../tests/integration/client/PagingTest.java    | 2255 ++++--------
 .../integration/client/ProducerCloseTest.java   |   15 +-
 .../client/ProducerFlowControlTest.java         |  315 +-
 .../tests/integration/client/ProducerTest.java  |   61 +-
 .../integration/client/QueueBrowserTest.java    |  112 +-
 .../client/ReceiveImmediateTest.java            |   69 +-
 .../tests/integration/client/ReceiveTest.java   |   49 +-
 .../client/RedeliveryConsumerTest.java          |  119 +-
 .../tests/integration/client/RequestorTest.java |   79 +-
 .../tests/integration/client/RoutingTest.java   |   70 +-
 .../client/SelfExpandingBufferTest.java         |   27 +-
 .../client/ServerLocatorConnectTest.java        |   91 +-
 .../client/SessionCloseOnGCTest.java            |   34 +-
 .../integration/client/SessionCloseTest.java    |  121 +-
 ...onClosedOnRemotingConnectionFailureTest.java |   28 +-
 .../client/SessionCreateAndDeleteQueueTest.java |   41 +-
 .../client/SessionCreateConsumerTest.java       |   47 +-
 .../client/SessionCreateProducerTest.java       |   29 +-
 .../integration/client/SessionFactoryTest.java  |  262 +-
 .../SessionSendAcknowledgementHandlerTest.java  |   64 +-
 .../client/SessionStopStartTest.java            |  195 +-
 .../tests/integration/client/SessionTest.java   |  104 +-
 .../client/SimpleSendMultipleQueuesTest.java    |   17 +-
 .../integration/client/SlowConsumerTest.java    |  126 +-
 .../integration/client/TemporaryQueueTest.java  |  186 +-
 .../client/TransactionDurabilityTest.java       |    6 +-
 .../client/TransactionalSendTest.java           |   25 +-
 .../integration/client/TransientQueueTest.java  |   65 +-
 .../integration/client/WildCardRoutingTest.java |   71 +-
 .../clientcrash/ClientCrashTest.java            |   21 +-
 .../integration/clientcrash/ClientExitTest.java |   13 +-
 .../integration/clientcrash/ClientTestBase.java |   26 +-
 .../integration/clientcrash/CrashClient.java    |   19 +-
 .../integration/clientcrash/CrashClient2.java   |   16 +-
 .../clientcrash/DummyInterceptor.java           |   24 +-
 .../clientcrash/DummyInterceptorB.java          |   12 +-
 .../integration/clientcrash/GracefulClient.java |   21 +-
 .../cluster/ClusterControllerTest.java          |   30 +-
 .../integration/cluster/NodeManagerAction.java  |   47 +-
 .../integration/cluster/NodeManagerTest.java    |   79 +-
 .../cluster/RealNodeManagerTest.java            |   22 +-
 .../cluster/bridge/BridgeFailoverTest.java      |   84 +-
 .../cluster/bridge/BridgeReconnectTest.java     |  217 +-
 .../cluster/bridge/BridgeStartTest.java         |  225 +-
 .../integration/cluster/bridge/BridgeTest.java  |  659 +---
 .../cluster/bridge/BridgeTestBase.java          |   75 +-
 .../BridgeWithDiscoveryGroupStartTest.java      |   90 +-
 .../cluster/bridge/SimpleTransformer.java       |   17 +-
 .../distribution/ClusterHeadersRemovedTest.java |   26 +-
 .../cluster/distribution/ClusterTestBase.java   | 1127 ++----
 .../distribution/ClusterWithBackupTest.java     |   29 +-
 .../distribution/ClusteredGroupingTest.java     |  355 +-
 .../ClusteredRequestResponseTest.java           |   31 +-
 .../LargeMessageRedistributionTest.java         |    6 +-
 .../distribution/MessageLoadBalancingTest.java  |   31 +-
 .../distribution/MessageRedistributionTest.java |  158 +-
 .../MessageRedistributionWithDiscoveryTest.java |   51 +-
 .../NettyFileStorageSymmetricClusterTest.java   |   11 +-
 ...leStorageSymmetricClusterWithBackupTest.java |   11 +-
 ...torageSymmetricClusterWithDiscoveryTest.java |   12 +-
 .../NettyOneWayChainClusterTest.java            |    7 +-
 .../NettyOneWayTwoNodeClusterTest.java          |    8 +-
 .../distribution/NettySymmetricClusterTest.java |    7 +-
 .../NettySymmetricClusterWithBackupTest.java    |    7 +-
 .../NettySymmetricClusterWithDiscoveryTest.java |    7 +-
 .../distribution/OneWayChainClusterTest.java    |   56 +-
 .../distribution/OnewayTwoNodeClusterTest.java  |  206 +-
 .../SimpleSymmetricClusterTest.java             |   58 +-
 .../distribution/SymmetricClusterTest.java      |  117 +-
 .../SymmetricClusterWithBackupTest.java         |  127 +-
 .../SymmetricClusterWithDiscoveryTest.java      |   55 +-
 .../distribution/TemporaryQueueClusterTest.java |   30 +-
 .../distribution/TwoWayTwoNodeClusterTest.java  |   39 +-
 .../TwoWayTwoNodeClusterWithDiscoveryTest.java  |    9 +-
 .../AlmostLargeAsynchronousFailoverTest.java    |   16 +-
 .../failover/AsynchronousFailoverTest.java      |  285 +-
 .../AutomaticColocatedQuorumVoteTest.java       |  138 +-
 .../failover/BackupAuthenticationTest.java      |   33 +-
 .../cluster/failover/BackupSyncJournalTest.java |  130 +-
 .../failover/BackupSyncLargeMessageTest.java    |   70 +-
 .../cluster/failover/BackupSyncPagingTest.java  |   22 +-
 .../ClusterWithBackupFailoverTestBase.java      |   48 +-
 .../cluster/failover/DelayInterceptor.java      |   13 +-
 .../cluster/failover/DelayInterceptor2.java     |   16 +-
 .../cluster/failover/DelayInterceptor3.java     |   12 +-
 .../DiscoveryClusterWithBackupFailoverTest.java |   10 +-
 .../cluster/failover/FailBackAutoTest.java      |   85 +-
 .../cluster/failover/FailBackManualTest.java    |   92 +-
 .../cluster/failover/FailoverListenerTest.java  |  103 +-
 .../failover/FailoverOnFlowControlTest.java     |   58 +-
 .../cluster/failover/FailoverTest.java          |  712 ++--
 .../cluster/failover/FailoverTestBase.java      |  158 +-
 .../GroupingFailoverReplicationTest.java        |    7 +-
 .../GroupingFailoverSharedServerTest.java       |    6 +-
 .../failover/GroupingFailoverTestBase.java      |   53 +-
 .../failover/LargeMessageFailoverTest.java      |   22 +-
 .../failover/LiveToLiveFailoverTest.java        |  188 +-
 .../MultipleBackupsFailoverTestBase.java        |   76 +-
 ...ultipleLivesMultipleBackupsFailoverTest.java |   72 +-
 .../MultipleServerFailoverTestBase.java         |  137 +-
 .../failover/NettyAsynchronousFailoverTest.java |   10 +-
 .../failover/NettyAsynchronousReattachTest.java |    9 +-
 ...yDiscoveryClusterWithBackupFailoverTest.java |    7 +-
 .../cluster/failover/NettyFailoverTest.java     |   19 +-
 ...eDiscoveryClusterWithBackupFailoverTest.java |    7 +-
 ...rageStaticClusterWithBackupFailoverTest.java |    7 +-
 .../failover/NettyReplicatedFailoverTest.java   |   24 +-
 ...ettyStaticClusterWithBackupFailoverTest.java |    7 +-
 .../cluster/failover/PagingFailoverTest.java    |   75 +-
 .../cluster/failover/QuorumFailOverTest.java    |   53 +-
 .../failover/QuorumVoteServerConnectTest.java   |   40 +-
 .../ReplicatedAsynchronousFailoverTest.java     |    7 +-
 .../failover/ReplicatedDistributionTest.java    |   40 +-
 .../failover/ReplicatedFailoverTest.java        |   71 +-
 ...eplicatedFailoverUsingNodeGroupNameTest.java |   18 +-
 .../ReplicatedLargeMessageFailoverTest.java     |   35 +-
 ...icatedLargeMessageWithDelayFailoverTest.java |   17 +-
 ...ltipleServerFailoverNoNodeGroupNameTest.java |    7 +-
 ...eplicatedManyMultipleServerFailoverTest.java |   10 +-
 ...dMultipleServerFailoverExtraBackupsTest.java |   53 +-
 ...ltipleServerFailoverNoGroupNodeNameTest.java |    7 +-
 .../ReplicatedMultipleServerFailoverTest.java   |   89 +-
 ...ReplicatedNettyAsynchronousFailoverTest.java |    6 +-
 .../failover/ReplicatedPagedFailoverTest.java   |   17 +-
 .../failover/ReplicatedPagingFailoverTest.java  |    6 +-
 .../ReplicatedWithDelayFailoverTest.java        |   16 +-
 .../cluster/failover/SecurityFailoverTest.java  |   61 +-
 .../cluster/failover/SharedStoreBackupTest.java |   45 +-
 .../failover/SharedStoreDistributionTest.java   |    7 +-
 .../SingleLiveMultipleBackupsFailoverTest.java  |   50 +-
 .../StaticClusterWithBackupFailoverTest.java    |   60 +-
 .../remote/FailoverWithSharedStoreTest.java     |   15 +-
 .../ha/HAAutomaticBackupSharedStore.java        |   18 +-
 .../reattach/MultiThreadRandomReattachTest.java |   14 +-
 .../MultiThreadRandomReattachTestBase.java      |  546 +--
 .../MultiThreadReattachSupportTestBase.java     |   98 +-
 .../NettyMultiThreadRandomReattachTest.java     |   15 +-
 .../cluster/reattach/OrderReattachTest.java     |  126 +-
 .../cluster/reattach/RandomReattachTest.java    |  654 ++--
 .../cluster/reattach/ReattachTest.java          |  396 +--
 .../cluster/restart/ClusterRestartTest.java     |   26 +-
 .../cluster/topology/HAClientTopologyTest.java  |   22 +-
 .../HAClientTopologyWithDiscoveryTest.java      |   27 +-
 .../cluster/topology/IsolatedTopologyTest.java  |  121 +-
 .../topology/NettyHAClientTopologyTest.java     |    6 +-
 .../NettyHAClientTopologyWithDiscoveryTest.java |    6 +-
 .../cluster/topology/NonHATopologyTest.java     |   62 +-
 .../topology/TopologyClusterTestBase.java       |  136 +-
 .../cluster/util/BackupSyncDelay.java           |  156 +-
 .../cluster/util/MultiServerTestBase.java       |  158 +-
 .../cluster/util/RemoteServerConfiguration.java |    6 +-
 .../cluster/util/SameProcessActiveMQServer.java |   45 +-
 .../cluster/util/TestableServer.java            |    4 +-
 .../discovery/DiscoveryBaseTest.java            |  133 +-
 .../discovery/DiscoveryStayAliveTest.java       |   59 +-
 .../integration/discovery/DiscoveryTest.java    |  403 +--
 .../tests/integration/divert/DivertTest.java    |  431 +--
 .../divert/PersistentDivertTest.java            |  162 +-
 .../integration/embedded/ValidateAIOTest.java   |   13 +-
 .../http/CoreClientOverHttpTest.java            |   53 +-
 .../jms/ActiveMQConnectionFactoryTest.java      |  357 +-
 .../tests/integration/jms/FloodServerTest.java  |  113 +-
 .../tests/integration/jms/JMSSecurityTest.java  |   30 +-
 .../tests/integration/jms/JmsProducerTest.java  |  206 +-
 .../ManualReconnectionToSingleServerTest.java   |   98 +-
 .../integration/jms/SimpleJNDIClientTest.java   |  108 +-
 .../jms/client/AutoGroupingTest.java            |   14 +-
 .../integration/jms/client/ConnectionTest.java  |   91 +-
 .../integration/jms/client/CreateQueueTest.java |   15 +-
 .../jms/client/ExpiryMessageTest.java           |   19 +-
 .../integration/jms/client/GroupIDTest.java     |   13 +-
 .../integration/jms/client/GroupingTest.java    |   82 +-
 .../jms/client/MessageProducerTest.java         |   45 +-
 .../integration/jms/client/MessageTest.java     |  133 +-
 .../jms/client/NewQueueRequestorTest.java       |   35 +-
 .../jms/client/NoLocalSubscriberTest.java       |   56 +-
 .../integration/jms/client/PreACKJMSTest.java   |   60 +-
 .../jms/client/ReSendMessageTest.java           |  136 +-
 .../jms/client/ReceiveNoWaitTest.java           |   25 +-
 .../jms/client/RemoteConnectionStressTest.java  |   14 +-
 ...onClosedOnRemotingConnectionFailureTest.java |   72 +-
 .../integration/jms/client/SessionTest.java     |   81 +-
 .../integration/jms/client/StoreConfigTest.java |   91 +-
 .../integration/jms/client/TextMessageTest.java |   78 +-
 .../jms/client/TopicCleanupTest.java            |   29 +-
 .../jms/cluster/BindingsClusterTest.java        |   93 +-
 .../jms/cluster/JMSFailoverListenerTest.java    |   93 +-
 .../jms/cluster/JMSFailoverTest.java            |  166 +-
 .../jms/cluster/JMSReconnectTest.java           |   77 +-
 .../jms/cluster/LargeMessageOverBridgeTest.java |   94 +-
 .../jms/cluster/MultipleThreadsOpeningTest.java |   36 +-
 .../jms/cluster/ReplicatedJMSFailoverTest.java  |   27 +-
 .../jms/cluster/TemporaryQueueClusterTest.java  |   43 +-
 .../jms/cluster/TopicClusterTest.java           |   17 +-
 .../CloseConnectionFactoryOnGCest.java          |   25 +-
 .../jms/connection/CloseConnectionOnGCTest.java |   41 +-
 .../CloseDestroyedConnectionTest.java           |   40 +-
 .../connection/ConcurrentSessionCloseTest.java  |   32 +-
 .../ConnectionFactorySerializationTest.java     |  176 +-
 ...tionFactoryWithJGroupsSerializationTest.java |  107 +-
 .../jms/connection/ExceptionListenerTest.java   |   34 +-
 .../jms/connection/InvalidConnectorTest.java    |   44 +-
 .../integration/jms/consumer/ConsumerTest.java  |  227 +-
 .../jms/divert/DivertAndACKClientTest.java      |   71 +-
 .../integration/jms/jms2client/BodyTest.java    |   19 +-
 .../jms/jms2client/InvalidDestinationTest.java  |  226 +-
 .../jms/jms2client/JmsContextTest.java          |  208 +-
 .../JmsProducerCompletionListenerTest.java      |   79 +-
 .../jms/jms2client/NonExistentQueueTest.java    |   26 +-
 .../jms/jms2client/SharedConsumerTest.java      |  167 +-
 .../jms/largemessage/JMSLargeMessageTest.java   |   80 +-
 .../jms/server/JMSServerDeployerTest.java       |   41 +-
 .../jms/server/JMSServerStartStopTest.java      |   32 +-
 .../jms/server/config/JMSConfigurationTest.java |   40 +-
 .../config/JMSServerConfigParserTest.java       |    9 +-
 .../ConnectionFactoryControlTest.java           |   40 +-
 .../server/management/JMSMessagingProxy.java    |   28 +-
 .../server/management/JMSQueueControlTest.java  |  310 +-
 .../management/JMSQueueControlUsingJMSTest.java |  245 +-
 .../management/JMSServerControl2Test.java       |  433 +--
 .../management/JMSServerControlRestartTest.java |   19 +-
 .../server/management/JMSServerControlTest.java |  341 +-
 .../JMSServerControlUsingJMSTest.java           |  282 +-
 .../jms/server/management/JMSUtil.java          |  144 +-
 .../server/management/NullInitialContext.java   |   18 +-
 .../management/TopicControlClusterTest.java     |   12 +-
 .../jms/server/management/TopicControlTest.java |  125 +-
 .../management/TopicControlUsingJMSTest.java    |  148 +-
 .../journal/AIOImportExportTest.java            |   10 +-
 .../journal/AIOJournalCompactTest.java          |   15 +-
 .../integration/journal/AIOJournalImplTest.java |   36 +-
 .../journal/AIOSequentialFileFactoryTest.java   |   13 +-
 .../journal/NIOBufferedJournalCompactTest.java  |    6 +-
 .../journal/NIOImportExportTest.java            |   17 +-
 .../journal/NIOJournalCompactTest.java          |  556 +--
 .../integration/journal/NIOJournalImplTest.java |   10 +-
 .../journal/NIONoBufferJournalImplTest.java     |   10 +-
 ...NIONonBufferedSequentialFileFactoryTest.java |    7 +-
 .../journal/NIOSequentialFileFactoryTest.java   |    7 +-
 .../integration/journal/RelativePathTest.java   |   24 +-
 .../journal/ValidateTransactionHealthTest.java  |  232 +-
 .../largemessage/LargeMessageTestBase.java      |  370 +-
 .../largemessage/ServerLargeMessageTest.java    |   19 +-
 .../management/AcceptorControlTest.java         |   56 +-
 .../AcceptorControlUsingCoreTest.java           |   38 +-
 .../management/ActiveMQServerControlTest.java   |  299 +-
 .../ActiveMQServerControlUsingCoreTest.java     |  404 +--
 .../management/AddressControlTest.java          |   61 +-
 .../management/AddressControlUsingCoreTest.java |   62 +-
 .../management/BridgeControlTest.java           |   80 +-
 .../management/BridgeControlUsingCoreTest.java  |   95 +-
 .../management/BroadcastGroupControlTest.java   |   33 +-
 .../BroadcastGroupControlUsingCoreTest.java     |   58 +-
 .../ClusterConnectionControl2Test.java          |   77 +-
 .../ClusterConnectionControlTest.java           |  134 +-
 .../ClusterConnectionControlUsingCoreTest.java  |   61 +-
 .../management/CoreMessagingProxy.java          |   41 +-
 .../management/DivertControlTest.java           |   38 +-
 .../management/DivertControlUsingCoreTest.java  |   34 +-
 .../integration/management/JMXDomainTest.java   |   14 +-
 .../management/ManagementActivationTest.java    |  121 +-
 .../management/ManagementControlHelper.java     |   99 +-
 .../management/ManagementHelperTest.java        |   24 +-
 .../management/ManagementServiceImplTest.java   |   44 +-
 .../management/ManagementTestBase.java          |   52 +-
 .../ManagementWithPagingServerTest.java         |  131 +-
 .../management/ManagementWithStompTest.java     |   66 +-
 .../management/NotificationTest.java            |  110 +-
 .../management/QueueControlTest.java            |  317 +-
 .../management/QueueControlUsingCoreTest.java   |  204 +-
 .../management/SecurityManagementTestBase.java  |   37 +-
 ...tyManagementWithConfiguredAdminUserTest.java |   27 +-
 ...yManagementWithDefaultConfigurationTest.java |   23 +-
 ...ManagementWithModifiedConfigurationTest.java |   26 +-
 .../management/SecurityNotificationTest.java    |   67 +-
 .../mqtt/imported/FuseMQTTClientProvider.java   |   49 +-
 .../mqtt/imported/MQTTClientProvider.java       |    4 +-
 .../integration/mqtt/imported/MQTTTest.java     |  894 ++---
 .../mqtt/imported/MQTTTestSupport.java          |  153 +-
 .../integration/mqtt/imported/PahoMQTTTest.java |   63 +-
 .../util/ResourceLoadingSslContext.java         |  129 +-
 .../integration/mqtt/imported/util/Wait.java    |   22 +-
 .../integration/openwire/BasicOpenWireTest.java |  105 +-
 .../integration/openwire/BasicSecurityTest.java |  115 +-
 .../integration/openwire/OpenWireTestBase.java  |   47 +-
 .../integration/openwire/OpenWireUtilTest.java  |    7 +-
 .../openwire/SimpleOpenWireTest.java            |   91 +-
 .../openwire/amq/JMSConsumer10Test.java         |   28 +-
 .../openwire/amq/JMSConsumer11Test.java         |   27 +-
 .../openwire/amq/JMSConsumer12Test.java         |   33 +-
 .../openwire/amq/JMSConsumer13Test.java         |   30 +-
 .../openwire/amq/JMSConsumer1Test.java          |   42 +-
 .../openwire/amq/JMSConsumer2Test.java          |   89 +-
 .../openwire/amq/JMSConsumer3Test.java          |   45 +-
 .../openwire/amq/JMSConsumer4Test.java          |   30 +-
 .../openwire/amq/JMSConsumer5Test.java          |   48 +-
 .../openwire/amq/JMSConsumer6Test.java          |   67 +-
 .../openwire/amq/JMSConsumer7Test.java          |   51 +-
 .../openwire/amq/JMSConsumer8Test.java          |   53 +-
 .../openwire/amq/JMSConsumer9Test.java          |   57 +-
 .../amq/JMSDurableTopicRedeliverTest.java       |   25 +-
 .../openwire/amq/JMSIndividualAckTest.java      |   15 +-
 .../openwire/amq/JMSMessageTest.java            |  234 +-
 .../openwire/amq/JMSQueueRedeliverTest.java     |    7 +-
 .../openwire/amq/JMSUsecase1Test.java           |   36 +-
 .../openwire/amq/JMSUsecaseTest.java            |   26 +-
 .../openwire/amq/JmsAutoAckListenerTest.java    |   10 +-
 .../openwire/amq/JmsAutoAckTest.java            |   10 +-
 .../openwire/amq/JmsClientAckTest.java          |   25 +-
 .../amq/JmsConnectionStartStopTest.java         |   65 +-
 .../amq/JmsConsumerResetActiveListenerTest.java |   64 +-
 .../amq/JmsCreateConsumerInOnMessageTest.java   |   34 +-
 .../JmsDurableQueueWildcardSendReceiveTest.java |   13 +-
 .../amq/JmsDurableTopicSelectorTest.java        |    7 +-
 .../amq/JmsDurableTopicSendReceiveTest.java     |   13 +-
 .../amq/JmsDurableTopicTransactionTest.java     |    6 +-
 .../JmsDurableTopicWildcardSendReceiveTest.java |   13 +-
 .../openwire/amq/JmsQueueBrowserTest.java       |  118 +-
 .../openwire/amq/JmsQueueRequestReplyTest.java  |    7 +-
 .../openwire/amq/JmsResourceProvider.java       |  104 +-
 .../openwire/amq/JmsSendReceiveTestSupport.java |   94 +-
 .../openwire/amq/JmsTopicRedeliverTest.java     |   60 +-
 .../openwire/amq/JmsTopicRequestReplyTest.java  |  113 +-
 .../openwire/amq/JmsTopicSelectorTest.java      |   79 +-
 .../openwire/amq/JmsTopicSendReceiveTest.java   |   68 +-
 ...sTopicSendReceiveWithTwoConnectionsTest.java |   42 +-
 .../openwire/amq/JmsTopicTransactionTest.java   |    7 +-
 .../amq/JmsTopicWildcardSendReceiveTest.java    |  117 +-
 .../openwire/amq/JmsTransactionTestSupport.java |  222 +-
 .../amq/MessageListenerRedeliveryTest.java      |  188 +-
 .../amq/ProducerFlowControlSendFailTest.java    |   94 +-
 .../openwire/amq/ProducerFlowControlTest.java   |  157 +-
 .../amq/ReconnectWithSameClientIDTest.java      |   40 +-
 .../openwire/amq/RedeliveryPolicyTest.java      |   64 +-
 .../integration/openwire/amq/TimeStampTest.java |   21 +-
 .../openwire/amq/TransactionContextTest.java    |   61 +-
 .../openwire/interop/GeneralInteropTest.java    |  224 +-
 .../tests/integration/openwire/util/Wait.java   |   22 +-
 .../paging/MultipleProducersPagingTest.java     |   82 +-
 .../integration/paging/NettyPagingSendTest.java |    7 +-
 .../paging/PageCountSyncOnNonTXTest.java        |   70 +-
 .../integration/paging/PageCountSyncServer.java |   32 +-
 .../integration/paging/PagingCounterTest.java   |   72 +-
 .../integration/paging/PagingReceiveTest.java   |   43 +-
 .../integration/paging/PagingSendTest.java      |  120 +-
 .../PagingWithFailoverAndCountersTest.java      |  228 +-
 .../paging/PagingWithFailoverBackup.java        |    7 +-
 .../paging/PagingWithFailoverServer.java        |   45 +-
 .../paging/SpawnedServerSupport.java            |   88 +-
 ...AddressSettingsConfigurationStorageTest.java |   23 +-
 .../DeleteMessagesOnStartupTest.java            |   22 +-
 .../persistence/DeleteQueueRestartTest.java     |   32 +-
 .../persistence/DuplicateCacheTest.java         |   25 +-
 .../persistence/ExportFormatTest.java           |   28 +-
 ...nnectionFactoryConfigurationStorageTest.java |   46 +-
 .../persistence/JMSDynamicConfigTest.java       |   26 +-
 .../persistence/JMSStorageManagerTest.java      |   10 +-
 .../integration/persistence/RestartSMTest.java  |   21 +-
 .../RolesConfigurationStorageTest.java          |   59 +-
 .../persistence/StorageManagerTestBase.java     |   37 +-
 ...ansportConfigurationEncodingSupportTest.java |   18 +-
 .../persistence/XmlImportExportTest.java        |  178 +-
 .../tests/integration/proton/ProtonTest.java    |  362 +-
 .../integration/ra/ActiveMQActivationTest.java  |    8 +-
 .../integration/ra/ActiveMQClusteredTest.java   |   17 +-
 .../ra/ActiveMQMessageHandlerSecurityTest.java  |   13 +-
 .../ra/ActiveMQMessageHandlerTest.java          |  168 +-
 .../ra/ActiveMQMessageHandlerXATest.java        |   82 +-
 .../ra/ActiveMQRAClusteredTestBase.java         |   29 +-
 .../integration/ra/ActiveMQRATestBase.java      |  107 +-
 .../tests/integration/ra/DummyTransaction.java  |   25 +-
 .../integration/ra/DummyTransactionManager.java |   31 +-
 .../tests/integration/ra/JMSContextTest.java    |   64 +-
 .../integration/ra/OutgoingConnectionTest.java  |   89 +-
 .../ra/OutgoingConnectionTestJTA.java           |  102 +-
 .../integration/ra/ResourceAdapterTest.java     |  111 +-
 .../integration/remoting/BatchDelayTest.java    |   22 +-
 .../remoting/DestroyConsumerTest.java           |    6 +-
 .../integration/remoting/DirectDeliverTest.java |   31 +-
 .../remoting/NettyNetworkAddressTest.java       |   15 +-
 .../remoting/NettySynchronousCloseTest.java     |    7 +-
 .../remoting/NetworkAddressTestBase.java        |   94 +-
 .../tests/integration/remoting/PingTest.java    |  142 +-
 .../integration/remoting/ReconnectTest.java     |  125 +-
 .../remoting/SynchronousCloseTest.java          |   27 +-
 .../replication/ReplicationOrderTest.java       |   48 +-
 .../replication/ReplicationTest.java            |  384 +-
 .../scheduling/DelayedMessageTest.java          |   65 +-
 .../MultipliedDelayedMessageTest.java           |   33 +-
 .../scheduling/ScheduledMessageTest.java        |  173 +-
 .../security/NettySecurityClientTest.java       |   44 +-
 .../integration/security/SecurityTest.java      |  353 +-
 .../integration/security/SimpleClient.java      |   36 +-
 .../server/AIOFileLockTimeoutTest.java          |    8 +-
 .../server/AddressFullLoggingTest.java          |   45 +-
 .../integration/server/ConnectionLimitTest.java |   32 +-
 .../integration/server/ExpiryRunnerTest.java    |  156 +-
 .../integration/server/FakeStorageManager.java  |   21 +-
 .../integration/server/FileLockTimeoutTest.java |   55 +-
 .../server/GracefulShutdownTest.java            |   68 +-
 .../integration/server/LVQRecoveryTest.java     |   27 +-
 .../tests/integration/server/LVQTest.java       |   59 +-
 .../server/NIOFileLockTimeoutTest.java          |    8 +-
 .../integration/server/PredefinedQueueTest.java |  136 +-
 .../integration/server/ResourceLimitTest.java   |   47 +-
 .../integration/server/ScaleDown3NodeTest.java  |  111 +-
 .../integration/server/ScaleDownDirectTest.java |   92 +-
 .../tests/integration/server/ScaleDownTest.java |  126 +-
 .../integration/server/SimpleStartStopTest.java |   23 +-
 .../server/SuppliedThreadPoolTest.java          |   30 +-
 .../integration/spring/ExampleListener.java     |   15 +-
 .../tests/integration/spring/MessageSender.java |   25 +-
 .../spring/SpringIntegrationTest.java           |   34 +-
 .../ssl/CoreClientOverOneWaySSLTest.java        |  204 +-
 .../ssl/CoreClientOverTwoWaySSLTest.java        |   58 +-
 .../integration/stomp/ConcurrentStompTest.java  |   65 +-
 .../tests/integration/stomp/ExtraStompTest.java |  326 +-
 .../stomp/StompConnectionCleanupTest.java       |   28 +-
 .../integration/stomp/StompOverHttpTest.java    |   30 +-
 .../stomp/StompOverWebsocketTest.java           |   64 +-
 .../tests/integration/stomp/StompTest.java      |  154 +-
 .../tests/integration/stomp/StompTestBase.java  |  163 +-
 .../integration/stomp/StompWebSocketTest.java   |   24 +-
 .../stomp/util/AbstractClientStompFrame.java    |   93 +-
 .../util/AbstractStompClientConnection.java     |  199 +-
 .../stomp/util/ClientStompFrame.java            |    3 +-
 .../stomp/util/ClientStompFrameV10.java         |   19 +-
 .../stomp/util/ClientStompFrameV11.java         |   36 +-
 .../stomp/util/ClientStompFrameV12.java         |   37 +-
 .../stomp/util/StompClientConnection.java       |    4 +-
 .../util/StompClientConnectionFactory.java      |   21 +-
 .../stomp/util/StompClientConnectionV10.java    |   40 +-
 .../stomp/util/StompClientConnectionV11.java    |   53 +-
 .../stomp/util/StompClientConnectionV12.java    |   48 +-
 .../stomp/util/StompFrameFactory.java           |    3 +-
 .../stomp/util/StompFrameFactoryFactory.java    |   16 +-
 .../stomp/util/StompFrameFactoryV10.java        |   18 +-
 .../stomp/util/StompFrameFactoryV11.java        |   92 +-
 .../stomp/util/StompFrameFactoryV12.java        |   75 +-
 .../integration/stomp/v11/ExtraStompTest.java   |   34 +-
 .../integration/stomp/v11/StompV11Test.java     |  496 +--
 .../integration/stomp/v11/StompV11TestBase.java |   62 +-
 .../integration/stomp/v12/StompV12Test.java     |  523 +--
 .../netty/ActiveMQFrameDecoder2Test.java        |   28 +-
 .../NettyConnectorWithHTTPUpgradeTest.java      |  137 +-
 .../vertx/ActiveMQVertxUnitTest.java            |  418 +--
 .../integration/xa/BasicXaRecoveryTest.java     |  306 +-
 .../tests/integration/xa/BasicXaTest.java       |  280 +-
 .../tests/integration/xa/XaTimeoutTest.java     |  201 +-
 .../tests/util/JMSClusteredTestBase.java        |   59 +-
 .../artemis/tests/util/JMSTestBase.java         |  125 +-
 .../tests/util/NonSerializableFactory.java      |  104 +-
 .../tests/util/ReplicatedBackupUtils.java       |   31 +-
 .../tests/util/TransportConfigurationUtils.java |   57 +-
 .../DummyTransactionManagerLocator.java         |   34 +-
 .../TransactionManagerLocatorTest.java          |    7 +-
 .../artemis/jms/tests/AcknowledgementTest.java  |  387 +-
 .../jms/tests/ActiveMQServerTestCase.java       |  265 +-
 .../jms/tests/AutoAckMesageListenerTest.java    |   52 +-
 .../activemq/artemis/jms/tests/BrowserTest.java |   87 +-
 .../artemis/jms/tests/CTSMiscellaneousTest.java |   71 +-
 .../artemis/jms/tests/ConnectionClosedTest.java |  166 +-
 .../jms/tests/ConnectionFactoryTest.java        |  211 +-
 .../artemis/jms/tests/ConnectionTest.java       |  138 +-
 .../artemis/jms/tests/ConsumerClosedTest.java   |   18 +-
 .../artemis/jms/tests/DeliveryOrderTest.java    |   49 +-
 .../jms/tests/DurableSubscriptionTest.java      |  129 +-
 .../activemq/artemis/jms/tests/JMSTest.java     |   72 +-
 .../activemq/artemis/jms/tests/JMSTestCase.java |  160 +-
 .../artemis/jms/tests/JmsTestLogger.java        |    4 +-
 .../artemis/jms/tests/MessageConsumerTest.java  | 1590 +++------
 .../artemis/jms/tests/MessageProducerTest.java  |  365 +-
 .../jms/tests/MessageWithReadResolveTest.java   |   31 +-
 .../artemis/jms/tests/MiscellaneousTest.java    |  107 +-
 .../jms/tests/NonDurableSubscriberTest.java     |   30 +-
 .../artemis/jms/tests/PersistenceTest.java      |  173 +-
 .../artemis/jms/tests/QueueReceiverTest.java    |   18 +-
 .../activemq/artemis/jms/tests/QueueTest.java   |   66 +-
 .../artemis/jms/tests/ReferenceableTest.java    |   21 +-
 .../artemis/jms/tests/SecurityTest.java         |   70 +-
 .../activemq/artemis/jms/tests/SessionTest.java |  135 +-
 .../jms/tests/TemporaryDestinationTest.java     |  183 +-
 .../activemq/artemis/jms/tests/TopicTest.java   |   47 +-
 .../jms/tests/TransactedSessionTest.java        |  381 +-
 .../tests/message/BodyIsAssignableFromTest.java |   63 +-
 .../jms/tests/message/BytesMessageTest.java     |   15 +-
 .../jms/tests/message/ExpiredMessageTest.java   |   17 +-
 .../message/JMSCorrelationIDHeaderTest.java     |   19 +-
 .../message/JMSDeliveryModeHeaderTest.java      |   12 +-
 .../tests/message/JMSDestinationHeaderTest.java |    6 +-
 .../tests/message/JMSExpirationHeaderTest.java  |  111 +-
 .../tests/message/JMSMessageIDHeaderTest.java   |   24 +-
 .../tests/message/JMSPriorityHeaderTest.java    |   58 +-
 .../jms/tests/message/JMSReplyToHeaderTest.java |   10 +-
 .../tests/message/JMSTimestampHeaderTest.java   |    9 +-
 .../jms/tests/message/JMSTypeHeaderTest.java    |    9 +-
 .../jms/tests/message/MapMessageTest.java       |   18 +-
 .../jms/tests/message/MessageBodyTest.java      |  736 ++--
 .../jms/tests/message/MessageBodyTestCase.java  |   11 +-
 .../jms/tests/message/MessageHeaderTest.java    |  708 ++--
 .../tests/message/MessageHeaderTestBase.java    |  211 +-
 .../message/MessagePropertyConversionTest.java  |  729 ++--
 .../jms/tests/message/MessageTestBase.java      |   40 +-
 .../message/ObjectMessageDeliveryTest.java      |   32 +-
 .../jms/tests/message/ObjectMessageTest.java    |   49 +-
 .../tests/message/SimpleJMSBytesMessage.java    |  375 +-
 .../jms/tests/message/SimpleJMSMapMessage.java  |  387 +-
 .../jms/tests/message/SimpleJMSMessage.java     |  216 +-
 .../tests/message/SimpleJMSObjectMessage.java   |    9 +-
 .../tests/message/SimpleJMSStreamMessage.java   |  498 +--
 .../jms/tests/message/SimpleJMSTextMessage.java |   15 +-
 .../artemis/jms/tests/message/SomeObject.java   |   26 +-
 .../jms/tests/message/StreamMessageTest.java    |   18 +-
 .../jms/tests/message/TextMessageTest.java      |   27 +-
 .../foreign/ForeignBytesMessageTest.java        |   15 +-
 .../message/foreign/ForeignMapMessageTest.java  |   16 +-
 .../message/foreign/ForeignMessageTest.java     |   35 +-
 .../foreign/ForeignObjectMessageTest.java       |   19 +-
 .../foreign/ForeignStreamMessageTest.java       |   15 +-
 .../message/foreign/ForeignTestObject.java      |   30 +-
 .../message/foreign/ForeignTextMessageTest.java |   11 +-
 .../jms/tests/selector/SelectorTest.java        |  335 +-
 .../jms/tests/tools/ServerManagement.java       |   50 +-
 .../jms/tests/tools/container/Constants.java    |    3 +-
 .../jms/tests/tools/container/InVMContext.java  |  190 +-
 .../container/InVMInitialContextFactory.java    |   52 +-
 .../InVMInitialContextFactoryBuilder.java       |   40 +-
 .../tests/tools/container/InVMNameParser.java   |   12 +-
 .../tests/tools/container/LocalTestServer.java  |  251 +-
 .../tools/container/NonSerializableFactory.java |  107 +-
 .../jms/tests/tools/container/Server.java       |   17 +-
 .../artemis/jms/tests/util/JNDIUtilTest.java    |   40 +-
 .../jms/tests/util/ProxyAssertSupport.java      |  307 +-
 .../activemq/artemis/jms/AbstractAdmin.java     |   52 +-
 .../activemq/artemis/jms/ActiveMQAdmin.java     |  172 +-
 .../activemq/artemis/jms/GenericAdmin.java      |   52 +-
 .../artemis/jms/JoramAggregationTest.java       |   36 +-
 .../activemq/artemis/jms/SpawnedJMSServer.java  |   29 +-
 .../org/objectweb/jtests/jms/admin/Admin.java   |   17 +-
 .../jtests/jms/admin/AdminFactory.java          |   24 +-
 .../jms/conform/connection/ConnectionTest.java  |  106 +-
 .../conform/connection/TopicConnectionTest.java |   39 +-
 .../jms/conform/message/MessageBodyTest.java    |   45 +-
 .../jms/conform/message/MessageDefaultTest.java |   13 +-
 .../jms/conform/message/MessageTypeTest.java    |  165 +-
 .../message/headers/MessageHeaderTest.java      |  144 +-
 .../message/properties/JMSXPropertyTest.java    |   66 +-
 .../MessagePropertyConversionTest.java          |  810 ++---
 .../message/properties/MessagePropertyTest.java |  196 +-
 .../jms/conform/queue/QueueBrowserTest.java     |   57 +-
 .../jms/conform/queue/TemporaryQueueTest.java   |   14 +-
 .../conform/selector/SelectorSyntaxTest.java    |  223 +-
 .../jms/conform/selector/SelectorTest.java      |  137 +-
 .../jms/conform/session/QueueSessionTest.java   |   71 +-
 .../jtests/jms/conform/session/SessionTest.java |  137 +-
 .../jms/conform/session/TopicSessionTest.java   |   88 +-
 .../jms/conform/session/UnifiedSessionTest.java |  123 +-
 .../jms/conform/topic/TemporaryTopicTest.java   |   14 +-
 .../jtests/jms/framework/JMSTestCase.java       |   43 +-
 .../jtests/jms/framework/PTPTestCase.java       |   37 +-
 .../jtests/jms/framework/PubSubTestCase.java    |   35 +-
 .../jtests/jms/framework/TestConfig.java        |   16 +-
 .../jtests/jms/framework/UnifiedTestCase.java   |   43 +-
 .../journal/FakeJournalImplTest.java            |    8 +-
 .../journal/JournalImplTestUnit.java            |   97 +-
 .../journal/RealJournalImplAIOTest.java         |   14 +-
 .../journal/RealJournalImplNIOTest.java         |    7 +-
 .../paging/MeasurePagingMultiThreadTest.java    |   75 +-
 .../sends/AbstractSendReceivePerfTest.java      |   97 +-
 .../tests/performance/sends/ClientACKPerf.java  |   42 +-
 .../sends/MeasureCommitPerfTest.java            |   29 +-
 .../tests/performance/sends/PreACKPerf.java     |   26 +-
 .../tests/soak/client/ClientAbstract.java       |   84 +-
 .../soak/client/ClientNonDivertedSoakTest.java  |   27 +-
 .../tests/soak/client/ClientSoakTest.java       |   41 +-
 .../artemis/tests/soak/client/Receiver.java     |   56 +-
 .../artemis/tests/soak/client/Sender.java       |   36 +-
 .../soak/client/SimpleSendReceiveSoakTest.java  |   28 +-
 .../soak/failover/RandomFailoverSoakTest.java   |    6 +-
 .../stress/chunk/LargeMessageStressTest.java    |   22 +-
 .../tests/stress/client/SendStressTest.java     |   39 +-
 .../MultiThreadRandomReattachStressTest.java    |    7 +-
 .../failover/RandomReattachStressTest.java      |    6 +-
 .../AIOAllPossibilitiesCompactStressTest.java   |   12 +-
 .../AIOMultiThreadCompactorStressTest.java      |    9 +-
 .../stress/journal/AddAndRemoveStressTest.java  |  109 +-
 .../AllPossibilitiesCompactStressTest.java      |    7 +-
 ...ibilitiesCompactWithAddDeleteStressTest.java |    6 +-
 .../stress/journal/CompactingStressTest.java    |  179 +-
 .../JournalCleanupCompactStressTest.java        |  244 +-
 .../journal/JournalRestartStressTest.java       |   67 +-
 .../stress/journal/LargeJournalStressTest.java  |  128 +-
 .../stress/journal/MixupCompactorTestBase.java  |   91 +-
 .../journal/MultiThreadConsumerStressTest.java  |  126 +-
 .../NIOMultiThreadCompactorStressTest.java      |  214 +-
 .../journal/XmlImportExportStressTest.java      |   22 +-
 .../paging/MultipleConsumersPageStressTest.java |  190 +-
 .../stress/paging/PageCursorStressTest.java     |  249 +-
 .../tests/stress/paging/PageStressTest.java     |   94 +-
 .../tests/stress/remote/PingStressTest.java     |   82 +-
 .../tests/stress/stomp/StompStressTest.java     |   70 +-
 .../core/journal/impl/AIOJournalImplTest.java   |   11 +-
 .../core/journal/impl/FakeJournalImplTest.java  |    7 +-
 .../core/journal/impl/JournalImplTestUnit.java  |   48 +-
 .../core/journal/impl/NIOJournalImplTest.java   |    7 +-
 .../core/server/impl/QueueConcurrentTest.java   |   75 +-
 .../timing/core/server/impl/QueueImplTest.java  |   73 +-
 .../jms/bridge/impl/JMSBridgeImplTest.java      |  186 +-
 .../tests/timing/util/ReusableLatchTest.java    |    7 +-
 .../timing/util/TokenBucketLimiterImplTest.java |  106 +-
 .../artemis/tests/timing/util/UTF8Test.java     |   40 +-
 .../artemis/tests/timing/util/UUIDTest.java     |   12 +-
 .../artemis/tests/unit/UnitTestLogger.java      |    4 +-
 .../tests/unit/core/asyncio/AIOTestBase.java    |   61 +-
 .../MultiThreadAsynchronousFileTest.java        |  114 +-
 .../client/impl/LargeMessageBufferTest.java     |  408 +--
 .../impl/ConfigurationValidationTest.java       |    9 +-
 .../core/config/impl/ConnectorsServiceTest.java |   25 +-
 .../config/impl/TransportConfigurationTest.java |   12 +-
 .../config/impl/fakes/FakeConnectorService.java |   16 +-
 .../impl/fakes/FakeConnectorServiceFactory.java |   26 +-
 .../journal/impl/AlignedJournalImplTest.java    |  436 +--
 .../unit/core/journal/impl/CleanBufferTest.java |   39 +-
 .../core/journal/impl/FakeJournalImplTest.java  |   10 +-
 .../impl/FakeSequentialFileFactoryTest.java     |    6 +-
 .../core/journal/impl/FileFactoryTestBase.java  |   14 +-
 .../core/journal/impl/JournalAsyncTest.java     |   81 +-
 .../core/journal/impl/JournalImplTestBase.java  |  267 +-
 .../core/journal/impl/JournalImplTestUnit.java  |  719 ++--
 .../unit/core/journal/impl/ReclaimerTest.java   |  285 +-
 .../impl/SequentialFileFactoryTestBase.java     |   86 +-
 .../unit/core/journal/impl/TimedBufferTest.java |  152 +-
 .../impl/fakes/FakeSequentialFileFactory.java   |  334 +-
 .../core/journal/impl/fakes/SimpleEncoding.java |   18 +-
 .../unit/core/message/impl/MessageImplTest.java |   95 +-
 .../unit/core/paging/impl/PagePositionTest.java |    6 +-
 .../tests/unit/core/paging/impl/PageTest.java   |   53 +-
 .../core/paging/impl/PagingManagerImplTest.java |   30 +-
 .../core/paging/impl/PagingStoreImplTest.java   |  333 +-
 .../impl/BatchIDGeneratorUnitTest.java          |   49 +-
 .../impl/OperationContextUnitTest.java          |   95 +-
 .../core/postoffice/impl/AddressImplTest.java   |   73 +-
 .../core/postoffice/impl/BindingsImplTest.java  |  183 +-
 .../impl/DuplicateDetectionUnitTest.java        |   60 +-
 .../unit/core/postoffice/impl/FakeQueue.java    |  282 +-
 .../postoffice/impl/QueueComparatorTest.java    |    7 +-
 .../impl/WildcardAddressManagerUnitTest.java    |  116 +-
 .../core/remoting/ActiveMQBufferTestBase.java   |   99 +-
 .../impl/invm/InVMConnectorFactoryTest.java     |    7 +-
 .../impl/netty/ChannelBufferWrapper2Test.java   |    6 +-
 .../impl/netty/NettyAcceptorFactoryTest.java    |   40 +-
 .../remoting/impl/netty/NettyAcceptorTest.java  |   50 +-
 .../impl/netty/NettyConnectionTest.java         |   33 +-
 .../impl/netty/NettyConnectorFactoryTest.java   |    7 +-
 .../remoting/impl/netty/NettyConnectorTest.java |  232 +-
 .../core/remoting/impl/ssl/SSLSupportTest.java  |   81 +-
 .../server/impl/RemotingServiceImplTest.java    |   27 +-
 .../server/impl/fake/FakeInterceptor.java       |    6 +-
 .../impl/ActiveMQSecurityManagerImplTest.java   |   41 +-
 .../impl/ClusterConnectionBridgeTest.java       |   22 +-
 .../cluster/impl/RemoteQueueBindImplTest.java   |   22 +-
 .../group/impl/SystemPropertyOverrideTest.java  |   11 +-
 .../unit/core/server/impl/FileLockTest.java     |   34 +-
 .../unit/core/server/impl/QueueImplTest.java    |  303 +-
 .../core/server/impl/fakes/FakeConsumer.java    |   84 +-
 .../unit/core/server/impl/fakes/FakeFilter.java |   27 +-
 .../server/impl/fakes/FakeJournalLoader.java    |   43 +-
 .../core/server/impl/fakes/FakePostOffice.java  |   98 +-
 .../server/impl/fakes/FakeQueueFactory.java     |   28 +-
 .../tests/unit/jms/ActiveMQDestinationTest.java |   25 +-
 .../unit/jms/client/ActiveMQMapMessageTest.java |  313 +-
 .../jms/client/ActiveMQStreamMessageTest.java   |  462 +--
 .../unit/jms/client/JMSExceptionHelperTest.java |   39 +-
 .../unit/jms/client/SelectorTranslatorTest.java |   63 +-
 .../tests/unit/jms/misc/ManifestTest.java       |   15 +-
 .../ConnectionFactoryObjectFactoryTest.java     |    6 +-
 .../DestinationObjectFactoryTest.java           |    6 +-
 .../ra/ActiveMQResourceAdapterConfigTest.java   |   42 +-
 .../artemis/tests/unit/ra/BootstrapContext.java |   34 +-
 .../ra/ConnectionFactoryPropertiesTest.java     |   29 +-
 .../tests/unit/ra/MessageEndpointFactory.java   |    9 +-
 .../tests/unit/ra/ResourceAdapterTest.java      |  101 +-
 .../util/ActiveMQBufferInputStreamTest.java     |   19 +-
 .../tests/unit/util/FakePagingManager.java      |  101 +-
 .../artemis/tests/unit/util/InVMContext.java    |  192 +-
 .../artemis/tests/unit/util/InVMNameParser.java |   12 +-
 .../tests/unit/util/InVMNamingContext.java      |  192 +-
 .../artemis/tests/unit/util/LinkedListTest.java |  459 +--
 .../artemis/tests/unit/util/MemorySizeTest.java |   19 +-
 .../tests/unit/util/NonSerializableFactory.java |   99 +-
 .../ObjectInputStreamWithClassLoaderTest.java   |  137 +-
 .../tests/unit/util/ReusableLatchTest.java      |  120 +-
 .../tests/unit/util/SoftValueMapTest.java       |   41 +-
 .../artemis/tests/unit/util/UTF8Test.java       |   49 +-
 .../tests/unit/util/UUIDGeneratorTest.java      |   15 +-
 .../artemis/tests/unit/util/UUIDTest.java       |   19 +-
 .../tests/unit/util/VersionLoaderTest.java      |   18 +-
 .../artemis/tests/util/CreateMessage.java       |   33 +-
 .../artemis/tests/util/SpawnedVMSupport.java    |   92 +-
 3597 files changed, 190605 insertions(+), 252741 deletions(-)
----------------------------------------------------------------------



Mime
View raw message