activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [26/27] activemq-6 git commit: ACTIVEMQ6-67 - cleaned up configuration
Date Thu, 15 Jan 2015 17:19:28 GMT
ACTIVEMQ6-67 - cleaned up configuration

https://issues.apache.org/jira/browse/ACTIVEMQ6-67

fixed distribution so that file based security works and hot deployers as broken and no longer needed with new bootstrap.

Also combined the jms and core configuration files.


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

Branch: refs/heads/master
Commit: 4b63891aaad1e0164a7b684b11cb2be439d089b7
Parents: 260f579
Author: Andy Taylor <andytaylor@apache.org>
Authored: Fri Jan 2 10:24:01 2015 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Thu Jan 15 15:48:22 2015 +0000

----------------------------------------------------------------------
 .../org/apache/activemq/cli/commands/Run.java   |  41 +-
 .../org/apache/activemq/cli/commands/Stop.java  |   4 +-
 .../activemq/factory/BasicSecurityHandler.java  |  43 ++
 .../apache/activemq/factory/BrokerFactory.java  |  30 +-
 .../apache/activemq/factory/BrokerHandler.java  |  29 +
 .../apache/activemq/factory/CoreFactory.java    |  51 --
 .../activemq/factory/CoreFactoryHandler.java    |  26 -
 .../activemq/factory/FileBrokerHandler.java     |  34 ++
 .../factory/FileCoreFactoryHandler.java         |  33 --
 .../activemq/factory/FileJmsFactoryHandler.java |  36 --
 .../org/apache/activemq/factory/JmsFactory.java |  50 --
 .../activemq/factory/JmsFactoryHandler.java     |  26 -
 .../activemq/factory/SecurityHandler.java       |  28 +
 .../factory/SecurityManagerFactory.java         |   6 +-
 .../org/apache/activemq/integration/Broker.java |  26 +
 .../apache/activemq/integration/FileBroker.java |  98 ++++
 .../org/apache/activemq/broker/core/file        |  17 -
 .../org/apache/activemq/broker/jms/file         |  17 -
 .../activemq/broker/security/basic-security     |  17 +
 .../org/apache/activemq/broker/server/file      |  17 +
 .../apache/activemq/dto/BasicSecurityDTO.java   |  15 +
 .../java/org/apache/activemq/dto/BrokerDTO.java |   9 +-
 .../java/org/apache/activemq/dto/CoreDTO.java   |  32 --
 .../java/org/apache/activemq/dto/JmsDTO.java    |  33 --
 .../java/org/apache/activemq/dto/ServerDTO.java |  32 ++
 .../org/apache/activemq/dto/jaxb.index          |   2 -
 .../config/impl/FileJMSConfiguration.java       | 219 ++++++++
 .../jms/server/embedded/EmbeddedJMS.java        |  30 +-
 .../server/impl/JMSServerConfigParserImpl.java  | 205 -------
 .../jms/server/impl/JMSServerDeployer.java      | 153 ------
 .../jms/server/impl/JMSServerManagerImpl.java   |  71 +--
 .../src/main/resources/schema/activemq-jms.xsd  |   7 +-
 .../activemq/server/ActiveMQBootstrap.java      |  30 +-
 .../rest/queue/QueueDestinationsResource.java   |   5 +-
 .../rest/topic/TopicDestinationsResource.java   |   5 +-
 .../src/main/resources/schema/hornetq-rest.xsd  |   4 +-
 .../apache/activemq/rest/test/EmbeddedTest.java |   9 +
 .../test/resources/activemq-configuration.xml   |  67 ++-
 .../src/test/resources/activemq-jms.xml         |  24 -
 .../test/resources/activemq-roles.properties    |  17 +
 .../test/resources/activemq-users.properties    |  17 +
 .../src/test/resources/activemq-users.xml       |  23 -
 .../activemq/core/config/Configuration.java     |  11 -
 .../core/config/FileDeploymentManager.java      | 115 ++++
 .../core/config/impl/ConfigurationImpl.java     |  16 -
 .../core/config/impl/FileConfiguration.java     |  81 +--
 .../config/impl/FileSecurityConfiguration.java  | 127 +++++
 .../core/config/impl/SecurityConfiguration.java | 103 ++++
 .../activemq/core/deployers/Deployable.java     |  57 ++
 .../activemq/core/deployers/Deployer.java       |  57 --
 .../core/deployers/DeploymentManager.java       |  41 --
 .../deployers/impl/AddressSettingsDeployer.java | 106 ----
 .../impl/BasicUserCredentialsDeployer.java      | 149 -----
 .../deployers/impl/FileConfigurationParser.java |  10 -
 .../deployers/impl/FileDeploymentManager.java   | 337 ------------
 .../core/deployers/impl/QueueDeployer.java      |  97 ----
 .../core/deployers/impl/SecurityDeployer.java   | 117 ----
 .../core/deployers/impl/XmlDeployer.java        | 334 ------------
 .../org/apache/activemq/core/security/User.java |  80 +++
 .../activemq/core/server/ActiveMQServers.java   |   8 +-
 .../core/server/embedded/EmbeddedActiveMQ.java  |   7 +-
 .../core/server/impl/ActiveMQServerImpl.java    |  74 +--
 .../core/security/ActiveMQSecurityManager.java  |  35 +-
 .../security/ActiveMQSecurityManagerImpl.java   | 143 +----
 .../spi/core/security/JAASSecurityManager.java  |  61 +--
 .../org/apache/activemq/security/basic-security |  17 -
 .../resources/schema/activemq-configuration.xsd | 272 +++++----
 .../main/resources/schema/activemq-server.xsd   |  46 ++
 .../main/resources/schema/activemq-users.xsd    |  45 --
 .../core/config/impl/ConfigurationImplTest.java |   9 -
 .../impl/DefaultsFileConfigurationTest.java     |   8 +-
 .../impl/FileConfigurationParserTest.java       |  21 +-
 .../core/config/impl/FileConfigurationTest.java |  24 +-
 .../config/impl/HAPolicyConfigurationTest.java  |   7 +-
 .../activemq/tests/util/UnitTestCase.java       |   1 -
 .../resources/ConfigurationTest-defaults.xml    |   3 +-
 .../resources/ConfigurationTest-full-config.xml |  91 ++--
 .../resources/InvalidConfigurationTest0.xml     |   5 +-
 .../resources/InvalidConfigurationTest1.xml     |   5 +-
 .../resources/InvalidConfigurationTest2.xml     |   4 +-
 .../resources/InvalidConfigurationTest3.xml     |   5 +-
 .../resources/InvalidConfigurationTest4.xml     |   5 +-
 .../resources/InvalidConfigurationTest5.xml     |   5 +-
 .../resources/colocated-hapolicy-config.xml     |  61 ++-
 .../resources/colocated-hapolicy-config2.xml    |  46 +-
 .../resources/live-only-hapolicy-config.xml     |  24 +-
 .../resources/live-only-hapolicy-config2.xml    |  37 +-
 .../resources/live-only-hapolicy-config3.xml    |  15 +-
 .../resources/live-only-hapolicy-config4.xml    |   6 +-
 .../resources/live-only-hapolicy-config5.xml    |   4 +-
 .../test/resources/replica-hapolicy-config.xml  |  41 +-
 .../test/resources/replica-hapolicy-config2.xml |  43 +-
 .../test/resources/replica-hapolicy-config3.xml |  25 +-
 .../resources/replicated-hapolicy-config.xml    |  23 +-
 .../shared-store-master-hapolicy-config.xml     |  20 +-
 .../shared-store-slave-hapolicy-config.xml      |  36 +-
 .../shared-store-slave-hapolicy-config2.xml     |  40 +-
 .../shared-store-slave-hapolicy-config3.xml     |  22 +-
 distribution/activemq/pom.xml                   | 100 ----
 .../config/clustered/activemq-configuration.xml | 180 +++---
 .../resources/config/clustered/activemq-jms.xml |  29 -
 .../config/clustered/activemq-roles.properties  |  17 +
 .../config/clustered/activemq-users.properties  |  17 +
 .../config/clustered/activemq-users.xml         |  27 -
 .../resources/config/clustered/bootstrap.xml    |   2 +-
 .../non-clustered/activemq-configuration.xml    | 124 ++---
 .../config/non-clustered/activemq-jms.xml       |  29 -
 .../non-clustered/activemq-roles.properties     |  17 +
 .../non-clustered/activemq-users.properties     |  17 +
 .../config/non-clustered/activemq-users.xml     |  27 -
 .../config/non-clustered/bootstrap.xml          |  10 +-
 .../replicated/activemq-configuration.xml       | 201 +++----
 .../config/replicated/activemq-jms.xml          |  29 -
 .../config/replicated/activemq-roles.properties |  17 +
 .../config/replicated/activemq-users.properties |  17 +
 .../config/replicated/activemq-users.xml        |  27 -
 .../resources/config/replicated/bootstrap.xml   |   2 +-
 .../shared-store/activemq-configuration.xml     | 201 +++----
 .../config/shared-store/activemq-jms.xml        |  29 -
 .../shared-store/activemq-roles.properties      |  17 +
 .../shared-store/activemq-users.properties      |  17 +
 .../config/shared-store/activemq-users.xml      |  27 -
 .../resources/config/shared-store/bootstrap.xml |   2 +-
 .../server0/activemq-configuration.xml          |  79 ++-
 .../hornetq-configuration-messaging-lab.xml     |  71 ++-
 .../server0/activemq-configuration.xml          | 100 ++--
 .../src/main/resources/server0/activemq-jms.xml |  28 -
 .../resources/server0/activemq-roles.properties |  17 +
 .../resources/server0/activemq-users.properties |  17 +
 .../main/resources/server0/activemq-users.xml   |  27 -
 .../activemq/server0/activemq-configuration.xml |  80 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  77 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  64 ++-
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml |  66 ++-
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 123 +++--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml |  75 +--
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  75 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  38 +-
 .../resources/activemq/server0/activemq-jms.xml |  25 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 125 +++--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 148 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 149 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 129 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 125 ++---
 .../resources/activemq/server2/activemq-jms.xml |  28 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 155 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 157 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 168 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 162 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 162 +++---
 .../resources/activemq/server2/activemq-jms.xml |  28 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 154 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 152 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 153 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 152 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 153 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 153 +++---
 .../resources/activemq/server2/activemq-jms.xml |  28 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 132 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 132 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 120 ++--
 .../resources/activemq/server2/activemq-jms.xml |  25 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server3/activemq-configuration.xml | 120 ++--
 .../resources/activemq/server3/activemq-jms.xml |  25 -
 .../activemq/server3/activemq-roles.properties  |  17 +
 .../activemq/server3/activemq-users.properties  |  17 +
 .../activemq/server3/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 118 ++--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 120 ++--
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 104 ++--
 .../resources/activemq/server2/activemq-jms.xml |  25 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 152 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 226 ++++----
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 225 ++++----
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 182 ++++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 183 ++++---
 .../resources/activemq/server1/activemq-jms.xml |  27 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  91 ++--
 .../resources/activemq/server0/activemq-jms.xml |  31 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  89 +--
 .../resources/activemq/server0/activemq-jms.xml |  31 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 198 ++++---
 .../resources/activemq/server0/activemq-jms.xml |  38 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml |  65 ++-
 .../resources/activemq/server1/activemq-jms.xml |  31 --
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  62 ++-
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../main/resources/activemq-configuration.xml   |  36 +-
 .../src/main/resources/activemq-jms.xml         |  28 -
 .../main/resources/activemq-roles.properties    |  17 +
 .../main/resources/activemq-users.properties    |  17 +
 .../src/main/resources/activemq-users.xml       |  27 -
 .../activemq/server0/activemq-configuration.xml |  89 +--
 .../resources/activemq/server0/activemq-jms.xml |  31 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 188 ++++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 188 ++++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  62 ++-
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  66 ++-
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-configuration.xml |  70 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  35 +-
 .../resources/activemq/server0/activemq-jms.xml |  27 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml |  41 +-
 .../resources/activemq/server1/activemq-jms.xml |  27 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  64 ++-
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  86 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 111 ++--
 .../resources/activemq/server0/activemq-jms.xml |  31 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  82 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 121 ++--
 .../resources/activemq/server0/activemq-jms.xml |  31 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 148 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 148 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 150 ++---
 .../resources/activemq/server2/activemq-jms.xml |  28 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 150 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 148 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 148 ++---
 .../resources/activemq/server2/activemq-jms.xml |  28 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 128 +++--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 150 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  92 ++--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 140 ++---
 .../resources/activemq/server0/activemq-jms.xml |  30 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  51 +-
 .../resources/activemq/server0/activemq-jms.xml |  27 -
 .../activemq/server0/activemq-configuration.xml |  78 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  58 +-
 .../resources/activemq/server0/activemq-jms.xml |  30 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  68 ++-
 .../resources/activemq/server0/activemq-jms.xml |  30 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  29 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 175 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 179 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  88 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 138 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  31 --
 .../activemq/server0/activemq-configuration.xml | 140 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 144 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 164 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 172 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 150 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 152 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 150 ++---
 .../resources/activemq/server2/activemq-jms.xml |  28 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 154 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  88 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../src/main/resources/activemq-client.xml      |  20 +-
 .../main/resources/activemq-configuration.xml   |  58 +-
 .../src/main/resources/activemq-jms.xml         |  28 -
 .../main/resources/activemq-roles.properties    |  17 +
 .../main/resources/activemq-users.properties    |  17 +
 .../src/main/resources/activemq-users.xml       |  27 -
 .../main/resources/activemq-configuration.xml   |  46 +-
 .../src/main/resources/activemq-jms.xml         |  28 -
 .../main/resources/activemq-roles.properties    |  17 +
 .../main/resources/activemq-users.properties    |  17 +
 .../src/main/resources/activemq-users.xml       |  27 -
 .../src/main/resources/activemq-client.xml      |  20 +-
 .../main/resources/activemq-configuration.xml   |  58 +-
 .../src/main/resources/activemq-jms.xml         |  28 -
 .../main/resources/activemq-roles.properties    |  17 +
 .../main/resources/activemq-users.properties    |  17 +
 .../src/main/resources/activemq-users.xml       |  27 -
 .../push/src/main/resources/activemq-client.xml |  20 +-
 .../main/resources/activemq-configuration.xml   |  59 +-
 .../push/src/main/resources/activemq-jms.xml    |  29 -
 .../main/resources/activemq-roles.properties    |  17 +
 .../main/resources/activemq-users.properties    |  17 +
 .../push/src/main/resources/activemq-users.xml  |  27 -
 .../activemq/server0/activemq-configuration.xml | 194 +++----
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 185 ++++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 113 ++--
 .../resources/activemq/server0/activemq-jms.xml |  31 --
 .../activemq/server0/activemq-roles.properties  |  20 +
 .../activemq/server0/activemq-users.properties  |  20 +
 .../activemq/server0/activemq-users.xml         |  45 --
 .../activemq/server0/activemq-configuration.xml |  72 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../main/resources/activemq-configuration.xml   |  36 +-
 .../src/main/resources/activemq-jms.xml         |  28 -
 .../main/resources/activemq-roles.properties    |  17 +
 .../main/resources/activemq-users.properties    |  17 +
 .../src/main/resources/activemq-users.xml       |  27 -
 .../activemq/server0/activemq-configuration.xml |  84 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  76 +--
 .../resources/activemq/server0/activemq-jms.xml |  30 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  88 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  86 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  88 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  88 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  88 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 148 ++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 150 ++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 160 +++---
 .../resources/activemq/server0/activemq-jms.xml |  29 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server1/activemq-jms.xml |  29 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server2/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server2/activemq-jms.xml |  29 -
 .../activemq/server2/activemq-roles.properties  |  17 +
 .../activemq/server2/activemq-users.properties  |  17 +
 .../activemq/server2/activemq-users.xml         |  27 -
 .../activemq/server3/activemq-configuration.xml | 158 +++---
 .../resources/activemq/server3/activemq-jms.xml |  29 -
 .../activemq/server3/activemq-roles.properties  |  17 +
 .../activemq/server3/activemq-users.properties  |  17 +
 .../activemq/server3/activemq-users.xml         |  27 -
 .../activemq/server4/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server4/activemq-jms.xml |  29 -
 .../activemq/server4/activemq-roles.properties  |  17 +
 .../activemq/server4/activemq-users.properties  |  17 +
 .../activemq/server4/activemq-users.xml         |  27 -
 .../activemq/server5/activemq-configuration.xml | 156 +++---
 .../resources/activemq/server5/activemq-jms.xml |  29 -
 .../activemq/server5/activemq-roles.properties  |  17 +
 .../activemq/server5/activemq-users.properties  |  17 +
 .../activemq/server5/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 106 ++--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  69 ++-
 .../resources/activemq/server0/activemq-jms.xml |  39 --
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml | 152 +++---
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server1/activemq-configuration.xml | 154 +++---
 .../resources/activemq/server1/activemq-jms.xml |  28 -
 .../activemq/server1/activemq-roles.properties  |  17 +
 .../activemq/server1/activemq-users.properties  |  17 +
 .../activemq/server1/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../activemq/server0/activemq-configuration.xml |  74 +--
 .../resources/activemq/server0/activemq-jms.xml |  28 -
 .../activemq/server0/activemq-roles.properties  |  17 +
 .../activemq/server0/activemq-users.properties  |  17 +
 .../activemq/server0/activemq-users.xml         |  27 -
 .../normal/server0/activemq-configuration.xml   |  72 +--
 examples/soak/normal/server0/activemq-jms.xml   |  27 -
 .../tests/integration/InterceptorTest.java      |  12 +-
 .../client/AutoCreateJmsQueueTest.java          |  13 +-
 .../cluster/failover/SecurityFailoverTest.java  |  14 +-
 .../core/deployers/impl/QueueDeployerTest.java  |  96 ----
 .../tests/integration/jms/JMSSecurityTest.java  |   9 +-
 .../jms/server/JMSServerDeployerTest.java       |  20 -
 .../jms/server/JMSServerStartStopTest.java      |  13 +-
 .../config/JMSServerConfigParserTest.java       |  19 +-
 .../server/management/JMSQueueControlTest.java  |   3 +-
 ...tyManagementWithConfiguredAdminUserTest.java |  10 +-
 .../management/SecurityNotificationTest.java    |  16 +-
 .../integration/openwire/OpenWireTestBase.java  |  18 +-
 .../ra/ActiveMQMessageHandlerSecurityTest.java  |   6 +-
 .../ra/ActiveMQRAClusteredTestBase.java         |   1 -
 .../tests/integration/ra/JMSContextTest.java    |  12 +-
 .../integration/ra/OutgoingConnectionTest.java  |  12 +-
 .../ra/OutgoingConnectionTestJTA.java           |  11 +-
 .../integration/security/SecurityTest.java      | 232 ++++----
 .../activemq-jms-for-JMSServerDeployerTest.xml  |   9 +-
 .../activemq-jms-for-JMSServerDeployerTest2.xml |  25 -
 .../resources/server-start-stop-config1.xml     |  63 ++-
 .../resources/server-start-stop-jms-config1.xml |  23 -
 .../test/resources/spring-activemq-config.xml   |  63 ++-
 .../src/test/resources/spring-activemq-jms.xml  |  24 -
 .../src/test/resources/spring-jms-beans.xml     |   1 -
 .../tests/tools/container/LocalTestServer.java  |   7 +-
 .../test/resources/activemq-configuration.xml   |  18 +-
 .../src/test/resources/activemq-jms.xml         |  22 -
 .../src/test/resources/activemq-queues.xml      |  32 --
 .../src/test/resources/activemq-users.xml       |  26 -
 .../apache/activemq/jms/SpawnedJMSServer.java   |   3 +-
 .../jms/bridge/impl/JMSBridgeImplTest.java      |   1 -
 .../impl/ConfigurationValidationTest.java       |   9 +-
 .../impl/AddressSettingsDeployerTest.java       | 136 -----
 .../impl/BasicUserCredentialsDeployerTest.java  | 546 -------------------
 .../deployers/impl/FakeDeploymentManager.java   |  51 --
 .../impl/FileDeploymentManagerTest.java         | 439 ---------------
 .../deployers/impl/SecurityDeployerTest.java    | 317 -----------
 .../core/deployers/impl/XMLDeployerTest.java    | 267 ---------
 .../impl/ActiveMQSecurityManagerImplTest.java   |  44 +-
 849 files changed, 15658 insertions(+), 20925 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
