activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [51/51] [partial] activemq-6 git commit: ACTIVEMQ6-2 Update to HQ master
Date Tue, 11 Nov 2014 11:01:21 GMT
ACTIVEMQ6-2 Update to HQ master


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

Branch: refs/heads/master
Commit: 177e6820b541e0a71b952eebf503a4d2235910c5
Parents: 8ecd255
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Mon Nov 10 16:14:12 2014 +0000
Committer: Andy Taylor <andy.tayls67@gmail.com>
Committed: Tue Nov 11 10:48:14 2014 +0000

----------------------------------------------------------------------
 README.md                                       |   34 +-
 distribution/hornetq/pom.xml                    |  169 +-
 distribution/hornetq/src/main/assembly/dep.xml  |  519 +----
 .../hornetq/src/main/resources/bin/hornetq      |   87 +
 .../src/main/resources/bin/hornetq-service      |  138 ++
 .../hornetq/src/main/resources/bin/hornetq.cmd  |   58 +
 .../hornetq/src/main/resources/bin/run.bat      |   22 +-
 .../hornetq/src/main/resources/bin/run.sh       |   34 +-
 .../hornetq/src/main/resources/bin/stop.bat     |   10 +-
 .../hornetq/src/main/resources/bin/stop.sh      |    4 +-
 .../resources/config/clustered/bootstrap.xml    |   25 +
 .../config/clustered/hornetq-configuration.xml  |   94 +
 .../resources/config/clustered/hornetq-jms.xml  |   53 +
 .../config/clustered/hornetq-users.xml          |    7 +
 .../resources/config/clustered/jndi.properties  |    2 +
 .../clustered/hornetq-configuration.xml         |  122 --
 .../clustered/hornetq-jboss-beans.xml           |   62 -
 .../config/jboss-as-6/clustered/hornetq-jms.xml |   47 -
 .../config/jboss-as-6/clustered/jms-ds.xml      |   26 -
 .../non-clustered/hornetq-configuration.xml     |   97 -
 .../non-clustered/hornetq-jboss-beans.xml       |   61 -
 .../jboss-as-6/non-clustered/hornetq-jms.xml    |   46 -
 .../config/jboss-as-6/non-clustered/jms-ds.xml  |   26 -
 .../main/resources/config/logging.properties    |   56 +
 .../config/non-clustered/bootstrap.xml          |   25 +
 .../non-clustered/hornetq-configuration.xml     |   67 +
 .../config/non-clustered/hornetq-jms.xml        |   53 +
 .../config/non-clustered/hornetq-users.xml      |    7 +
 .../config/non-clustered/jndi.properties        |    2 +
 .../resources/config/replicated/bootstrap.xml   |   25 +
 .../config/replicated/hornetq-configuration.xml |  104 ++
 .../resources/config/replicated/hornetq-jms.xml |   53 +
 .../config/replicated/hornetq-users.xml         |    7 +
 .../resources/config/replicated/jndi.properties |    2 +
 .../resources/config/shared-store/bootstrap.xml |   25 +
 .../shared-store/hornetq-configuration.xml      |  104 ++
 .../config/shared-store/hornetq-jms.xml         |   53 +
 .../config/shared-store/hornetq-users.xml       |    7 +
 .../config/shared-store/jndi.properties         |    2 +
 .../stand-alone/clustered/hornetq-beans.xml     |   61 -
 .../clustered/hornetq-configuration.xml         |   94 -
 .../stand-alone/clustered/hornetq-jms.xml       |   53 -
 .../stand-alone/clustered/hornetq-users.xml     |    7 -
 .../stand-alone/clustered/jndi.properties       |    2 -
 .../stand-alone/clustered/logging.properties    |   56 -
 .../stand-alone/non-clustered/hornetq-beans.xml |   61 -
 .../non-clustered/hornetq-configuration.xml     |   67 -
 .../stand-alone/non-clustered/hornetq-jms.xml   |   53 -
 .../stand-alone/non-clustered/hornetq-users.xml |    7 -
 .../stand-alone/non-clustered/jndi.properties   |    2 -
 .../non-clustered/logging.properties            |   56 -
 .../stand-alone/replicated/hornetq-beans.xml    |   61 -
 .../replicated/hornetq-configuration.xml        |  101 -
 .../stand-alone/replicated/hornetq-jms.xml      |   53 -
 .../stand-alone/replicated/hornetq-users.xml    |    7 -
 .../stand-alone/replicated/jndi.properties      |    2 -
 .../stand-alone/replicated/logging.properties   |   56 -
 .../stand-alone/shared-store/hornetq-beans.xml  |   61 -
 .../shared-store/hornetq-configuration.xml      |  101 -
 .../stand-alone/shared-store/hornetq-jms.xml    |   53 -
 .../stand-alone/shared-store/hornetq-users.xml  |    7 -
 .../stand-alone/shared-store/jndi.properties    |    2 -
 .../stand-alone/shared-store/logging.properties |   56 -
 .../trunk/clustered-backup/hornetq-beans.xml    |   74 -
 .../clustered-backup/hornetq-configuration.xml  |   88 -
 .../trunk/clustered-backup/hornetq-jms.xml      |   28 -
 .../trunk/clustered-backup/hornetq-users.xml    |    7 -
 .../trunk/clustered-backup/jndi.properties      |   15 -
 .../trunk/clustered-backup/logging.properties   |   34 -
 .../config/trunk/clustered/hornetq-beans.xml    |   61 -
 .../trunk/clustered/hornetq-configuration.xml   |   73 -
 .../config/trunk/clustered/hornetq-jms.xml      |   28 -
 .../config/trunk/clustered/hornetq-users.xml    |    7 -
 .../config/trunk/clustered/jndi.properties      |    2 -
 .../config/trunk/clustered/logging.properties   |   34 -
 .../trunk/non-clustered/hornetq-beans.xml       |   60 -
 .../non-clustered/hornetq-configuration.xml     |   59 -
 .../config/trunk/non-clustered/hornetq-jms.xml  |   40 -
 .../trunk/non-clustered/hornetq-users.xml       |    7 -
 .../config/trunk/non-clustered/jndi.properties  |    2 -
 .../trunk/non-clustered/logging.properties      |   38 -
 .../examples/common/config/ant.properties       |    4 -
 distribution/jboss-mc/pom.xml                   |  123 --
 distribution/pom.xml                            |    1 -
 docs/quickstart-guide/en/running.xml            |   20 +-
 docs/user-manual/en/HornetQ_User_Manual.xml     |    1 +
 docs/user-manual/en/clusters.xml                |   30 +-
 docs/user-manual/en/configuring-transports.xml  |    4 +-
 docs/user-manual/en/core-bridges.xml            |   12 +-
 docs/user-manual/en/diagrams/ha-colocated.odg   |  Bin 0 -> 16917 bytes
 docs/user-manual/en/diagrams/ha-scaledown.odg   |  Bin 0 -> 15455 bytes
 docs/user-manual/en/examples.xml                |    5 +
 docs/user-manual/en/ha.xml                      |  587 +++++-
 docs/user-manual/en/images/ha-colocated.png     |  Bin 0 -> 19713 bytes
 docs/user-manual/en/images/ha-scaledown.png     |  Bin 0 -> 16525 bytes
 docs/user-manual/en/interoperability.xml        |   19 +
 docs/user-manual/en/management.xml              |   23 +-
 docs/user-manual/en/queue-attributes.xml        |   16 +-
 docs/user-manual/en/slow-consumers.xml          |   53 +
 docs/user-manual/en/using-core.xml              |   25 +-
 docs/user-manual/en/using-server.xml            |  262 +--
 docs/user-manual/user-manual.xpr                |    1 +
 etc/checkstyle.xml                              |   11 +
 examples/core/microcontainer/pom.xml            |   84 -
 examples/core/microcontainer/readme.html        |   82 -
 .../example/EmbeddedMicroContainerExample.java  |  108 --
 .../src/main/resources/hornetq-beans.xml        |   36 -
 .../main/resources/hornetq-configuration.xml    |   29 -
 .../main/resources/server0/hornetq-beans.xml    |   17 -
 .../main/resources/server0/hornetq-beans.xml    |   59 -
 examples/core/vertx-connector/pom.xml           |    2 +-
 .../main/resources/server0/hornetq-beans.xml    |   59 -
 .../src/test/resources/arquillian.xml           |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../jms/example/ClusteredGroupingExample.java   |   22 +-
 .../resources/hornetq/server0/hornetq-beans.xml |   60 -
 .../resources/hornetq/server1/hornetq-beans.xml |   59 -
 .../jms/colocated-failover-scale-down/pom.xml   |    2 +-
 .../colocated-failover-scale-down/readme.html   |   26 +-
 .../hornetq/server0/hornetq-configuration.xml   |   16 +-
 .../hornetq/server1/hornetq-configuration.xml   |   16 +-
 examples/jms/colocated-failover/readme.html     |   16 +-
 .../hornetq/server0/hornetq-configuration.xml   |   14 +-
 .../hornetq/server1/hornetq-configuration.xml   |   14 +-
 .../resources/hornetq/server0/hornetq-beans.xml |   59 -
 .../resources/hornetq/server0/hornetq-beans.xml |   60 -
 .../resources/hornetq/server0/hornetq-beans.xml |   60 -
 .../resources/hornetq/server0/hornetq-beans.xml |   60 -
 .../hornetq/server0/hornetq-configuration.xml   |   31 +-
 .../hornetq/server1/hornetq-configuration.xml   |   31 +-
 .../config/hornetq-example-beans.xml            |  165 --
 examples/jms/hornetq-ra-rar/pom.xml             |    2 +-
 .../src/main/resources/hornetq-beans.xml        |  234 ---
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 examples/jms/openwire/pom.xml                   |  125 ++
 examples/jms/openwire/readme.html               |   79 +
 .../hornetq/jms/example/OpenWireExample.java    |   96 +
 .../hornetq/server0/hornetq-configuration.xml   |   50 +
 .../resources/hornetq/server0/hornetq-jms.xml   |   19 +
 .../resources/hornetq/server0/hornetq-users.xml |    7 +
 examples/jms/proton-cpp/compile.sh              |    2 +
 examples/jms/proton-cpp/pom.xml                 |  135 ++
 examples/jms/proton-cpp/readme.html             |  104 ++
 examples/jms/proton-cpp/src/main/cpp/hello.cpp  |   72 +
 .../hornetq/server0/hornetq-configuration.xml   |   35 +
 .../resources/hornetq/server0/hornetq-jms.xml   |   10 +
 .../resources/hornetq/server0/hornetq-users.xml |    7 +
 examples/jms/proton-j/readme.html               |   11 +-
 .../org/hornetq/jms/example/ProtonJExample.java |    4 +-
 .../hornetq/server0/hornetq-configuration.xml   |    3 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    4 +
 .../jms/replicated-failback-static/readme.html  |    2 -
 .../hornetq/server0/hornetq-configuration.xml   |   12 +-
 .../hornetq/server1/hornetq-configuration.xml   |   12 +-
 .../hornetq/server0/hornetq-configuration.xml   |   12 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 examples/jms/scale-down/readme.html             |   18 +-
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../hornetq/server1/hornetq-configuration.xml   |   13 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-beans.xml |   59 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 examples/jms/xa-with-jta/pom.xml                |    2 +-
 examples/soak/normal/README                     |   49 +-
 examples/soak/normal/build.xml                  |   92 -
 examples/soak/normal/pom.xml                    |  195 ++
 examples/soak/normal/server0/hornetq-beans.xml  |   40 -
 .../org/hornetq/jms/soak/example/SoakBase.java  |  129 ++
 .../hornetq/jms/soak/example/SoakParams.java    |  183 ++
 .../hornetq/jms/soak/example/SoakReceiver.java  |  244 +++
 .../hornetq/jms/soak/example/SoakSender.java    |  245 +++
 .../org/hornetq/jms/soak/example/SoakBase.java  |  134 --
 .../hornetq/jms/soak/example/SoakParams.java    |  183 --
 .../hornetq/jms/soak/example/SoakReceiver.java  |  235 ---
 .../hornetq/jms/soak/example/SoakSender.java    |  249 ---
 examples/soak/pom.xml                           |   29 +
 examples/soak/tx-restarts/README                |   29 -
 examples/soak/tx-restarts/build.bat             |   13 -
 examples/soak/tx-restarts/build.sh              |   15 -
 examples/soak/tx-restarts/build.xml             |   38 -
 .../tx-restarts/server0/client-jndi.properties  |    3 -
 .../soak/tx-restarts/server0/hornetq-beans.xml  |   59 -
 .../server0/hornetq-configuration.xml           |   65 -
 .../soak/tx-restarts/server0/hornetq-jms.xml    |   28 -
 .../soak/tx-restarts/server0/hornetq-users.xml  |    7 -
 .../soak/tx-restarts/server0/jndi.properties    |    2 -
 .../org/hornetq/jms/example/ClientAbstract.java |  277 ---
 .../src/org/hornetq/jms/example/Receiver.java   |  191 --
 .../src/org/hornetq/jms/example/Sender.java     |  128 --
 .../org/hornetq/jms/example/TXRestartSoak.java  |  179 --
 hornetq-bootstrap/pom.xml                       |   38 +-
 .../org/hornetq/cli/banner.txt                  |    8 +
 .../org/hornetq/cli/ConfigurationException.java |   21 +
 .../src/main/java/org/hornetq/cli/HornetQ.java  |   76 +
 .../java/org/hornetq/cli/commands/Action.java   |   20 +
 .../org/hornetq/cli/commands/ActionContext.java |   37 +
 .../org/hornetq/cli/commands/HelpAction.java    |   26 +
 .../main/java/org/hornetq/cli/commands/Run.java |  148 ++
 .../java/org/hornetq/cli/commands/Stop.java     |   45 +
 .../java/org/hornetq/factory/BrokerFactory.java |   52 +
 .../hornetq/factory/BrokerFactoryHandler.java   |   22 +
 .../java/org/hornetq/factory/CoreFactory.java   |   47 +
 .../org/hornetq/factory/CoreFactoryHandler.java |   22 +
 .../hornetq/factory/FileCoreFactoryHandler.java |   29 +
 .../hornetq/factory/FileJmsFactoryHandler.java  |   32 +
 .../java/org/hornetq/factory/JmsFactory.java    |   46 +
 .../org/hornetq/factory/JmsFactoryHandler.java  |   22 +
 .../hornetq/factory/SecurityManagerFactory.java |   38 +
 .../factory/XmlBrokerFactoryHandler.java        |   34 +
 .../bootstrap/HornetQBootstrapLogger.java       |    4 +
 .../bootstrap/HornetQBootstrapServer.java       |  284 ---
 .../services/org/hornetq/broker/core/file       |   13 +
 .../services/org/hornetq/broker/jms/file        |   13 +
 .../META-INF/services/org/hornetq/broker/xml    |   13 +
 .../main/java/org/hornetq/utils/ByteUtil.java   |   82 +
 .../java/org/hornetq/utils/FactoryFinder.java   |  166 ++
 .../org/hornetq/utils/HornetQThreadFactory.java |   42 +-
 .../java/org/hornetq/utils/TypedProperties.java |   67 +-
 .../main/java/org/hornetq/utils/UTF8Util.java   |    4 +-
 .../java/org/hornetq/utils/ByteUtilTest.java    |   52 +
 .../api/core/BroadcastEndpointFactory.java      |    4 +-
 .../api/core/BroadcastGroupConfiguration.java   |   34 +-
 .../api/core/DiscoveryGroupConfiguration.java   |   68 +-
 .../java/org/hornetq/api/core/Interceptor.java  |    2 +-
 .../JGroupsBroadcastGroupConfiguration.java     |   82 +-
 .../main/java/org/hornetq/api/core/Message.java |   22 +-
 .../api/core/TransportConfiguration.java        |   13 +-
 .../api/core/TransportConfigurationHelper.java  |   26 +
 .../core/UDPBroadcastGroupConfiguration.java    |   86 +-
 .../hornetq/api/core/client/ClientConsumer.java |    5 +-
 .../hornetq/api/core/client/ClientMessage.java  |  125 +-
 .../hornetq/api/core/client/ClientSession.java  |    5 +-
 .../api/core/client/ClientSessionFactory.java   |    3 +-
 .../hornetq/api/core/client/ServerLocator.java  |  110 +-
 .../core/management/AddressSettingsInfo.java    |   34 +-
 .../core/management/CoreNotificationType.java   |   54 +
 .../core/management/HornetQServerControl.java   |   26 +-
 .../api/core/management/ManagementHelper.java   |    4 +
 .../api/core/management/NotificationType.java   |   34 +-
 .../api/core/management/ObjectNameBuilder.java  |   84 +-
 .../api/core/management/QueueControl.java       |   20 +
 .../impl/ResetLimitWrappedHornetQBuffer.java    |   12 +-
 .../core/client/HornetQClientLogger.java        |    4 +
 .../core/client/HornetQClientMessageBundle.java |    5 +-
 .../core/client/impl/ClientConsumerImpl.java    |   43 +-
 .../client/impl/ClientConsumerInternal.java     |    6 +-
 .../client/impl/ClientLargeMessageImpl.java     |    4 +-
 .../core/client/impl/ClientMessageImpl.java     |  184 +-
 .../core/client/impl/ClientMessageInternal.java |    6 +-
 .../impl/ClientProducerCreditManager.java       |    3 +-
 .../impl/ClientProducerCreditManagerImpl.java   |    7 +-
 .../core/client/impl/ClientProducerCredits.java |    3 +-
 .../client/impl/ClientProducerCreditsImpl.java  |    9 +-
 .../core/client/impl/ClientProducerImpl.java    |    2 +-
 .../client/impl/ClientSessionFactoryImpl.java   |   88 +-
 .../impl/ClientSessionFactoryInternal.java      |    4 +-
 .../core/client/impl/ClientSessionImpl.java     |   83 +-
 .../core/client/impl/ClientSessionInternal.java |   12 +-
 .../core/client/impl/DelegatingSession.java     |   28 +-
 .../core/client/impl/HornetQXAResource.java     |   20 +
 .../core/client/impl/ServerLocatorImpl.java     |  171 +-
 .../core/client/impl/ServerLocatorInternal.java |   14 +-
 .../org/hornetq/core/client/impl/Topology.java  |    7 +-
 .../hornetq/core/cluster/DiscoveryGroup.java    |    6 +-
 .../hornetq/core/message/impl/MessageImpl.java  |   69 +-
 .../core/message/impl/MessageInternal.java      |    2 -
 .../org/hornetq/core/protocol/core/Channel.java |    5 +
 .../core/protocol/core/impl/ChannelImpl.java    |    7 +-
 .../core/impl/HornetQClientProtocolManager.java |  121 +-
 .../HornetQClientProtocolManagerFactory.java    |   18 +-
 .../core/impl/HornetQConsumerContext.java       |   54 +
 .../core/impl/HornetQSessionContext.java        |   53 +-
 .../core/impl/RemotingConnectionImpl.java       |  215 +--
 .../protocol/core/impl/wireformat/Ping.java     |    6 +-
 .../impl/wireformat/SessionSendMessage.java     |    6 +-
 .../impl/TransportConfigurationUtil.java        |   92 +
 .../impl/netty/HornetQAMQPFrameDecoder.java     |   41 +
 .../remoting/impl/netty/NettyConnection.java    |   67 +-
 .../remoting/impl/netty/NettyConnector.java     |   57 +-
 .../impl/netty/NettyConnectorFactory.java       |   11 +-
 .../core/remoting/impl/ssl/SSLSupport.java      |   30 +-
 .../org/hornetq/reader/BytesMessageUtil.java    |  233 +++
 .../java/org/hornetq/reader/MapMessageUtil.java |   59 +
 .../java/org/hornetq/reader/MessageUtil.java    |  201 ++
 .../org/hornetq/reader/StreamMessageUtil.java   |  300 +++
 .../org/hornetq/reader/TextMessageUtil.java     |   47 +
 .../java/org/hornetq/reader/package-info.java   |   21 +
 .../protocol/AbstractRemotingConnection.java    |  219 +++
 .../spi/core/protocol/ConnectionEntry.java      |    5 +
 .../spi/core/protocol/RemotingConnection.java   |    4 +
 .../spi/core/remoting/AbstractConnector.java    |   10 -
 .../core/remoting/ClientProtocolManager.java    |   18 +-
 .../remoting/ClientProtocolManagerFactory.java  |    7 +-
 .../hornetq/spi/core/remoting/Connection.java   |   34 +-
 .../hornetq/spi/core/remoting/Connector.java    |    2 -
 .../spi/core/remoting/ConnectorFactory.java     |    7 +-
 .../spi/core/remoting/ConsumerContext.java      |   22 +
 .../core/remoting/ProtocolResponseHandler.java  |   37 -
 .../spi/core/remoting/SessionContext.java       |   17 +-
 .../core/remoting/TopologyResponseHandler.java  |   37 +
 .../java/org/hornetq/utils/FutureLatch.java     |   14 +-
 hornetq-dto/pom.xml                             |  147 ++
 .../java/org/hornetq/dto/BasicSecurityDTO.java  |   23 +
 .../main/java/org/hornetq/dto/BrokerDTO.java    |   40 +
 .../src/main/java/org/hornetq/dto/CoreDTO.java  |   28 +
 .../src/main/java/org/hornetq/dto/JmsDTO.java   |   29 +
 .../main/java/org/hornetq/dto/NamingDTO.java    |   35 +
 .../main/java/org/hornetq/dto/SecurityDTO.java  |   26 +
 .../src/main/java/org/hornetq/dto/XmlUtil.java  |  106 ++
 .../main/java/org/hornetq/dto/package-info.java |   19 +
 .../main/resources/org/hornetq/dto/jaxb.index   |   19 +
 .../api/jms/management/JMSQueueControl.java     |    8 +
 .../api/jms/management/JMSServerControl.java    |   12 +
 .../hornetq/jms/client/HornetQBytesMessage.java |  155 +-
 .../hornetq/jms/client/HornetQConnection.java   |    3 +-
 .../hornetq/jms/client/HornetQMapMessage.java   |   17 +-
 .../org/hornetq/jms/client/HornetQMessage.java  |  133 +-
 .../jms/client/HornetQObjectMessage.java        |    2 +-
 .../org/hornetq/jms/client/HornetQQueue.java    |    2 +-
 .../jms/client/HornetQStreamMessage.java        |  270 +--
 .../hornetq/jms/client/HornetQTextMessage.java  |   15 +-
 hornetq-jms-server/pom.xml                      |    2 +-
 .../jms/bridge/HornetQJMSBridgeLogger.java      |  101 +
 .../hornetq/jms/bridge/impl/JMSBridgeImpl.java  |  305 +--
 .../management/impl/JMSQueueControlImpl.java    |    5 +
 .../management/impl/JMSServerControlImpl.java   |  179 +-
 .../management/impl/JMSTopicControlImpl.java    |   10 +-
 .../jms/server/HornetQJMSServerLogger.java      |   57 +-
 .../hornetq/jms/server/JMSServerManager.java    |    4 +
 .../config/ConnectionFactoryConfiguration.java  |   75 +-
 .../jms/server/config/JMSConfiguration.java     |   10 +-
 .../server/config/JMSQueueConfiguration.java    |    8 +
 .../jms/server/config/TopicConfiguration.java   |    4 +
 .../ConnectionFactoryConfigurationImpl.java     |  144 +-
 .../config/impl/JMSConfigurationImpl.java       |   50 +-
 .../config/impl/JMSQueueConfigurationImpl.java  |   42 +-
 .../config/impl/TopicConfigurationImpl.java     |   21 +-
 .../server/impl/JMSServerConfigParserImpl.java  |   93 +-
 .../jms/server/impl/JMSServerManagerImpl.java   |  254 ++-
 .../jms/server/impl/StandaloneNamingServer.java |    6 +
 .../server/management/JMSNotificationType.java  |   41 +
 .../journal/impl/AIOSequentialFileFactory.java  |    6 +-
 .../journal/impl/JournalFilesRepository.java    |   28 +-
 hornetq-protocols/hornetq-amqp-protocol/pom.xml |   35 +-
 .../HornetQAMQPProtocolMessageBundle.java       |   82 -
 .../proton/HornetQProtonRemotingConnection.java |  146 ++
 .../core/protocol/proton/ProtonConsumer.java    |  314 ----
 .../protocol/proton/ProtonDeliveryHandler.java  |   31 -
 .../core/protocol/proton/ProtonProducer.java    |  142 --
 .../protocol/proton/ProtonProtocolManager.java  |  292 +--
 .../proton/ProtonRemotingConnection.java        |  670 -------
 .../core/protocol/proton/ProtonSession.java     |  327 ----
 .../core/protocol/proton/ProtonUtils.java       |  633 -------
 .../protocol/proton/TransactionHandler.java     |   83 -
 .../proton/converter/HornetQJMSVendor.java      |  155 ++
 .../converter/ProtonMessageConverter.java       |   78 +
 .../converter/jms/ServerJMSBytesMessage.java    |  239 +++
 .../converter/jms/ServerJMSMapMessage.java      |  326 ++++
 .../proton/converter/jms/ServerJMSMessage.java  |  435 +++++
 .../converter/jms/ServerJMSStreamMessage.java   |  417 +++++
 .../converter/jms/ServerJMSTextMessage.java     |  112 ++
 .../proton/converter/jms/package-info.java      |   21 +
 .../proton/exceptions/HornetQAMQPException.java |   40 -
 .../HornetQAMQPIllegalStateException.java       |   28 -
 .../HornetQAMQPInternalErrorException.java      |   28 -
 .../HornetQAMQPInvalidFieldException.java       |   28 -
 .../HornetQAMQPNotImplementedException.java     |   28 -
 .../plug/HornetQProtonConnectionCallback.java   |  125 ++
 .../plug/ProtonSessionIntegrationCallback.java  |  341 ++++
 .../core/protocol/proton/plug/package-info.java |   18 +
 .../protocol/proton/sasl/HornetQPlainSASL.java  |   50 +
 .../core/protocol/proton/TestConversions.java   |  841 +++++++++
 .../hornetq-openwire-protocol/pom.xml           |   49 +
 .../protocol/openwire/AMQConnectorImpl.java     |  121 ++
 .../protocol/openwire/AMQTransactionImpl.java   |   74 +
 .../core/protocol/openwire/BrokerState.java     |   23 +
 .../protocol/openwire/DataInputWrapper.java     |  257 +++
 .../openwire/NotEnoughBytesException.java       |   21 +
 .../protocol/openwire/OpenWireConnection.java   | 1765 ++++++++++++++++++
 .../openwire/OpenWireMessageConverter.java      |  787 ++++++++
 .../openwire/OpenWireProtocolManager.java       |  756 ++++++++
 .../OpenWireProtocolManagerFactory.java         |   46 +
 .../core/protocol/openwire/OpenWireUtil.java    |   57 +
 .../core/protocol/openwire/SendingResult.java   |   63 +
 .../amq/AMQAbstractDeadLetterStrategy.java      |  107 ++
 .../openwire/amq/AMQBrokerStoppedException.java |   41 +
 .../openwire/amq/AMQConnectionContext.java      |  393 ++++
 .../protocol/openwire/amq/AMQConnector.java     |   70 +
 .../openwire/amq/AMQConnectorStatistics.java    |  116 ++
 .../core/protocol/openwire/amq/AMQConsumer.java |  390 ++++
 .../openwire/amq/AMQConsumerBrokerExchange.java |   89 +
 .../openwire/amq/AMQDeadLetterStrategy.java     |   65 +
 .../protocol/openwire/amq/AMQDestination.java   |  240 +++
 .../openwire/amq/AMQDestinationStatistics.java  |  228 +++
 .../AMQMapTransportConnectionStateRegister.java |  147 ++
 .../amq/AMQMessageAuthorizationPolicy.java      |   28 +
 .../protocol/openwire/amq/AMQMessageStore.java  |   18 +
 .../openwire/amq/AMQPersistenceAdapter.java     |   58 +
 .../core/protocol/openwire/amq/AMQProducer.java |   33 +
 .../openwire/amq/AMQProducerBrokerExchange.java |  264 +++
 .../openwire/amq/AMQSecurityContext.java        |   91 +
 .../openwire/amq/AMQServerConsumer.java         |  183 ++
 .../protocol/openwire/amq/AMQServerSession.java |  451 +++++
 .../openwire/amq/AMQServerSessionFactory.java   |   50 +
 .../core/protocol/openwire/amq/AMQSession.java  |  590 ++++++
 .../amq/AMQSharedDeadLetterStrategy.java        |   55 +
 ...QSingleTransportConnectionStateRegister.java |  183 ++
 .../openwire/amq/AMQSlowConsumerStrategy.java   |   39 +
 .../protocol/openwire/amq/AMQSubscription.java  |  241 +++
 .../openwire/amq/AMQSubscriptionRecovery.java   |   42 +
 .../protocol/openwire/amq/AMQTransaction.java   |  249 +++
 .../openwire/amq/AMQTransactionFactory.java     |   29 +
 .../amq/AMQTransportConnectionState.java        |   86 +
 .../AMQTransportConnectionStateRegister.java    |   58 +
 .../protocol/openwire/amq/BrowserListener.java  |   18 +
 .../core/protocol/openwire/amq/MessageInfo.java |   47 +
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 +
 hornetq-protocols/hornetq-proton-plug/pom.xml   |   80 +
 .../plug/AMQPClientConnectionContext.java       |   34 +
 .../proton/plug/AMQPClientReceiverContext.java  |   29 +
 .../proton/plug/AMQPClientSenderContext.java    |   25 +
 .../proton/plug/AMQPClientSessionContext.java   |   27 +
 .../org/proton/plug/AMQPConnectionCallback.java |   41 +
 .../org/proton/plug/AMQPConnectionContext.java  |   68 +
 .../plug/AMQPConnectionContextFactory.java      |   26 +
 .../plug/AMQPServerConnectionContext.java       |   22 +
 .../org/proton/plug/AMQPSessionCallback.java    |   85 +
 .../org/proton/plug/AMQPSessionContext.java     |   35 +
 .../main/java/org/proton/plug/ClientSASL.java   |   24 +
 .../main/java/org/proton/plug/SASLResult.java   |   25 +
 .../main/java/org/proton/plug/ServerSASL.java   |   25 +
 .../plug/context/AbstractConnectionContext.java |  282 +++
 .../context/AbstractProtonContextSender.java    |  154 ++
 .../context/AbstractProtonReceiverContext.java  |   67 +
 .../context/AbstractProtonSessionContext.java   |  189 ++
 .../plug/context/ProtonDeliveryHandler.java     |   31 +
 .../plug/context/ProtonInitializable.java       |   83 +
 .../proton/plug/context/ProtonPlugSender.java   |   27 +
 .../plug/context/ProtonTransactionHandler.java  |  134 ++
 .../client/ProtonClientConnectionContext.java   |   97 +
 .../ProtonClientConnectionContextFactory.java   |   39 +
 .../context/client/ProtonClientContext.java     |   82 +
 .../client/ProtonClientReceiverContext.java     |   89 +
 .../client/ProtonClientSessionContext.java      |   91 +
 .../server/ProtonServerConnectionContext.java   |   76 +
 .../ProtonServerConnectionContextFactory.java   |   38 +
 .../server/ProtonServerReceiverContext.java     |  159 ++
 .../server/ProtonServerSenderContext.java       |  283 +++
 .../server/ProtonServerSessionContext.java      |  124 ++
 .../plug/exceptions/HornetQAMQPException.java   |   45 +
 .../HornetQAMQPIllegalStateException.java       |   28 +
 .../HornetQAMQPInternalErrorException.java      |   33 +
 .../HornetQAMQPInvalidFieldException.java       |   28 +
 .../HornetQAMQPNotImplementedException.java     |   28 +
 .../exceptions/HornetQAMQPTimeoutException.java |   29 +
 .../org/proton/plug/handler/EventHandler.java   |   80 +
 .../java/org/proton/plug/handler/Events.java    |  109 ++
 .../org/proton/plug/handler/ProtonHandler.java  |  134 ++
 .../plug/handler/impl/DefaultEventHandler.java  |  167 ++
 .../plug/handler/impl/ProtonHandlerImpl.java    |  423 +++++
 .../HornetQAMQPProtocolMessageBundle.java       |   83 +
 .../proton/plug/sasl/AnonymousServerSASL.java   |   41 +
 .../org/proton/plug/sasl/ClientSASLPlain.java   |   62 +
 .../org/proton/plug/sasl/PlainSASLResult.java   |   51 +
 .../org/proton/plug/sasl/ServerSASLPlain.java   |   75 +
 .../java/org/proton/plug/util/ByteUtil.java     |  152 ++
 .../java/org/proton/plug/util/CodecCache.java   |   56 +
 .../org/proton/plug/util/CreditsSemaphore.java  |  134 ++
 .../java/org/proton/plug/util/DebugInfo.java    |   23 +
 .../java/org/proton/plug/util/DeliveryUtil.java |   49 +
 .../org/proton/plug/util/FutureRunnable.java    |   70 +
 .../org/proton/plug/util/NettyWritable.java     |  120 ++
 .../proton/plug/util/ProtonServerMessage.java   |  596 ++++++
 .../org/proton/plug/util/ReusableLatch.java     |  156 ++
 .../org/proton/plug/test/AbstractJMSTest.java   |  135 ++
 .../java/org/proton/plug/test/Constants.java    |   23 +
 .../java/org/proton/plug/test/ProtonTest.java   |  372 ++++
 .../plug/test/invm/InVMTestConnector.java       |   38 +
 .../proton/plug/test/invm/ProtonINVMSPI.java    |  209 +++
 .../plug/test/minimalclient/AMQPClientSPI.java  |  121 ++
 .../plug/test/minimalclient/Connector.java      |   27 +
 .../test/minimalclient/SimpleAMQPConnector.java |   84 +
 .../plug/test/minimalserver/DumbServer.java     |   59 +
 .../minimalserver/MinimalConnectionSPI.java     |  151 ++
 .../plug/test/minimalserver/MinimalServer.java  |  184 ++
 .../test/minimalserver/MinimalSessionSPI.java   |  219 +++
 .../SimpleServerThreadFactory.java              |   90 +
 .../proton/plug/test/sasl/PlainSASLTest.java    |   39 +
 .../plug/test/util/CreditsSemaphoreTest.java    |  149 ++
 .../plug/test/util/ReusableLatchTest.java       |  335 ++++
 .../test/util/SimpleServerAbstractTest.java     |   79 +
 .../core/protocol/stomp/StompDecoder.java       |    2 +
 .../hornetq/core/protocol/stomp/StompFrame.java |   42 +-
 .../protocol/stomp/StompProtocolManager.java    |   22 +-
 .../core/protocol/stomp/StompSession.java       |   25 +-
 .../stomp/v11/StompFrameHandlerV11.java         |   32 +-
 .../core/protocol/stomp/v11/StompFrameV11.java  |    4 +-
 .../stomp/v12/StompFrameHandlerV12.java         |   32 +-
 .../core/protocol/stomp/v12/StompFrameV12.java  |   49 +-
 hornetq-protocols/pom.xml                       |    4 +-
 hornetq-ra/pom.xml                              |   15 +
 .../hornetq/ra/HornetQRAManagedConnection.java  |   10 +-
 .../java/org/hornetq/ra/HornetQRASession.java   |   16 +
 .../hornetq/ra/HornetQRASessionFactoryImpl.java |    4 +-
 .../org/hornetq/ra/HornetQRAXAResource.java     |    9 +-
 .../org/hornetq/ra/HornetQResourceAdapter.java  |   55 +-
 .../hornetq/ra/HornetQXAResourceWrapper.java    |  143 ++
 .../hornetq/ra/inflow/HornetQActivation.java    |   27 +-
 .../ra/inflow/HornetQActivationSpec.java        |   49 +-
 .../ra/inflow/HornetQMessageHandler.java        |   23 +-
 .../java/org/hornetq/rest/test/Embedded.java    |    8 +-
 .../test/PersistentPushQueueConsumerTest.java   |    8 +-
 .../test/PersistentPushTopicConsumerTest.java   |    8 +-
 .../java/org/hornetq/rest/test/RawAckTest.java  |    8 +-
 .../selector/filter/BinaryExpression.java       |   34 +-
 .../selector/filter/ConstantExpression.java     |   27 +-
 .../selector/filter/UnaryExpression.java        |   28 +-
 .../hornetq/selector/SelectorParserTest.java    |   20 +-
 .../java/org/hornetq/selector/SelectorTest.java |   32 +-
 hornetq-server/pom.xml                          |    5 -
 .../core/config/BridgeConfiguration.java        |  184 +-
 .../config/ClusterConnectionConfiguration.java  |  306 ++-
 .../org/hornetq/core/config/Configuration.java  |  266 ++-
 .../hornetq/core/config/ConfigurationUtils.java |  110 +-
 .../config/ConnectorServiceConfiguration.java   |   34 +-
 .../core/config/CoreQueueConfiguration.java     |   28 +-
 .../core/config/DivertConfiguration.java        |   58 +-
 .../core/config/HAPolicyConfiguration.java      |   30 +
 .../core/config/ScaleDownConfiguration.java     |   93 +
 .../config/ha/ColocatedPolicyConfiguration.java |  149 ++
 .../config/ha/LiveOnlyPolicyConfiguration.java  |   46 +
 .../config/ha/ReplicaPolicyConfiguration.java   |  124 ++
 .../ha/ReplicatedPolicyConfiguration.java       |   68 +
 .../SharedStoreMasterPolicyConfiguration.java   |   55 +
 .../ha/SharedStoreSlavePolicyConfiguration.java |   96 +
 .../core/config/impl/ConfigurationImpl.java     |  639 ++++---
 .../hornetq/core/config/impl/Validators.java    |   14 +
 .../deployers/impl/FileConfigurationParser.java |  694 ++++---
 .../impl/HornetQServerControlImpl.java          |  279 ++-
 .../core/management/impl/QueueControlImpl.java  |   47 +
 .../core/messagecounter/MessageCounter.java     |    6 +-
 .../org/hornetq/core/paging/PagingManager.java  |   20 +-
 .../org/hornetq/core/paging/PagingStore.java    |    2 +-
 .../cursor/impl/PageCursorProviderImpl.java     |    4 +-
 .../paging/cursor/impl/PagePositionImpl.java    |   12 +-
 .../impl/PageSubscriptionCounterImpl.java       |    2 +-
 .../cursor/impl/PageSubscriptionImpl.java       |    5 +-
 .../core/paging/impl/PagingStoreImpl.java       |    4 +-
 .../core/persistence/StorageManager.java        |   23 +-
 .../impl/journal/DescribeJournal.java           |   26 +-
 .../impl/journal/JournalStorageManager.java     |   75 +-
 .../impl/journal/LargeServerMessageInSync.java  |    7 +-
 .../impl/nullpm/NullStorageManager.java         |    6 +-
 .../org/hornetq/core/postoffice/QueueInfo.java  |   23 +-
 .../core/postoffice/impl/BindingsImpl.java      |   29 +
 .../postoffice/impl/DuplicateIDCacheImpl.java   |   17 +-
 .../core/postoffice/impl/PostOfficeImpl.java    |   47 +-
 .../postoffice/impl/SimpleAddressManager.java   |    4 +-
 .../hornetq/core/protocol/ProtocolHandler.java  |   33 +-
 .../protocol/core/impl/CoreProtocolManager.java |   45 +-
 .../protocol/core/impl/CoreSessionCallback.java |   26 +-
 .../core/impl/HornetQPacketHandler.java         |   17 +-
 .../impl/wireformat/BackupRequestMessage.java   |   43 +-
 .../wireformat/ReplicationSyncFileMessage.java  |    2 +-
 .../core/remoting/impl/invm/InVMAcceptor.java   |    6 +-
 .../core/remoting/impl/invm/InVMConnection.java |   40 +-
 .../core/remoting/impl/invm/InVMConnector.java  |   23 +-
 .../impl/invm/InVMConnectorFactory.java         |   14 +-
 .../remoting/impl/invm/TransportConstants.java  |    3 +
 .../core/remoting/impl/netty/NettyAcceptor.java |    7 +-
 .../server/impl/RemotingServiceImpl.java        |   97 +-
 .../core/replication/ReplicatedJournal.java     |    4 +-
 .../replication/ReplicatedLargeMessage.java     |   20 +-
 .../core/replication/ReplicationEndpoint.java   |   13 +-
 .../core/replication/ReplicationManager.java    |   29 +-
 .../hornetq/core/security/SecurityStore.java    |    2 +
 .../core/security/impl/SecurityStoreImpl.java   |   14 +-
 .../hornetq/core/server/ActivateCallback.java   |   15 +
 .../core/server/HornetQMessageBundle.java       |   12 +
 .../org/hornetq/core/server/HornetQServer.java  |   49 +-
 .../core/server/HornetQServerLogger.java        |   39 +-
 .../org/hornetq/core/server/NodeManager.java    |   11 -
 .../java/org/hornetq/core/server/Queue.java     |   43 +-
 .../org/hornetq/core/server/ServerConsumer.java |   28 +-
 .../org/hornetq/core/server/ServerMessage.java  |    2 +-
 .../org/hornetq/core/server/ServerSession.java  |    4 +-
 .../core/server/ServerSessionFactory.java       |   41 +
 .../core/server/cluster/BackupManager.java      |   11 +-
 .../core/server/cluster/ClusterControl.java     |    4 +-
 .../core/server/cluster/ClusterController.java  |   99 +-
 .../core/server/cluster/ClusterManager.java     |   40 +-
 ...HornetQServerSideProtocolManagerFactory.java |   55 +
 .../core/server/cluster/ha/BackupPolicy.java    |   61 +
 .../server/cluster/ha/ColocatedHAManager.java   |  313 ++++
 .../core/server/cluster/ha/ColocatedPolicy.java |  187 ++
 .../core/server/cluster/ha/HAManager.java       |  560 +-----
 .../core/server/cluster/ha/HAPolicy.java        |  342 +---
 .../server/cluster/ha/HAPolicyTemplate.java     |  118 --
 .../core/server/cluster/ha/LiveOnlyPolicy.java  |   85 +
 .../core/server/cluster/ha/ReplicaPolicy.java   |  136 ++
 .../server/cluster/ha/ReplicatedPolicy.java     |  167 ++
 .../core/server/cluster/ha/ScaleDownPolicy.java |  164 ++
 .../cluster/ha/SharedStoreMasterPolicy.java     |  111 ++
 .../cluster/ha/SharedStoreSlavePolicy.java      |  110 ++
 .../server/cluster/ha/StandaloneHAManager.java  |   56 +
 .../core/server/cluster/impl/BridgeImpl.java    |   14 +-
 .../server/cluster/impl/BroadcastGroupImpl.java |    6 +-
 .../cluster/impl/ClusterConnectionBridge.java   |  110 +-
 .../cluster/impl/ClusterConnectionImpl.java     |   23 +-
 .../core/server/cluster/qourum/Quorum.java      |    2 +-
 .../group/impl/GroupHandlingAbstract.java       |    4 +-
 .../impl/GroupingHandlerConfiguration.java      |  102 +-
 .../server/group/impl/LocalGroupingHandler.java |   20 +-
 .../group/impl/RemoteGroupingHandler.java       |    9 +-
 .../hornetq/core/server/impl/Activation.java    |  118 ++
 .../impl/BackupRecoveryJournalLoader.java       |    6 +-
 .../core/server/impl/ColocatedActivation.java   |  331 ++++
 .../core/server/impl/ConnectorsService.java     |   64 +-
 .../hornetq/core/server/impl/DivertImpl.java    |    4 +-
 .../core/server/impl/HornetQServerImpl.java     | 1568 +++-------------
 .../core/server/impl/LiveActivation.java        |   17 +
 .../core/server/impl/LiveOnlyActivation.java    |  197 ++
 .../NamedLiveNodeLocatorForReplication.java     |    2 +-
 .../server/impl/PostOfficeJournalLoader.java    |    2 +-
 .../org/hornetq/core/server/impl/QueueImpl.java |  431 +++--
 .../hornetq/core/server/impl/RefsOperation.java |  218 +++
 .../core/server/impl/ReplicationError.java      |    2 +-
 .../core/server/impl/ScaleDownHandler.java      |   86 +-
 .../core/server/impl/ServerConsumerImpl.java    |  104 +-
 .../core/server/impl/ServerMessageImpl.java     |   31 +-
 .../core/server/impl/ServerSessionImpl.java     |  284 ++-
 .../core/server/impl/ServiceRegistry.java       |  128 ++
 .../impl/SharedNothingBackupActivation.java     |  498 +++++
 .../impl/SharedNothingLiveActivation.java       |  486 +++++
 .../impl/SharedStoreBackupActivation.java       |  276 +++
 .../server/impl/SharedStoreLiveActivation.java  |  100 +
 .../management/impl/ManagementServiceImpl.java  |    4 +-
 .../core/settings/impl/AddressSettings.java     |  118 +-
 .../org/hornetq/core/settings/impl/Match.java   |   11 +-
 .../core/settings/impl/SlowConsumerPolicy.java  |   24 +
 .../hornetq/core/transaction/Transaction.java   |    4 +
 .../core/transaction/TransactionFactory.java    |   25 +
 .../impl/BindingsTransactionImpl.java           |    7 +
 .../core/transaction/impl/TransactionImpl.java  |   15 +-
 .../spi/core/protocol/MessageConverter.java     |   27 +
 .../spi/core/protocol/ProtocolManager.java      |    7 +
 .../spi/core/protocol/SessionCallback.java      |   12 +-
 .../org/hornetq/security/basic-security         |   13 +
 .../resources/schema/hornetq-configuration.xsd  |  508 ++++-
 .../core/config/impl/ConfigurationImplTest.java |    9 +-
 .../impl/DefaultsFileConfigurationTest.java     |   31 +-
 .../impl/FileConfigurationParserTest.java       |    2 -
 .../core/config/impl/FileConfigurationTest.java |   47 +-
 .../config/impl/HAPolicyConfigurationTest.java  |  434 +++++
 .../group/impl/ClusteredResetMockTest.java      |    3 +-
 .../core/server/impl/EmbeddedServerTest.java    |   10 +-
 .../impl/ScheduledDeliveryHandlerTest.java      |   73 +-
 .../core/settings/AddressSettingsTest.java      |  146 ++
 .../hornetq/core/settings/RepositoryTest.java   |  281 +++
 .../tests/util/ColocatedHornetQServer.java      |    4 +-
 .../tests/util/InVMNodeManagerServer.java       |    3 +-
 .../org/hornetq/tests/util/ServiceTestBase.java |   33 +-
 .../tests/util/SingleServerTestBase.java        |    4 +-
 .../org/hornetq/tests/util/UnitTestCase.java    |  164 +-
 .../resources/ConfigurationTest-full-config.xml |   45 +-
 .../resources/colocated-hapolicy-config.xml     |   34 +
 .../resources/colocated-hapolicy-config2.xml    |   28 +
 .../resources/live-only-hapolicy-config.xml     |   16 +
 .../resources/live-only-hapolicy-config2.xml    |   22 +
 .../resources/live-only-hapolicy-config3.xml    |   11 +
 .../resources/live-only-hapolicy-config4.xml    |    7 +
 .../resources/live-only-hapolicy-config5.xml    |    6 +
 .../test/resources/replica-hapolicy-config.xml  |   24 +
 .../test/resources/replica-hapolicy-config2.xml |   25 +
 .../test/resources/replica-hapolicy-config3.xml |   16 +
 .../resources/replicated-hapolicy-config.xml    |   15 +
 .../shared-store-master-hapolicy-config.xml     |   14 +
 .../shared-store-slave-hapolicy-config.xml      |   22 +
 .../shared-store-slave-hapolicy-config2.xml     |   24 +
 .../shared-store-slave-hapolicy-config3.xml     |   15 +
 .../src/main/java/org/hornetq/tools/Main.java   |   26 +-
 .../java/org/hornetq/tools/TransferQueue.java   |  243 +++
 .../org/hornetq/tools/XmlDataConstants.java     |    2 +
 .../java/org/hornetq/tools/XmlDataExporter.java |   14 +-
 .../java/org/hornetq/tools/XmlDataImporter.java |   13 +-
 hornetq_doap.rdf                                |   76 +
 .../hornetq-aerogear-integration/pom.xml        |    2 +-
 .../aerogear/AeroGearConnectorService.java      |   22 +-
 .../integration/aerogear/AeroGearConstants.java |    6 +
 .../hornetq-jboss-as-integration/pom.xml        |    2 +-
 .../twitter/impl/IncomingTweetsHandler.java     |    2 +-
 integration/hornetq-vertx-integration/pom.xml   |    6 +-
 .../vertx/IncomingVertxEventHandler.java        |    2 +-
 pom.xml                                         |  127 +-
 tests/byteman-tests/pom.xml                     |    4 +-
 .../hornetq/byteman/tests/BMFailoverTest.java   |  135 +-
 .../BridgeServerLocatorConfigurationTest.java   |   27 +-
 .../byteman/tests/ClusteredGroupingTest.java    |    4 +-
 .../tests/HornetQMessageHandlerTest.java        |    7 +-
 .../tests/JMSBridgeReconnectionTest.java        |  159 ++
 .../byteman/tests/OrphanedConsumerTest.java     |  298 +++
 .../hornetq/byteman/tests/PagingLeakTest.java   |  270 +++
 .../byteman/tests/ScaleDownFailoverTest.java    |   29 +-
 .../byteman/tests/ScaleDownFailureTest.java     |   15 +-
 .../byteman/tests/StartStopDeadlockTest.java    |   19 +-
 .../byteman/tests/StompInternalStateTest.java   |   14 +-
 tests/config/logging.properties.trace           |   68 +
 tests/integration-tests/pom.xml                 |   45 +-
 .../integration/DuplicateDetectionTest.java     |   82 +-
 .../tests/integration/String64KLimitTest.java   |    5 +-
 .../aerogear/AeroGearBasicServerTest.java       |   26 +-
 .../integration/client/AcknowledgeTest.java     |   42 +-
 .../integration/client/CommitRollbackTest.java  |   12 +-
 .../ConcurrentCreateDeleteProduceTest.java      |    7 +-
 .../integration/client/ConsumerCloseTest.java   |    6 +-
 .../integration/client/ConsumerStuckTest.java   |  305 +++
 .../tests/integration/client/ConsumerTest.java  |   33 +-
 .../integration/client/CoreClientTest.java      |    8 +-
 .../client/CreateQueueIdempotentTest.java       |    6 +-
 .../client/DeadLetterAddressTest.java           |   12 +-
 .../integration/client/ExpiryAddressTest.java   |   26 +-
 .../client/ExpiryLargeMessageTest.java          |    4 +-
 .../integration/client/FailureDeadlockTest.java |    6 +-
 .../integration/client/HangConsumerTest.java    |   45 +-
 .../integration/client/HeuristicXATest.java     |   32 +-
 .../integration/client/HornetQCrashTest.java    |    8 +-
 .../client/IncompatibleVersionTest.java         |    6 +-
 .../client/InterruptedLargeMessageTest.java     |    2 +-
 .../integration/client/JournalCrashTest.java    |   10 +-
 .../integration/client/LargeMessageTest.java    |   22 +-
 .../client/MessageExpirationTest.java           |    4 +-
 .../MessageGroupingConnectionFactoryTest.java   |    8 +-
 .../integration/client/MessageGroupingTest.java |    8 +-
 .../integration/client/MessagePriorityTest.java |    6 +-
 .../tests/integration/client/NIOvsOIOTest.java  |    5 +-
 .../integration/client/NettyConsumerTest.java   |   29 -
 .../client/NewDeadLetterAddressTest.java        |    8 +-
 .../tests/integration/client/OrderTest.java     |   62 +-
 .../integration/client/PagingOrderTest.java     |   70 +-
 .../integration/client/PagingSyncTest.java      |    5 +-
 .../tests/integration/client/PagingTest.java    |  260 ++-
 .../integration/client/ProducerCloseTest.java   |    6 +-
 .../integration/client/QueueBrowserTest.java    |    4 +-
 .../client/ReceiveImmediateTest.java            |    2 +-
 .../client/RedeliveryConsumerTest.java          |    4 +-
 .../tests/integration/client/RequestorTest.java |    4 +-
 .../integration/client/SessionCloseTest.java    |    6 +-
 ...onClosedOnRemotingConnectionFailureTest.java |    6 +-
 .../integration/client/SessionFactoryTest.java  |   38 +-
 .../tests/integration/client/SessionTest.java   |   37 +-
 .../integration/client/SlowConsumerTest.java    |  361 ++++
 .../integration/client/TemporaryQueueTest.java  |    7 +
 .../client/TransactionalSendTest.java           |   16 +-
 .../integration/client/WildCardRoutingTest.java |   13 +-
 .../integration/clientcrash/ClientTestBase.java |    4 +-
 .../integration/clientcrash/CrashClient.java    |    2 +-
 .../integration/clientcrash/CrashClient2.java   |    2 +-
 .../integration/clientcrash/GracefulClient.java |    2 +-
 .../cluster/ClusterControllerTest.java          |   97 +
 .../cluster/bridge/BridgeFailoverTest.java      |   24 +-
 .../cluster/bridge/BridgeReconnectTest.java     |  107 +-
 .../cluster/bridge/BridgeStartTest.java         |  174 +-
 .../integration/cluster/bridge/BridgeTest.java  |  404 ++--
 .../cluster/bridge/BridgeTestBase.java          |   61 +-
 .../BridgeWithDiscoveryGroupStartTest.java      |   81 +-
 .../bridge/NettyBridgeReconnectTest.java        |   28 -
 .../cluster/bridge/NettyBridgeStartTest.java    |   31 -
 .../cluster/bridge/NettyBridgeTest.java         |   30 -
 .../NettyBridgeWithDiscoveryGroupStartTest.java |   29 -
 .../cluster/distribution/ClusterTestBase.java   |  290 +--
 .../distribution/ClusterWithBackupTest.java     |    6 +-
 .../distribution/ClusteredGroupingTest.java     |   14 +-
 .../distribution/MessageRedistributionTest.java |   12 +-
 .../SimpleSymmetricClusterTest.java             |    6 +-
 .../distribution/SymmetricClusterTest.java      |  191 ++
 .../SymmetricClusterWithBackupTest.java         |   22 +-
 .../AutomaticColocatedQuorumVoteTest.java       |  123 +-
 .../cluster/failover/BackupSyncJournalTest.java |   34 +-
 .../failover/BackupSyncLargeMessageTest.java    |    2 +
 ...ColocatedFailoverCheckPairingsNettyTest.java |  113 --
 .../ColocatedFailoverCheckPairingsTest.java     |  160 --
 .../cluster/failover/ColocatedFailoverTest.java | 1403 --------------
 .../cluster/failover/FailBackAutoTest.java      |   51 +-
 .../cluster/failover/FailBackManualTest.java    |   72 +-
 .../cluster/failover/FailoverListenerTest.java  |   43 +-
 .../cluster/failover/FailoverTest.java          |   43 +-
 .../cluster/failover/FailoverTestBase.java      |   86 +-
 .../failover/GroupingFailoverTestBase.java      |   34 +-
 .../failover/LiveToLiveFailoverTest.java        |   76 +-
 ...ultipleLivesMultipleBackupsFailoverTest.java |   97 +-
 .../MultipleServerFailoverTestBase.java         |   96 +-
 .../cluster/failover/PagingFailoverTest.java    |    2 +-
 .../cluster/failover/QuorumFailOverTest.java    |   22 +-
 .../failover/QuorumVoteServerConnectTest.java   |    2 +-
 .../failover/ReplicatedDistributionTest.java    |    4 +-
 .../failover/ReplicatedFailoverTest.java        |   56 +-
 ...eplicatedFailoverUsingNodeGroupNameTest.java |   15 +-
 ...dMultipleServerFailoverExtraBackupsTest.java |   14 +-
 .../ReplicatedMultipleServerFailoverTest.java   |   54 -
 .../ReplicatedWithDelayFailoverTest.java        |    6 +
 .../cluster/failover/SecurityFailoverTest.java  |   43 +-
 .../SingleLiveMultipleBackupsFailoverTest.java  |   75 +-
 .../StaticClusterWithBackupFailoverTest.java    |    6 +-
 .../ha/HAAutomaticBackupSharedStore.java        |   19 +-
 .../reattach/MultiThreadRandomReattachTest.java |    6 +-
 .../NettyMultiThreadRandomReattachTest.java     |   10 +-
 .../cluster/reattach/RandomReattachTest.java    |    7 +-
 .../HAClientTopologyWithDiscoveryTest.java      |    7 +-
 .../cluster/topology/IsolatedTopologyTest.java  |  108 +-
 .../cluster/topology/NonHATopologyTest.java     |   11 +-
 .../cluster/util/BackupSyncDelay.java           |   12 +-
 .../cluster/util/MultiServerTestBase.java       |   93 +-
 .../integration/discovery/DiscoveryTest.java    |   55 +-
 .../tests/integration/divert/DivertTest.java    |  437 +++--
 .../divert/PersistentDivertTest.java            |   80 +-
 .../integration/embedded/ValidateAIOTest.java   |    6 +-
 .../http/CoreClientOverHttpTest.java            |    8 +-
 .../tests/integration/jms/FloodServerTest.java  |    6 +-
 .../jms/HornetQConnectionFactoryTest.java       |   30 +-
 .../ManualReconnectionToSingleServerTest.java   |   24 +-
 .../integration/jms/bridge/BridgeTestBase.java  |   35 +-
 .../jms/bridge/ClusteredBridgeTestBase.java     |   37 +-
 .../jms/bridge/JMSBridgeReconnectionTest.java   |  228 ++-
 .../jms/client/ExpiryMessageTest.java           |    7 +-
 .../integration/jms/client/StoreConfigTest.java |   18 +-
 .../jms/client/TopicCleanupTest.java            |    4 +-
 .../jms/cluster/BindingsClusterTest.java        |    5 +-
 .../jms/cluster/JMSFailoverListenerTest.java    |  113 +-
 .../jms/cluster/JMSFailoverTest.java            |   78 +-
 .../jms/cluster/JMSReconnectTest.java           |   18 +-
 .../jms/cluster/ReplicatedJMSFailoverTest.java  |   52 +-
 .../ConnectionFactorySerializationTest.java     |   14 +-
 ...tionFactoryWithJGroupsSerializationTest.java |  192 ++
 .../jms/connection/ExceptionListenerTest.java   |    7 +-
 .../integration/jms/consumer/ConsumerTest.java  |   52 +-
 .../jms/divert/DivertAndACKClientTest.java      |   13 +-
 .../JmsProducerCompletionListenerTest.java      |    3 +-
 .../server/ColocatedJMSServerStartStopTest.java |  166 --
 .../jms/server/JMSServerDeployerTest.java       |   23 +-
 .../jms/server/config/JMSConfigurationTest.java |   30 +-
 .../config/JMSServerConfigParserTest.java       |    7 +-
 .../ConnectionFactoryControlTest.java           |   65 +-
 .../server/management/JMSQueueControlTest.java  |  167 +-
 .../management/JMSQueueControlUsingJMSTest.java |   14 +
 .../management/JMSServerControl2Test.java       |  298 ++-
 .../management/JMSServerControlRestartTest.java |   12 +-
 .../server/management/JMSServerControlTest.java |  140 +-
 .../JMSServerControlUsingJMSTest.java           |   10 +
 .../jms/server/management/JMSUtil.java          |   20 +-
 .../jms/server/management/TopicControlTest.java |   76 +-
 .../management/TopicControlUsingJMSTest.java    |    7 +-
 .../journal/NIOJournalCompactTest.java          |   14 +-
 .../management/AcceptorControlTest.java         |   25 +-
 .../management/AddressControlTest.java          |    6 +-
 .../management/AddressControlUsingCoreTest.java |    6 +-
 .../management/BridgeControlTest.java           |   84 +-
 .../management/BridgeControlUsingCoreTest.java  |   73 +-
 .../management/BroadcastGroupControlTest.java   |   32 +-
 .../ClusterConnectionControl2Test.java          |   82 +-
 .../ClusterConnectionControlTest.java           |  109 +-
 .../management/DivertControlTest.java           |   47 +-
 .../management/HornetQServerControlTest.java    |  124 +-
 .../HornetQServerControlUsingCoreTest.java      |   39 +-
 .../integration/management/JMXDomainTest.java   |  133 +-
 .../management/ManagementActivationTest.java    |    5 +-
 .../management/ManagementServiceImplTest.java   |   24 +-
 .../management/ManagementTestBase.java          |   24 +
 .../ManagementWithPagingServerTest.java         |    7 +-
 .../management/ManagementWithStompTest.java     |   12 +-
 .../management/NotificationTest.java            |   16 +-
 .../management/QueueControlTest.java            |  246 ++-
 .../management/QueueControlUsingCoreTest.java   |   23 +
 ...tyManagementWithConfiguredAdminUserTest.java |    6 +-
 ...yManagementWithDefaultConfigurationTest.java |    8 +-
 ...ManagementWithModifiedConfigurationTest.java |    8 +-
 .../management/SecurityNotificationTest.java    |   14 +-
 .../integration/openwire/BasicOpenWireTest.java |  249 +++
 .../integration/openwire/BasicSecurityTest.java |  256 +++
 .../integration/openwire/OpenWireTestBase.java  |  190 ++
 .../integration/openwire/OpenWireUtilTest.java  |   37 +
 .../openwire/SimpleOpenWireTest.java            |  280 +++
 .../openwire/amq/JMSConsumer10Test.java         |  108 ++
 .../openwire/amq/JMSConsumer11Test.java         |  115 ++
 .../openwire/amq/JMSConsumer12Test.java         |   92 +
 .../openwire/amq/JMSConsumer13Test.java         |   85 +
 .../openwire/amq/JMSConsumer1Test.java          |  121 ++
 .../openwire/amq/JMSConsumer2Test.java          |  240 +++
 .../openwire/amq/JMSConsumer3Test.java          |  113 ++
 .../openwire/amq/JMSConsumer4Test.java          |  103 +
 .../openwire/amq/JMSConsumer5Test.java          |  135 ++
 .../openwire/amq/JMSConsumer6Test.java          |  146 ++
 .../openwire/amq/JMSConsumer7Test.java          |  162 ++
 .../openwire/amq/JMSConsumer8Test.java          |  159 ++
 .../openwire/amq/JMSConsumer9Test.java          |  141 ++
 .../amq/JMSDurableTopicRedeliverTest.java       |   95 +
 .../openwire/amq/JMSIndividualAckTest.java      |  151 ++
 .../openwire/amq/JMSMessageTest.java            |  639 +++++++
 .../openwire/amq/JMSQueueRedeliverTest.java     |   33 +
 .../openwire/amq/JMSUsecase1Test.java           |  122 ++
 .../openwire/amq/JMSUsecaseTest.java            |   88 +
 .../openwire/amq/JmsAutoAckListenerTest.java    |   67 +
 .../openwire/amq/JmsAutoAckTest.java            |   65 +
 .../openwire/amq/JmsClientAckTest.java          |  144 ++
 .../amq/JmsConnectionStartStopTest.java         |  185 ++
 .../amq/JmsConsumerResetActiveListenerTest.java |  165 ++
 .../amq/JmsCreateConsumerInOnMessageTest.java   |   99 +
 .../JmsDurableQueueWildcardSendReceiveTest.java |   43 +
 .../amq/JmsDurableTopicSelectorTest.java        |   33 +
 .../amq/JmsDurableTopicSendReceiveTest.java     |  101 +
 .../amq/JmsDurableTopicTransactionTest.java     |   39 +
 .../JmsDurableTopicWildcardSendReceiveTest.java |   44 +
 .../openwire/amq/JmsQueueBrowserTest.java       |  506 +++++
 .../openwire/amq/JmsQueueRequestReplyTest.java  |   38 +
 .../openwire/amq/JmsResourceProvider.java       |  265 +++
 .../openwire/amq/JmsSendReceiveTestSupport.java |  245 +++
 .../openwire/amq/JmsTopicRedeliverTest.java     |  154 ++
 .../openwire/amq/JmsTopicRequestReplyTest.java  |  273 +++
 .../openwire/amq/JmsTopicSelectorTest.java      |  230 +++
 .../openwire/amq/JmsTopicSendReceiveTest.java   |  119 ++
 ...sTopicSendReceiveWithTwoConnectionsTest.java |  110 ++
 .../openwire/amq/JmsTopicTransactionTest.java   |   36 +
 .../amq/JmsTopicWildcardSendReceiveTest.java    |  255 +++
 .../openwire/amq/JmsTransactionTestSupport.java |  760 ++++++++
 .../amq/MessageListenerRedeliveryTest.java      |  457 +++++
 .../amq/ProducerFlowControlSendFailTest.java    |  217 +++
 .../openwire/amq/ProducerFlowControlTest.java   |  410 ++++
 .../amq/ReconnectWithSameClientIDTest.java      |   97 +
 .../openwire/amq/RedeliveryPolicyTest.java      |  637 +++++++
 .../integration/openwire/amq/TimeStampTest.java |   91 +
 .../openwire/amq/TransactionContextTest.java    |  153 ++
 .../openwire/interop/GeneralInteropTest.java    |  669 +++++++
 .../tests/integration/openwire/util/Wait.java   |   56 +
 .../paging/MultipleProducersPagingTest.java     |   29 +-
 .../paging/PageCountSyncOnNonTXTest.java        |    2 +-
 .../integration/paging/PagingReceiveTest.java   |    4 +-
 .../PagingWithFailoverAndCountersTest.java      |    4 +-
 .../paging/SpawnedServerSupport.java            |   65 +-
 ...nnectionFactoryConfigurationStorageTest.java |   17 +-
 .../persistence/JMSDynamicConfigTest.java       |    5 +-
 .../persistence/XmlImportExportTest.java        |  205 +-
 .../tests/integration/proton/ProtonTest.java    |  782 ++++++--
 .../integration/ra/DummyTransactionManager.java |    9 +-
 .../integration/ra/HornetQClusteredTest.java    |    3 +-
 .../ra/HornetQMessageHandlerTest.java           |  226 +++
 .../ra/HornetQMessageHandlerXATest.java         |  131 ++
 .../ra/HornetQRAClusteredTestBase.java          |   55 +-
 .../tests/integration/ra/HornetQRATestBase.java |    1 +
 .../integration/ra/OutgoingConnectionTest.java  |   19 +
 .../integration/remoting/BatchDelayTest.java    |    6 +-
 .../integration/remoting/DirectDeliverTest.java |    6 +-
 .../tests/integration/remoting/PingTest.java    |   10 +-
 .../remoting/SynchronousCloseTest.java          |    4 +-
 .../replication/ReplicationTest.java            |   27 +-
 .../scheduling/DelayedMessageTest.java          |    6 +-
 .../MultipliedDelayedMessageTest.java           |    6 +-
 .../scheduling/ScheduledMessageTest.java        |   14 +-
 .../security/NettySecurityClientTest.java       |    5 +-
 .../integration/security/SecurityTest.java      |   34 +-
 .../integration/security/SimpleClient.java      |    2 +-
 .../integration/server/ExpiryRunnerTest.java    |    8 +-
 .../integration/server/FileLockTimeoutTest.java |    8 +-
 .../integration/server/LVQRecoveryTest.java     |    4 +-
 .../tests/integration/server/LVQTest.java       |    6 +-
 .../integration/server/PredefinedQueueTest.java |   56 +-
 .../integration/server/ScaleDown3NodeTest.java  |   48 +-
 .../tests/integration/server/ScaleDownTest.java |   37 +-
 .../server/SuppliedThreadPoolTest.java          |  118 ++
 .../ssl/CoreClientOverOneWaySSLTest.java        |   87 +-
 .../ssl/CoreClientOverTwoWaySSLTest.java        |   59 +-
 .../tests/integration/stomp/ExtraStompTest.java |   46 +-
 .../tests/integration/stomp/StompTestBase.java  |   24 +-
 .../integration/stomp/StompWebSocketTest.java   |   18 +-
 .../stomp/util/StompFrameFactoryV11.java        |  105 +-
 .../stomp/util/StompFrameFactoryV12.java        |  131 +-
 .../integration/stomp/v11/StompV11Test.java     |   43 +-
 .../integration/stomp/v11/StompV11TestBase.java |   21 +-
 .../integration/stomp/v12/StompV12Test.java     |   43 +-
 .../integration/tools/TransferMessageTest.java  |  433 +++++
 .../NettyConnectorWithHTTPUpgradeTest.java      |   55 +-
 .../tests/integration/twitter/TwitterTest.java  |  100 +-
 .../integration/vertx/HornetQVertxUnitTest.java |   82 +-
 .../integration/xa/BasicXaRecoveryTest.java     |   10 +-
 .../tests/integration/xa/BasicXaTest.java       |   41 +-
 .../tests/integration/xa/XaTimeoutTest.java     |    8 +-
 .../largemessage/LargeMessageTestBase.java      |    2 +-
 .../tests/util/JMSClusteredTestBase.java        |   38 +-
 .../org/hornetq/tests/util/JMSTestBase.java     |   44 +-
 .../tests/util/ReplicatedBackupUtils.java       |   36 +-
 tests/jms-tests/pom.xml                         |    7 +-
 .../jms/tests/HornetQServerTestCase.java        |   23 +-
 .../jms/tests/message/MessageHeaderTest.java    |    6 +-
 .../jms/tests/tools/ConfigurationHelper.java    |   69 -
 .../tests/tools/container/LocalTestServer.java  |   49 +-
 .../jms/tests/tools/container/Server.java       |    2 +-
 .../src/test/resources/hornetq-beans.xml        |   60 -
 .../jms-tests/src/test/resources/test-beans.xml |   60 -
 tests/joram-tests/pom.xml                       |    2 +-
 .../java/org/hornetq/jms/SpawnedJMSServer.java  |    9 +-
 tests/performance-tests/pom.xml                 |    2 +-
 tests/soak-tests/pom.xml                        |    2 +-
 .../soak/client/ClientNonDivertedSoakTest.java  |    5 +-
 .../tests/soak/client/ClientSoakTest.java       |   33 +-
 .../soak/client/SimpleSendReceiveSoakTest.java  |    5 +-
 tests/stress-tests/pom.xml                      |    2 +-
 .../stress/journal/CompactingStressTest.java    |   14 +-
 .../stress/journal/LargeJournalStressTest.java  |   14 +-
 .../journal/MultiThreadConsumerStressTest.java  |   16 +-
 .../NIOMultiThreadCompactorStressTest.java      |   24 +-
 .../journal/XmlImportExportStressTest.java      |   19 +-
 .../stress/paging/PageCursorStressTest.java     |   11 +-
 .../tests/stress/paging/PageStressTest.java     |   14 +-
 .../tests/stress/stomp/StompStressTest.java     |   19 +-
 tests/timing-tests/pom.xml                      |    2 +-
 .../jms/bridge/impl/JMSBridgeImplTest.java      |    8 +-
 tests/unit-tests/pom.xml                        |    6 +-
 .../client/impl/LargeMessageBufferTest.java     |   16 +-
 .../core/config/impl/ConnectorsServiceTest.java |   95 +
 .../config/impl/fakes/FakeConnectorService.java |   45 +
 .../impl/fakes/FakeConnectorServiceFactory.java |   65 +
 .../core/postoffice/impl/BindingsImplTest.java  |    8 +
 .../unit/core/postoffice/impl/FakeQueue.java    |   41 +-
 .../impl/invm/InVMConnectorFactoryTest.java     |   54 +
 .../impl/netty/NettyConnectorFactoryTest.java   |   54 +
 .../remoting/impl/netty/NettyConnectorTest.java |    8 +-
 .../core/remoting/impl/ssl/SSLSupportTest.java  |   55 +-
 .../server/impl/RemotingServiceImplTest.java    |  142 ++
 .../server/impl/fake/FakeInterceptor.java       |   33 +
 .../impl/ClusterConnectionBridgeTest.java       |  110 ++
 .../group/impl/SystemPropertyOverrideTest.java  |    5 +-
 .../unit/core/server/impl/QueueImplTest.java    |  113 +-
 .../core/settings/impl/AddressSettingsTest.java |  143 --
 .../unit/core/settings/impl/RepositoryTest.java |  271 ---
 .../tests/unit/microcontainer/DummyBean.java    |   31 -
 .../HornetQBootstrapServerTest.java             |   95 -
 .../ra/ConnectionFactoryPropertiesTest.java     |    3 +-
 .../ra/HornetQResourceAdapterConfigTest.java    |    6 +
 .../tests/unit/ra/ResourceAdapterTest.java      |   37 +-
 .../tests/unit/xa/XAResourceWrapperTest.java    |   43 +
 .../test/resources/client-side-keystore.jceks   |  Bin 0 -> 1256 bytes
 .../src/test/resources/client-side-keystore.jks |  Bin 0 -> 1300 bytes
 .../test/resources/client-side-truststore.jceks |  Bin 0 -> 877 bytes
 .../test/resources/client-side-truststore.jks   |  Bin 0 -> 1515 bytes
 .../src/test/resources/client-side.keystore     |  Bin 1300 -> 0 bytes
 .../src/test/resources/client-side.truststore   |  Bin 670 -> 0 bytes
 .../test/resources/server-side-keystore.jceks   |  Bin 0 -> 1257 bytes
 .../src/test/resources/server-side-keystore.jks |  Bin 0 -> 2627 bytes
 .../test/resources/server-side-truststore.jceks |  Bin 0 -> 876 bytes
 .../test/resources/server-side-truststore.jks   |  Bin 0 -> 893 bytes
 .../src/test/resources/server-side.keystore     |  Bin 1375 -> 0 bytes
 .../src/test/resources/server-side.truststore   |  Bin 893 -> 0 bytes
 1065 files changed, 60911 insertions(+), 22942 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d37b3a5..7e91952 100644
