You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/06/27 14:14:51 UTC

[2/2] activemq-artemis git commit: This closes #600

This closes #600


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

Branch: refs/heads/master
Commit: 7d69d913e495695e3466044fa5a279f816a94790
Parents: 425fe86 ce9ea17
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jun 27 10:10:11 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jun 27 10:10:11 2016 -0400

----------------------------------------------------------------------
 .../config/ActiveMQDefaultConfiguration.java    |  10 +
 .../core/management/ActiveMQServerControl.java  |   1 +
 .../core/config/BridgeConfiguration.java        |  18 ++
 .../config/ClusterConnectionConfiguration.java  | 290 +++++++++++--------
 .../deployers/impl/FileConfigurationParser.java |  49 +++-
 .../impl/ActiveMQServerControlImpl.java         |  19 +-
 .../core/server/cluster/ClusterManager.java     |   7 +-
 .../cluster/impl/ClusterConnectionImpl.java     |  11 +-
 .../resources/schema/artemis-configuration.xsd  |  16 +
 .../core/config/impl/FileConfigurationTest.java |   4 +
 .../resources/ConfigurationTest-full-config.xml |   4 +
 .../integration/cluster/bridge/BridgeTest.java  | 195 +++++++++++++
 .../management/ActiveMQServerControlTest.java   |   1 +
 13 files changed, 492 insertions(+), 133 deletions(-)
----------------------------------------------------------------------