index a83be75..9df46c0 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
@@ -21,25 +21,16 @@ import io.airlift.command.Command;
 
 import org.apache.activemq.cli.ActiveMQ;
 import org.apache.activemq.components.ExternalComponent;
-import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
 import org.apache.activemq.dto.BrokerDTO;
 import org.apache.activemq.dto.ComponentDTO;
 import org.apache.activemq.factory.BrokerFactory;
-import org.apache.activemq.factory.CoreFactory;
-import org.apache.activemq.factory.JmsFactory;
 import org.apache.activemq.factory.SecurityManagerFactory;
+import org.apache.activemq.integration.Broker;
 import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
 import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
 
-import javax.management.MBeanServer;
-
 import java.io.File;
-import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -50,9 +41,10 @@ public class Run implements Action
 
    @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'")
    String configuration;
-   private JMSServerManager jmsServerManager;
    private ArrayList<ActiveMQComponent> components = new ArrayList<>();
 
+   private Broker server;
+
    @Override
    public Object execute(ActionContext context) throws Exception
    {
@@ -68,32 +60,15 @@ public class Run implements Action
 
       System.out.println("Loading configuration file: " + configuration);
 
-      BrokerDTO broker = BrokerFactory.createBroker(configuration);
-
-      addShutdownHook(new File(broker.core.configuration).getParentFile());
+      BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration);
 
