activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [51/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:49:26 GMT
ACTIVEMQ6-3 renaming package names from activemq6 to activemq

https://issues.apache.org/jira/browse/ACTIVEMQ6-3

We are renaming packages from activemq6 to activemq as that's more generic and version independent
The previous commit renamed the directories. On this commit now I'm changing the code.
If we changed the code and the directories on the same commit git would remove and add a lot of files
without recognizing the renames.


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

Branch: refs/heads/master
Commit: 9a587c5633136fc0780caa0eedcb28e084611988
Parents: 3c44e26
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Nov 17 09:23:06 2014 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Nov 17 09:33:53 2014 -0500

----------------------------------------------------------------------
 README.md                                       |   6 +-
 activemq-bootstrap/pom.xml                      |  18 +-
 .../activemq/cli/ConfigurationException.java    |   2 +-
 .../java/org/apache/activemq/cli/HornetQ.java   |  12 +-
 .../apache/activemq/cli/commands/Action.java    |   2 +-
 .../activemq/cli/commands/ActionContext.java    |   2 +-
 .../activemq/cli/commands/HelpAction.java       |   2 +-
 .../org/apache/activemq/cli/commands/Run.java   |  30 +-
 .../org/apache/activemq/cli/commands/Stop.java  |   6 +-
 .../apache/activemq/factory/BrokerFactory.java  |  10 +-
 .../activemq/factory/BrokerFactoryHandler.java  |   4 +-
 .../apache/activemq/factory/CoreFactory.java    |  14 +-
 .../activemq/factory/CoreFactoryHandler.java    |   4 +-
 .../factory/FileCoreFactoryHandler.java         |   6 +-
 .../activemq/factory/FileJmsFactoryHandler.java |   6 +-
 .../org/apache/activemq/factory/JmsFactory.java |  12 +-
 .../activemq/factory/JmsFactoryHandler.java     |   4 +-
 .../factory/SecurityManagerFactory.java         |  10 +-
 .../factory/XmlBrokerFactoryHandler.java        |   8 +-
 .../bootstrap/HornetQBootstrapBundle.java       |   2 +-
 .../bootstrap/HornetQBootstrapLogger.java       |   2 +-
 .../org/apache/activemq/broker/core/file        |   2 +-
 .../org/apache/activemq/broker/jms/file         |   2 +-
 .../services/org/apache/activemq/broker/xml     |   2 +-
 activemq-commons/pom.xml                        |   6 +-
 .../api/core/HornetQAddressExistsException.java |   4 +-
 .../api/core/HornetQAddressFullException.java   |   4 +-
 .../HornetQAlreadyReplicatingException.java     |   4 +-
 .../apache/activemq/api/core/HornetQBuffer.java |   2 +-
 .../activemq/api/core/HornetQBuffers.java       |   4 +-
 .../core/HornetQClusterSecurityException.java   |   2 +-
 .../HornetQConnectionTimedOutException.java     |   4 +-
 .../api/core/HornetQDisconnectedException.java  |   4 +-
 .../api/core/HornetQDuplicateIdException.java   |   4 +-
 .../core/HornetQDuplicateMetaDataException.java |   4 +-
 .../activemq/api/core/HornetQException.java     |   2 +-
 .../activemq/api/core/HornetQExceptionType.java |   2 +-
 .../api/core/HornetQIOErrorException.java       |   4 +-
 .../api/core/HornetQIllegalStateException.java  |   4 +-
 ...ornetQIncompatibleClientServerException.java |   4 +-
 ...rnetQInterceptorRejectedPacketException.java |   6 +-
 .../api/core/HornetQInternalErrorException.java |   4 +-
 .../api/core/HornetQInterruptedException.java   |   2 +-
 ...HornetQInvalidFilterExpressionException.java |   4 +-
 ...ornetQInvalidTransientQueueUseException.java |   4 +-
 .../api/core/HornetQLargeMessageException.java  |   4 +-
 ...HornetQLargeMessageInterruptedException.java |   4 +-
 .../activemq/api/core/HornetQNativeIOError.java |   2 +-
 .../core/HornetQNonExistentQueueException.java  |   4 +-
 .../api/core/HornetQNotConnectedException.java  |   4 +-
 .../api/core/HornetQObjectClosedException.java  |   4 +-
 .../HornetQPropertyConversionException.java     |   6 +-
 .../api/core/HornetQQueueExistsException.java   |   4 +-
 .../api/core/HornetQSecurityException.java      |   4 +-
 .../core/HornetQSessionCreationException.java   |   4 +-
 ...rnetQTransactionOutcomeUnknownException.java |   4 +-
 .../HornetQTransactionRolledBackException.java  |   4 +-
 .../api/core/HornetQUnBlockedException.java     |   4 +-
 .../core/HornetQUnsupportedPacketException.java |   4 +-
 .../java/org/apache/activemq/api/core/Pair.java |   2 +-
 .../apache/activemq/api/core/SimpleString.java  |   4 +-
 .../core/buffers/impl/ChannelBufferWrapper.java |  10 +-
 .../activemq/core/server/HornetQComponent.java  |   2 +-
 .../java/org/apache/activemq/utils/Base64.java  |   2 +-
 .../org/apache/activemq/utils/ByteUtil.java     |   2 +-
 .../apache/activemq/utils/ClassloadingUtil.java |   2 +-
 .../activemq/utils/ConcurrentHashSet.java       |   2 +-
 .../apache/activemq/utils/ConcurrentSet.java    |   2 +-
 .../apache/activemq/utils/DataConstants.java    |   2 +-
 .../utils/DefaultSensitiveStringCodec.java      |   2 +-
 .../apache/activemq/utils/FactoryFinder.java    |   4 +-
 .../activemq/utils/HornetQThreadFactory.java    |   2 +-
 .../activemq/utils/HornetQUtilBundle.java       |   4 +-
 .../activemq/utils/HornetQUtilLogger.java       |   2 +-
 .../activemq/utils/PasswordMaskingUtil.java     |   6 +-
 .../apache/activemq/utils/ReferenceCounter.java |   2 +-
 .../activemq/utils/ReferenceCounterUtil.java    |   2 +-
 .../apache/activemq/utils/ReusableLatch.java    |   2 +-
 .../activemq/utils/SensitiveDataCodec.java      |   2 +-
 .../apache/activemq/utils/TypedProperties.java  |  32 +-
 .../org/apache/activemq/utils/UTF8Util.java     |   4 +-
 .../java/org/apache/activemq/utils/UUID.java    |   2 +-
 .../apache/activemq/utils/UUIDGenerator.java    |   4 +-
 .../org/apache/activemq/utils/UUIDTimer.java    |   2 +-
 .../org/apache/activemq/utils/ByteUtilTest.java |   2 +-
 .../org/apache/activemq/utils/PairTest.java     |   4 +-
 .../activemq/utils/ReferenceCounterTest.java    |   2 +-
 activemq-core-client/pom.xml                    |  26 +-
 .../activemq/api/core/BroadcastEndpoint.java    |   2 +-
 .../api/core/BroadcastEndpointFactory.java      |   2 +-
 .../BroadcastEndpointFactoryConfiguration.java  |   2 +-
 .../api/core/BroadcastGroupConfiguration.java   |   6 +-
 .../api/core/DiscoveryGroupConfiguration.java   |   6 +-
 ...ryGroupConfigurationCompatibilityHelper.java |   4 +-
 .../activemq/api/core/FilterConstants.java      |   2 +-
 .../apache/activemq/api/core/Interceptor.java   |   8 +-
 .../JGroupsBroadcastGroupConfiguration.java     |   2 +-
 .../org/apache/activemq/api/core/Message.java   |   4 +-
 .../api/core/TransportConfiguration.java        |  16 +-
 .../api/core/TransportConfigurationHelper.java  |   2 +-
 .../core/UDPBroadcastGroupConfiguration.java    |   8 +-
 .../api/core/client/ClientConsumer.java         |   6 +-
 .../activemq/api/core/client/ClientMessage.java |  52 ++--
 .../api/core/client/ClientProducer.java         |  12 +-
 .../api/core/client/ClientRequestor.java        |  12 +-
 .../activemq/api/core/client/ClientSession.java |  10 +-
 .../api/core/client/ClientSessionFactory.java   |   8 +-
 .../core/client/ClusterTopologyListener.java    |   2 +-
 .../api/core/client/FailoverEventListener.java  |   2 +-
 .../api/core/client/FailoverEventType.java      |   2 +-
 .../activemq/api/core/client/HornetQClient.java |  12 +-
 .../api/core/client/MessageHandler.java         |   2 +-
 .../core/client/SendAcknowledgementHandler.java |   4 +-
 .../activemq/api/core/client/ServerLocator.java |  22 +-
 .../api/core/client/SessionFailureListener.java |   6 +-
 .../api/core/client/TopologyMember.java         |   6 +-
 .../ConnectionLoadBalancingPolicy.java          |   2 +-
 ...rstElementConnectionLoadBalancingPolicy.java |   2 +-
 .../RandomConnectionLoadBalancingPolicy.java    |   4 +-
 ...ndomStickyConnectionLoadBalancingPolicy.java |   4 +-
 ...RoundRobinConnectionLoadBalancingPolicy.java |   4 +-
 .../core/client/loadbalance/package-info.java   |   2 +-
 .../activemq/api/core/client/package-info.java  |   2 +-
 .../api/core/management/AcceptorControl.java    |   2 +-
 .../api/core/management/AddressControl.java     |   2 +-
 .../core/management/AddressSettingsInfo.java    |   4 +-
 .../api/core/management/BridgeControl.java      |   4 +-
 .../core/management/BroadcastGroupControl.java  |   2 +-
 .../management/ClusterConnectionControl.java    |   2 +-
 .../core/management/CoreNotificationType.java   |   2 +-
 .../api/core/management/DayCounterInfo.java     |   8 +-
 .../api/core/management/DivertControl.java      |   4 +-
 .../management/HornetQComponentControl.java     |   2 +-
 .../core/management/HornetQServerControl.java   |  14 +-
 .../api/core/management/ManagementHelper.java   |  12 +-
 .../api/core/management/NotificationType.java   |   2 +-
 .../api/core/management/ObjectNameBuilder.java  |  12 +-
 .../activemq/api/core/management/Operation.java |   2 +-
 .../activemq/api/core/management/Parameter.java |   2 +-
 .../api/core/management/QueueControl.java       |   2 +-
 .../api/core/management/ResourceNames.java      |   2 +-
 .../activemq/api/core/management/RoleInfo.java  |   6 +-
 .../api/core/management/package-info.java       |   2 +-
 .../apache/activemq/api/core/package-info.java  |   2 +-
 .../impl/ResetLimitWrappedHornetQBuffer.java    |   8 +-
 .../core/client/HornetQClientLogger.java        |  10 +-
 .../core/client/HornetQClientMessageBundle.java |  36 +--
 .../core/client/impl/AddressQueryImpl.java      |   6 +-
 .../impl/AfterConnectInternalListener.java      |   2 +-
 .../core/client/impl/ClientConsumerImpl.java    |  42 +--
 .../client/impl/ClientConsumerInternal.java     |  16 +-
 .../client/impl/ClientLargeMessageImpl.java     |  12 +-
 .../client/impl/ClientLargeMessageInternal.java |   2 +-
 .../core/client/impl/ClientMessageImpl.java     |  22 +-
 .../core/client/impl/ClientMessageInternal.java |   8 +-
 .../impl/ClientProducerCreditManager.java       |   6 +-
 .../impl/ClientProducerCreditManagerImpl.java   |   6 +-
 .../core/client/impl/ClientProducerCredits.java |   6 +-
 .../client/impl/ClientProducerCreditsImpl.java  |  12 +-
 .../core/client/impl/ClientProducerImpl.java    |  34 +--
 .../client/impl/ClientProducerInternal.java     |   4 +-
 .../client/impl/ClientSessionFactoryImpl.java   |  70 ++---
 .../impl/ClientSessionFactoryInternal.java      |  12 +-
 .../core/client/impl/ClientSessionImpl.java     |  48 +--
 .../core/client/impl/ClientSessionInternal.java |  20 +-
 .../CompressedLargeMessageControllerImpl.java   |  22 +-
 .../core/client/impl/DelegatingSession.java     |  30 +-
 .../core/client/impl/HornetQXAResource.java     |   2 +-
 .../client/impl/LargeMessageController.java     |   6 +-
 .../client/impl/LargeMessageControllerImpl.java |  24 +-
 .../core/client/impl/QueueQueryImpl.java        |   6 +-
 .../core/client/impl/ServerLocatorImpl.java     |  56 ++--
 .../core/client/impl/ServerLocatorInternal.java |  14 +-
 .../activemq/core/client/impl/Topology.java     |  10 +-
 .../core/client/impl/TopologyMemberImpl.java    |  10 +-
 .../activemq/core/cluster/DiscoveryEntry.java   |   4 +-
 .../activemq/core/cluster/DiscoveryGroup.java   |  28 +-
 .../core/cluster/DiscoveryListener.java         |   2 +-
 .../core/exception/HornetQXAException.java      |   2 +-
 .../activemq/core/message/BodyEncoder.java      |   6 +-
 .../activemq/core/message/impl/MessageImpl.java |  28 +-
 .../core/message/impl/MessageInternal.java      |  14 +-
 .../core/protocol/ClientPacketDecoder.java      |  20 +-
 .../activemq/core/protocol/core/Channel.java    |  22 +-
 .../core/protocol/core/ChannelHandler.java      |   2 +-
 .../core/CommandConfirmationHandler.java        |   2 +-
 .../protocol/core/CoreRemotingConnection.java   |   6 +-
 .../activemq/core/protocol/core/Packet.java     |   8 +-
 .../core/protocol/core/impl/ChannelImpl.java    |  30 +-
 .../core/impl/HornetQClientProtocolManager.java |  76 ++---
 .../HornetQClientProtocolManagerFactory.java    |   6 +-
 .../core/impl/HornetQConsumerContext.java       |   4 +-
 .../core/impl/HornetQSessionContext.java        | 160 +++++-----
 .../core/protocol/core/impl/PacketDecoder.java  | 244 +++++++--------
 .../core/protocol/core/impl/PacketImpl.java     |  10 +-
 .../core/impl/RemotingConnectionImpl.java       |  32 +-
 .../impl/wireformat/CheckFailoverMessage.java   |   6 +-
 .../wireformat/CheckFailoverReplyMessage.java   |   6 +-
 .../ClusterTopologyChangeMessage.java           |  10 +-
 .../ClusterTopologyChangeMessage_V2.java        |   8 +-
 .../ClusterTopologyChangeMessage_V3.java        |   8 +-
 .../impl/wireformat/CreateQueueMessage.java     |   8 +-
 .../impl/wireformat/CreateSessionMessage.java   |   6 +-
 .../CreateSessionResponseMessage.java           |   6 +-
 .../wireformat/CreateSharedQueueMessage.java    |   8 +-
 .../wireformat/DisconnectConsumerMessage.java   |   6 +-
 .../core/impl/wireformat/DisconnectMessage.java |   8 +-
 .../impl/wireformat/DisconnectMessage_V2.java   |   6 +-
 .../wireformat/HornetQExceptionMessage.java     |  10 +-
 .../core/impl/wireformat/MessagePacket.java     |   8 +-
 .../impl/wireformat/NullResponseMessage.java    |   4 +-
 .../wireformat/PacketsConfirmedMessage.java     |   6 +-
 .../protocol/core/impl/wireformat/Ping.java     |  12 +-
 .../impl/wireformat/ReattachSessionMessage.java |   6 +-
 .../ReattachSessionResponseMessage.java         |   6 +-
 .../core/impl/wireformat/RollbackMessage.java   |   6 +-
 .../wireformat/SessionAcknowledgeMessage.java   |   6 +-
 .../wireformat/SessionAddMetaDataMessage.java   |   6 +-
 .../wireformat/SessionAddMetaDataMessageV2.java |   6 +-
 .../wireformat/SessionBindingQueryMessage.java  |   8 +-
 .../SessionBindingQueryResponseMessage.java     |   8 +-
 .../impl/wireformat/SessionCloseMessage.java    |   4 +-
 .../impl/wireformat/SessionCommitMessage.java   |   4 +-
 .../wireformat/SessionConsumerCloseMessage.java |   6 +-
 .../SessionConsumerFlowCreditMessage.java       |   6 +-
 .../wireformat/SessionContinuationMessage.java  |   8 +-
 .../SessionCreateConsumerMessage.java           |   8 +-
 .../wireformat/SessionDeleteQueueMessage.java   |   8 +-
 .../impl/wireformat/SessionExpireMessage.java   |   6 +-
 .../SessionForceConsumerDelivery.java           |   6 +-
 .../SessionIndividualAcknowledgeMessage.java    |   6 +-
 .../SessionProducerCreditsFailMessage.java      |   8 +-
 .../SessionProducerCreditsMessage.java          |   8 +-
 .../wireformat/SessionQueueQueryMessage.java    |   8 +-
 .../SessionQueueQueryResponseMessage.java       |  16 +-
 .../SessionReceiveClientLargeMessage.java       |   8 +-
 .../SessionReceiveContinuationMessage.java      |   6 +-
 .../wireformat/SessionReceiveLargeMessage.java  |   8 +-
 .../impl/wireformat/SessionReceiveMessage.java  |  10 +-
 .../SessionRequestProducerCreditsMessage.java   |   8 +-
 .../SessionSendContinuationMessage.java         |  14 +-
 .../wireformat/SessionSendLargeMessage.java     |   8 +-
 .../impl/wireformat/SessionSendMessage.java     |  18 +-
 .../SessionUniqueAddMetaDataMessage.java        |   2 +-
 .../wireformat/SessionXAAfterFailedMessage.java |   8 +-
 .../impl/wireformat/SessionXACommitMessage.java |   8 +-
 .../impl/wireformat/SessionXAEndMessage.java    |   8 +-
 .../impl/wireformat/SessionXAForgetMessage.java |   8 +-
 .../SessionXAGetInDoubtXidsResponseMessage.java |   8 +-
 .../SessionXAGetTimeoutResponseMessage.java     |   6 +-
 .../impl/wireformat/SessionXAJoinMessage.java   |   8 +-
 .../wireformat/SessionXAPrepareMessage.java     |   8 +-
 .../wireformat/SessionXAResponseMessage.java    |   6 +-
 .../impl/wireformat/SessionXAResumeMessage.java |   8 +-
 .../wireformat/SessionXARollbackMessage.java    |   8 +-
 .../wireformat/SessionXASetTimeoutMessage.java  |   6 +-
 .../SessionXASetTimeoutResponseMessage.java     |   6 +-
 .../impl/wireformat/SessionXAStartMessage.java  |   8 +-
 .../SubscribeClusterTopologyUpdatesMessage.java |   6 +-
 ...ubscribeClusterTopologyUpdatesMessageV2.java |   4 +-
 .../activemq/core/remoting/CloseListener.java   |   6 +-
 .../activemq/core/remoting/FailureListener.java |   4 +-
 .../impl/TransportConfigurationUtil.java        |   6 +-
 .../impl/netty/HornetQAMQPFrameDecoder.java     |   2 +-
 .../impl/netty/HornetQChannelHandler.java       |  14 +-
 .../impl/netty/HornetQFrameDecoder2.java        |   4 +-
 .../remoting/impl/netty/NettyConnection.java    |  26 +-
 .../remoting/impl/netty/NettyConnector.java     |  48 +--
 .../impl/netty/NettyConnectorFactory.java       |  12 +-
 .../netty/PartialPooledByteBufAllocator.java    |   2 +-
 .../impl/netty/SharedNioEventLoopGroup.java     |   6 +-
 .../remoting/impl/netty/TransportConstants.java |   4 +-
 .../core/remoting/impl/ssl/SSLSupport.java      |   4 +-
 .../activemq/core/remoting/package-info.java    |   2 +-
 .../core/security/HornetQPrincipal.java         |   2 +-
 .../org/apache/activemq/core/security/Role.java |   2 +-
 .../activemq/core/server/QueueQueryResult.java  |   4 +-
 .../core/server/management/Notification.java    |   8 +-
 .../server/management/NotificationListener.java |   2 +-
 .../server/management/NotificationService.java  |   2 +-
 .../settings/impl/AddressFullMessagePolicy.java |   2 +-
 .../activemq/core/transaction/impl/XidImpl.java |   4 +-
 .../apache/activemq/core/version/Version.java   |   2 +-
 .../activemq/core/version/impl/VersionImpl.java |   4 +-
 .../activemq/reader/BytesMessageUtil.java       |   4 +-
 .../apache/activemq/reader/MapMessageUtil.java  |   8 +-
 .../org/apache/activemq/reader/MessageUtil.java |  14 +-
 .../activemq/reader/StreamMessageUtil.java      |  10 +-
 .../apache/activemq/reader/TextMessageUtil.java |   8 +-
 .../apache/activemq/reader/package-info.java    |   2 +-
 .../protocol/AbstractRemotingConnection.java    |  18 +-
 .../spi/core/protocol/ConnectionEntry.java      |   2 +-
 .../spi/core/protocol/RemotingConnection.java   |  14 +-
 .../spi/core/remoting/AbstractConnector.java    |   2 +-
 .../spi/core/remoting/BufferDecoder.java        |   6 +-
 .../spi/core/remoting/BufferHandler.java        |   4 +-
 .../core/remoting/ClientProtocolManager.java    |  10 +-
 .../remoting/ClientProtocolManagerFactory.java  |   2 +-
 .../activemq/spi/core/remoting/Connection.java  |  10 +-
 .../remoting/ConnectionLifeCycleListener.java   |   6 +-
 .../activemq/spi/core/remoting/Connector.java   |   2 +-
 .../spi/core/remoting/ConnectorFactory.java     |   6 +-
 .../spi/core/remoting/ConsumerContext.java      |   2 +-
 .../spi/core/remoting/ReadyListener.java        |   2 +-
 .../spi/core/remoting/SessionContext.java       |  32 +-
 .../core/remoting/TopologyResponseHandler.java  |   8 +-
 .../spi/core/remoting/package-info.java         |   2 +-
 .../org/apache/activemq/utils/BufferHelper.java |   6 +-
 .../activemq/utils/ConfigurationHelper.java     |   8 +-
 .../utils/ConfirmationWindowWarning.java        |   2 +-
 .../apache/activemq/utils/DeflaterReader.java   |   2 +-
 .../apache/activemq/utils/ExecutorFactory.java  |   2 +-
 .../org/apache/activemq/utils/FutureLatch.java  |   2 +-
 .../utils/HornetQBufferInputStream.java         |   4 +-
 .../org/apache/activemq/utils/IDGenerator.java  |   2 +-
 .../apache/activemq/utils/InflaterReader.java   |   2 +-
 .../apache/activemq/utils/InflaterWriter.java   |   2 +-
 .../org/apache/activemq/utils/JNDIUtil.java     |   2 +-
 .../org/apache/activemq/utils/LinkedList.java   |   2 +-
 .../apache/activemq/utils/LinkedListImpl.java   |   2 +-
 .../activemq/utils/LinkedListIterator.java      |   2 +-
 .../org/apache/activemq/utils/MemorySize.java   |   4 +-
 .../utils/ObjectInputStreamWithClassLoader.java |   2 +-
 .../activemq/utils/OrderedExecutorFactory.java  |   6 +-
 .../activemq/utils/PriorityLinkedList.java      |   2 +-
 .../activemq/utils/PriorityLinkedListImpl.java  |   2 +-
 .../java/org/apache/activemq/utils/Random.java  |   2 +-
 .../activemq/utils/SecurityFormatter.java       |   4 +-
 .../activemq/utils/SimpleIDGenerator.java       |   2 +-
 .../activemq/utils/SizeFormatterUtil.java       |   2 +-
 .../apache/activemq/utils/SoftValueHashMap.java |   4 +-
 .../utils/TimeAndCounterIDGenerator.java        |   2 +-
 .../activemq/utils/TokenBucketLimiter.java      |   2 +-
 .../activemq/utils/TokenBucketLimiterImpl.java  |   2 +-
 .../apache/activemq/utils/VersionLoader.java    |   8 +-
 .../java/org/apache/activemq/utils/XMLUtil.java |   6 +-
 .../apache/activemq/utils/XidCodecSupport.java  |   6 +-
 .../apache/activemq/utils/json/JSONArray.java   |   2 +-
 .../activemq/utils/json/JSONException.java      |   2 +-
 .../apache/activemq/utils/json/JSONObject.java  |   2 +-
 .../apache/activemq/utils/json/JSONString.java  |   2 +-
 .../apache/activemq/utils/json/JSONTokener.java |   2 +-
 .../org/apache/activemq/utils/package-info.java |   2 +-
 .../resources/HornetQDefaultConfiguration.txt   |   6 +-
 .../src/main/resources/hqDefaults.xsl           |   2 +-
 .../apache/activemq/tests/CoreUnitTestCase.java |   4 +-
 .../apache/activemq/tests/util/RandomUtil.java  |  10 +-
 .../activemq/tests/util/SilentTestCase.java     |   2 +-
 .../activemq/util/CompressionUtilTest.java      |   8 +-
 .../activemq/util/ConcurrentHashSetTest.java    |   8 +-
 .../util/TimeAndCounterIDGeneratorTest.java     |   8 +-
 .../util/TypedPropertiesConversionTest.java     |  10 +-
 .../activemq/util/TypedPropertiesTest.java      |  12 +-
 .../org/apache/activemq/util/XMLUtilTest.java   |  80 ++---
 activemq-dto/pom.xml                            |  12 +-
 .../apache/activemq/dto/BasicSecurityDTO.java   |   2 +-
 .../java/org/apache/activemq/dto/BrokerDTO.java |   2 +-
 .../java/org/apache/activemq/dto/CoreDTO.java   |   2 +-
 .../java/org/apache/activemq/dto/JmsDTO.java    |   2 +-
 .../java/org/apache/activemq/dto/NamingDTO.java |   2 +-
 .../org/apache/activemq/dto/SecurityDTO.java    |   2 +-
 .../java/org/apache/activemq/dto/XmlUtil.java   |   6 +-
 .../org/apache/activemq/dto/package-info.java   |   2 +-
 activemq-jms-client/pom.xml                     |  12 +-
 .../activemq/api/jms/HornetQJMSClient.java      |  22 +-
 .../activemq/api/jms/HornetQJMSConstants.java   |   2 +-
 .../apache/activemq/api/jms/JMSFactoryType.java |   2 +-
 .../management/ConnectionFactoryControl.java    |  12 +-
 .../api/jms/management/DestinationControl.java  |   6 +-
 .../api/jms/management/JMSConnectionInfo.java   |   6 +-
 .../api/jms/management/JMSConsumerInfo.java     |   6 +-
 .../api/jms/management/JMSManagementHelper.java |  14 +-
 .../api/jms/management/JMSQueueControl.java     |   6 +-
 .../api/jms/management/JMSServerControl.java    |  10 +-
 .../api/jms/management/JMSSessionInfo.java      |   8 +-
 .../api/jms/management/SubscriptionInfo.java    |   6 +-
 .../api/jms/management/TopicControl.java        |   6 +-
 .../api/jms/management/package-info.java        |   2 +-
 .../apache/activemq/api/jms/package-info.java   |   2 +-
 .../jms/client/HornetQBytesMessage.java         |  64 ++--
 .../activemq/jms/client/HornetQConnection.java  |  36 +--
 .../jms/client/HornetQConnectionFactory.java    |  18 +-
 .../jms/client/HornetQConnectionForContext.java |   2 +-
 .../client/HornetQConnectionForContextImpl.java |   8 +-
 .../jms/client/HornetQConnectionMetaData.java   |   4 +-
 .../activemq/jms/client/HornetQDestination.java |  10 +-
 .../jms/client/HornetQJMSClientBundle.java      |  10 +-
 .../jms/client/HornetQJMSClientLogger.java      |   2 +-
 .../jms/client/HornetQJMSConnectionFactory.java |   8 +-
 .../activemq/jms/client/HornetQJMSConsumer.java |   2 +-
 .../activemq/jms/client/HornetQJMSContext.java  |   2 +-
 .../activemq/jms/client/HornetQJMSProducer.java |   8 +-
 .../activemq/jms/client/HornetQMapMessage.java  |  20 +-
 .../activemq/jms/client/HornetQMessage.java     |  32 +-
 .../jms/client/HornetQMessageConsumer.java      |  14 +-
 .../jms/client/HornetQMessageProducer.java      |  20 +-
 .../jms/client/HornetQObjectMessage.java        |  12 +-
 .../activemq/jms/client/HornetQQueue.java       |   4 +-
 .../jms/client/HornetQQueueBrowser.java         |  12 +-
 .../client/HornetQQueueConnectionFactory.java   |  10 +-
 .../activemq/jms/client/HornetQSession.java     |  22 +-
 .../jms/client/HornetQStreamMessage.java        |  40 +--
 .../jms/client/HornetQTemporaryQueue.java       |   2 +-
 .../jms/client/HornetQTemporaryTopic.java       |   2 +-
 .../activemq/jms/client/HornetQTextMessage.java |  16 +-
 .../activemq/jms/client/HornetQTopic.java       |   4 +-
 .../client/HornetQTopicConnectionFactory.java   |  10 +-
 .../jms/client/HornetQXAConnection.java         |   4 +-
 .../jms/client/HornetQXAConnectionFactory.java  |  10 +-
 .../jms/client/HornetQXAJMSContext.java         |   2 +-
 .../client/HornetQXAQueueConnectionFactory.java |  10 +-
 .../activemq/jms/client/HornetQXASession.java   |   4 +-
 .../client/HornetQXATopicConnectionFactory.java |  10 +-
 .../activemq/jms/client/JMSExceptionHelper.java |   4 +-
 .../jms/client/JMSMessageListenerWrapper.java   |  12 +-
 .../activemq/jms/client/JmsExceptionUtils.java  |   2 +-
 .../activemq/jms/client/SelectorTranslator.java |   2 +-
 .../activemq/jms/client/ThreadAwareContext.java |   4 +-
 .../activemq/jms/client/package-info.java       |   4 +-
 .../ConnectionFactoryObjectFactory.java         |   2 +-
 .../referenceable/DestinationObjectFactory.java |   2 +-
 .../SerializableObjectRefAddr.java              |   2 +-
 activemq-jms-server/pom.xml                     |  20 +-
 .../jms/bridge/ConnectionFactoryFactory.java    |   2 +-
 .../activemq/jms/bridge/DestinationFactory.java |   2 +-
 .../jms/bridge/HornetQJMSBridgeLogger.java      |   2 +-
 .../apache/activemq/jms/bridge/JMSBridge.java   |   4 +-
 .../activemq/jms/bridge/JMSBridgeControl.java   |   4 +-
 .../jms/bridge/QualityOfServiceMode.java        |   2 +-
 .../jms/bridge/impl/JMSBridgeControlImpl.java   |   8 +-
 .../activemq/jms/bridge/impl/JMSBridgeImpl.java |  46 +--
 .../impl/JNDIConnectionFactoryFactory.java      |   4 +-
 .../jms/bridge/impl/JNDIDestinationFactory.java |   4 +-
 .../jms/bridge/impl/JNDIFactorySupport.java     |   2 +-
 .../impl/JMSConnectionFactoryControlImpl.java   |  18 +-
 .../management/impl/JMSQueueControlImpl.java    |  32 +-
 .../management/impl/JMSServerControlImpl.java   |  52 ++--
 .../management/impl/JMSTopicControlImpl.java    |  32 +-
 .../jms/persistence/JMSStorageManager.java      |  12 +-
 .../config/PersistedConnectionFactory.java      |  10 +-
 .../config/PersistedDestination.java            |  12 +-
 .../jms/persistence/config/PersistedJNDI.java   |  10 +-
 .../jms/persistence/config/PersistedType.java   |   2 +-
 .../journal/JMSJournalStorageManagerImpl.java   |  40 +--
 .../impl/nullpm/NullJMSStorageManagerImpl.java  |  12 +-
 .../jms/server/HornetQJMSServerBundle.java      |   8 +-
 .../jms/server/HornetQJMSServerLogger.java      |   6 +-
 .../jms/server/JMSServerConfigParser.java       |  10 +-
 .../activemq/jms/server/JMSServerManager.java   |  18 +-
 .../config/ConnectionFactoryConfiguration.java  |   6 +-
 .../jms/server/config/JMSConfiguration.java     |   2 +-
 .../server/config/JMSQueueConfiguration.java    |   2 +-
 .../jms/server/config/TopicConfiguration.java   |   2 +-
 .../ConnectionFactoryConfigurationImpl.java     |  16 +-
 .../config/impl/JMSConfigurationImpl.java       |  12 +-
 .../config/impl/JMSQueueConfigurationImpl.java  |   4 +-
 .../config/impl/TopicConfigurationImpl.java     |   4 +-
 .../TransportConfigurationEncodingSupport.java  |  12 +-
 .../jms/server/embedded/EmbeddedJMS.java        |  14 +-
 .../server/impl/JMSServerConfigParserImpl.java  |  42 +--
 .../jms/server/impl/JMSServerDeployer.java      |  20 +-
 .../jms/server/impl/JMSServerManagerImpl.java   | 118 +++----
 .../jms/server/impl/StandaloneNamingServer.java |  10 +-
 .../server/management/JMSManagementService.java |  18 +-
 .../server/management/JMSNotificationType.java  |   6 +-
 .../impl/JMSManagementServiceImpl.java          |  46 +--
 .../recovery/HornetQRecoveryRegistry.java       |   8 +-
 .../server/recovery/HornetQRegistryBase.java    |   2 +-
 .../recovery/HornetQXAResourceRecovery.java     |  12 +-
 .../recovery/HornetQXAResourceWrapper.java      |  20 +-
 .../jms/server/recovery/RecoveryDiscovery.java  |  22 +-
 .../jms/server/recovery/XARecoveryConfig.java   |  12 +-
 .../jms/server/recovery/package-info.java       |   2 +-
 .../jms/transaction/JMSTransactionDetail.java   |  20 +-
 .../src/main/resources/schema/hornetq-jms.xsd   |   4 +-
 activemq-journal/pom.xml                        |  16 +-
 .../activemq/core/asyncio/AIOCallback.java      |   2 +-
 .../activemq/core/asyncio/AsynchronousFile.java |   4 +-
 .../activemq/core/asyncio/BufferCallback.java   |   2 +-
 .../core/asyncio/IOExceptionListener.java       |   2 +-
 .../core/asyncio/impl/AsynchronousFileImpl.java |  20 +-
 .../core/asyncio/impl/HornetQFileLock.java      |   4 +-
 .../activemq/core/journal/EncodingSupport.java  |   4 +-
 .../activemq/core/journal/IOAsyncTask.java      |   6 +-
 .../activemq/core/journal/IOCompletion.java     |   2 +-
 .../core/journal/IOCriticalErrorListener.java   |   2 +-
 .../apache/activemq/core/journal/Journal.java   |   8 +-
 .../core/journal/JournalLoadInformation.java    |   2 +-
 .../activemq/core/journal/LoaderCallback.java   |   2 +-
 .../core/journal/PreparedTransactionInfo.java   |   2 +-
 .../activemq/core/journal/RecordInfo.java       |   2 +-
 .../activemq/core/journal/SequentialFile.java   |   8 +-
 .../core/journal/SequentialFileFactory.java     |   2 +-
 .../activemq/core/journal/TestableJournal.java  |   4 +-
 .../journal/TransactionFailureCallback.java     |   2 +-
 .../core/journal/impl/AIOSequentialFile.java    |  18 +-
 .../journal/impl/AIOSequentialFileFactory.java  |  22 +-
 .../journal/impl/AbstractJournalUpdateTask.java |  20 +-
 .../journal/impl/AbstractSequentialFile.java    |  22 +-
 .../impl/AbstractSequentialFileFactory.java     |  14 +-
 .../core/journal/impl/CompactJournal.java       |   6 +-
 .../core/journal/impl/DummyCallback.java        |   4 +-
 .../core/journal/impl/ExportJournal.java        |  12 +-
 .../core/journal/impl/FileWrapperJournal.java   |  38 +--
 .../core/journal/impl/ImportJournal.java        |  10 +-
 .../activemq/core/journal/impl/JournalBase.java |  12 +-
 .../core/journal/impl/JournalCompactor.java     |  32 +-
 .../core/journal/impl/JournalConstants.java     |   2 +-
 .../activemq/core/journal/impl/JournalFile.java |   4 +-
 .../core/journal/impl/JournalFileImpl.java      |   4 +-
 .../journal/impl/JournalFilesRepository.java    |   8 +-
 .../activemq/core/journal/impl/JournalImpl.java |  56 ++--
 .../journal/impl/JournalReaderCallback.java     |   4 +-
 .../impl/JournalReaderCallbackAbstract.java     |   4 +-
 .../core/journal/impl/JournalRecord.java        |   4 +-
 .../journal/impl/JournalRecordProvider.java     |   2 +-
 .../core/journal/impl/JournalTransaction.java   |   6 +-
 .../core/journal/impl/NIOSequentialFile.java    |  20 +-
 .../journal/impl/NIOSequentialFileFactory.java  |   6 +-
 .../activemq/core/journal/impl/Reclaimer.java   |   4 +-
 .../core/journal/impl/SimpleWaitIOCallback.java |   8 +-
 .../core/journal/impl/SyncIOCompletion.java     |   4 +-
 .../core/journal/impl/SyncSpeedTest.java        |  10 +-
 .../activemq/core/journal/impl/TimedBuffer.java |  16 +-
 .../core/journal/impl/TimedBufferObserver.java  |   4 +-
 .../core/journal/impl/TransactionCallback.java  |   6 +-
 .../impl/dataformat/ByteArrayEncoding.java      |   6 +-
 .../impl/dataformat/JournalAddRecord.java       |   8 +-
 .../impl/dataformat/JournalAddRecordTX.java     |   8 +-
 .../dataformat/JournalCompleteRecordTX.java     |  10 +-
 .../impl/dataformat/JournalDeleteRecord.java    |   6 +-
 .../impl/dataformat/JournalDeleteRecordTX.java  |   8 +-
 .../impl/dataformat/JournalInternalRecord.java  |   6 +-
 .../dataformat/JournalRollbackRecordTX.java     |   6 +-
 .../activemq/journal/HornetQJournalBundle.java  |   4 +-
 .../activemq/journal/HornetQJournalLogger.java  |   4 +-
 .../asyncio/LibaioDependencyCheckTest.java      |   4 +-
 activemq-native/pom.xml                         |  12 +-
 .../src/main/c/JNI_AsynchronousFileImpl.cpp     |   4 +-
 activemq-native/src/main/c/JavaUtilities.cpp    |   2 +-
 activemq-native/src/main/c/Version.h            |   2 +-
 .../org/apache/activemq/core/libaio/Native.java |   6 +-
 .../activemq-amqp-protocol/pom.xml              |  22 +-
 .../proton/HornetQProtonRemotingConnection.java |  12 +-
 .../protocol/proton/ProtonProtocolManager.java  |  30 +-
 .../proton/ProtonProtocolManagerFactory.java    |  10 +-
 .../proton/converter/HornetQJMSVendor.java      |  38 +--
 .../converter/ProtonMessageConverter.java       |  10 +-
 .../converter/jms/ServerJMSBytesMessage.java    |  56 ++--
 .../converter/jms/ServerJMSMapMessage.java      |  16 +-
 .../proton/converter/jms/ServerJMSMessage.java  |  14 +-
 .../converter/jms/ServerJMSStreamMessage.java   |  38 +--
 .../converter/jms/ServerJMSTextMessage.java     |  12 +-
 .../proton/converter/jms/package-info.java      |   2 +-
 .../plug/HornetQProtonConnectionCallback.java   |  14 +-
 .../plug/ProtonSessionIntegrationCallback.java  |  30 +-
 .../core/protocol/proton/plug/package-info.java |   2 +-
 .../protocol/proton/sasl/HornetQPlainSASL.java  |   6 +-
 ...etq.spi.core.protocol.ProtocolManagerFactory |   2 +-
 .../core/protocol/proton/TestConversions.java   |  24 +-
 .../activemq-openwire-protocol/pom.xml          |  14 +-
 .../protocol/openwire/AMQConnectorImpl.java     |   8 +-
 .../protocol/openwire/AMQTransactionImpl.java   |  12 +-
 .../core/protocol/openwire/BrokerState.java     |   2 +-
 .../protocol/openwire/DataInputWrapper.java     |   8 +-
 .../openwire/NotEnoughBytesException.java       |   2 +-
 .../protocol/openwire/OpenWireConnection.java   |  48 +--
 .../openwire/OpenWireMessageConverter.java      |  62 ++--
 .../openwire/OpenWireProtocolManager.java       |  44 +--
 .../OpenWireProtocolManagerFactory.java         |  10 +-
 .../core/protocol/openwire/OpenWireUtil.java    |   8 +-
 .../core/protocol/openwire/SendingResult.java   |   8 +-
 .../amq/AMQAbstractDeadLetterStrategy.java      |   2 +-
 .../openwire/amq/AMQBrokerStoppedException.java |   2 +-
 .../openwire/amq/AMQConnectionContext.java      |   6 +-
 .../protocol/openwire/amq/AMQConnector.java     |   4 +-
 .../openwire/amq/AMQConnectorStatistics.java    |   2 +-
 .../core/protocol/openwire/amq/AMQConsumer.java |  14 +-
 .../openwire/amq/AMQConsumerBrokerExchange.java |   2 +-
 .../openwire/amq/AMQDeadLetterStrategy.java     |   2 +-
 .../protocol/openwire/amq/AMQDestination.java   |   2 +-
 .../openwire/amq/AMQDestinationStatistics.java  |   2 +-
 .../AMQMapTransportConnectionStateRegister.java |   2 +-
 .../amq/AMQMessageAuthorizationPolicy.java      |   2 +-
 .../protocol/openwire/amq/AMQMessageStore.java  |   2 +-
 .../openwire/amq/AMQPersistenceAdapter.java     |   2 +-
 .../core/protocol/openwire/amq/AMQProducer.java |   2 +-
 .../openwire/amq/AMQProducerBrokerExchange.java |   2 +-
 .../openwire/amq/AMQSecurityContext.java        |   2 +-
 .../openwire/amq/AMQServerConsumer.java         |  26 +-
 .../protocol/openwire/amq/AMQServerSession.java |  66 ++--
 .../openwire/amq/AMQServerSessionFactory.java   |  26 +-
 .../core/protocol/openwire/amq/AMQSession.java  |  32 +-
 .../amq/AMQSharedDeadLetterStrategy.java        |   2 +-
 ...QSingleTransportConnectionStateRegister.java |   2 +-
 .../openwire/amq/AMQSlowConsumerStrategy.java   |   2 +-
 .../protocol/openwire/amq/AMQSubscription.java  |   2 +-
 .../openwire/amq/AMQSubscriptionRecovery.java   |   2 +-
 .../protocol/openwire/amq/AMQTransaction.java   |   2 +-
 .../openwire/amq/AMQTransactionFactory.java     |  10 +-
 .../amq/AMQTransportConnectionState.java        |   4 +-
 .../AMQTransportConnectionStateRegister.java    |   2 +-
 .../protocol/openwire/amq/BrowserListener.java  |   2 +-
 .../core/protocol/openwire/amq/MessageInfo.java |   2 +-
 ...etq.spi.core.protocol.ProtocolManagerFactory |   2 +-
 activemq-protocols/activemq-proton-plug/pom.xml |  18 +-
 .../activemq-stomp-protocol/pom.xml             |  10 +-
 .../core/protocol/stomp/FrameEventListener.java |   2 +-
 .../protocol/stomp/HornetQStompException.java   |   2 +-
 .../stomp/HornetQStompProtocolLogger.java       |   2 +-
 .../HornetQStompProtocolMessageBundle.java      |   4 +-
 .../core/protocol/stomp/SimpleBytes.java        |   2 +-
 .../activemq/core/protocol/stomp/Stomp.java     |   2 +-
 .../core/protocol/stomp/StompCommands.java      |   2 +-
 .../core/protocol/stomp/StompConnection.java    |  40 +--
 .../core/protocol/stomp/StompDecoder.java       |   6 +-
 .../core/protocol/stomp/StompFrame.java         |   6 +-
 .../protocol/stomp/StompProtocolManager.java    |  62 ++--
 .../stomp/StompProtocolManagerFactory.java      |  10 +-
 .../core/protocol/stomp/StompSession.java       |  50 +--
 .../core/protocol/stomp/StompSubscription.java  |   2 +-
 .../core/protocol/stomp/StompUtils.java         |  12 +-
 .../core/protocol/stomp/StompVersions.java      |   2 +-
 .../stomp/VersionedStompFrameHandler.java       |  28 +-
 .../stomp/v10/StompFrameHandlerV10.java         |  20 +-
 .../core/protocol/stomp/v10/StompFrameV10.java  |   4 +-
 .../stomp/v11/StompFrameHandlerV11.java         |  24 +-
 .../core/protocol/stomp/v11/StompFrameV11.java  |  10 +-
 .../stomp/v12/StompFrameHandlerV12.java         |  30 +-
 .../core/protocol/stomp/v12/StompFrameV12.java  |  10 +-
 ...etq.spi.core.protocol.ProtocolManagerFactory |   2 +-
 activemq-protocols/pom.xml                      |  14 +-
 activemq-ra/pom.xml                             |  18 +-
 .../ra/ConnectionFactoryProperties.java         |   2 +-
 .../org/apache/activemq/ra/HornetQRABundle.java |   4 +-
 .../activemq/ra/HornetQRABytesMessage.java      |   2 +-
 .../activemq/ra/HornetQRAConnectionFactory.java |   4 +-
 .../ra/HornetQRAConnectionFactoryImpl.java      |   8 +-
 .../activemq/ra/HornetQRAConnectionManager.java |   4 +-
 .../ra/HornetQRAConnectionMetaData.java         |   2 +-
 .../ra/HornetQRAConnectionRequestInfo.java      |   2 +-
 .../apache/activemq/ra/HornetQRACredential.java |   2 +-
 .../apache/activemq/ra/HornetQRAJMSContext.java |   8 +-
 .../activemq/ra/HornetQRALocalTransaction.java  |   2 +-
 .../org/apache/activemq/ra/HornetQRALogger.java |   4 +-
 .../activemq/ra/HornetQRAMCFProperties.java     |   2 +-
 .../activemq/ra/HornetQRAManagedConnection.java |  10 +-
 .../ra/HornetQRAManagedConnectionFactory.java   |   6 +-
 .../apache/activemq/ra/HornetQRAMapMessage.java |   2 +-
 .../apache/activemq/ra/HornetQRAMessage.java    |   2 +-
 .../activemq/ra/HornetQRAMessageConsumer.java   |   2 +-
 .../activemq/ra/HornetQRAMessageListener.java   |   2 +-
 .../activemq/ra/HornetQRAMessageProducer.java   |   2 +-
 .../apache/activemq/ra/HornetQRAMetaData.java   |   2 +-
 .../activemq/ra/HornetQRAObjectMessage.java     |   2 +-
 .../apache/activemq/ra/HornetQRAProperties.java |  12 +-
 .../activemq/ra/HornetQRAQueueReceiver.java     |   2 +-
 .../activemq/ra/HornetQRAQueueSender.java       |   2 +-
 .../apache/activemq/ra/HornetQRAService.java    |   2 +-
 .../apache/activemq/ra/HornetQRASession.java    |   6 +-
 .../activemq/ra/HornetQRASessionFactory.java    |   2 +-
 .../ra/HornetQRASessionFactoryImpl.java         |   8 +-
 .../activemq/ra/HornetQRAStreamMessage.java     |   2 +-
 .../activemq/ra/HornetQRATextMessage.java       |   2 +-
 .../activemq/ra/HornetQRATopicPublisher.java    |   2 +-
 .../activemq/ra/HornetQRATopicSubscriber.java   |   2 +-
 .../activemq/ra/HornetQRAXAJMSContext.java      |   6 +-
 .../apache/activemq/ra/HornetQRAXAResource.java |   8 +-
 .../org/apache/activemq/ra/HornetQRaUtils.java  |   2 +-
 .../activemq/ra/HornetQResourceAdapter.java     |  50 +--
 .../activemq/ra/HornetQXAResourceWrapper.java   |   6 +-
 .../activemq/ra/inflow/HornetQActivation.java   |  40 +--
 .../ra/inflow/HornetQActivationSpec.java        |  10 +-
 .../ra/inflow/HornetQMessageHandler.java        |  32 +-
 .../activemq/ra/recovery/RecoveryManager.java   |  14 +-
 activemq-rest/pom.xml                           |  16 +-
 .../apache/activemq/rest/HornetQRestBundle.java |   2 +-
 .../apache/activemq/rest/HornetQRestLogger.java |   6 +-
 .../java/org/apache/activemq/rest/Hornetq.java  |   6 +-
 .../activemq/rest/HttpHeaderProperty.java       |   2 +-
 .../main/java/org/apache/activemq/rest/Jms.java |   4 +-
 .../rest/MessageServiceConfiguration.java       |   2 +-
 .../activemq/rest/MessageServiceManager.java    |  32 +-
 .../apache/activemq/rest/UnknownMediaType.java  |   2 +-
 .../activemq/rest/UnmarshalException.java       |   2 +-
 .../rest/integration/EmbeddedRestHornetQ.java   |   6 +-
 .../integration/EmbeddedRestHornetQJMS.java     |   6 +-
 .../integration/HornetqBootstrapListener.java   |   4 +-
 .../RestMessagingBootstrapListener.java         |   4 +-
 .../ServletContextBindingRegistry.java          |   4 +-
 .../rest/queue/AcknowledgedQueueConsumer.java   |  18 +-
 .../activemq/rest/queue/Acknowledgement.java    |   4 +-
 .../rest/queue/ConsumedHttpMessage.java         |   4 +-
 .../activemq/rest/queue/ConsumedMessage.java    |  10 +-
 .../rest/queue/ConsumedObjectMessage.java       |   4 +-
 .../activemq/rest/queue/ConsumersResource.java  |  10 +-
 .../rest/queue/DestinationResource.java         |   2 +-
 .../rest/queue/DestinationServiceManager.java   |  20 +-
 .../rest/queue/DestinationSettings.java         |   2 +-
 .../apache/activemq/rest/queue/PostMessage.java |  22 +-
 .../activemq/rest/queue/PostMessageDupsOk.java  |  10 +-
 .../activemq/rest/queue/PostMessageNoDups.java  |   4 +-
 .../activemq/rest/queue/QueueConsumer.java      |  20 +-
 .../activemq/rest/queue/QueueDeployment.java    |   2 +-
 .../rest/queue/QueueDestinationsResource.java   |  24 +-
 .../activemq/rest/queue/QueueResource.java      |  10 +-
 .../rest/queue/QueueServiceManager.java         |  10 +-
 .../activemq/rest/queue/push/FilePushStore.java |   8 +-
 .../rest/queue/push/HornetQPushStrategy.java    |   6 +-
 .../activemq/rest/queue/push/PushConsumer.java  |  18 +-
 .../queue/push/PushConsumerMessageHandler.java  |  12 +-
 .../rest/queue/push/PushConsumerResource.java   |   8 +-
 .../activemq/rest/queue/push/PushStore.java     |   4 +-
 .../activemq/rest/queue/push/PushStrategy.java  |   6 +-
 .../activemq/rest/queue/push/UriStrategy.java   |  14 +-
 .../rest/queue/push/UriTemplateStrategy.java    |   4 +-
 .../rest/queue/push/xml/Authentication.java     |   2 +-
 .../rest/queue/push/xml/AuthenticationType.java |   2 +-
 .../activemq/rest/queue/push/xml/BasicAuth.java |   2 +-
 .../rest/queue/push/xml/DigestAuth.java         |   2 +-
 .../rest/queue/push/xml/PushRegistration.java   |   2 +-
 .../rest/queue/push/xml/XmlHttpHeader.java      |   2 +-
 .../activemq/rest/queue/push/xml/XmlLink.java   |   2 +-
 .../topic/AcknowledgedSubscriptionResource.java |  10 +-
 .../activemq/rest/topic/FileTopicPushStore.java |   6 +-
 .../activemq/rest/topic/PushSubscription.java   |  16 +-
 .../rest/topic/PushSubscriptionsResource.java   |  14 +-
 .../rest/topic/PushTopicRegistration.java       |   4 +-
 .../activemq/rest/topic/Subscription.java       |   2 +-
 .../rest/topic/SubscriptionResource.java        |  10 +-
 .../rest/topic/SubscriptionsResource.java       |  22 +-
 .../activemq/rest/topic/TopicDeployment.java    |   4 +-
 .../rest/topic/TopicDestinationsResource.java   |  26 +-
 .../activemq/rest/topic/TopicPushStore.java     |   4 +-
 .../activemq/rest/topic/TopicResource.java      |  12 +-
 .../rest/topic/TopicServiceManager.java         |   8 +-
 .../apache/activemq/rest/util/Constants.java    |   2 +-
 .../rest/util/CustomHeaderLinkStrategy.java     |   2 +-
 .../activemq/rest/util/HttpMessageHelper.java   |  10 +-
 .../rest/util/LinkHeaderLinkStrategy.java       |   2 +-
 .../apache/activemq/rest/util/LinkStrategy.java |   2 +-
 .../apache/activemq/rest/util/TimeoutTask.java  |   4 +-
 .../activemq/rest/test/AutoAckQueueTest.java    |   6 +-
 .../activemq/rest/test/AutoAckTopicTest.java    |   4 +-
 .../activemq/rest/test/ClientAckQueueTest.java  |  10 +-
 .../activemq/rest/test/ClientAckTopicTest.java  |  10 +-
 .../rest/test/CreateDestinationTest.java        |   4 +-
 .../apache/activemq/rest/test/DupQueueTest.java |   6 +-
 .../org/apache/activemq/rest/test/Embedded.java |  18 +-
 .../apache/activemq/rest/test/EmbeddedTest.java |   8 +-
 .../activemq/rest/test/FindDestinationTest.java |   4 +-
 .../org/apache/activemq/rest/test/JMSTest.java  |  12 +-
 .../activemq/rest/test/MessageTestBase.java     |   8 +-
 .../test/PersistentPushQueueConsumerTest.java   |  24 +-
 .../test/PersistentPushTopicConsumerTest.java   |  26 +-
 .../rest/test/PushQueueConsumerTest.java        |  12 +-
 .../rest/test/PushTopicConsumerTest.java        |  12 +-
 .../apache/activemq/rest/test/RawAckTest.java   |  34 +--
 .../activemq/rest/test/RepostingQueueTest.java  |   6 +-
 .../activemq/rest/test/RepostingTopicTest.java  |   6 +-
 .../activemq/rest/test/RoundtripTimeTest.java   |   4 +-
 .../apache/activemq/rest/test/SelectorTest.java |  14 +-
 .../apache/activemq/rest/test/SessionTest.java  |   8 +-
 .../activemq/rest/test/TransformTest.java       |  16 +-
 .../org/apache/activemq/rest/test/Util.java     |   4 +-
 .../org/apache/activemq/rest/test/XmlTest.java  |   4 +-
 .../test/resources/hornetq-configuration.xml    |   4 +-
 activemq-selector/pom.xml                       |   8 +-
 .../org/apache/activemq/selector/LRUCache.java  |   2 +-
 .../activemq/selector/SelectorParser.java       |  12 +-
 .../selector/filter/ArithmeticExpression.java   |   2 +-
 .../selector/filter/BinaryExpression.java       |   2 +-
 .../selector/filter/BooleanExpression.java      |   2 +-
 .../selector/filter/ComparisonExpression.java   |   2 +-
 .../selector/filter/ConstantExpression.java     |   2 +-
 .../activemq/selector/filter/Expression.java    |   2 +-
 .../selector/filter/FilterException.java        |   2 +-
 .../activemq/selector/filter/Filterable.java    |   2 +-
 .../selector/filter/LogicExpression.java        |   2 +-
 .../selector/filter/PropertyExpression.java     |   2 +-
 .../selector/filter/UnaryExpression.java        |   2 +-
 .../selector/filter/XPathExpression.java        |   2 +-
 .../selector/filter/XQueryExpression.java       |   2 +-
 .../selector/filter/XalanXPathEvaluator.java    |   2 +-
 .../src/main/javacc/HyphenatedParser.jj         |   4 +-
 .../src/main/javacc/StrictParser.jj             |   4 +-
 .../activemq/selector/SelectorParserTest.java   |  14 +-
 .../apache/activemq/selector/SelectorTest.java  |   8 +-
 activemq-server/pom.xml                         |  24 +-
 .../api/core/management/MessageCounterInfo.java |   6 +-
 .../activemq/core/config/BackupStrategy.java    |   2 +-
 .../core/config/BridgeConfiguration.java        |   6 +-
 .../config/ClusterConnectionConfiguration.java  |   6 +-
 .../activemq/core/config/Configuration.java     | 154 +++++-----
 .../core/config/ConfigurationUtils.java         |  36 +--
 .../config/ConnectorServiceConfiguration.java   |   2 +-
 .../core/config/CoreQueueConfiguration.java     |   2 +-
 .../core/config/DivertConfiguration.java        |   6 +-
 .../core/config/HAPolicyConfiguration.java      |   2 +-
 .../core/config/ScaleDownConfiguration.java     |   4 +-
 .../config/ha/ColocatedPolicyConfiguration.java |   6 +-
 .../config/ha/LiveOnlyPolicyConfiguration.java  |   6 +-
 .../config/ha/ReplicaPolicyConfiguration.java   |   8 +-
 .../ha/ReplicatedPolicyConfiguration.java       |   6 +-
 .../SharedStoreMasterPolicyConfiguration.java   |   6 +-
 .../ha/SharedStoreSlavePolicyConfiguration.java |   8 +-
 .../core/config/impl/ConfigurationImpl.java     |  42 +--
 .../core/config/impl/FileConfiguration.java     |  12 +-
 .../activemq/core/config/impl/Validators.java   |  10 +-
 .../activemq/core/deployers/Deployer.java       |   4 +-
 .../core/deployers/DeploymentManager.java       |   4 +-
 .../deployers/impl/AddressSettingsDeployer.java |  12 +-
 .../impl/BasicUserCredentialsDeployer.java      |  12 +-
 .../deployers/impl/FileConfigurationParser.java |  88 +++---
 .../deployers/impl/FileDeploymentManager.java   |  10 +-
 .../core/deployers/impl/QueueDeployer.java      |  12 +-
 .../core/deployers/impl/SecurityDeployer.java   |  12 +-
 .../core/deployers/impl/XmlDeployer.java        |  18 +-
 .../org/apache/activemq/core/filter/Filter.java |   6 +-
 .../activemq/core/filter/impl/FilterImpl.java   |  26 +-
 .../core/management/impl/AbstractControl.java   |   4 +-
 .../management/impl/AcceptorControlImpl.java    |  10 +-
 .../management/impl/AddressControlImpl.java     |  30 +-
 .../core/management/impl/BridgeControlImpl.java |  10 +-
 .../impl/BroadcastGroupControlImpl.java         |  14 +-
 .../impl/ClusterConnectionControlImpl.java      |  12 +-
 .../core/management/impl/DivertControlImpl.java |  10 +-
 .../impl/HornetQServerControlImpl.java          | 106 +++----
 .../core/management/impl/MBeanInfoHelper.java   |   6 +-
 .../core/management/impl/QueueControlImpl.java  |  48 +--
 .../core/messagecounter/MessageCounter.java     |   4 +-
 .../messagecounter/MessageCounterManager.java   |   2 +-
 .../impl/MessageCounterHelper.java              |   8 +-
 .../impl/MessageCounterManagerImpl.java         |   8 +-
 .../core/paging/PageTransactionInfo.java        |  12 +-
 .../activemq/core/paging/PagedMessage.java      |   8 +-
 .../activemq/core/paging/PagingManager.java     |  12 +-
 .../activemq/core/paging/PagingStore.java       |  24 +-
 .../core/paging/PagingStoreFactory.java         |  10 +-
 .../core/paging/cursor/LivePageCache.java       |   4 +-
 .../activemq/core/paging/cursor/PageCache.java  |   6 +-
 .../core/paging/cursor/PageCursorProvider.java  |   6 +-
 .../core/paging/cursor/PagePosition.java        |   2 +-
 .../core/paging/cursor/PageSubscription.java    |  14 +-
 .../paging/cursor/PageSubscriptionCounter.java  |   6 +-
 .../core/paging/cursor/PagedReference.java      |   6 +-
 .../core/paging/cursor/PagedReferenceImpl.java  |  18 +-
 .../paging/cursor/impl/LivePageCacheImpl.java   |  10 +-
 .../core/paging/cursor/impl/PageCacheImpl.java  |   8 +-
 .../cursor/impl/PageCursorProviderImpl.java     |  34 +--
 .../paging/cursor/impl/PagePositionImpl.java    |   4 +-
 .../impl/PageSubscriptionCounterImpl.java       |  24 +-
 .../cursor/impl/PageSubscriptionImpl.java       |  50 +--
 .../apache/activemq/core/paging/impl/Page.java  |  30 +-
 .../core/paging/impl/PageSyncTimer.java         |   8 +-
 .../paging/impl/PageTransactionInfoImpl.java    |  28 +-
 .../core/paging/impl/PagedMessageImpl.java      |  18 +-
 .../core/paging/impl/PagingManagerImpl.java     |  18 +-
 .../core/paging/impl/PagingStoreFactoryNIO.java |  28 +-
 .../core/paging/impl/PagingStoreImpl.java       |  72 ++---
 .../activemq/core/persistence/GroupingInfo.java |   4 +-
 .../core/persistence/OperationContext.java      |   6 +-
 .../core/persistence/QueueBindingInfo.java      |   4 +-
 .../core/persistence/StorageManager.java        |  64 ++--
 .../config/PersistedAddressSetting.java         |  10 +-
 .../core/persistence/config/PersistedRoles.java |   8 +-
 .../core/persistence/impl/PageCountPending.java |   2 +-
 .../impl/journal/AddMessageRecord.java          |   4 +-
 .../impl/journal/BatchingIDGenerator.java       |  14 +-
 .../impl/journal/DescribeJournal.java           | 110 +++----
 .../impl/journal/JournalRecordIds.java          |   4 +-
 .../impl/journal/JournalStorageManager.java     | 182 +++++------
 .../impl/journal/LargeServerMessageImpl.java    |  32 +-
 .../impl/journal/LargeServerMessageInSync.java  |  18 +-
 .../impl/journal/OperationContextImpl.java      |  18 +-
 .../nullpm/NullStorageLargeServerMessage.java   |  10 +-
 .../impl/nullpm/NullStorageManager.java         |  62 ++--
 .../activemq/core/postoffice/Address.java       |   4 +-
 .../core/postoffice/AddressManager.java         |   6 +-
 .../activemq/core/postoffice/Binding.java       |  16 +-
 .../activemq/core/postoffice/BindingType.java   |   4 +-
 .../activemq/core/postoffice/Bindings.java      |  10 +-
 .../core/postoffice/BindingsFactory.java        |   4 +-
 .../core/postoffice/DuplicateIDCache.java       |   6 +-
 .../activemq/core/postoffice/PostOffice.java    |  18 +-
 .../activemq/core/postoffice/QueueBinding.java  |   4 +-
 .../activemq/core/postoffice/QueueInfo.java     |   6 +-
 .../core/postoffice/impl/AddressImpl.java       |   6 +-
 .../core/postoffice/impl/BindingsImpl.java      |  34 +--
 .../core/postoffice/impl/DivertBinding.java     |  20 +-
 .../postoffice/impl/DuplicateIDCacheImpl.java   |  18 +-
 .../core/postoffice/impl/LocalQueueBinding.java |  20 +-
 .../core/postoffice/impl/PostOfficeImpl.java    | 100 +++---
 .../postoffice/impl/SimpleAddressManager.java   |  24 +-
 .../postoffice/impl/WildcardAddressManager.java |  14 +-
 .../activemq/core/protocol/ProtocolHandler.java |  26 +-
 .../core/protocol/ServerPacketDecoder.java      | 108 +++----
 .../core/ServerSessionPacketHandler.java        | 180 +++++------
 .../protocol/core/impl/CoreProtocolManager.java |  66 ++--
 .../core/impl/CoreProtocolManagerFactory.java   |  12 +-
 .../protocol/core/impl/CoreSessionCallback.java |  34 +--
 .../core/impl/HornetQPacketHandler.java         |  50 +--
 .../wireformat/BackupRegistrationMessage.java   |   8 +-
 .../BackupReplicationStartFailedMessage.java    |   8 +-
 .../impl/wireformat/BackupRequestMessage.java   |   8 +-
 .../impl/wireformat/BackupResponseMessage.java  |   6 +-
 .../impl/wireformat/ClusterConnectMessage.java  |   6 +-
 .../wireformat/ClusterConnectReplyMessage.java  |   6 +-
 .../impl/wireformat/NodeAnnounceMessage.java    |   8 +-
 .../core/impl/wireformat/QuorumVoteMessage.java |  12 +-
 .../impl/wireformat/QuorumVoteReplyMessage.java |  12 +-
 .../impl/wireformat/ReplicationAddMessage.java  |  10 +-
 .../wireformat/ReplicationAddTXMessage.java     |  10 +-
 .../wireformat/ReplicationCommitMessage.java    |   6 +-
 .../wireformat/ReplicationDeleteMessage.java    |   6 +-
 .../wireformat/ReplicationDeleteTXMessage.java  |   8 +-
 .../ReplicationLargeMessageBeginMessage.java    |   6 +-
 .../ReplicationLargeMessageEndMessage.java      |   6 +-
 .../ReplicationLargeMessageWriteMessage.java    |   6 +-
 .../ReplicationLiveIsStoppingMessage.java       |   6 +-
 .../wireformat/ReplicationPageEventMessage.java |   8 +-
 .../wireformat/ReplicationPageWriteMessage.java |  10 +-
 .../wireformat/ReplicationPrepareMessage.java   |   8 +-
 .../wireformat/ReplicationResponseMessage.java  |   4 +-
 .../wireformat/ReplicationStartSyncMessage.java |  10 +-
 .../wireformat/ReplicationSyncFileMessage.java  |  14 +-
 .../wireformat/ScaleDownAnnounceMessage.java    |   8 +-
 .../protocol/stomp/WebSocketServerHandler.java  |   2 +-
 .../core/registry/JndiBindingRegistry.java      |   6 +-
 .../core/registry/MapBindingRegistry.java       |   4 +-
 .../core/remoting/impl/invm/InVMAcceptor.java   |  38 +--
 .../remoting/impl/invm/InVMAcceptorFactory.java |  14 +-
 .../core/remoting/impl/invm/InVMConnection.java |  28 +-
 .../core/remoting/impl/invm/InVMConnector.java  |  26 +-
 .../impl/invm/InVMConnectorFactory.java         |  12 +-
 .../core/remoting/impl/invm/InVMRegistry.java   |   4 +-
 .../remoting/impl/invm/TransportConstants.java  |   6 +-
 .../remoting/impl/netty/ConnectionCreator.java  |   2 +-
 .../impl/netty/HttpAcceptorHandler.java         |   2 +-
 .../impl/netty/HttpKeepAliveRunnable.java       |   2 +-
 .../core/remoting/impl/netty/NettyAcceptor.java |  48 +--
 .../impl/netty/NettyAcceptorFactory.java        |  14 +-
 .../impl/netty/NettyServerConnection.java       |   8 +-
 .../core/remoting/server/RemotingService.java   |  12 +-
 .../server/impl/RemotingServiceImpl.java        |  70 ++---
 .../core/replication/ReplicatedJournal.java     |  74 ++---
 .../replication/ReplicatedLargeMessage.java     |  18 +-
 .../core/replication/ReplicationEndpoint.java   |  98 +++---
 .../core/replication/ReplicationManager.java    |  78 ++---
 .../activemq/core/security/CheckType.java       |   2 +-
 .../activemq/core/security/SecurityStore.java   |   6 +-
 .../core/security/impl/SecurityStoreImpl.java   |  34 +--
 .../activemq/core/server/ActivateCallback.java  |   2 +-
 .../activemq/core/server/ActivationParams.java  |   2 +-
 .../apache/activemq/core/server/Bindable.java   |   2 +-
 .../core/server/BindingQueryResult.java         |   4 +-
 .../activemq/core/server/ConnectorService.java  |   2 +-
 .../core/server/ConnectorServiceFactory.java    |   6 +-
 .../apache/activemq/core/server/Consumer.java   |   4 +-
 .../org/apache/activemq/core/server/Divert.java |   6 +-
 .../activemq/core/server/HandleStatus.java      |   2 +-
 .../core/server/HornetQMessageBundle.java       |  54 ++--
 .../activemq/core/server/HornetQServer.java     |  56 ++--
 .../core/server/HornetQServerLogger.java        |  42 +--
 .../activemq/core/server/HornetQServers.java    |  10 +-
 .../activemq/core/server/JournalType.java       |   2 +-
 .../core/server/LargeServerMessage.java         |   8 +-
 .../activemq/core/server/LiveNodeLocator.java   |  14 +-
 .../activemq/core/server/MemoryManager.java     |   4 +-
 .../activemq/core/server/MessageReference.java  |   2 +-
 .../activemq/core/server/NodeManager.java       |  10 +-
 .../org/apache/activemq/core/server/Queue.java  |  14 +-
 .../activemq/core/server/QueueFactory.java      |  10 +-
 .../activemq/core/server/RouteContextList.java  |   2 +-
 .../activemq/core/server/RoutingContext.java    |   6 +-
 .../core/server/ScheduledDeliveryHandler.java   |   4 +-
 .../activemq/core/server/ServerConsumer.java    |   4 +-
 .../activemq/core/server/ServerMessage.java     |  10 +-
 .../activemq/core/server/ServerSession.java     |  14 +-
 .../core/server/ServerSessionFactory.java       |  24 +-
 .../core/server/TransientQueueManager.java      |   6 +-
 .../core/server/cluster/BackupManager.java      |  28 +-
 .../activemq/core/server/cluster/Bridge.java    |  16 +-
 .../core/server/cluster/BroadcastGroup.java     |   8 +-
 .../cluster/ClusterConfigurationUtil.java       |  12 +-
 .../core/server/cluster/ClusterConnection.java  |  16 +-
 .../core/server/cluster/ClusterControl.java     |  56 ++--
 .../core/server/cluster/ClusterController.java  |  66 ++--
 .../core/server/cluster/ClusterManager.java     |  82 ++---
 ...HornetQServerSideProtocolManagerFactory.java |  12 +-
 .../core/server/cluster/MessageFlowRecord.java  |   4 +-
 .../core/server/cluster/RemoteQueueBinding.java |   6 +-
 .../core/server/cluster/Transformer.java        |   4 +-
 .../core/server/cluster/ha/BackupPolicy.java    |   6 +-
 .../server/cluster/ha/ColocatedHAManager.java   |  22 +-
 .../core/server/cluster/ha/ColocatedPolicy.java |  10 +-
 .../core/server/cluster/ha/HAManager.java       |   6 +-
 .../core/server/cluster/ha/HAPolicy.java        |   6 +-
 .../core/server/cluster/ha/LiveOnlyPolicy.java  |   8 +-
 .../core/server/cluster/ha/ReplicaPolicy.java   |  10 +-
 .../server/cluster/ha/ReplicatedPolicy.java     |  10 +-
 .../core/server/cluster/ha/ScaleDownPolicy.java |  22 +-
 .../cluster/ha/SharedStoreMasterPolicy.java     |  10 +-
 .../cluster/ha/SharedStoreSlavePolicy.java      |  10 +-
 .../server/cluster/ha/StandaloneHAManager.java  |   4 +-
 .../core/server/cluster/impl/BridgeImpl.java    |  74 ++---
 .../server/cluster/impl/BroadcastGroupImpl.java |  30 +-
 .../cluster/impl/ClusterConnectionBridge.java   |  54 ++--
 .../cluster/impl/ClusterConnectionImpl.java     |  84 ++---
 .../core/server/cluster/impl/Redistributor.java |  36 +--
 .../cluster/impl/RemoteQueueBindingImpl.java    |  24 +-
 .../core/server/cluster/qourum/BooleanVote.java |   4 +-
 .../core/server/cluster/qourum/Quorum.java      |   4 +-
 .../server/cluster/qourum/QuorumManager.java    |  38 +--
 .../core/server/cluster/qourum/QuorumVote.java  |  16 +-
 .../cluster/qourum/QuorumVoteHandler.java       |   6 +-
 .../cluster/qourum/QuorumVoteServerConnect.java |   8 +-
 .../qourum/SharedNothingBackupQuorum.java       |  26 +-
 .../core/server/cluster/qourum/Vote.java        |   4 +-
 .../core/server/embedded/EmbeddedHornetQ.java   |  16 +-
 .../core/server/group/GroupingHandler.java      |  16 +-
 .../core/server/group/UnproposalListener.java   |   4 +-
 .../core/server/group/impl/GroupBinding.java    |   4 +-
 .../group/impl/GroupHandlingAbstract.java       |  22 +-
 .../impl/GroupingHandlerConfiguration.java      |  10 +-
 .../server/group/impl/LocalGroupingHandler.java |  24 +-
 .../core/server/group/impl/Proposal.java        |   4 +-
 .../group/impl/RemoteGroupingHandler.java       |  24 +-
 .../core/server/group/impl/Response.java        |   4 +-
 .../server/impl/AIOFileLockNodeManager.java     |   4 +-
 .../activemq/core/server/impl/Activation.java   |  36 +--
 .../impl/AnyLiveNodeLocatorForReplication.java  |  14 +-
 .../impl/AnyLiveNodeLocatorForScaleDown.java    |  14 +-
 .../impl/BackupRecoveryJournalLoader.java       |  42 +--
 .../server/impl/BackupTopologyListener.java     |   6 +-
 .../core/server/impl/ColocatedActivation.java   |  44 +--
 .../core/server/impl/ConnectorsService.java     |  24 +-
 .../activemq/core/server/impl/DivertImpl.java   |  22 +-
 .../core/server/impl/FileLockNodeManager.java   |  12 +-
 .../core/server/impl/HornetQServerImpl.java     | 194 ++++++------
 .../core/server/impl/InVMNodeManager.java       |  20 +-
 .../core/server/impl/JournalLoader.java         |  24 +-
 .../core/server/impl/LastValueQueue.java        |  36 +--
 .../core/server/impl/LiveActivation.java        |   2 +-
 .../core/server/impl/LiveOnlyActivation.java    |  34 +--
 .../core/server/impl/MessageReferenceImpl.java  |  12 +-
 .../NamedLiveNodeLocatorForReplication.java     |  16 +-
 .../impl/NamedLiveNodeLocatorForScaleDown.java  |  16 +-
 .../server/impl/NamedNodeIdNodeLocator.java     |  12 +-
 .../server/impl/PostOfficeJournalLoader.java    |  72 ++---
 .../core/server/impl/QueueFactoryImpl.java      |  22 +-
 .../activemq/core/server/impl/QueueImpl.java    |  98 +++---
 .../core/server/impl/RefsOperation.java         |  20 +-
 .../core/server/impl/ReplicationError.java      |  24 +-
 .../core/server/impl/RoutingContextImpl.java    |  12 +-
 .../core/server/impl/ScaleDownHandler.java      |  64 ++--
 .../impl/ScheduledDeliveryHandlerImpl.java      |  12 +-
 .../core/server/impl/ServerConsumerImpl.java    |  64 ++--
 .../activemq/core/server/impl/ServerInfo.java   |  12 +-
 .../core/server/impl/ServerMessageImpl.java     |  24 +-
 .../core/server/impl/ServerSessionImpl.java     | 106 +++----
 .../core/server/impl/ServiceRegistry.java       |  10 +-
 .../impl/SharedNothingBackupActivation.java     |  66 ++--
 .../impl/SharedNothingLiveActivation.java       |  68 ++---
 .../impl/SharedStoreBackupActivation.java       |  30 +-
 .../server/impl/SharedStoreLiveActivation.java  |   8 +-
 .../server/impl/TransientQueueManagerImpl.java  |  14 +-
 .../server/management/ManagementService.java    |  58 ++--
 .../management/impl/ManagementServiceImpl.java  | 104 +++----
 .../core/settings/HierarchicalRepository.java   |   2 +-
 .../HierarchicalRepositoryChangeListener.java   |   2 +-
 .../activemq/core/settings/Mergeable.java       |   2 +-
 .../core/settings/impl/AddressSettings.java     |  12 +-
 .../impl/HierarchicalObjectRepository.java      |  10 +-
 .../activemq/core/settings/impl/Match.java      |   4 +-
 .../core/settings/impl/SlowConsumerPolicy.java  |   2 +-
 .../core/transaction/ResourceManager.java       |   4 +-
 .../activemq/core/transaction/Transaction.java  |   8 +-
 .../core/transaction/TransactionDetail.java     |  16 +-
 .../core/transaction/TransactionFactory.java    |   4 +-
 .../core/transaction/TransactionOperation.java  |   4 +-
 .../TransactionOperationAbstract.java           |   6 +-
 .../transaction/TransactionPropertyIndexes.java |   2 +-
 .../impl/BindingsTransactionImpl.java           |   8 +-
 .../transaction/impl/CoreTransactionDetail.java |  10 +-
 .../transaction/impl/ResourceManagerImpl.java   |   8 +-
 .../core/transaction/impl/TransactionImpl.java  |  18 +-
 .../spi/core/naming/BindingRegistry.java        |   2 +-
 .../spi/core/protocol/MessageConverter.java     |   4 +-
 .../spi/core/protocol/ProtocolManager.java      |  10 +-
 .../core/protocol/ProtocolManagerFactory.java   |   6 +-
 .../spi/core/protocol/SessionCallback.java      |  10 +-
 .../activemq/spi/core/remoting/Acceptor.java    |  10 +-
 .../spi/core/remoting/AcceptorFactory.java      |   8 +-
 .../ServerConnectionLifeCycleListener.java      |   2 +-
 .../core/security/HornetQSecurityManager.java   |   8 +-
 .../security/HornetQSecurityManagerImpl.java    |   8 +-
 .../spi/core/security/JAASSecurityManager.java  |  10 +-
 .../spi/core/security/package-info.java         |   2 +-
 .../activemq/utils/XMLConfigurationUtil.java    |   6 +-
 .../org/apache/activemq/security/basic-security |   2 +-
 .../resources/schema/hornetq-configuration.xsd  |   6 +-
 .../core/config/impl/ConfigurationImplTest.java |  18 +-
 .../impl/DefaultsFileConfigurationTest.java     |  10 +-
 .../impl/FileConfigurationParserTest.java       |  28 +-
 .../core/config/impl/FileConfigurationTest.java |  44 +--
 .../config/impl/HAPolicyConfigurationTest.java  |  38 +--
 .../core/config/impl/ValidatorsTest.java        |   6 +-
 .../WrongRoleFileConfigurationParserTest.java   |  22 +-
 .../activemq/core/filter/impl/FilterTest.java   |  20 +-
 .../core/list/PriorityLinkedListTest.java       |   6 +-
 .../core/message/impl/MessagePropertyTest.java  |  20 +-
 .../apache/activemq/core/security/RoleTest.java |  14 +-
 .../group/impl/ClusteredResetMockTest.java      |  70 ++---
 .../core/server/impl/EmbeddedServerTest.java    |  14 +-
 .../impl/ScheduledDeliveryHandlerTest.java      |  44 +--
 .../core/settings/AddressSettingsTest.java      |  10 +-
 .../activemq/core/settings/RepositoryTest.java  |   8 +-
 .../core/version/impl/VersionImplTest.java      |   2 +-
 .../tests/logging/AssertionLoggerHandler.java   |   2 +-
 .../tests/util/ColocatedHornetQServer.java      |  22 +-
 .../util/CountDownSessionFailureListener.java   |   8 +-
 .../tests/util/InVMNodeManagerServer.java       |  10 +-
 .../activemq/tests/util/ServiceTestBase.java    | 108 +++----
 .../activemq/tests/util/SimpleStringTest.java   |   6 +-
 .../tests/util/SingleServerTestBase.java        |  16 +-
 .../activemq/tests/util/UnitTestCase.java       | 112 +++----
 .../resources/ConfigurationTest-full-config.xml |  14 +-
 .../resources/InvalidConfigurationTest0.xml     |  12 +-
 .../resources/InvalidConfigurationTest1.xml     |  12 +-
 .../resources/InvalidConfigurationTest2.xml     |  12 +-
 .../resources/InvalidConfigurationTest3.xml     |  12 +-
 .../resources/InvalidConfigurationTest4.xml     |  12 +-
 .../resources/InvalidConfigurationTest5.xml     |  12 +-
 .../resources/divertRoutingNameNotRequired.xml  |   8 +-
 .../src/test/resources/logging.properties       |   6 +-
 activemq-service-sar/pom.xml                    |  18 +-
 .../HornetQFileConfigurationService.java        |   6 +-
 .../HornetQFileConfigurationServiceMBean.java   |   4 +-
 .../service/HornetQJMSStarterService.java       |   4 +-
 .../service/HornetQJMSStarterServiceMBean.java  |   2 +-
 .../activemq/service/HornetQServiceBundle.java  |   2 +-
 .../activemq/service/HornetQServiceLogger.java  |   2 +-
 .../activemq/service/HornetQStarterService.java |  12 +-
 .../service/HornetQStarterServiceMBean.java     |   4 +-
 .../service/JBossASSecurityManagerService.java  |   4 +-
 .../JBossASSecurityManagerServiceMBean.java     |   4 +-
 activemq-tools/pom.xml                          |  16 +-
 .../org/apache/activemq/tools/DataTool.java     |  10 +-
 .../activemq/tools/HornetQToolsLogger.java      |   2 +-
 .../java/org/apache/activemq/tools/Main.java    |   2 +-
 .../org/apache/activemq/tools/PrintData.java    |  10 +-
 .../org/apache/activemq/tools/PrintPages.java   |  58 ++--
 .../apache/activemq/tools/TransferQueue.java    |  24 +-
 .../apache/activemq/tools/XmlDataConstants.java |   6 +-
 .../apache/activemq/tools/XmlDataExporter.java  | 104 +++----
 .../apache/activemq/tools/XmlDataImporter.java  |  46 +--
 distribution/activemq/pom.xml                   | 100 +++---
 distribution/activemq/src/main/assembly/dep.xml |  18 +-
 .../activemq/src/main/resources/bin/hornetq     |   2 +-
 .../activemq/src/main/resources/bin/hornetq.cmd |   2 +-
 .../config/clustered/hornetq-configuration.xml  |   8 +-
 .../main/resources/config/logging.properties    |  12 +-
 .../non-clustered/hornetq-configuration.xml     |   8 +-
 .../config/replicated/hornetq-configuration.xml |   8 +-
 .../shared-store/hornetq-configuration.xml      |   8 +-
 .../src/main/resources/licenses/base64.txt      |   2 +-
 .../src/main/resources/licenses/json.txt        |   2 +-
 distribution/jnp-client/pom.xml                 |   4 +-
 distribution/pom.xml                            |   8 +-
 docs/eap-manual/en/clusters.xml                 |  20 +-
 docs/pom.xml                                    |   8 +-
 docs/quickstart-guide/en/examples.xml           |  66 ++--
 docs/quickstart-guide/en/running.xml            |  34 +--
 docs/quickstart-guide/pom.xml                   |   6 +-
 docs/quickstart-guide/zh/examples.xml           |  24 +-
 docs/user-manual/en/aerogear-integration.xml    |   2 +-
 docs/user-manual/en/appserver-integration.xml   |  66 ++--
 docs/user-manual/en/clusters.xml                |  14 +-
 docs/user-manual/en/configuration-index.xml     |  10 +-
 docs/user-manual/en/configuring-transports.xml  |  22 +-
 docs/user-manual/en/connection-ttl.xml          |  18 +-
 docs/user-manual/en/core-bridges.xml            |   4 +-
 docs/user-manual/en/diverts.xml                 |   2 +-
 docs/user-manual/en/duplicate-detection.xml     |   4 +-
 docs/user-manual/en/embedding-hornetq.xml       |  18 +-
 docs/user-manual/en/intercepting-operations.xml |  10 +-
 docs/user-manual/en/interoperability.xml        |  14 +-
 docs/user-manual/en/jms-bridge.xml              |  16 +-
 docs/user-manual/en/large-messages.xml          |   2 +-
 docs/user-manual/en/logging.xml                 |  20 +-
 docs/user-manual/en/management.xml              |  62 ++--
 docs/user-manual/en/persistence.xml             |   4 +-
 docs/user-manual/en/project-info.xml            |   2 +-
 docs/user-manual/en/queue-attributes.xml        |   2 +-
 docs/user-manual/en/rest.xml                    |  24 +-
 docs/user-manual/en/security.xml                |  12 +-
 docs/user-manual/en/send-guarantees.xml         |   2 +-
 docs/user-manual/en/spring-integration.xml      |   6 +-
 docs/user-manual/en/using-jms.xml               |   2 +-
 docs/user-manual/en/using-server.xml            |   2 +-
 docs/user-manual/en/vertx-integration.xml       |   8 +-
 docs/user-manual/pom.xml                        |   8 +-
 .../src/main/resources/schemaToTable.xsl        |   2 +-
 docs/user-manual/zh/appserver-integration.xml   |  42 +--
 docs/user-manual/zh/clusters.xml                |   6 +-
 docs/user-manual/zh/configuration-index.xml     |   4 +-
 docs/user-manual/zh/configuring-transports.xml  |  24 +-
 docs/user-manual/zh/connection-ttl.xml          |   6 +-
 docs/user-manual/zh/core-bridges.xml            |   4 +-
 docs/user-manual/zh/diverts.xml                 |   2 +-
 docs/user-manual/zh/duplicate-detection.xml     |   4 +-
 docs/user-manual/zh/embedding-hornetq.xml       |  18 +-
 docs/user-manual/zh/ha.xml                      |   4 +-
 docs/user-manual/zh/intercepting-operations.xml |   6 +-
 docs/user-manual/zh/interoperability.xml        |   4 +-
 docs/user-manual/zh/jms-bridge.xml              |  16 +-
 docs/user-manual/zh/large-messages.xml          |   2 +-
 docs/user-manual/zh/logging.xml                 |  12 +-
 docs/user-manual/zh/management.xml              |  60 ++--
 docs/user-manual/zh/persistence.xml             |   4 +-
 docs/user-manual/zh/project-info.xml            |   2 +-
 docs/user-manual/zh/queue-attributes.xml        |   2 +-
 docs/user-manual/zh/security.xml                |  12 +-
 docs/user-manual/zh/send-guarantees.xml         |   2 +-
 docs/user-manual/zh/using-server.xml            |  32 +-
 etc/findbugs-exclude.xml                        |  42 +--
 examples/core/embedded-remote/pom.xml           |  28 +-
 .../core/example/EmbeddedRemoteExample.java     |  20 +-
 .../activemq/core/example/EmbeddedServer.java   |  14 +-
 examples/core/embedded/pom.xml                  |  18 +-
 .../activemq/core/example/EmbeddedExample.java  |  30 +-
 examples/core/perf/pom.xml                      |  44 +--
 .../apache/activemq/core/example/PerfBase.java  |  32 +-
 .../activemq/core/example/PerfListener.java     |   2 +-
 .../activemq/core/example/PerfParams.java       |   2 +-
 .../activemq/core/example/PerfSender.java       |   2 +-
 .../hornetq-configuration-messaging-lab.xml     |   2 +-
 .../resources/server0/hornetq-configuration.xml |   2 +-
 examples/core/pom.xml                           |   6 +-
 examples/core/twitter-connector/pom.xml         |  46 +--
 examples/core/twitter-connector/readme.html     |   2 +-
 .../core/example/TwitterConnectorExample.java   |  24 +-
 .../resources/server0/hornetq-configuration.xml |   8 +-
 examples/core/vertx-connector/pom.xml           |  46 +--
 examples/core/vertx-connector/readme.html       |   2 +-
 .../activemq/core/example/ExampleVerticle.java  |   2 +-
 .../core/example/VertxConnectorExample.java     |   4 +-
 .../resources/server0/hornetq-configuration.xml |   8 +-
 examples/javaee/ejb-jms-transaction/pom.xml     |   4 +-
 examples/javaee/ejb-jms-transaction/readme.html |   2 +-
 .../javaee/example/EJBClientExample.java        |   6 +-
 .../javaee/example/server/SendMessageBean.java  |   2 +-
 .../example/server/SendMessageService.java      |   2 +-
 .../examples/MDBEJBTXRequiredRunnerTest.java    |   8 +-
 examples/javaee/jca-config/pom.xml              |   4 +-
 examples/javaee/jca-config/readme.html          |   2 +-
 .../javaee/example/MDBRemoteClientExample.java  |   6 +-
 .../javaee/example/server/MDBQueueA.java        |   2 +-
 .../javaee/example/server2/MDBQueueB.java       |   2 +-
 .../javaee/example/server2/StatelessSender.java |   6 +-
 .../example/server2/StatelessSenderService.java |   2 +-
 .../example/server/ExampleRunner2Test.java      |  10 +-
 .../resources/jboss-deployment-structure.xml    |   2 +-
 examples/javaee/jca-remote/pom.xml              |   4 +-
 .../example/MDBRemoteServerClientExample.java   |   2 +-
 .../javaee/example/server/MDBQueue.java         |   4 +-
 .../javaee/examples/JCARemoteRunnerTest.java    |   6 +-
 .../resources/jboss-deployment-structure.xml    |   2 +-
 examples/javaee/jms-bridge/pom.xml              |   4 +-
 .../javaee/example/JMSBridgeExample.java        |   2 +-
 .../javaee/examples/JMSBridgeRunnerTest.java    |   4 +-
 examples/javaee/jms-context-injection/pom.xml   |   4 +-
 .../JmsContextInjectionClientExample.java       |   2 +-
 .../server/JmsContextInjectionExample.java      |   2 +-
 .../examples/JmsContextInjectionRunnerTest.java |   6 +-
 examples/javaee/mdb-bmt/pom.xml                 |   4 +-
 .../javaee/example/MDB_BMTClientExample.java    |   2 +-
 .../javaee/example/server/MDB_BMTExample.java   |   2 +-
 .../example/server/ExampleRunnerTest.java       |   4 +-
 .../mdb-cmt-setrollbackonly-with-dlq/pom.xml    |   4 +-
 ...CMT_SetRollbackOnlyWithDLQClientExample.java |   2 +-
 .../MDB_CMT_SetRollbackOnlyWithDLQExample.java  |   2 +-
 .../MDBCMTSetRollbackOnlyWithDLQRunnerTest.java |   4 +-
 examples/javaee/mdb-cmt-setrollbackonly/pom.xml |   4 +-
 .../MDB_CMT_SetRollbackOnlyClientExample.java   |   2 +-
 .../server/MDB_CMT_SetRollbackOnlyExample.java  |   2 +-
 .../MDBCMTSetRollbackOnlyRunnerTest.java        |   4 +-
 examples/javaee/mdb-cmt-tx-local/pom.xml        |   4 +-
 .../example/MDB_CMT_TxLocalClientExample.java   |   2 +-
 .../example/server/MDB_CMT_TxLocalExample.java  |   2 +-
 .../example/MDBCMTSetLocalTXRunnerTest.java     |   4 +-
 .../javaee/mdb-cmt-tx-not-supported/pom.xml     |   4 +-
 .../MDB_CMT_TxNotSupportedClientExample.java    |   2 +-
 .../example/server/MDB_CMT_TxNotSupported.java  |   2 +-
 .../MDBCMTSetTXNotSupportedRunnerTest.java      |   4 +-
 examples/javaee/mdb-cmt-tx-required/pom.xml     |   4 +-
 .../MDB_CMT_TxRequiredClientExample.java        |   2 +-
 .../server/MDB_CMT_TxRequiredExample.java       |   2 +-
 .../examples/MDBCMTSetTXRequiredRunnerTest.java |   6 +-
 examples/javaee/mdb-message-selector/pom.xml    |   4 +-
 .../MDBMessageSelectorClientExample.java        |   2 +-
 .../server/MDBMessageSelectorExample.java       |   2 +-
 .../MDBCMTSetMessageSelectorRunnerTest.java     |   6 +-
 .../javaee/mdb-remote-failover-static/pom.xml   |   4 +-
 .../MDBRemoteFailoverStaticClientExample.java   |   4 +-
 .../server/MDBRemoteFailoverStaticExample.java  |   4 +-
 .../javaee/example/server/ServerKiller.java     |   2 +-
 .../examples/FailoverStaticRunnerTest.java      |   8 +-
 .../resources/jboss-deployment-structure.xml    |   2 +-
 examples/javaee/mdb-remote-failover/pom.xml     |   4 +-
 .../example/MDBRemoteFailoverClientExample.java |   4 +-
 .../server/MDBRemoteFailoverExample.java        |   4 +-
 .../javaee/example/server/ServerKiller.java     |   2 +-
 .../javaee/examples/FailoverRunnerTest.java     |   8 +-
 .../resources/jboss-deployment-structure.xml    |   2 +-
 examples/javaee/mdb-tx-send/pom.xml             |   4 +-
 .../example/MDBMessageSendTxClientExample.java  |   2 +-
 .../example/server/MDBMessageSendTxExample.java |   2 +-
 .../javaee/examples/MDBCMTTxSendRunnerTest.java |   6 +-
 .../resources/jboss-deployment-structure.xml    |   2 +-
 examples/javaee/pom.xml                         |  18 +-
 examples/javaee/xarecovery/pom.xml              |   4 +-
 examples/javaee/xarecovery/readme.html          |   2 +-
 .../example/XARecoveryExampleStepOne.java       |   6 +-
 .../example/XARecoveryExampleStepTwo.java       |   4 +-
 .../example/server/XARecoveryExampleBean.java   |   2 +-
 .../server/XARecoveryExampleService.java        |   2 +-
 .../javaee/examples/XARecoveryRunnerTest.java   |  10 +-
 .../jms/activemq-jms-examples-common/common.css |  29 --
 .../config/logging.properties                   |  35 ---
 .../config/server.properties                    |   1 -
 .../images/hornetQ-banner_final.png             | Bin 109633 -> 0 bytes
 .../jms/activemq-jms-examples-common/pom.xml    |  37 ---
 .../activemq-jms-examples-common/prettify.css   |   1 -
 .../activemq-jms-examples-common/prettify.js    |  23 --
 .../activemq/common/example/DummyXid.java       | 207 -------------
 .../activemq/common/example/HornetQExample.java | 234 --------------
 examples/jms/activemq-ra-rar/pom.xml            |  82 -----
 .../activemq-ra-rar/src/main/resources/ra.xml   | 304 -------------------
 examples/jms/aerogear/pom.xml                   |  38 +--
 examples/jms/aerogear/readme.html               |   4 +-
 .../activemq/jms/example/AerogearExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/applet/applet.html                 |   2 +-
 examples/jms/applet/pom.xml                     |  34 +--
 .../activemq/jms/example/AppletExample.java     |  10 +-
 .../jms/example/HttpStaticFileServer.java       |   4 +-
 .../example/HttpStaticFileServerHandler.java    |   2 +-
 .../HttpStaticFileServerPipelineFactory.java    |   2 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/application-layer-failover/pom.xml |  34 +--
 .../ApplicationLayerFailoverExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/bridge/pom.xml                     |  38 +--
 examples/jms/bridge/readme.html                 |   2 +-
 .../activemq/jms/example/BridgeExample.java     |   4 +-
 .../jms/example/HatColourChangeTransformer.java |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   8 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/browser/pom.xml                    |  34 +--
 .../jms/example/QueueBrowserExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/client-kickoff/pom.xml             |  38 +--
 examples/jms/client-kickoff/readme.html         |   6 +-
 .../jms/example/ClientKickoffExample.java       |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../jms/client-side-failoverlistener/pom.xml    |  34 +--
 .../ClientSideFailoverListerExample.java        |  10 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/client-side-load-balancing/pom.xml |  34 +--
 .../example/ClientSideLoadBalancingExample.java |  10 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 .../jms/clustered-durable-subscription/pom.xml  |  34 +--
 .../ClusteredDurableSubscriptionExample.java    |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/clustered-grouping/pom.xml         |  34 +--
 .../jms/example/ClusteredGroupingExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 examples/jms/clustered-jgroups/pom.xml          |  30 +-
 .../jms/example/ClusteredJgroupsExample.java    |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/clustered-queue/pom.xml            |  30 +-
 .../jms/example/ClusteredQueueExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/clustered-standalone/pom.xml       |  34 +--
 .../jms/example/ClusteredStandaloneExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 examples/jms/clustered-static-discovery/pom.xml |  34 +--
 .../example/StaticClusteredQueueExample.java    |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 .../hornetq/server2/hornetq-configuration.xml   |   6 +-
 .../hornetq/server3/hornetq-configuration.xml   |   6 +-
 examples/jms/clustered-static-oneway/pom.xml    |  34 +--
 .../jms/example/ClusterStaticOnewayExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 examples/jms/clustered-topic/pom.xml            |  34 +--
 .../jms/example/ClusteredTopicExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../jms/colocated-failover-scale-down/pom.xml   |  30 +-
 .../ColocatedFailoverScaleDownExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   8 +-
 .../hornetq/server1/hornetq-configuration.xml   |   8 +-
 examples/jms/colocated-failover/pom.xml         |  30 +-
 .../jms/example/ColocatedFailoverExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/consumer-rate-limit/pom.xml        |  34 +--
 .../jms/example/ConsumerRateLimitExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/dead-letter/pom.xml                |  34 +--
 .../activemq/jms/example/DeadLetterExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/delayed-redelivery/pom.xml         |  34 +--
 .../jms/example/DelayedRedeliveryExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/divert/pom.xml                     |  38 +--
 examples/jms/divert/readme.html                 |   2 +-
 .../example/AddForwardingTimeTransformer.java   |   8 +-
 .../activemq/jms/example/DivertExample.java     |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   8 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/durable-subscription/pom.xml       |  34 +--
 .../jms/example/DurableSubscriptionExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/embedded-simple/pom.xml            |  42 +--
 .../activemq/jms/example/EmbeddedExample.java   |   6 +-
 .../main/resources/hornetq-configuration.xml    |   4 +-
 examples/jms/embedded/pom.xml                   |  42 +--
 .../activemq/jms/example/EmbeddedExample.java   |  28 +-
 examples/jms/expiry/pom.xml                     |  34 +--
 .../activemq/jms/example/ExpiryExample.java     |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/ha-policy-autobackup/pom.xml       |  30 +-
 .../jms/example/HAPolicyAutoBackupExample.java  |  14 +-
 .../hornetq/server0/hornetq-configuration.xml   |  10 +-
 .../hornetq/server1/hornetq-configuration.xml   |  10 +-
 examples/jms/http-transport/pom.xml             |  34 +--
 examples/jms/http-transport/readme.html         |   4 +-
 .../jms/example/HttpTransportExample.java       |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../jms/instantiate-connection-factory/pom.xml  |  42 +--
 .../InstantiateConnectionFactoryExample.java    |  14 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/interceptor/pom.xml                |  38 +--
 examples/jms/interceptor/readme.html            |   2 +-
 .../jms/example/InterceptorExample.java         |   4 +-
 .../activemq/jms/example/SimpleInterceptor.java |  16 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/jaas/pom.xml                       |  52 ++--
 examples/jms/jaas/readme.html                   |  10 +-
 .../jms/example/ExampleCallbackHandler.java     |   2 +-
 .../jms/example/ExampleConfiguration.java       |   2 +-
 .../jms/example/ExampleLoginModule.java         |   4 +-
 .../activemq/jms/example/JAASExample.java       |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/jms-auto-closeable/pom.xml         |  34 +--
 .../jms/example/JMSAutoCloseableExample.java    |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/jms-bridge/pom.xml                 |  42 +--
 examples/jms/jms-bridge/readme.html             |   2 +-
 .../activemq/jms/example/JMSBridgeExample.java  |  12 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/jms-completion-listener/pom.xml    |  34 +--
 .../example/JMSCompletionListenerExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/jms-context/pom.xml                |  34 +--
 .../activemq/jms/example/JMSContextExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/jms-shared-consumer/pom.xml        |  34 +--
 .../jms/example/JMSSharedConsumerExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/jmx/pom.xml                        |  42 +--
 .../apache/activemq/jms/example/JMXExample.java |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/large-message/pom.xml              |  34 +--
 .../jms/example/LargeMessageExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/last-value-queue/pom.xml           |  34 +--
 .../jms/example/LastValueQueueExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/management-notifications/pom.xml   |  34 +--
 .../example/ManagementNotificationExample.java  |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/management/pom.xml                 |  34 +--
 .../activemq/jms/example/ManagementExample.java |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/message-counters/pom.xml           |  38 +--
 .../jms/example/MessageCounterExample.java      |  10 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/message-group/pom.xml              |  34 +--
 .../jms/example/MessageGroupExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/message-group2/pom.xml             |  34 +--
 .../jms/example/MessageGroup2Example.java       |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/message-priority/pom.xml           |  34 +--
 .../jms/example/MessagePriorityExample.java     |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/multiple-failover-failback/pom.xml |  34 +--
 .../MultipleFailoverFailbackExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 examples/jms/multiple-failover/pom.xml          |  34 +--
 .../jms/example/MultipleFailoverExample.java    |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 examples/jms/no-consumer-buffering/pom.xml      |  34 +--
 .../jms/example/NoConsumerBufferingExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/non-transaction-failover/pom.xml   |  30 +-
 .../example/NonTransactionFailoverExample.java  |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/openwire/pom.xml                   |  38 +--
 .../activemq/jms/example/OpenWireExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/paging/pom.xml                     |  34 +--
 .../activemq/jms/example/PagingExample.java     |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/perf/pom.xml                       |  44 +--
 .../apache/activemq/jms/example/PerfBase.java   |   6 +-
 .../activemq/jms/example/PerfListener.java      |   2 +-
 .../apache/activemq/jms/example/PerfParams.java |   2 +-
 .../apache/activemq/jms/example/PerfSender.java |   2 +-
 .../hornetq-configuration-messaging-lab.xml     |   2 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/pom.xml                            |  12 +-
 examples/jms/pre-acknowledge/pom.xml            |  34 +--
 .../jms/example/PreacknowledgeExample.java      |  10 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/producer-rate-limit/pom.xml        |  34 +--
 .../jms/example/ProducerRateLimitExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/proton-cpp/pom.xml                 |  40 +--
 examples/jms/proton-cpp/readme.html             |   2 +-
 .../hornetq/server0/hornetq-configuration.xml   |   2 +-
 examples/jms/proton-j/pom.xml                   |  38 +--
 examples/jms/proton-j/readme.html               |   2 +-
 .../activemq/jms/example/ProtonJExample.java    |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   2 +-
 examples/jms/proton-ruby/pom.xml                |  36 +--
 examples/jms/proton-ruby/readme.html            |   2 +-
 .../hornetq/server0/hornetq-configuration.xml   |   2 +-
 .../jms/queue-message-redistribution/pom.xml    |  34 +--
 .../QueueMessageRedistributionExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/queue-requestor/pom.xml            |  34 +--
 .../jms/example/QueueRequestorExample.java      |   4 +-
 .../jms/example/TextReverserService.java        |   2 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/queue-selector/pom.xml             |  34 +--
 .../jms/example/QueueSelectorExample.java       |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/queue/pom.xml                      |  34 +--
 .../activemq/jms/example/QueueExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/reattach-node/pom.xml              |  34 +--
 .../activemq/jms/example/ReattachExample.java   |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   8 +-
 examples/jms/replicated-failback-static/pom.xml |  34 +--
 .../ReplicatedFailbackStaticExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 examples/jms/replicated-failback/pom.xml        |  34 +--
 .../jms/example/ReplicatedFailbackExample.java  |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 .../jms/replicated-multiple-failover/pom.xml    |  34 +--
 .../ReplicatedMultipleFailoverExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 .../hornetq/server2/hornetq-configuration.xml   |   6 +-
 .../jms/replicated-transaction-failover/pom.xml |  34 +--
 .../ReplicatedTransactionFailoverExample.java   |   6 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 examples/jms/request-reply/pom.xml              |  34 +--
 .../jms/example/RequestReplyExample.java        |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/rest/dup-send/pom.xml              |  24 +-
 .../rest/dup-send/src/main/java/PostOrder.java  |   2 +-
 .../src/main/resources/hornetq-client.xml       |   2 +-
 .../main/resources/hornetq-configuration.xml    |   6 +-
 .../dup-send/src/main/webapp/WEB-INF/web.xml    |   4 +-
 examples/jms/rest/javascript-chat/pom.xml       |  24 +-
 .../main/resources/hornetq-configuration.xml    |   4 +-
 .../src/main/webapp/WEB-INF/web.xml             |   4 +-
 .../messaging/test/AutoAckTopicTest.java        |   2 +-
 examples/jms/rest/jms-to-rest/pom.xml           |  24 +-
 .../jms-to-rest/src/main/java/JmsHelper.java    |  16 +-
 .../jms-to-rest/src/main/java/JmsReceive.java   |   4 +-
 .../rest/jms-to-rest/src/main/java/JmsSend.java |   2 +-
 .../src/main/resources/hornetq-client.xml       |   2 +-
 .../main/resources/hornetq-configuration.xml    |   6 +-
 .../jms-to-rest/src/main/webapp/WEB-INF/web.xml |   4 +-
 examples/jms/rest/pom.xml                       |   6 +-
 examples/jms/rest/push/pom.xml                  |  24 +-
 .../jms/rest/push/src/main/java/JmsHelper.java  |  14 +-
 .../jms/rest/push/src/main/java/PostOrder.java  |   2 +-
 .../jms/rest/push/src/main/java/PushReg.java    |   8 +-
 .../push/src/main/java/ReceiveShipping.java     |   4 +-
 .../push/src/main/resources/hornetq-client.xml  |   2 +-
 .../main/resources/hornetq-configuration.xml    |   6 +-
 .../rest/push/src/main/webapp/WEB-INF/web.xml   |   4 +-
 examples/jms/scale-down/pom.xml                 |  30 +-
 .../activemq/jms/example/ScaleDownExample.java  |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 .../hornetq/server1/hornetq-configuration.xml   |   6 +-
 examples/jms/scheduled-message/pom.xml          |  34 +--
 .../jms/example/ScheduledMessageExample.java    |   6 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/security/pom.xml                   |  34 +--
 .../activemq/jms/example/SecurityExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/send-acknowledgements/pom.xml      |  34 +--
 .../example/SendAcknowledgementsExample.java    |  12 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/spring-integration/pom.xml         |  38 +--
 .../activemq/jms/example/ExampleListener.java   |   2 +-
 .../activemq/jms/example/MessageSender.java     |   2 +-
 .../activemq/jms/example/SpringExample.java     |   2 +-
 .../main/resources/hornetq-configuration.xml    |   4 +-
 .../src/main/resources/spring-jms-beans.xml     |   6 +-
 examples/jms/ssl-enabled/pom.xml                |  34 +--
 examples/jms/ssl-enabled/readme.html            |   4 +-
 .../apache/activemq/jms/example/SSLExample.java |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/static-selector-jms/pom.xml        |  34 +--
 .../jms/example/StaticSelectorJMSExample.java   |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/static-selector/pom.xml            |  34 +--
 .../jms/example/StaticSelectorExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/stomp-websockets/pom.xml           |  38 +--
 examples/jms/stomp-websockets/readme.html       |   2 +-
 .../jms/example/StompWebSocketExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/stomp/pom.xml                      |  38 +--
 .../activemq/jms/example/StompExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/stomp1.1/pom.xml                   |  38 +--
 .../activemq/jms/example/StompExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/stomp1.2/pom.xml                   |  38 +--
 .../activemq/jms/example/StompExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   6 +-
 examples/jms/stop-server-failover/pom.xml       |  34 +--
 .../jms/example/StopServerFailoverExample.java  |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/symmetric-cluster/pom.xml          |  34 +--
 .../jms/example/SymmetricClusterExample.java    |  14 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 .../hornetq/server2/hornetq-configuration.xml   |   4 +-
 .../hornetq/server3/hornetq-configuration.xml   |   4 +-
 .../hornetq/server4/hornetq-configuration.xml   |   4 +-
 .../hornetq/server5/hornetq-configuration.xml   |   4 +-
 examples/jms/temp-queue/pom.xml                 |  34 +--
 .../jms/example/TemporaryQueueExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/topic-hierarchies/pom.xml          |  34 +--
 .../jms/example/TopicHierarchyExample.java      |   6 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/topic-selector-example1/pom.xml    |  34 +--
 .../jms/example/TopicSelectorExample1.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/topic-selector-example2/pom.xml    |  34 +--
 .../jms/example/TopicSelectorExample2.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/topic/pom.xml                      |  34 +--
 .../activemq/jms/example/TopicExample.java      |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/transaction-failover/pom.xml       |  34 +--
 .../jms/example/TransactionFailoverExample.java |   6 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 .../hornetq/server1/hornetq-configuration.xml   |   4 +-
 examples/jms/transactional/pom.xml              |  34 +--
 .../jms/example/TransactionalExample.java       |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/xa-heuristic/pom.xml               |  34 +--
 .../jms/example/XAHeuristicExample.java         |  10 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/xa-receive/pom.xml                 |  34 +--
 .../activemq/jms/example/XAReceiveExample.java  |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/xa-send/pom.xml                    |  34 +--
 .../activemq/jms/example/XASendExample.java     |   8 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/jms/xa-with-jta/pom.xml                |  34 +--
 .../activemq/jms/example/XAwithJTAExample.java  |   4 +-
 .../hornetq/server0/hornetq-configuration.xml   |   4 +-
 examples/pom.xml                                |   8 +-
 examples/soak/normal/pom.xml                    |  44 +--
 .../normal/server0/hornetq-configuration.xml    |   4 +-
 .../activemq/jms/soak/example/SoakBase.java     |   2 +-
 .../activemq/jms/soak/example/SoakParams.java   |   2 +-
 .../activemq/jms/soak/example/SoakReceiver.java |   2 +-
 .../activemq/jms/soak/example/SoakSender.java   |   6 +-
 examples/soak/pom.xml                           |   6 +-
 .../activemq-aerogear-integration/pom.xml       |  10 +-
 .../aerogear/AeroGearConnectorService.java      |  28 +-
 .../AeroGearConnectorServiceFactory.java        |  10 +-
 .../integration/aerogear/AeroGearConstants.java |   4 +-
 .../aerogear/HornetQAeroGearBundle.java         |   4 +-
 .../aerogear/HornetQAeroGearLogger.java         |   2 +-
 .../activemq-jboss-as-integration/pom.xml       |  10 +-
 .../integration/jboss/HornetQJBossBundle.java   |   2 +-
 .../integration/jboss/HornetQJBossLogger.java   |   2 +-
 .../jboss/security/AS4SecurityActions.java      |   2 +-
 .../jboss/security/JBossASSecurityManager.java  |  12 +-
 .../jboss/security/SecurityActions.java         |   4 +-
 .../tm/JBoss4TransactionManagerLocator.java     |   2 +-
 .../tm/JBoss5TransactionManagerLocator.java     |   2 +-
 integration/activemq-spring-integration/pom.xml |  14 +-
 .../spring/SpringBindingRegistry.java           |   4 +-
 .../integration/spring/SpringJmsBootstrap.java  |   4 +-
 .../activemq/spring/HornetQSpringBundle.java    |   2 +-
 .../activemq/spring/HornetQSpringLogger.java    |   2 +-
 .../activemq-twitter-integration/pom.xml        |  10 +-
 .../integration/twitter/TwitterConstants.java   |   2 +-
 .../TwitterIncomingConnectorServiceFactory.java |  12 +-
 .../TwitterOutgoingConnectorServiceFactory.java |  12 +-
 .../twitter/impl/IncomingTweetsHandler.java     |  22 +-
 .../twitter/impl/OutgoingTweetsHandler.java     |  32 +-
 .../activemq/twitter/HornetQTwitterBundle.java  |   2 +-
 .../activemq/twitter/HornetQTwitterLogger.java  |   2 +-
 integration/activemq-vertx-integration/pom.xml  |  10 +-
 .../integration/vertx/HornetQVertxLogger.java   |   4 +-
 .../vertx/IncomingVertxEventHandler.java        |  22 +-
 .../vertx/OutgoingVertxEventHandler.java        |  30 +-
 .../integration/vertx/VertxConstants.java       |   2 +-
 .../VertxIncomingConnectorServiceFactory.java   |  10 +-
 .../VertxOutgoingConnectorServiceFactory.java   |  10 +-
 pom.xml                                         | 242 +++++++--------
 scripts/replace-wildfly.sh                      |  18 +-
 tests/byteman-tests/pom.xml                     |  34 +--
 .../activemq/byteman/tests/BMFailoverTest.java  |  62 ++--
 .../BridgeServerLocatorConfigurationTest.java   |  22 +-
 .../byteman/tests/ClusteredGroupingTest.java    |  54 ++--
 .../activemq/byteman/tests/GroupingTest.java    |  14 +-
 .../tests/HornetQMessageHandlerTest.java        |  32 +-
 .../tests/JMSBridgeReconnectionTest.java        |  30 +-
 .../activemq/byteman/tests/LatencyTest.java     |  12 +-
 .../activemq/byteman/tests/MessageCopyTest.java |  22 +-
 .../byteman/tests/OrphanedConsumerTest.java     |  46 +--
 .../activemq/byteman/tests/PagingLeakTest.java  |  40 +--
 .../byteman/tests/ScaleDownFailoverTest.java    |  24 +-
 .../byteman/tests/ScaleDownFailureTest.java     |  14 +-
 .../tests/ScaleDownGroupedFailoverTest.java     |   2 +-
 .../tests/ScaleDownGroupedFailureTest.java      |   2 +-
 .../byteman/tests/StartStopDeadlockTest.java    |  26 +-
 .../byteman/tests/StompInternalStateTest.java   |  34 +--
 .../impl/HierarchicalObjectRepositoryTest.java  |   6 +-
 tests/concurrent-tests/pom.xml                  |  28 +-
 .../tests/concurrent/server/impl/QueueTest.java |  22 +-
 .../concurrent/stomp/ConcurrentStompTest.java   |   6 +-
 tests/config/logging.properties                 |  20 +-
 tests/config/logging.properties.trace           |  20 +-
 .../config/server-start-stop-backup-config1.xml |   4 +-
 tests/config/server-start-stop-live-config1.xml |   6 +-
 tests/integration-tests/pom.xml                 |  72 ++---
 .../integration/DuplicateDetectionTest.java     |  42 +--
 .../integration/IntegrationTestLogger.java      |   2 +-
 .../tests/integration/InterceptorTest.java      |  56 ++--
 .../integration/SimpleNotificationService.java  |   8 +-
 .../tests/integration/String64KLimitTest.java   |  28 +-
 .../aerogear/AeroGearBasicServerTest.java       |  44 +--
 .../integration/client/AckBatchSizeTest.java    |  24 +-
 .../integration/client/AcknowledgeTest.java     |  42 +--
 .../integration/client/AddressSettingsTest.java |  26 +-
 .../integration/client/AutoCloseCoreTest.java   |  10 +-
 .../integration/client/AutogroupIdTest.java     |  26 +-
 .../integration/client/BlockingSendTest.java    |  20 +-
 .../integration/client/CommitRollbackTest.java  |  26 +-
 .../ConcurrentCreateDeleteProduceTest.java      |  26 +-
 .../integration/client/ConsumerCloseTest.java   |  44 +--
 .../integration/client/ConsumerFilterTest.java  |  24 +-
 .../client/ConsumerRoundRobinTest.java          |  22 +-
 .../integration/client/ConsumerStuckTest.java   |  32 +-
 .../tests/integration/client/ConsumerTest.java  |  38 +--
 .../client/ConsumerWindowSizeTest.java          |  42 +--
 .../integration/client/CoreClientTest.java      |  34 +--
 .../client/CreateQueueIdempotentTest.java       |  24 +-
 .../client/DeadLetterAddressTest.java           |  44 +--
 .../integration/client/DeliveryOrderTest.java   |  24 +-
 .../integration/client/DurableQueueTest.java    |  22 +-
 .../client/ExpireTestOnRestartTest.java         |  28 +-
 .../integration/client/ExpiryAddressTest.java   |  40 +--
 .../client/ExpiryLargeMessageTest.java          |  30 +-
 .../integration/client/FailureDeadlockTest.java |  30 +-
 ...FlowControlOnIgnoreLargeMessageBodyTest.java |   6 +-
 .../integration/client/HangConsumerTest.java    | 102 +++----
 .../integration/client/HeuristicXATest.java     |  32 +-
 .../integration/client/HornetQCrashTest.java    |  44 +--
 .../InVMNonPersistentMessageBufferTest.java     |  24 +-
 .../client/InVMPersistentMessageBufferTest.java |   2 +-
 .../client/IncompatibleVersionTest.java         |  56 ++--
 .../client/InterruptedLargeMessageTest.java     |  66 ++--
 .../client/JMSMessageCounterTest.java           |   8 +-
 .../client/JMSPagingFileDeleteTest.java         |  12 +-
 .../client/JmsNettyNioStressTest.java           |  28 +-
 .../integration/client/JournalCrashTest.java    |  34 +--
 .../LargeMessageAvoidLargeMessagesTest.java     |  28 +-
 .../client/LargeMessageCompressTest.java        |  22 +-
 .../integration/client/LargeMessageTest.java    |  50 +--
 .../client/LibaioDependencyCheckTest.java       |   6 +-
 .../client/MessageConcurrencyTest.java          |  26 +-
 .../client/MessageConsumerRollbackTest.java     |  24 +-
 .../integration/client/MessageCounterTest.java  |  20 +-
 .../client/MessageDurabilityTest.java           |  30 +-
 .../client/MessageExpirationTest.java           |  28 +-
 .../MessageGroupingConnectionFactoryTest.java   |  34 +--
 .../integration/client/MessageGroupingTest.java |  38 +--
 .../integration/client/MessageHandlerTest.java  |  24 +-
 .../integration/client/MessagePriorityTest.java |  38 +--
 .../integration/client/MessageRateTest.java     |  22 +-
 .../client/MultipleThreadFilterOneTest.java     |  24 +-
 .../tests/integration/client/NIOvsOIOTest.java  |  42 +--
 .../integration/client/NettyConnectorTest.java  |  20 +-
 .../client/NettyConsumerWindowSizeTest.java     |   2 +-
 .../NettyNonPersistentMessageBufferTest.java    |   2 +-
 .../NettyPersistentMessageBufferTest.java       |   2 +-
 .../client/NettyProducerFlowControlTest.java    |   2 +-
 .../client/NewDeadLetterAddressTest.java        |  32 +-
 .../tests/integration/client/OrderTest.java     |  20 +-
 .../integration/client/PagingOrderTest.java     |  52 ++--
 .../integration/client/PagingSyncTest.java      |  24 +-
 .../tests/integration/client/PagingTest.java    |  88 +++---
 .../integration/client/ProducerCloseTest.java   |  28 +-
 .../client/ProducerFlowControlTest.java         |  44 +--
 .../tests/integration/client/ProducerTest.java  |  34 +--
 .../integration/client/QueueBrowserTest.java    |  22 +-
 .../client/ReceiveImmediateTest.java            |  26 +-
 .../tests/integration/client/ReceiveTest.java   |  30 +-
 .../client/RedeliveryConsumerTest.java          |  38 +--
 .../tests/integration/client/RequestorTest.java |  44 +--
 .../tests/integration/client/RoutingTest.java   |  20 +-
 .../client/SelfExpandingBufferTest.java         |  30 +-
 .../client/ServerLocatorConnectTest.java        |  22 +-
 .../client/ServerLocatorSerializationTest.java  |  30 +-
 .../client/SessionCloseOnGCTest.java            |  16 +-
 .../integration/client/SessionCloseTest.java    |  34 +--
 ...onClosedOnRemotingConnectionFailureTest.java |  32 +-
 .../client/SessionCreateAndDeleteQueueTest.java |  26 +-
 .../client/SessionCreateConsumerTest.java       |  20 +-
 .../client/SessionCreateProducerTest.java       |  18 +-
 .../integration/client/SessionFactoryTest.java  |  32 +-
 .../SessionSendAcknowledgementHandlerTest.java  |  22 +-
 .../client/SessionStopStartTest.java            |  24 +-
 .../tests/integration/client/SessionTest.java   |  38 +--
 .../client/SimpleSendMultipleQueuesTest.java    |  20 +-
 .../integration/client/SlowConsumerTest.java    |  40 +--
 .../integration/client/TemporaryQueueTest.java  |  64 ++--
 .../client/TransactionDurabilityTest.java       |  26 +-
 .../client/TransactionalSendTest.java           |  18 +-
 .../integration/client/TransientQueueTest.java  |  24 +-
 .../integration/client/WildCardRoutingTest.java |  30 +-
 .../clientcrash/ClientCrashTest.java            |  26 +-
 .../integration/clientcrash/ClientExitTest.java |  26 +-
 .../integration/clientcrash/ClientTestBase.java |   8 +-
 .../integration/clientcrash/CrashClient.java    |  22 +-
 .../integration/clientcrash/CrashClient2.java   |  22 +-
 .../clientcrash/DummyInterceptor.java           |  18 +-
 .../clientcrash/DummyInterceptorB.java          |  12 +-
 .../integration/clientcrash/GracefulClient.java |  26 +-
 .../cluster/ClusterControllerTest.java          |  20 +-
 .../integration/cluster/NodeManagerAction.java  |   6 +-
 .../integration/cluster/NodeManagerTest.java    |  30 +-
 .../cluster/RealNodeManagerTest.java            |  10 +-
 .../cluster/bridge/BridgeFailoverTest.java      |  24 +-
 .../cluster/bridge/BridgeReconnectTest.java     |  54 ++--
 .../cluster/bridge/BridgeStartTest.java         |  42 +--
 .../integration/cluster/bridge/BridgeTest.java  |  68 ++---
 .../cluster/bridge/BridgeTestBase.java          |  34 +--
 .../BridgeWithDiscoveryGroupStartTest.java      |  44 +--
 .../cluster/bridge/SimpleTransformer.java       |  10 +-
 .../distribution/ClusterHeadersRemovedTest.java |  14 +-
 .../cluster/distribution/ClusterTestBase.java   |  96 +++---
 .../distribution/ClusterWithBackupTest.java     |   4 +-
 .../distribution/ClusteredGroupingTest.java     |  46 +--
 .../ClusteredRequestResponseTest.java           |   2 +-
 .../LargeMessageRedistributionTest.java         |   2 +-
 .../distribution/MessageRedistributionTest.java |  30 +-
 .../MessageRedistributionWithDiscoveryTest.java |  12 +-
 .../NettyFileStorageSymmetricClusterTest.java   |   4 +-
 ...leStorageSymmetricClusterWithBackupTest.java |   2 +-
 ...torageSymmetricClusterWithDiscoveryTest.java |   4 +-
 .../NettyOneWayChainClusterTest.java            |   2 +-
 .../NettyOneWayTwoNodeClusterTest.java          |   2 +-
 .../distribution/NettySymmetricClusterTest.java |   2 +-
 .../NettySymmetricClusterWithBackupTest.java    |   2 +-
 .../NettySymmetricClusterWithDiscoveryTest.java |   2 +-
 .../distribution/OneWayChainClusterTest.java    |  10 +-
 .../distribution/OnewayTwoNodeClusterTest.java  |   6 +-
 .../SimpleSymmetricClusterTest.java             |   4 +-
 .../distribution/SymmetricClusterTest.java      |   6 +-
 .../SymmetricClusterWithBackupTest.java         |   8 +-
 .../SymmetricClusterWithDiscoveryTest.java      |   4 +-
 .../distribution/TemporaryQueueClusterTest.java |   8 +-
 .../distribution/TwoWayTwoNodeClusterTest.java  |   4 +-
 .../TwoWayTwoNodeClusterWithDiscoveryTest.java  |   2 +-
 .../AlmostLargeAsynchronousFailoverTest.java    |   6 +-
 .../failover/AsynchronousFailoverTest.java      |  42 +--
 .../AutomaticColocatedQuorumVoteTest.java       |  38 +--
 .../failover/BackupAuthenticationTest.java      |  16 +-
 .../cluster/failover/BackupSyncJournalTest.java |  44 +--
 .../failover/BackupSyncLargeMessageTest.java    |  20 +-
 .../cluster/failover/BackupSyncPagingTest.java  |  12 +-
 .../ClusterWithBackupFailoverTestBase.java      |  14 +-
 .../cluster/failover/DelayInterceptor.java      |  12 +-
 .../cluster/failover/DelayInterceptor2.java     |  12 +-
 .../cluster/failover/DelayInterceptor3.java     |  12 +-
 .../DiscoveryClusterWithBackupFailoverTest.java |   2 +-
 .../cluster/failover/FailBackAutoTest.java      |  38 +--
 .../cluster/failover/FailBackManualTest.java    |  34 +--
 .../cluster/failover/FailoverListenerTest.java  |  38 +--
 .../failover/FailoverOnFlowControlTest.java     |  32 +-
 .../cluster/failover/FailoverTest.java          |  66 ++--
 .../cluster/failover/FailoverTestBase.java      |  56 ++--
 .../GroupingFailoverReplicationTest.java        |   2 +-
 .../GroupingFailoverSharedServerTest.java       |   2 +-
 .../failover/GroupingFailoverTestBase.java      |  24 +-
 .../failover/LargeMessageFailoverTest.java      |   8 +-
 .../failover/LiveToLiveFailoverTest.java        |  30 +-
 .../MultipleBackupsFailoverTestBase.java        |  34 +--
 ...ultipleLivesMultipleBackupsFailoverTest.java |  32 +-
 .../MultipleServerFailoverTestBase.java         |  44 +--
 .../failover/NettyAsynchronousFailoverTest.java |   4 +-
 .../failover/NettyAsynchronousReattachTest.java |  10 +-
 ...yDiscoveryClusterWithBackupFailoverTest.java |   2 +-
 .../cluster/failover/NettyFailoverTest.java     |  18 +-
 ...eDiscoveryClusterWithBackupFailoverTest.java |   2 +-
 ...rageStaticClusterWithBackupFailoverTest.java |   2 +-
 .../failover/NettyReplicatedFailoverTest.java   |  10 +-
 ...ettyStaticClusterWithBackupFailoverTest.java |   2 +-
 .../cluster/failover/PagingFailoverTest.java    |  32 +-
 .../cluster/failover/QuorumFailOverTest.java    |  18 +-
 .../failover/QuorumVoteServerConnectTest.java   |  10 +-
 .../ReplicatedAsynchronousFailoverTest.java     |   2 +-
 .../failover/ReplicatedDistributionTest.java    |  24 +-
 .../failover/ReplicatedFailoverTest.java        |  10 +-
 ...eplicatedFailoverUsingNodeGroupNameTest.java |   6 +-
 .../ReplicatedLargeMessageFailoverTest.java     |   6 +-
 ...icatedLargeMessageWithDelayFailoverTest.java |   6 +-
 ...ltipleServerFailoverNoNodeGroupNameTest.java |   2 +-
 ...eplicatedManyMultipleServerFailoverTest.java |   2 +-
 ...dMultipleServerFailoverExtraBackupsTest.java |  18 +-
 ...ltipleServerFailoverNoGroupNodeNameTest.java |   2 +-
 .../ReplicatedMultipleServerFailoverTest.java   |  18 +-
 ...ReplicatedNettyAsynchronousFailoverTest.java |   2 +-
 .../failover/ReplicatedPagedFailoverTest.java   |  10 +-
 .../failover/ReplicatedPagingFailoverTest.java  |   2 +-
 .../ReplicatedWithDelayFailoverTest.java        |   6 +-
 .../cluster/failover/SecurityFailoverTest.java  |  20 +-
 .../failover/SharedStoreDistributionTest.java   |   2 +-
 .../SingleLiveMultipleBackupsFailoverTest.java  |  32 +-
 .../StaticClusterWithBackupFailoverTest.java    |   2 +-
 .../remote/FailoverWithSharedStoreTest.java     |  16 +-
 .../ha/HAAutomaticBackupSharedStore.java        |  16 +-
 .../reattach/MultiThreadRandomReattachTest.java |   8 +-
 .../MultiThreadRandomReattachTestBase.java      |  32 +-
 .../MultiThreadReattachSupportTestBase.java     |  24 +-
 .../NettyMultiThreadRandomReattachTest.java     |   8 +-
 .../cluster/reattach/OrderReattachTest.java     |  32 +-
 .../cluster/reattach/RandomReattachTest.java    |  50 +--
 .../cluster/reattach/ReattachTest.java          |  48 +--
 .../cluster/restart/ClusterRestartTest.java     |  10 +-
 .../cluster/topology/HAClientTopologyTest.java  |   8 +-
 .../HAClientTopologyWithDiscoveryTest.java      |  10 +-
 .../cluster/topology/IsolatedTopologyTest.java  |  28 +-
 .../topology/NettyHAClientTopologyTest.java     |   2 +-
 .../NettyHAClientTopologyWithDiscoveryTest.java |   2 +-
 .../cluster/topology/NonHATopologyTest.java     |  24 +-
 .../topology/TopologyClusterTestBase.java       |  40 +--
 .../cluster/util/BackupSyncDelay.java           |  30 +-
 .../cluster/util/MultiServerTestBase.java       |  32 +-
 .../cluster/util/RemoteServerConfiguration.java |   4 +-
 .../cluster/util/SameProcessHornetQServer.java  |  12 +-
 .../cluster/util/TestableServer.java            |  10 +-
 .../core/deployers/impl/QueueDeployerTest.java  |  22 +-
 .../integration/discovery/DiscoveryTest.java    |  46 +--
 .../tests/integration/divert/DivertTest.java    |  30 +-
 .../divert/PersistentDivertTest.java            |  30 +-
 .../integration/embedded/ValidateAIOTest.java   |  12 +-
 .../http/CoreClientOverHttpTest.java            |  32 +-
 .../tests/integration/jms/FloodServerTest.java  |  28 +-
 .../jms/HornetQConnectionFactoryTest.java       |  32 +-
 .../tests/integration/jms/JMSSecurityTest.java  |   4 +-
 .../tests/integration/jms/JmsProducerTest.java  |  16 +-
 .../ManualReconnectionToSingleServerTest.java   |  28 +-
 .../integration/jms/bridge/BridgeTestBase.java  |  48 +--
 .../jms/bridge/ClusteredBridgeTestBase.java     |  54 ++--
 .../jms/bridge/JMSBridgeClusteredTest.java      |  12 +-
 .../jms/bridge/JMSBridgeReconnectionTest.java   |  24 +-
 .../integration/jms/bridge/JMSBridgeTest.java   |  16 +-
 .../jms/client/AutoGroupingTest.java            |  10 +-
 .../integration/jms/client/ConnectionTest.java  |   4 +-
 .../integration/jms/client/CreateQueueTest.java |   8 +-
 .../jms/client/ExpiryMessageTest.java           |  10 +-
 .../integration/jms/client/GroupIDTest.java     |  10 +-
 .../integration/jms/client/GroupingTest.java    |  18 +-
 .../jms/client/MessageProducerTest.java         |   4 +-
 .../integration/jms/client/MessageTest.java     |   8 +-
 .../jms/client/NewQueueRequestorTest.java       |   6 +-
 .../jms/client/NoLocalSubscriberTest.java       |   8 +-
 .../integration/jms/client/PreACKJMSTest.java   |  10 +-
 .../jms/client/ReSendMessageTest.java           |  14 +-
 .../jms/client/ReceiveNoWaitTest.java           |   4 +-
 .../jms/client/RemoteConnectionStressTest.java  |  24 +-
 ...onClosedOnRemotingConnectionFailureTest.java |  20 +-
 .../integration/jms/client/SessionTest.java     |   6 +-
 .../integration/jms/client/StoreConfigTest.java |   8 +-
 .../integration/jms/client/TextMessageTest.java |  12 +-
 .../jms/client/TopicCleanupTest.java            |  18 +-
 .../jms/cluster/BindingsClusterTest.java        |  28 +-
 .../jms/cluster/JMSFailoverListenerTest.java    |  56 ++--
 .../jms/cluster/JMSFailoverTest.java            |  66 ++--
 .../jms/cluster/JMSReconnectTest.java           |  48 +--
 .../jms/cluster/LargeMessageOverBridgeTest.java |  16 +-
 .../jms/cluster/MultipleThreadsOpeningTest.java |  12 +-
 .../jms/cluster/ReplicatedJMSFailoverTest.java  |  16 +-
 .../jms/cluster/TemporaryQueueClusterTest.java  |   4 +-
 .../jms/cluster/TopicClusterTest.java           |   4 +-
 .../CloseConnectionFactoryOnGCest.java          |  16 +-
 .../jms/connection/CloseConnectionOnGCTest.java |  20 +-
 .../CloseDestroyedConnectionTest.java           |  28 +-
 .../connection/ConcurrentSessionCloseTest.java  |  12 +-
 .../ConnectionFactorySerializationTest.java     |  14 +-
 ...tionFactoryWithJGroupsSerializationTest.java |  14 +-
 .../jms/connection/ExceptionListenerTest.java   |  34 +--
 .../jms/connection/InvalidConnectorTest.java    |  14 +-
 .../integration/jms/consumer/ConsumerTest.java  |  26 +-
 .../jms/divert/DivertAndACKClientTest.java      |  14 +-
 .../integration/jms/jms2client/BodyTest.java    |   6 +-
 .../jms/jms2client/InvalidDestinationTest.java  |   4 +-
 .../jms/jms2client/JmsContextTest.java          |   4 +-
 .../JmsProducerCompletionListenerTest.java      |   6 +-
 .../jms/jms2client/NonExistentQueueTest.java    |  12 +-
 .../jms/jms2client/SharedConsumerTest.java      |   8 +-
 .../jms/largemessage/JMSLargeMessageTest.java   |   8 +-
 .../jms/server/JMSServerDeployerTest.java       |  40 +--
 .../jms/server/JMSServerStartStopTest.java      |  28 +-
 .../jms/server/config/JMSConfigurationTest.java |  36 +--
 .../config/JMSServerConfigParserTest.java       |  20 +-
 .../ConnectionFactoryControlTest.java           |  30 +-
 .../server/management/JMSMessagingProxy.java    |   4 +-
 .../server/management/JMSQueueControlTest.java  |  66 ++--
 .../management/JMSQueueControlUsingJMSTest.java |  18 +-
 .../management/JMSServerControl2Test.java       |  58 ++--
 .../management/JMSServerControlRestartTest.java |  40 +--
 .../server/management/JMSServerControlTest.java |  66 ++--
 .../JMSServerControlUsingJMSTest.java           |  22 +-
 .../jms/server/management/JMSUtil.java          |  40 +--
 .../server/management/NullInitialContext.java   |   2 +-
 .../management/TopicControlClusterTest.java     |   8 +-
 .../jms/server/management/TopicControlTest.java |  46 +--
 .../management/TopicControlUsingJMSTest.java    |  38 +--
 .../journal/AIOImportExportTest.java            |   6 +-
 .../journal/AIOJournalCompactTest.java          |   8 +-
 .../integration/journal/AIOJournalImplTest.java |  12 +-
 .../journal/AIOSequentialFileFactoryTest.java   |  10 +-
 .../journal/JournalPerfTuneTest.java            |  28 +-
 .../journal/NIOBufferedJournalCompactTest.java  |   6 +-
 .../journal/NIOImportExportTest.java            |  14 +-
 .../journal/NIOJournalCompactTest.java          |  48 +--
 .../integration/journal/NIOJournalImplTest.java |  10 +-
 .../journal/NIONoBufferJournalImplTest.java     |  10 +-
 ...NIONonBufferedSequentialFileFactoryTest.java |   8 +-
 .../journal/NIOSequentialFileFactoryTest.java   |   8 +-
 .../integration/journal/OldFormatTest.java      |  18 +-
 .../journal/ValidateTransactionHealthTest.java  |  24 +-
 .../largemessage/LargeMessageTestBase.java      |  40 +--
 .../largemessage/ServerLargeMessageTest.java    |  30 +-
 .../management/AcceptorControlTest.java         |  30 +-
 .../AcceptorControlUsingCoreTest.java           |  18 +-
 .../management/AddressControlTest.java          |  44 +--
 .../management/AddressControlUsingCoreTest.java |  30 +-
 .../management/BridgeControlTest.java           |  34 +--
 .../management/BridgeControlUsingCoreTest.java  |  34 +--
 .../management/BroadcastGroupControlTest.java   |  22 +-
 .../BroadcastGroupControlUsingCoreTest.java     |  12 +-
 .../ClusterConnectionControl2Test.java          |  26 +-
 .../ClusterConnectionControlTest.java           |  40 +--
 .../ClusterConnectionControlUsingCoreTest.java  |  18 +-
 .../management/CoreMessagingProxy.java          |  12 +-
 .../management/DivertControlTest.java           |  24 +-
 .../management/DivertControlUsingCoreTest.java  |  20 +-
 .../management/HornetQServerControlTest.java    |  62 ++--
 .../HornetQServerControlUsingCoreTest.java      |  22 +-
 .../integration/management/JMXDomainTest.java   |  18 +-
 .../management/ManagementActivationTest.java    |  16 +-
 .../management/ManagementControlHelper.java     |  30 +-
 .../management/ManagementHelperTest.java        |  12 +-
 .../management/ManagementServiceImplTest.java   |  36 +--
 .../management/ManagementTestBase.java          |  16 +-
 .../ManagementWithPagingServerTest.java         |  36 +--
 .../management/ManagementWithStompTest.java     |  34 +--
 .../management/NotificationTest.java            |  50 +--
 .../management/QueueControlTest.java            |  62 ++--
 .../management/QueueControlUsingCoreTest.java   |  14 +-
 .../management/SecurityManagementTestBase.java  |  26 +-
 ...tyManagementWithConfiguredAdminUserTest.java |  20 +-
 ...yManagementWithDefaultConfigurationTest.java |  14 +-
 ...ManagementWithModifiedConfigurationTest.java |  14 +-
 .../management/SecurityNotificationTest.java    |  46 +--
 .../integration/openwire/BasicOpenWireTest.java |   4 +-
 .../integration/openwire/BasicSecurityTest.java |   2 +-
 .../integration/openwire/OpenWireTestBase.java  |  30 +-
 .../integration/openwire/OpenWireUtilTest.java  |   4 +-
 .../openwire/SimpleOpenWireTest.java            |   2 +-
 .../openwire/amq/JMSConsumer10Test.java         |   4 +-
 .../openwire/amq/JMSConsumer11Test.java         |   4 +-
 .../openwire/amq/JMSConsumer12Test.java         |   4 +-
 .../openwire/amq/JMSConsumer13Test.java         |   4 +-
 .../openwire/amq/JMSConsumer1Test.java          |   4 +-
 .../openwire/amq/JMSConsumer2Test.java          |   4 +-
 .../openwire/amq/JMSConsumer3Test.java          |   4 +-
 .../openwire/amq/JMSConsumer4Test.java          |   4 +-
 .../openwire/amq/JMSConsumer5Test.java          |   4 +-
 .../openwire/amq/JMSConsumer6Test.java          |   4 +-
 .../openwire/amq/JMSConsumer7Test.java          |   4 +-
 .../openwire/amq/JMSConsumer8Test.java          |   4 +-
 .../openwire/amq/JMSConsumer9Test.java          |   4 +-
 .../amq/JMSDurableTopicRedeliverTest.java       |   2 +-
 .../openwire/amq/JMSIndividualAckTest.java      |   4 +-
 .../openwire/amq/JMSMessageTest.java            |   4 +-
 .../openwire/amq/JMSQueueRedeliverTest.java     |   2 +-
 .../openwire/amq/JMSUsecase1Test.java           |   4 +-
 .../openwire/amq/JMSUsecaseTest.java            |   4 +-
 .../openwire/amq/JmsAutoAckListenerTest.java    |   4 +-
 .../openwire/amq/JmsAutoAckTest.java            |   4 +-
 .../openwire/amq/JmsClientAckTest.java          |   4 +-
 .../amq/JmsConnectionStartStopTest.java         |   4 +-
 .../amq/JmsConsumerResetActiveListenerTest.java |   4 +-
 .../amq/JmsCreateConsumerInOnMessageTest.java   |   4 +-
 .../JmsDurableQueueWildcardSendReceiveTest.java |   2 +-
 .../amq/JmsDurableTopicSelectorTest.java        |   2 +-
 .../amq/JmsDurableTopicSendReceiveTest.java     |   2 +-
 .../amq/JmsDurableTopicTransactionTest.java     |   2 +-
 .../JmsDurableTopicWildcardSendReceiveTest.java |   2 +-
 .../openwire/amq/JmsQueueBrowserTest.java       |   4 +-
 .../openwire/amq/JmsQueueRequestReplyTest.java  |   2 +-
 .../openwire/amq/JmsResourceProvider.java       |   2 +-
 .../openwire/amq/JmsSendReceiveTestSupport.java |   4 +-
 .../openwire/amq/JmsTopicRedeliverTest.java     |   4 +-
 .../openwire/amq/JmsTopicRequestReplyTest.java  |   4 +-
 .../openwire/amq/JmsTopicSelectorTest.java      |   4 +-
 .../openwire/amq/JmsTopicSendReceiveTest.java   |   2 +-
 ...sTopicSendReceiveWithTwoConnectionsTest.java |   2 +-
 .../openwire/amq/JmsTopicTransactionTest.java   |   2 +-
 .../amq/JmsTopicWildcardSendReceiveTest.java    |   2 +-
 .../openwire/amq/JmsTransactionTestSupport.java |   4 +-
 .../amq/MessageListenerRedeliveryTest.java      |   4 +-
 .../amq/ProducerFlowControlSendFailTest.java    |   8 +-
 .../openwire/amq/ProducerFlowControlTest.java   |  10 +-
 .../amq/ReconnectWithSameClientIDTest.java      |   4 +-
 .../openwire/amq/RedeliveryPolicyTest.java      |   4 +-
 .../integration/openwire/amq/TimeStampTest.java |   4 +-
 .../openwire/amq/TransactionContextTest.java    |   4 +-
 .../openwire/interop/GeneralInteropTest.java    |   6 +-
 .../tests/integration/openwire/util/Wait.java   |   2 +-
 .../paging/MultipleProducersPagingTest.java     |  26 +-
 .../integration/paging/NettyPagingSendTest.java |   2 +-
 .../paging/PageCountSyncOnNonTXTest.java        |  26 +-
 .../integration/paging/PageCountSyncServer.java |   8 +-
 .../integration/paging/PagingCounterTest.java   |  32 +-
 .../integration/paging/PagingReceiveTest.java   |  28 +-
 .../integration/paging/PagingSendTest.java      |  22 +-
 .../PagingWithFailoverAndCountersTest.java      |  22 +-
 .../paging/PagingWithFailoverBackup.java        |   6 +-
 .../paging/PagingWithFailoverServer.java        |   6 +-
 .../paging/SpawnedServerSupport.java            |  36 +--
 ...AddressSettingsConfigurationStorageTest.java |  12 +-
 .../DeleteMessagesOnStartupTest.java            |  24 +-
 .../persistence/DeleteQueueRestartTest.java     |  20 +-
 .../persistence/DuplicateCacheTest.java         |  12 +-
 .../persistence/ExportFormatTest.java           |  22 +-
 ...nnectionFactoryConfigurationStorageTest.java |  18 +-
 .../persistence/JMSDynamicConfigTest.java       |  10 +-
 .../persistence/JMSStorageManagerTest.java      |   8 +-
 .../integration/persistence/RestartSMTest.java  |  24 +-
 .../RolesConfigurationStorageTest.java          |   6 +-
 .../persistence/StorageManagerTestBase.java     |  26 +-
 ...ansportConfigurationEncodingSupportTest.java |  18 +-
 .../persistence/XmlImportExportTest.java        |  58 ++--
 .../tests/integration/proton/ProtonTest.java    |  22 +-
 .../tests/integration/ra/DummyTransaction.java  |   2 +-
 .../integration/ra/DummyTransactionManager.java |   2 +-
 .../integration/ra/HornetQActivationTest.java   |   8 +-
 .../integration/ra/HornetQClusteredTest.java    |  20 +-
 .../ra/HornetQMessageHandlerSecurityTest.java   |  12 +-
 .../ra/HornetQMessageHandlerTest.java           |  32 +-
 .../ra/HornetQMessageHandlerXATest.java         |  22 +-
 .../ra/HornetQRAClusteredTestBase.java          |  16 +-
 .../tests/integration/ra/HornetQRATestBase.java |  18 +-
 .../tests/integration/ra/JMSContextTest.java    |  16 +-
 .../integration/ra/OutgoingConnectionTest.java  |  36 +--
 .../integration/ra/ResourceAdapterTest.java     |  46 +--
 .../integration/remoting/BatchDelayTest.java    |  26 +-
 .../remoting/DestroyConsumerTest.java           |   4 +-
 .../integration/remoting/DirectDeliverTest.java |  38 +--
 .../remoting/NettyNetworkAddressTest.java       |   8 +-
 .../remoting/NettySynchronousCloseTest.java     |   2 +-
 .../remoting/NetworkAddressTestBase.java        |  18 +-
 .../tests/integration/remoting/PingTest.java    |  52 ++--
 .../integration/remoting/ReconnectTest.java     |  18 +-
 .../remoting/SynchronousCloseTest.java          |  18 +-
 .../replication/ReplicationOrderTest.java       |  24 +-
 .../replication/ReplicationTest.java            | 112 +++----
 .../scheduling/DelayedMessageTest.java          |  28 +-
 .../MultipliedDelayedMessageTest.java           |  32 +-
 .../scheduling/ScheduledMessageTest.java        |  36 +--
 .../security/NettySecurityClientTest.java       |  12 +-
 .../integration/security/SecurityTest.java      |  38 +--
 .../integration/security/SimpleClient.java      |  22 +-
 .../server/AIOFileLockTimeoutTest.java          |   2 +-
 .../server/AddressFullLoggingTest.java          |  26 +-
 .../integration/server/ExpiryRunnerTest.java    |  34 +--
 .../integration/server/FakeStorageManager.java  |   6 +-
 .../integration/server/FileLockTimeoutTest.java |  18 +-
 .../integration/server/LVQRecoveryTest.java     |  36 +--
 .../tests/integration/server/LVQTest.java       |  36 +--
 .../server/NIOFileLockTimeoutTest.java          |   2 +-
 .../integration/server/PredefinedQueueTest.java |  38 +--
 .../integration/server/ScaleDown3NodeTest.java  |  40 +--
 .../tests/integration/server/ScaleDownTest.java |  36 +--
 .../server/SuppliedThreadPoolTest.java          |  10 +-
 .../integration/spring/ExampleListener.java     |   4 +-
 .../tests/integration/spring/MessageSender.java |   2 +-
 .../spring/SpringIntegrationTest.java           |  10 +-
 .../ssl/CoreClientOverOneWaySSLTest.java        |  42 +--
 .../ssl/CoreClientOverTwoWaySSLTest.java        |  46 +--
 .../tests/integration/stomp/ExtraStompTest.java |  46 +--
 .../stomp/StompConnectionCleanupTest.java       |   6 +-
 .../integration/stomp/StompOverHttpTest.java    |   2 +-
 .../stomp/StompOverWebsocketTest.java           |   2 +-
 .../tests/integration/stomp/StompTest.java      |   6 +-
 .../tests/integration/stomp/StompTestBase.java  |  40 +--
 .../integration/stomp/StompWebSocketTest.java   |  30 +-
 .../stomp/util/AbstractClientStompFrame.java    |   2 +-
 .../util/AbstractStompClientConnection.java     |   2 +-
 .../stomp/util/ClientStompFrame.java            |   2 +-
 .../stomp/util/ClientStompFrameV10.java         |   2 +-
 .../stomp/util/ClientStompFrameV11.java         |   2 +-
 .../stomp/util/ClientStompFrameV12.java         |   2 +-
 .../stomp/util/StompClientConnection.java       |   2 +-
 .../util/StompClientConnectionFactory.java      |   2 +-
 .../stomp/util/StompClientConnectionV10.java    |   2 +-
 .../stomp/util/StompClientConnectionV11.java    |   2 +-
 .../stomp/util/StompClientConnectionV12.java    |   2 +-
 .../stomp/util/StompFrameFactory.java           |   2 +-
 .../stomp/util/StompFrameFactoryFactory.java    |   2 +-
 .../stomp/util/StompFrameFactoryV10.java        |   2 +-
 .../stomp/util/StompFrameFactoryV11.java        |   2 +-
 .../stomp/util/StompFrameFactoryV12.java        |   2 +-
 .../integration/stomp/v11/ExtraStompTest.java   |   8 +-
 .../integration/stomp/v11/StompV11Test.java     |  12 +-
 .../integration/stomp/v11/StompV11TestBase.java |  38 +--
 .../integration/stomp/v12/StompV12Test.java     |  16 +-
 .../integration/tools/TransferMessageTest.java  |  28 +-
 .../netty/HornetQFrameDecoder2Test.java         |   6 +-
 .../NettyConnectorWithHTTPUpgradeTest.java      |  54 ++--
 .../tests/integration/twitter/TwitterTest.java  |  40 +--
 .../integration/vertx/HornetQVertxUnitTest.java |  46 +--
 .../integration/xa/BasicXaRecoveryTest.java     |  42 +--
 .../tests/integration/xa/BasicXaTest.java       |  36 +--
 .../tests/integration/xa/XaTimeoutTest.java     |  54 ++--
 .../largemessage/LargeMessageTestBase.java      |  38 +--
 .../tests/util/JMSClusteredTestBase.java        |  30 +-
 .../apache/activemq/tests/util/JMSTestBase.java |  22 +-
 .../activemq/tests/util/JournalExample.java     |  14 +-
 .../tests/util/NonSerializableFactory.java      |   2 +-
 .../tests/util/ReplicatedBackupUtils.java       |  10 +-
 .../tests/util/TransportConfigurationUtils.java |  10 +-
 .../colocated-server-start-stop-config1.xml     |   4 +-
 .../colocated-server-start-stop-config2.xml     |   4 +-
 .../resources/server-start-stop-config1.xml     |   4 +-
 .../test/resources/spring-hornetq-config.xml    |   4 +-
 .../src/test/resources/spring-jms-beans.xml     |   6 +-
 tests/jms-tests/pom.xml                         |  44 +--
 .../activemq/jms/tests/AcknowledgementTest.java |   4 +-
 .../jms/tests/AutoAckMesageListenerTest.java    |   2 +-
 .../apache/activemq/jms/tests/BrowserTest.java  |  10 +-
 .../jms/tests/CTSMiscellaneousTest.java         |   8 +-
 .../jms/tests/ConnectionClosedTest.java         |   4 +-
 .../jms/tests/ConnectionFactoryTest.java        |   6 +-
 .../activemq/jms/tests/ConnectionTest.java      |   4 +-
 .../activemq/jms/tests/ConsumerClosedTest.java  |   2 +-
 .../activemq/jms/tests/DeliveryOrderTest.java   |   4 +-
 .../jms/tests/DurableSubscriptionTest.java      |   4 +-
 .../jms/tests/HornetQServerTestCase.java        |  24 +-
 .../org/apache/activemq/jms/tests/JMSTest.java  |   4 +-
 .../apache/activemq/jms/tests/JMSTestCase.java  |  14 +-
 .../activemq/jms/tests/JmsTestLogger.java       |   2 +-
 .../activemq/jms/tests/MessageConsumerTest.java |   6 +-
 .../activemq/jms/tests/MessageProducerTest.java |  10 +-
 .../jms/tests/MessageWithReadResolveTest.java   |   4 +-
 .../activemq/jms/tests/MiscellaneousTest.java   |   4 +-
 .../jms/tests/NonDurableSubscriberTest.java     |   4 +-
 .../activemq/jms/tests/PersistenceTest.java     |   4 +-
 .../activemq/jms/tests/QueueReceiverTest.java   |   4 +-
 .../apache/activemq/jms/tests/QueueTest.java    |   4 +-
 .../activemq/jms/tests/ReferenceableTest.java   |  18 +-
 .../apache/activemq/jms/tests/SecurityTest.java |   4 +-
 .../apache/activemq/jms/tests/SessionTest.java  |   4 +-
 .../jms/tests/TemporaryDestinationTest.java     |   4 +-
 .../apache/activemq/jms/tests/TopicTest.java    |   4 +-
 .../jms/tests/TransactedSessionTest.java        |   4 +-
 .../activemq/jms/tests/XARecoveryTest.java      |   6 +-
 .../org/apache/activemq/jms/tests/XATest.java   |   6 +-
 .../tests/message/BodyIsAssignableFromTest.java |   2 +-
 .../jms/tests/message/BytesMessageTest.java     |   4 +-
 .../jms/tests/message/ExpiredMessageTest.java   |   6 +-
 .../message/JMSCorrelationIDHeaderTest.java     |   4 +-
 .../message/JMSDeliveryModeHeaderTest.java      |   4 +-
 .../tests/message/JMSDestinationHeaderTest.java |   4 +-
 .../tests/message/JMSExpirationHeaderTest.java  |   8 +-
 .../tests/message/JMSMessageIDHeaderTest.java   |   4 +-
 .../tests/message/JMSPriorityHeaderTest.java    |   6 +-
 .../jms/tests/message/JMSReplyToHeaderTest.java |   4 +-
 .../tests/message/JMSTimestampHeaderTest.java   |   4 +-
 .../jms/tests/message/JMSTypeHeaderTest.java    |   4 +-
 .../tests/message/JMSXDeliveryCountTest.java    |   6 +-
 .../jms/tests/message/MapMessageTest.java       |   4 +-
 .../jms/tests/message/MessageBodyTest.java      |   4 +-
 .../jms/tests/message/MessageBodyTestCase.java  |   4 +-
 .../jms/tests/message/MessageHeaderTest.java    |  54 ++--
 .../tests/message/MessageHeaderTestBase.java    |  20 +-
 .../message/MessagePropertyConversionTest.java  |   8 +-
 .../jms/tests/message/MessageTestBase.java      |   6 +-
 .../message/ObjectMessageDeliveryTest.java      |   6 +-
 .../jms/tests/message/ObjectMessageTest.java    |   6 +-
 .../tests/message/SimpleJMSBytesMessage.java    |   2 +-
 .../jms/tests/message/SimpleJMSMapMessage.java  |   2 +-
 .../jms/tests/message/SimpleJMSMessage.java     |   2 +-
 .../tests/message/SimpleJMSObjectMessage.java   |   2 +-
 .../tests/message/SimpleJMSStreamMessage.java   |   2 +-
 .../jms/tests/message/SimpleJMSTextMessage.java |   2 +-
 .../activemq/jms/tests/message/SomeObject.java  |   2 +-
 .../jms/tests/message/StreamMessageTest.java    |   4 +-
 .../jms/tests/message/TextMessageTest.java      |   4 +-
 .../foreign/ForeignBytesMessageTest.java        |   6 +-
 .../message/foreign/ForeignMapMessageTest.java  |   6 +-
 .../message/foreign/ForeignMessageTest.java     |  12 +-
 .../foreign/ForeignObjectMessageTest.java       |   6 +-
 .../foreign/ForeignStreamMessageTest.java       |   6 +-
 .../message/foreign/ForeignTestObject.java      |   2 +-
 .../message/foreign/ForeignTextMessageTest.java |   6 +-
 .../jms/tests/selector/SelectorTest.java        |  10 +-
 .../tests/stress/ConcurrentCloseStressTest.java |   8 +-
 .../tests/stress/CorruptMessageStressTest.java  |   4 +-
 .../jms/tests/stress/JMSStressTestBase.java     |   6 +-
 .../tests/stress/ManyConnectionsStressTest.java |   6 +-
 .../jms/tests/stress/OpenCloseStressTest.java   |   8 +-
 .../jms/tests/stress/QueueStressTest.java       |   2 +-
 .../activemq/jms/tests/stress/Receiver.java     |   4 +-
 .../jms/tests/stress/RecoveringReceiver.java    |   4 +-
 .../jms/tests/stress/RelayStressTest.java       |   8 +-
 .../activemq/jms/tests/stress/Runner.java       |   4 +-
 .../activemq/jms/tests/stress/Sender.java       |   4 +-
 .../tests/stress/SeveralClientsStressTest.java  |   8 +-
 .../jms/tests/stress/TopicStressTest.java       |   2 +-
 .../tests/stress/Transactional2PCReceiver.java  |   8 +-
 .../tests/stress/Transactional2PCSender.java    |   8 +-
 .../jms/tests/stress/TransactionalReceiver.java |   4 +-
 .../jms/tests/stress/TransactionalSender.java   |   4 +-
 .../jms/tests/tools/ServerManagement.java       |  10 +-
 .../jms/tests/tools/WrappedJNDIServer.java      |   2 +-
 .../jms/tests/tools/container/Constants.java    |   2 +-
 .../jms/tests/tools/container/InVMContext.java  |   4 +-
 .../container/InVMInitialContextFactory.java    |   4 +-
 .../InVMInitialContextFactoryBuilder.java       |   4 +-
 .../tests/tools/container/InVMNameParser.java   |   2 +-
 .../tests/tools/container/LocalTestServer.java  |  36 +--
 .../tools/container/NonSerializableFactory.java |   2 +-
 .../jms/tests/tools/container/Server.java       |   8 +-
 .../activemq/jms/tests/util/JNDIUtilTest.java   |   6 +-
 .../jms/tests/util/ProxyAssertSupport.java      |   4 +-
 .../test/resources/hornetq-configuration.xml    |   8 +-
 .../src/test/resources/jbossjta-properties.xml  |   2 +-
 tests/joram-tests/pom.xml                       |  14 +-
 .../org/apache/activemq/jms/AbstractAdmin.java  |   2 +-
 .../org/apache/activemq/jms/GenericAdmin.java   |   2 +-
 .../org/apache/activemq/jms/HornetQAdmin.java   |  28 +-
 .../activemq/jms/JoramAggregationTest.java      |   2 +-
 .../apache/activemq/jms/SpawnedJMSServer.java   |  20 +-
 .../src/test/resources/provider.properties      |   4 +-
 tests/performance-tests/pom.xml                 |  28 +-
 .../journal/FakeJournalImplTest.java            |   6 +-
 .../journal/JournalImplTestUnit.java            |  18 +-
 .../journal/RealJournalImplAIOTest.java         |   8 +-
 .../journal/RealJournalImplNIOTest.java         |   8 +-
 .../paging/MeasurePagingMultiThreadTest.java    |  26 +-
 tests/pom.xml                                   |   8 +-
 tests/soak-tests/pom.xml                        |  30 +-
 .../tests/soak/client/ClientAbstract.java       |  12 +-
 .../soak/client/ClientNonDivertedSoakTest.java  |  22 +-
 .../tests/soak/client/ClientSoakTest.java       |  24 +-
 .../activemq/tests/soak/client/Receiver.java    |  16 +-
 .../activemq/tests/soak/client/Sender.java      |  12 +-
 .../soak/client/SimpleSendReceiveSoakTest.java  |  24 +-
 .../soak/failover/RandomFailoverSoakTest.java   |   4 +-
 tests/stress-tests/pom.xml                      |  30 +-
 .../stress/chunk/LargeMessageStressTest.java    |   4 +-
 .../tests/stress/client/SendStressTest.java     |  20 +-
 .../MultiThreadRandomReattachStressTest.java    |   4 +-
 .../failover/RandomReattachStressTest.java      |   4 +-
 .../AIOAllPossibilitiesCompactStressTest.java   |   8 +-
 .../AIOMultiThreadCompactorStressTest.java      |   6 +-
 .../stress/journal/AddAndRemoveStressTest.java  |  18 +-
 .../AllPossibilitiesCompactStressTest.java      |   2 +-
 ...ibilitiesCompactWithAddDeleteStressTest.java |   2 +-
 .../stress/journal/CompactingStressTest.java    |  30 +-
 .../JournalCleanupCompactStressTest.java        |  36 +--
 .../journal/JournalRestartStressTest.java       |  20 +-
 .../stress/journal/LargeJournalStressTest.java  |  26 +-
 .../stress/journal/MixupCompactorTestBase.java  |  14 +-
 .../journal/MultiThreadConsumerStressTest.java  |  28 +-
 .../NIOMultiThreadCompactorStressTest.java      |  40 +--
 .../journal/XmlImportExportStressTest.java      |  24 +-
 .../paging/MultipleConsumersPageStressTest.java |  28 +-
 .../stress/paging/PageCursorStressTest.java     |  52 ++--
 .../tests/stress/paging/PageStressTest.java     |  28 +-
 .../tests/stress/remote/PingStressTest.java     |  34 +--
 .../tests/stress/stomp/StompStressTest.java     |  24 +-
 tests/timing-tests/pom.xml                      |  22 +-
 .../core/journal/impl/AIOJournalImplTest.java   |   6 +-
 .../core/journal/impl/FakeJournalImplTest.java  |   6 +-
 .../core/journal/impl/JournalImplTestUnit.java  |  12 +-
 .../core/journal/impl/NIOJournalImplTest.java   |   8 +-
 .../timing/core/server/impl/QueueImplTest.java  |  16 +-
 .../jms/bridge/impl/JMSBridgeImplTest.java      |  42 +--
 .../tests/timing/util/ReusableLatchTest.java    |   6 +-
 .../timing/util/TokenBucketLimiterImplTest.java |   8 +-
 .../activemq/tests/timing/util/UTF8Test.java    |  10 +-
 .../activemq/tests/timing/util/UUIDTest.java    |   6 +-
 tests/unit-tests/pom.xml                        |  28 +-
 .../activemq/tests/unit/UnitTestLogger.java     |   2 +-
 .../tests/unit/core/asyncio/AIOTestBase.java    |  10 +-
 .../unit/core/asyncio/AsynchronousFileTest.java |  18 +-
 .../core/asyncio/LibaioDependencyCheckTest.java |   6 +-
 .../MultiThreadAsynchronousFileTest.java        |  16 +-
 .../client/impl/LargeMessageBufferTest.java     |  42 +--
 .../impl/ConfigurationValidationTest.java       |   8 +-
 .../core/config/impl/ConnectorsServiceTest.java |  20 +-
 .../config/impl/TransportConfigurationTest.java |   6 +-
 .../config/impl/fakes/FakeConnectorService.java |   4 +-
 .../impl/fakes/FakeConnectorServiceFactory.java |  10 +-
 .../impl/AddressSettingsDeployerTest.java       |  22 +-
 .../impl/BasicUserCredentialsDeployerTest.java  |  18 +-
 .../deployers/impl/FakeDeploymentManager.java   |   6 +-
 .../impl/FileDeploymentManagerTest.java         |  14 +-
 .../deployers/impl/SecurityDeployerTest.java    |  26 +-
 .../core/deployers/impl/XMLDeployerTest.java    |  16 +-
 .../journal/impl/AlignedJournalImplTest.java    |  26 +-
 .../unit/core/journal/impl/CleanBufferTest.java |  14 +-
 .../core/journal/impl/FakeJournalImplTest.java  |   6 +-
 .../impl/FakeSequentialFileFactoryTest.java     |   6 +-
 .../core/journal/impl/FileFactoryTestBase.java  |   8 +-
 .../core/journal/impl/JournalAsyncTest.java     |  14 +-
 .../core/journal/impl/JournalImplTestBase.java  |  22 +-
 .../core/journal/impl/JournalImplTestUnit.java  |  20 +-
 .../unit/core/journal/impl/ReclaimerTest.java   |  38 +--
 .../impl/SequentialFileFactoryTestBase.java     |  14 +-
 .../unit/core/journal/impl/TimedBufferTest.java |  22 +-
 .../impl/fakes/FakeSequentialFileFactory.java   |  46 +--
 .../core/journal/impl/fakes/SimpleEncoding.java |   6 +-
 .../unit/core/message/impl/MessageImplTest.java |  18 +-
 .../unit/core/paging/impl/PagePositionTest.java |   4 +-
 .../tests/unit/core/paging/impl/PageTest.java   |  28 +-
 .../core/paging/impl/PagingManagerImplTest.java |  36 +--
 .../core/paging/impl/PagingStoreImplTest.java   |  56 ++--
 .../impl/BatchIDGeneratorUnitTest.java          |  26 +-
 .../impl/OperationContextUnitTest.java          |  10 +-
 .../core/postoffice/impl/AddressImplTest.java   |  10 +-
 .../core/postoffice/impl/BindingsImplTest.java  |  64 ++--
 .../impl/DuplicateDetectionUnitTest.java        |  36 +--
 .../unit/core/postoffice/impl/FakeQueue.java    |  30 +-
 .../postoffice/impl/QueueComparatorTest.java    |   8 +-
 .../impl/WildcardAddressManagerUnitTest.java    |  26 +-
 .../core/remoting/HornetQBufferTestBase.java    |  10 +-
 .../impl/invm/InVMConnectorFactoryTest.java     |   8 +-
 .../impl/netty/ChannelBufferWrapper2Test.java   |   8 +-
 .../impl/netty/NettyAcceptorFactoryTest.java    |  24 +-
 .../remoting/impl/netty/NettyAcceptorTest.java  |  22 +-
 .../impl/netty/NettyConnectionTest.java         |  18 +-
 .../impl/netty/NettyConnectorFactoryTest.java   |   8 +-
 .../remoting/impl/netty/NettyConnectorTest.java |  20 +-
 .../core/remoting/impl/ssl/SSLSupportTest.java  |   6 +-
 .../server/impl/RemotingServiceImplTest.java    |  16 +-
 .../server/impl/fake/FakeInterceptor.java       |  10 +-
 .../impl/HornetQSecurityManagerImplTest.java    |  10 +-
 .../security/impl/JAASSecurityManagerTest.java  |  10 +-
 .../impl/ClusterConnectionBridgeTest.java       |   8 +-
 .../cluster/impl/RemoteQueueBindImplTest.java   |  14 +-
 .../group/impl/SystemPropertyOverrideTest.java  |   8 +-
 .../unit/core/server/impl/FileLockTest.java     |  10 +-
 .../unit/core/server/impl/QueueImplTest.java    |  50 +--
 .../core/server/impl/fakes/FakeConsumer.java    |  10 +-
 .../unit/core/server/impl/fakes/FakeFilter.java |   8 +-
 .../server/impl/fakes/FakeJournalLoader.java    |  26 +-
 .../core/server/impl/fakes/FakePostOffice.java  |  30 +-
 .../server/impl/fakes/FakeQueueFactory.java     |  16 +-
 .../tests/unit/jms/HornetQDestinationTest.java  |   8 +-
 .../unit/jms/client/HornetQMapMessageTest.java  |   8 +-
 .../jms/client/HornetQStreamMessageTest.java    |   8 +-
 .../unit/jms/client/JMSExceptionHelperTest.java |  16 +-
 .../unit/jms/client/SelectorTranslatorTest.java |   6 +-
 .../tests/unit/jms/misc/ManifestTest.java       |  12 +-
 .../ConnectionFactoryObjectFactoryTest.java     |   4 +-
 .../DestinationObjectFactoryTest.java           |  12 +-
 .../tests/unit/ra/BootstrapContext.java         |   2 +-
 .../ra/ConnectionFactoryPropertiesTest.java     |   8 +-
 .../ra/HornetQResourceAdapterConfigTest.java    |  14 +-
 .../tests/unit/ra/MessageEndpointFactory.java   |   2 +-
 .../tests/unit/ra/ResourceAdapterTest.java      |  44 +--
 .../tests/unit/util/FakePagingManager.java      |  22 +-
 .../unit/util/HornetQBufferInputStreamTest.java |  10 +-
 .../activemq/tests/unit/util/InVMContext.java   |   6 +-
 .../tests/unit/util/InVMNameParser.java         |   2 +-
 .../tests/unit/util/InVMNamingContext.java      |   6 +-
 .../tests/unit/util/LinkedListTest.java         |   8 +-
 .../tests/unit/util/MemorySizeTest.java         |  10 +-
 .../tests/unit/util/NonSerializableFactory.java |   2 +-
 .../ObjectInputStreamWithClassLoaderTest.java   |  10 +-
 .../tests/unit/util/ReusableLatchTest.java      |   8 +-
 .../tests/unit/util/SoftValueMapTest.java       |   8 +-
 .../activemq/tests/unit/util/UTF8Test.java      |  16 +-
 .../tests/unit/util/UUIDGeneratorTest.java      |   6 +-
 .../activemq/tests/unit/util/UUIDTest.java      |   8 +-
 .../tests/unit/util/VersionLoaderTest.java      |   8 +-
 .../tests/unit/xa/XAResourceWrapperTest.java    |   8 +-
 .../activemq/tests/util/CreateMessage.java      |  10 +-
 .../activemq/tests/util/SpawnedVMSupport.java   |   4 +-
 tests/unit-tests/src/test/resources/beans1.xml  |   2 +-
 2556 files changed, 18048 insertions(+), 19001 deletions(-)
----------------------------------------------------------------------



Mime
View raw message