This closes #2388
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3f3046c5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3f3046c5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3f3046c5 Branch: refs/heads/master Commit: 3f3046c5ef9476ab3da74cbb89c6c3b24ac8b282 Parents: 9a885f1 97612c4 Author: Michael Andre Pearce <[email protected]> Authored: Fri Oct 26 19:30:07 2018 +0100 Committer: Michael Andre Pearce <[email protected]> Committed: Fri Oct 26 19:30:07 2018 +0100 ---------------------------------------------------------------------- .../config/ActiveMQDefaultConfiguration.java | 10 ++ .../artemis/core/config/Configuration.java | 13 ++ .../core/config/impl/ConfigurationImpl.java | 13 ++ .../deployers/impl/FileConfigurationParser.java | 14 ++ .../artemis/core/postoffice/PostOffice.java | 2 + .../core/postoffice/impl/PostOfficeImpl.java | 130 ++++++++++++--- .../core/server/ActiveMQMessageBundle.java | 5 +- .../artemis/core/server/ActiveMQServer.java | 19 ++- .../core/server/ActiveMQServerLogger.java | 4 + .../activemq/artemis/core/server/Queue.java | 2 + .../core/server/impl/ActiveMQServerImpl.java | 32 +++- .../artemis/core/server/impl/AddressInfo.java | 10 ++ .../artemis/core/server/impl/QueueImpl.java | 9 + .../core/server/impl/QueueManagerImpl.java | 10 +- .../core/settings/impl/AddressSettings.java | 66 +++++++- .../resources/schema/artemis-configuration.xsd | 27 ++- .../impl/DefaultsFileConfigurationTest.java | 2 + .../core/config/impl/FileConfigurationTest.java | 5 + .../impl/ScheduledDeliveryHandlerTest.java | 5 + .../resources/ConfigurationTest-full-config.xml | 3 + ...ionTest-xinclude-config-address-settings.xml | 2 + .../ConfigurationTest-xinclude-config.xml | 1 + docs/user-manual/en/address-model.md | 14 ++ docs/user-manual/en/configuration-index.md | 7 +- .../server/AddressQueueDeleteDelayTest.java | 167 +++++++++++++++++++ .../unit/core/postoffice/impl/FakeQueue.java | 5 + .../core/server/impl/fakes/FakePostOffice.java | 4 + 27 files changed, 538 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