-      Configuration core = CoreFactory.create(broker.core);
-
-      JMSConfiguration jms = JmsFactory.create(broker.jms);
+      addShutdownHook(new File(broker.server.configuration).getParentFile());
 
       ActiveMQSecurityManager security = SecurityManagerFactory.create(broker.security);
 
-      MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
-
-      ActiveMQServerImpl server = new ActiveMQServerImpl(core, mBeanServer, security);
-
-      if (jms != null)
-      {
-         jmsServerManager = new JMSServerManagerImpl(server, jms);
-      }
-      else
-      {
-         jmsServerManager = new JMSServerManagerImpl(server);
-      }
-
-      ActiveMQBootstrapLogger.LOGGER.serverStarting();
+      server = BrokerFactory.createServer(broker.server, security);
 
-      jmsServerManager.start();
+      server.start();
 
       if (broker.web != null)
       {
@@ -139,7 +114,7 @@ public class Run implements Action
                   try
                   {
                      //TODO stop components
-                     jmsServerManager.stop();
+                     server.stop();
                   }
                   catch (Exception e)
                   {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
index 3aee94d..e0fdc4b 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
@@ -36,9 +36,9 @@ public class Stop implements Action
       {
          configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
       }
-      BrokerDTO broker = BrokerFactory.createBroker(configuration);
+      BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration);
 
-      File file = new File(broker.core.configuration).getParentFile();
+      File file = new File(broker.server.configuration).getParentFile();
 
       File stopFile = new File(file, "STOP_ME");
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java
new file mode 100644
index 0000000..6244440
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.factory;
+
+import org.apache.activemq.core.config.impl.FileSecurityConfiguration;
+import org.apache.activemq.dto.BasicSecurityDTO;
+import org.apache.activemq.dto.SecurityDTO;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ */
+public class BasicSecurityHandler implements SecurityHandler
+{
+   @Override
+   public ActiveMQSecurityManager createSecurityManager(SecurityDTO security) throws Exception
+   {
+      BasicSecurityDTO fileSecurity = (BasicSecurityDTO) security;
+      String home = System.getProperty("activemq.home");
+      FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration(fileSecurity.users.replace("${activemq.home}", home).replace("\\", "/"),
+                                                                                      fileSecurity.roles.replace("${activemq.home}", home).replace("\\", "/"),
+                                                                                      fileSecurity.defaultUser,
+                                                                                      fileSecurity.maskPassword,
+                                                                                      fileSecurity.passwordCodec);
+      securityConfiguration.start();
+      return new ActiveMQSecurityManagerImpl(securityConfiguration);
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
index 1320099..ba11d56 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
@@ -18,6 +18,9 @@ package org.apache.activemq.factory;
 
 import org.apache.activemq.cli.ConfigurationException;
 import org.apache.activemq.dto.BrokerDTO;
+import org.apache.activemq.dto.ServerDTO;
+import org.apache.activemq.integration.Broker;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
 import org.apache.activemq.utils.FactoryFinder;
 
 import java.io.IOException;
@@ -26,7 +29,7 @@ import java.net.URI;
 public class BrokerFactory
 {
 
-   public static BrokerDTO createBroker(URI configURI) throws Exception
+   public static BrokerDTO createBrokerConfiguration(URI configURI) throws Exception
    {
       if (configURI.getScheme() == null)
       {
@@ -48,9 +51,30 @@ public class BrokerFactory
       return factory.createBroker(configURI);
    }
 
-   public static BrokerDTO createBroker(String configuration) throws Exception
+   public static BrokerDTO createBrokerConfiguration(String configuration) throws Exception
    {
-      return createBroker(new URI(configuration));
+      return createBrokerConfiguration(new URI(configuration));
+   }
+
+   public static Broker createServer(ServerDTO brokerDTO, ActiveMQSecurityManager security) throws Exception
+   {
+      if (brokerDTO.configuration != null)
+      {
+         BrokerHandler handler;
+         URI configURI = new URI(brokerDTO.configuration.replace("\\", "/"));
+         try
+         {
+            FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/server/");
+            handler = (BrokerHandler)finder.newInstance(configURI.getScheme());
+         }
+         catch (IOException ioe )
+         {
+            throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme());
+         }
+
+         return handler.createServer(brokerDTO, security);
+      }
+      return null;
    }
 
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java
new file mode 100644
index 0000000..1e8b71d
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.factory;
+
+import org.apache.activemq.dto.ServerDTO;
+import org.apache.activemq.integration.Broker;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ */
+public interface BrokerHandler
+{
+   Broker createServer(ServerDTO brokerDTO, ActiveMQSecurityManager security);
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
deleted file mode 100644
index eb777bf..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.factory;
-
-import org.apache.activemq.cli.ConfigurationException;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.dto.CoreDTO;
-import org.apache.activemq.utils.FactoryFinder;
-
-import java.io.IOException;
-import java.net.URI;
-
-public class CoreFactory
-{
-   public static Configuration create(CoreDTO core) throws Exception
-   {
-      if (core.configuration != null)
-      {
-         CoreFactoryHandler factory = null;
-         URI configURI = new URI(core.configuration.replace("\\", "/"));
-         try
-         {
-            FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/core/");
-            factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme());
-         }
-         catch (IOException ioe )
-         {
-            throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme());
-         }
-
-         return factory.createConfiguration(configURI);
-      }
-      return new ConfigurationImpl();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java
deleted file mode 100644
index 9f76cb0..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.factory;
-
-import org.apache.activemq.core.config.Configuration;
-
-import java.net.URI;
-
-public interface CoreFactoryHandler
-{
-   Configuration createConfiguration(URI configuration) throws Exception;
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java
new file mode 100644
index 0000000..1c4601d
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.factory;
+
+import org.apache.activemq.dto.ServerDTO;
+import org.apache.activemq.integration.Broker;
+import org.apache.activemq.integration.FileBroker;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ */
+public class FileBrokerHandler implements BrokerHandler
+{
+   @Override
+   public Broker createServer(ServerDTO brokerDTO, ActiveMQSecurityManager security)
+   {
+      return new FileBroker(brokerDTO, security);
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java
deleted file mode 100644
index e0fdaed..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.factory;
-
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-
-import java.net.URI;
-
-public class FileCoreFactoryHandler implements CoreFactoryHandler
-{
-   @Override
-   public Configuration createConfiguration(URI configuration) throws Exception
-   {
-      FileConfiguration fileConfiguration = new FileConfiguration(configuration.toURL().toExternalForm());
-      fileConfiguration.start();
-      return fileConfiguration;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java
deleted file mode 100644
index 6d6aff1..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.factory;
-
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URI;
-
-public class FileJmsFactoryHandler implements JmsFactoryHandler
-{
-   @Override
-   public JMSConfiguration createConfiguration(URI configuration) throws Exception
-   {
-      try (InputStream configIn = new FileInputStream(configuration.getSchemeSpecificPart()))
-      {
-         return new JMSServerConfigParserImpl().parseConfiguration(configIn);
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
deleted file mode 100644
index 5b1a990..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.factory;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.apache.activemq.cli.ConfigurationException;
-import org.apache.activemq.dto.JmsDTO;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.utils.FactoryFinder;
-
-public class JmsFactory
-{
-   public static JMSConfiguration create(JmsDTO jms) throws Exception
-   {
-      if (jms != null && jms.configuration != null)
-      {
-         JmsFactoryHandler factory = null;
-         URI configURI = new URI(jms.configuration.replace("\\", "/"));
-         try
-         {
-            FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/jms/");
-            factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme());
-         }
-         catch (IOException ioe )
-         {
-            throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme());
-         }
-
-         return factory.createConfiguration(configURI);
-      }
-
-      return null;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java
deleted file mode 100644
index 6a35508..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.factory;
-
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-
-import java.net.URI;
-
-public interface JmsFactoryHandler
-{
-   JMSConfiguration createConfiguration(URI configuration) throws Exception;
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java
new file mode 100644
index 0000000..30eb25f
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.factory;
+
+import org.apache.activemq.dto.SecurityDTO;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ */
+public interface SecurityHandler
+{
+   ActiveMQSecurityManager createSecurityManager(SecurityDTO securityDTO) throws Exception;
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
index f128c36..2c58007 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
@@ -29,9 +29,9 @@ public class SecurityManagerFactory
    {
       if (config != null)
       {
-         FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/security/");
-         ActiveMQSecurityManager manager = (ActiveMQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name());
-         return manager;
+         FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/security/");
+         SecurityHandler securityHandler = (SecurityHandler)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name());
+         return securityHandler.createSecurityManager(config);
       }
       else
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java
new file mode 100644
index 0000000..8ba2f32
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.integration;
+
+import org.apache.activemq.core.server.ActiveMQComponent;
+
+/**
+ * A Broker os a set of ActiveMQComponents that create a Server, for instance core and jms.
+ */
+public interface Broker extends ActiveMQComponent
+{
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java
new file mode 100644
index 0000000..82e05bf
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.integration;
+
+import org.apache.activemq.core.config.FileDeploymentManager;
+import org.apache.activemq.core.config.impl.FileConfiguration;
+import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.dto.ServerDTO;
+import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger;
+import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+
+import java.lang.management.ManagementFactory;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ */
+public class FileBroker implements Broker
+{
+   private final String configurationUrl;
+
+   private boolean started;
+
+   private final ActiveMQSecurityManager securityManager;
+
+   private Map<String, ActiveMQComponent> components;
+
+   public FileBroker(ServerDTO broker, ActiveMQSecurityManager security)
+   {
+      this.securityManager = security;
+      this.configurationUrl = broker.configuration;
+   }
+
+
+   public synchronized void start() throws Exception
+   {
+      if (started)
+      {
+         return;
+      }
+
+      //todo if we start to pullout more configs from the main config then we should pull out the configuration objects from factories if available
+      FileConfiguration configuration = new FileConfiguration();
+      FileJMSConfiguration jmsConfiguration = new FileJMSConfiguration();
+
+      FileDeploymentManager fileDeploymentManager = new FileDeploymentManager(configurationUrl);
+      fileDeploymentManager.addDeployable(configuration).addDeployable(jmsConfiguration);
+      fileDeploymentManager.readConfiguration();
+
+      components = fileDeploymentManager.buildService(securityManager, ManagementFactory.getPlatformMBeanServer());
+
+      ActiveMQBootstrapLogger.LOGGER.serverStarting();
+      for (ActiveMQComponent component : components.values())
+      {
+         component.start();
+      }
+      started = true;
+
+
+   }
+
+   @Override
+   public void stop() throws Exception
+   {
+      if (!started)
+      {
+         return;
+      }
+      ActiveMQComponent[] mqComponents = new ActiveMQComponent[components.size()];
+      components.values().toArray(mqComponents);
+      for (int i = mqComponents.length - 1; i >= 0; i--)
+      {
+         mqComponents[i].stop();
+      }
+      started = false;
+   }
+
+   @Override
+   public boolean isStarted()
+   {
+      return false;
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file
deleted file mode 100644
index eee1798..0000000
--- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file
+++ /dev/null
@@ -1,17 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0 
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##   
-##     http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and 
-## limitations under the License.
-## ---------------------------------------------------------------------------
-class=org.apache.activemq.factory.FileCoreFactoryHandler

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file
deleted file mode 100644
index 08e1f76..0000000
--- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file
+++ /dev/null
@@ -1,17 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-##     http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-class=org.apache.activemq.factory.FileJmsFactoryHandler


Mime
View raw message