--- a/README.md
+++ b/README.md
@@ -156,16 +156,30 @@ Do not use the [maven-eclipse-plugin] to copy the files as it conflicts with [m2
 [maven-eclipse-plugin]: https://maven.apache.org/plugins/maven-eclipse-plugin/
 [m2e]: http://eclipse.org/m2e/
 
-## GitHub procedures
+## Committing Changes
 
-The best way to submit changes to HornetQ is through pull requests on
-GitHub. After review a pull request should either get merged or be
-rejected.
+### GitHub
 
-When a pull request needs to be reworked, say you have missed
-something, the pull request is then closed. When you finished
-addressing the required changes you should reopen your original pull
-request and it will then be re-evaluated. At that point if the request
-is approved we will then merge it.
+We follow the GitHub workflow for all code changes in HornetQ. For information on the GitHub workflow please see:
+https://guides.github.com/introduction/flow/index.html
 
-Make sure you always rebase your branch on master before submitting pull requests.
+### Commit Messages
+
+We follow the 50/72 git commit message format.  A HornetQ commit message should be formatted in the following manner:
+
+* Add the HornetQ JIRA or Bugzilla reference (if one exists) followed by a brief description of the change in the first line.
+* Insert a single blank line after the first line.
+* Provide a detailed description of the change in the following lines, breaking paragraphs where needed.
+* The first line should be limited to 50 characters
+* Subsequent lines should be wrapped at 72 characters.
+
+An example correctly formatted commit message:
+
+```
+HORNETQ-1234 Add new commit msg format to README
+
+Adds a description of the new commit message format as well as examples
+of well formatted commit messages to the README.md.  This is required 
+to enable developers to quickly identify what the commit is intended to 
+do and why the commit was added.
+```

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/pom.xml b/distribution/hornetq/pom.xml
index 644b6b4..c725c7e 100644
--- a/distribution/hornetq/pom.xml
+++ b/distribution/hornetq/pom.xml
@@ -28,11 +28,86 @@
 
    <properties>
       <schemaLocation>${project.build.directory}/${project.artifactId}-${project.version}-bin/${project.artifactId}-${project.version}/schema</schemaLocation>
-      <standalone>src/main/resources/config/stand-alone</standalone>
-      <as6>src/main/resources/config/jboss-as-6</as6>
+      <configLocation>src/main/resources/config</configLocation>
    </properties>
 
    <dependencies>
+     <!-- HornetQ artifacts -->
+      <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-server</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-dto</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-bootstrap</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jms-server</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jms-client</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-tools</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jboss-as-integration</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-ra</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-service-sar</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-spring-integration</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-twitter-integration</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-vertx-integration</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq.rest</groupId>
+        <artifactId>hornetq-rest</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-aerogear-integration</artifactId>
+        <version>${project.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>jnp-client</artifactId>
+        <version>${project.version}</version>
+     </dependency>
       <dependency>
          <groupId>org.hornetq</groupId>
          <artifactId>hornetq-core-client</artifactId>
@@ -49,17 +124,64 @@
            <version>${project.version}</version>
        </dependency>
        <dependency>
-           <groupId>org.apache.qpid</groupId>
-           <artifactId>proton-api</artifactId>
+           <groupId>org.hornetq</groupId>
+           <artifactId>hornetq-openwire-protocol</artifactId>
+           <version>${project.version}</version>
        </dependency>
        <dependency>
-           <groupId>org.apache.qpid</groupId>
-           <artifactId>proton-j-impl</artifactId>
+           <groupId>org.hornetq</groupId>
+           <artifactId>hornetq-native</artifactId>
+           <version>${project.version}</version>
        </dependency>
+
+      <!-- dependencies -->
        <dependency>
            <groupId>org.apache.qpid</groupId>
            <artifactId>proton-jms</artifactId>
        </dependency>
+       <dependency>
+           <groupId>io.airlift</groupId>
+           <artifactId>airline</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>org.apache.activemq</groupId>
+           <artifactId>activemq-client</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>com.fasterxml.jackson.core</groupId>
+           <artifactId>jackson-databind</artifactId>
+           <version>${jackson-databind.version}</version>
+       </dependency>
+       <dependency>
+           <groupId>org.apache.activemq</groupId>
+           <artifactId>activemq-client</artifactId>
+       </dependency>
+
+       <!-- javadoc -->
+       <dependency>
+           <groupId>org.hornetq</groupId>
+           <artifactId>hornetq-core-client</artifactId>
+           <version>${project.version}</version>
+           <classifier>javadoc</classifier>
+       </dependency>
+     <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-server</artifactId>
+         <version>${project.version}</version>
+         <classifier>javadoc</classifier>
+     </dependency>
+     <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-jms-server</artifactId>
+         <version>${project.version}</version>
+         <classifier>javadoc</classifier>
+     </dependency>
+     <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-jms-client</artifactId>
+         <version>${project.version}</version>
+         <classifier>javadoc</classifier>
+     </dependency>
    </dependencies>
 
    <build>
@@ -107,70 +229,84 @@
             <configuration>
                <validationSets>
                   <validationSet>
-                     <dir>${standalone}/clustered</dir>
+                     <dir>${configLocation}/clustered</dir>
                      <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
                      <includes>
                         <include>hornetq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${standalone}/non-clustered</dir>
+                     <dir>${configLocation}/non-clustered</dir>
                      <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
                      <includes>
                         <include>hornetq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${as6}/clustered</dir>
+                     <dir>${configLocation}/replicated</dir>
                      <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
                      <includes>
                         <include>hornetq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${as6}/non-clustered</dir>
+                     <dir>${configLocation}/shared-store</dir>
                      <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
                      <includes>
                         <include>hornetq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${standalone}/clustered</dir>
+                     <dir>${configLocation}/clustered</dir>
                      <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
                      <includes>
                         <include>hornetq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${standalone}/non-clustered</dir>
+                     <dir>${configLocation}/non-clustered</dir>
                      <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
                      <includes>
                         <include>hornetq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${as6}/clustered</dir>
+                     <dir>${configLocation}/replicated</dir>
                      <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
                      <includes>
                         <include>hornetq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${as6}/non-clustered</dir>
+                     <dir>${configLocation}/shared-store</dir>
                      <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
                      <includes>
                         <include>hornetq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${standalone}/clustered</dir>
+                     <dir>${configLocation}/clustered</dir>
                      <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
                      <includes>
                         <include>hornetq-users.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
-                     <dir>${standalone}/non-clustered</dir>
+                     <dir>${configLocation}/non-clustered</dir>
+                     <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
+                     <includes>
+                        <include>hornetq-users.xml</include>
+                     </includes>
+                  </validationSet>
+                  <validationSet>
+                     <dir>${configLocation}/replicated</dir>
+                     <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
+                     <includes>
+                        <include>hornetq-users.xml</include>
+                     </includes>
+                  </validationSet>
+                  <validationSet>
+                     <dir>${configLocation}/shared-store</dir>
                      <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
                      <includes>
                         <include>hornetq-users.xml</include>
@@ -179,7 +315,6 @@
                </validationSets>
             </configuration>
          </plugin>
-
       </plugins>
    </build>
 


Mime
View raw message