This closes #703
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1af6f5c5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1af6f5c5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1af6f5c5 Branch: refs/heads/master Commit: 1af6f5c5cc8c1ba05aafab559986e9c1a5a4a139 Parents: 410cd91 1ef9e74 Author: Martyn Taylor <[email protected]> Authored: Mon Aug 8 13:20:33 2016 +0100 Committer: Martyn Taylor <[email protected]> Committed: Mon Aug 8 13:20:33 2016 +0100 ---------------------------------------------------------------------- .../activemq/cli/test/FileBrokerTest.java | 76 ++++++++++++++++++++ .../src/test/resources/broker-reload.xml | 76 ++++++++++++++++++++ .../config/ActiveMQDefaultConfiguration.java | 7 ++ .../config/impl/FileJMSConfiguration.java | 3 +- .../artemis/core/config/Configuration.java | 9 +++ .../core/config/FileDeploymentManager.java | 2 +- .../core/config/impl/ConfigurationImpl.java | 27 +++++++ .../core/config/impl/FileConfiguration.java | 5 +- .../artemis/core/deployers/Deployable.java | 3 +- .../deployers/impl/FileConfigurationParser.java | 2 + .../core/server/ActiveMQServerLogger.java | 35 ++++----- .../core/server/impl/ActiveMQServerImpl.java | 40 +++++++++++ .../core/settings/HierarchicalRepository.java | 4 ++ .../impl/HierarchicalObjectRepository.java | 26 ++++++- .../resources/schema/artemis-configuration.xsd | 8 +++ .../core/config/impl/FileConfigurationTest.java | 1 + .../resources/ConfigurationTest-full-config.xml | 1 + 17 files changed, 304 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
