You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ga...@apache.org on 2018/02/27 12:13:35 UTC

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

This closes #1896


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

Branch: refs/heads/master
Commit: aceacceb97e054966d455c074ca5ef1b37ec45c8
Parents: 706abe8 9d1c59c
Author: Howard Gao <ho...@gmail.com>
Authored: Tue Feb 27 20:12:08 2018 +0800
Committer: Howard Gao <ho...@gmail.com>
Committed: Tue Feb 27 20:12:08 2018 +0800

----------------------------------------------------------------------
 .../artemis/cli/commands/etc/broker.xml         |   1 +
 .../apache/activemq/artemis/utils/XMLUtil.java  |   1 +
 .../resources/schema/artemis-configuration.xsd  |  71 ++++-
 .../core/config/impl/FileConfigurationTest.java |   8 +-
 .../impl/FileXIncludeConfigurationTest.java     |  25 ++
 ...ionTest-xinclude-config-address-settings.xml |  66 +++++
 ...figurationTest-xinclude-config-addresses.xml |  50 ++++
 ...onTest-xinclude-config-security-settings.xml |  24 ++
 .../ConfigurationTest-xinclude-config.xml       | 294 +++++++++++++++++++
 .../test/resources/artemis-configuration.xsd    |  65 +++-
 docs/user-manual/en/configuration-index.md      |  37 +++
 11 files changed, 636 insertions(+), 6 deletions(-)
----------------------------------------------------------------------