activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [19/20] activemq-6 git commit: ACTIVEMQ6-4 - rename all config files
Date Tue, 18 Nov 2014 16:12:32 GMT
ACTIVEMQ6-4 - rename all config files

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

rename all the config files to activemq and fix schema names in them


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

Branch: refs/heads/master
Commit: aeaba39219c6202ccbdf8710f9439cef1eba0f7b
Parents: 571fb7a
Author: Andy Taylor <andytaylor@apache.org>
Authored: Tue Nov 18 14:38:35 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Tue Nov 18 15:54:53 2014 +0000

----------------------------------------------------------------------
 .../jms/server/impl/JMSServerDeployer.java      |   2 +-
 .../test/resources/activemq-configuration.xml   |  34 +++++
 .../src/test/resources/activemq-jms.xml         |  19 +++
 .../src/test/resources/activemq-users.xml       |   7 ++
 .../test/resources/hornetq-configuration.xml    |  34 -----
 .../src/test/resources/hornetq-jms.xml          |  19 ---
 .../src/test/resources/hornetq-users.xml        |   7 --
 .../core/config/impl/FileConfiguration.java     |   2 +-
 .../deployers/impl/AddressSettingsDeployer.java |   2 +-
 .../impl/BasicUserCredentialsDeployer.java      |   2 +-
 .../deployers/impl/FileConfigurationParser.java |   2 +-
 .../core/deployers/impl/QueueDeployer.java      |   2 +-
 .../core/deployers/impl/SecurityDeployer.java   |   2 +-
 .../core/server/embedded/EmbeddedHornetQ.java   |   4 +-
 .../impl/FileConfigurationParserTest.java       |   2 +-
 .../WrongRoleFileConfigurationParserTest.java   |   2 +-
 .../resources/ConfigurationTest-defaults.xml    |   2 +-
 .../resources/ConfigurationTest-full-config.xml |   2 +-
 .../resources/InvalidConfigurationTest0.xml     |   2 +-
 .../resources/InvalidConfigurationTest1.xml     |   2 +-
 .../resources/InvalidConfigurationTest2.xml     |   2 +-
 .../resources/InvalidConfigurationTest3.xml     |   2 +-
 .../resources/InvalidConfigurationTest4.xml     |   2 +-
 .../resources/InvalidConfigurationTest5.xml     |   2 +-
 .../resources/colocated-hapolicy-config.xml     |   2 +-
 .../resources/colocated-hapolicy-config2.xml    |   2 +-
 .../resources/divertRoutingNameNotRequired.xml  |   2 +-
 .../resources/live-only-hapolicy-config.xml     |   2 +-
 .../resources/live-only-hapolicy-config2.xml    |   2 +-
 .../resources/live-only-hapolicy-config3.xml    |   2 +-
 .../resources/live-only-hapolicy-config4.xml    |   2 +-
 .../resources/live-only-hapolicy-config5.xml    |   2 +-
 .../test/resources/replica-hapolicy-config.xml  |   2 +-
 .../test/resources/replica-hapolicy-config2.xml |   2 +-
 .../test/resources/replica-hapolicy-config3.xml |   2 +-
 .../resources/replicated-hapolicy-config.xml    |   2 +-
 .../shared-store-master-hapolicy-config.xml     |   2 +-
 .../shared-store-slave-hapolicy-config.xml      |   2 +-
 .../shared-store-slave-hapolicy-config2.xml     |   2 +-
 .../shared-store-slave-hapolicy-config3.xml     |   2 +-
 .../config/clustered/activemq-configuration.xml |   2 +-
 .../resources/config/clustered/activemq-jms.xml |   2 +-
 .../config/clustered/activemq-users.xml         |   2 +-
 .../non-clustered/activemq-configuration.xml    |   2 +-
 .../config/non-clustered/activemq-jms.xml       |   2 +-
 .../config/non-clustered/activemq-users.xml     |   2 +-
 .../replicated/activemq-configuration.xml       |   2 +-
 .../config/replicated/activemq-jms.xml          |   2 +-
 .../config/replicated/activemq-users.xml        |   2 +-
 .../shared-store/activemq-configuration.xml     |   2 +-
 .../config/shared-store/activemq-jms.xml        |   2 +-
 .../config/shared-store/activemq-users.xml      |   2 +-
 docs/eap-manual/en/clusters.xml                 |   2 +-
 docs/user-manual/en/large-messages.xml          |   2 +-
 docs/user-manual/en/paging.xml                  |   2 +-
 docs/user-manual/en/security.xml                |   2 +-
 docs/user-manual/en/spring-integration.xml      |   2 +-
 docs/user-manual/en/using-jms.xml               |   4 +-
 docs/user-manual/zh/large-messages.xml          |   2 +-
 docs/user-manual/zh/paging.xml                  |   2 +-
 docs/user-manual/zh/security.xml                |   2 +-
 docs/user-manual/zh/using-jms.xml               |   4 +-
 .../server0/activemq-configuration.xml          |  53 ++++++++
 .../hornetq-configuration-messaging-lab.xml     |   2 +-
 .../resources/server0/hornetq-configuration.xml |  53 --------
 .../server0/activemq-configuration.xml          |  71 +++++++++++
 .../src/main/resources/server0/activemq-jms.xml |  19 +++
 .../main/resources/server0/activemq-users.xml   |   7 ++
 .../resources/server0/hornetq-configuration.xml |  71 -----------
 .../src/main/resources/server0/hornetq-jms.xml  |  19 ---
 .../main/resources/server0/hornetq-users.xml    |   7 --
 .../server0/activemq-configuration.xml          |  61 +++++++++
 .../src/main/resources/server0/activemq-jms.xml |  19 +++
 .../main/resources/server0/activemq-users.xml   |   7 ++
 .../resources/server0/hornetq-configuration.xml |  61 ---------
 .../src/main/resources/server0/hornetq-jms.xml  |  19 ---
 .../main/resources/server0/hornetq-users.xml    |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  61 +++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  61 ---------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  41 ++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  41 ------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  39 ++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  39 ------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  40 ++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  40 ------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  44 +++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  44 -------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  30 +++++
 .../resources/hornetq/server0/activemq-jms.xml  |  14 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  30 -----
 .../resources/hornetq/server0/hornetq-jms.xml   |  14 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  33 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  33 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  73 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  17 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  73 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  17 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  17 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  17 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  17 +++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  17 ---
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  83 ++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  83 ------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  80 ++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  80 ------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  80 ++++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  19 +++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  80 ------------
 .../resources/hornetq/server2/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  74 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  74 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  74 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  74 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  19 +++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  64 ++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  31 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  64 ----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  64 ++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  31 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  64 ----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  77 ++++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  45 +++++++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  77 ------------
 .../resources/hornetq/server2/hornetq-jms.xml   |  45 -------
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server3/activemq-configuration.xml  |  77 ++++++++++++
 .../resources/hornetq/server3/activemq-jms.xml  |  45 +++++++
 .../hornetq/server3/activemq-users.xml          |   7 ++
 .../hornetq/server3/hornetq-configuration.xml   |  77 ------------
 .../resources/hornetq/server3/hornetq-jms.xml   |  45 -------
 .../resources/hornetq/server3/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  77 ++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  31 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  77 ------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  77 ++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  31 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  77 ------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  69 ++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  45 +++++++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  69 ----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  45 -------
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  74 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  74 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  99 +++++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  30 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  99 ---------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  | 100 +++++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  30 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   | 100 ---------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  90 +++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  30 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  90 -------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  90 +++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  30 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  90 -------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  50 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  50 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  49 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  49 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  96 ++++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  38 ++++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  96 --------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  38 ------
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  45 +++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  24 ++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  45 -------
 .../resources/hornetq/server1/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  44 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  44 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../main/resources/activemq-configuration.xml   |  34 +++++
 .../src/main/resources/activemq-jms.xml         |  19 +++
 .../src/main/resources/activemq-users.xml       |   7 ++
 .../main/resources/hornetq-configuration.xml    |  34 -----
 .../src/main/resources/hornetq-jms.xml          |  19 ---
 .../src/main/resources/hornetq-users.xml        |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  50 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  50 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  93 ++++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  30 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  93 --------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  93 ++++++++++++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  93 --------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  46 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  46 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  45 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  10 ++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  45 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  10 --
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  47 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  47 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  35 ++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  27 ++++
 .../hornetq/server0/hornetq-configuration.xml   |  35 ------
 .../resources/hornetq/server0/hornetq-jms.xml   |  27 ----
 .../resources/hornetq/server0/hornetq-users.xml |   2 +-
 .../hornetq/server1/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  27 ++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server1/hornetq-jms.xml   |  27 ----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  45 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  45 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  50 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  18 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  50 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  18 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  58 +++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  23 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  58 ---------
 .../resources/hornetq/server0/hornetq-jms.xml   |  23 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  56 +++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  18 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  56 ---------
 .../resources/hornetq/server0/hornetq-jms.xml   |  18 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  64 ++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  64 ----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |   2 +-
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  33 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  33 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  32 +++++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  73 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  33 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  73 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  33 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  32 +++++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  71 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  32 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  71 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  50 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  50 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  67 ++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  23 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  67 ----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  23 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  34 +++++
 .../resources/hornetq/server0/activemq-jms.xml  |  18 +++
 .../hornetq-configuration-messaging-lab.xml     |   2 +-
 .../hornetq/server0/hornetq-configuration.xml   |  34 -----
 .../resources/hornetq/server0/hornetq-jms.xml   |  18 ---
 .../hornetq/server0/activemq-configuration.xml  |  46 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  46 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  24 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  24 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  35 ++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  10 ++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  35 ------
 .../resources/hornetq/server0/hornetq-jms.xml   |  10 --
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  10 ++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  10 --
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  41 ++++++
 .../resources/hornetq/server0/activemq-jms.xml  |   9 ++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  41 ------
 .../resources/hornetq/server0/hornetq-jms.xml   |   9 --
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  86 +++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  86 -------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  87 +++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  19 +++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  87 -------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  50 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  50 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  41 ++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  41 ------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  66 ++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  51 ++++++++
 .../hornetq/server0/activemq-users.xml          |  11 ++
 .../hornetq/server0/hornetq-configuration.xml   |  66 ----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  51 --------
 .../resources/hornetq/server0/hornetq-users.xml |  11 --
 .../hornetq/server0/activemq-configuration.xml  |  69 ++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  33 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  69 ----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  33 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  70 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  70 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  80 ++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  33 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  80 ------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  33 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  83 ++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  83 ------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  73 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  33 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  73 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  33 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  77 ++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  77 ------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  32 +++++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  74 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  31 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  74 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  79 ++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  31 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  79 ------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  49 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  49 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../main/resources/activemq-configuration.xml   |  38 ++++++
 .../src/main/resources/activemq-jms.xml         |  19 +++
 .../src/main/resources/activemq-users.xml       |   7 ++
 .../src/main/resources/hornetq-client.xml       |   2 +-
 .../main/resources/hornetq-configuration.xml    |  38 ------
 .../dup-send/src/main/resources/hornetq-jms.xml |  19 ---
 .../src/main/resources/hornetq-users.xml        |   7 --
 .../main/resources/activemq-configuration.xml   |  34 +++++
 .../src/main/resources/activemq-jms.xml         |  19 +++
 .../src/main/resources/activemq-users.xml       |   7 ++
 .../main/resources/hornetq-configuration.xml    |  34 -----
 .../src/main/resources/hornetq-jms.xml          |  19 ---
 .../src/main/resources/hornetq-users.xml        |   7 --
 .../main/resources/activemq-configuration.xml   |  38 ++++++
 .../src/main/resources/activemq-jms.xml         |  19 +++
 .../src/main/resources/activemq-users.xml       |   7 ++
 .../src/main/resources/hornetq-client.xml       |   2 +-
 .../main/resources/hornetq-configuration.xml    |  38 ------
 .../src/main/resources/hornetq-jms.xml          |  19 ---
 .../src/main/resources/hornetq-users.xml        |   7 --
 .../main/resources/activemq-configuration.xml   |  38 ++++++
 .../push/src/main/resources/activemq-jms.xml    |  22 ++++
 .../push/src/main/resources/activemq-users.xml  |   7 ++
 .../push/src/main/resources/hornetq-client.xml  |   2 +-
 .../main/resources/hornetq-configuration.xml    |  38 ------
 .../push/src/main/resources/hornetq-jms.xml     |  22 ----
 .../push/src/main/resources/hornetq-users.xml   |   7 --
 .../hornetq/server0/activemq-configuration.xml  | 100 +++++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  30 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   | 100 ---------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  91 ++++++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  30 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  91 --------------
 .../resources/hornetq/server1/hornetq-jms.xml   |  30 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  60 +++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  28 +++++
 .../hornetq/server0/activemq-users.xml          |  25 ++++
 .../hornetq/server0/hornetq-configuration.xml   |  60 ---------
 .../resources/hornetq/server0/hornetq-jms.xml   |  28 -----
 .../resources/hornetq/server0/hornetq-users.xml |  25 ----
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../main/resources/activemq-configuration.xml   |  34 +++++
 .../src/main/resources/activemq-jms.xml         |  19 +++
 .../src/main/resources/activemq-users.xml       |   7 ++
 .../main/resources/hornetq-configuration.xml    |  34 -----
 .../src/main/resources/hornetq-jms.xml          |  19 ---
 .../src/main/resources/hornetq-users.xml        |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  53 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  53 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  49 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  49 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  49 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  49 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  51 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  51 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  51 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  51 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  51 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  51 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  32 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  72 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  32 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  72 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  32 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  78 ++++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  22 ++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  78 ------------
 .../resources/hornetq/server0/hornetq-jms.xml   |  22 ----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  22 ++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  22 ----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server2/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server2/activemq-jms.xml  |  22 ++++
 .../hornetq/server2/activemq-users.xml          |   7 ++
 .../hornetq/server2/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server2/hornetq-jms.xml   |  22 ----
 .../resources/hornetq/server2/hornetq-users.xml |   7 --
 .../hornetq/server3/activemq-configuration.xml  |  76 +++++++++++
 .../resources/hornetq/server3/activemq-jms.xml  |  22 ++++
 .../hornetq/server3/activemq-users.xml          |   7 ++
 .../hornetq/server3/hornetq-configuration.xml   |  76 -----------
 .../resources/hornetq/server3/hornetq-jms.xml   |  22 ----
 .../resources/hornetq/server3/hornetq-users.xml |   7 --
 .../hornetq/server4/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server4/activemq-jms.xml  |  22 ++++
 .../hornetq/server4/activemq-users.xml          |   7 ++
 .../hornetq/server4/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server4/hornetq-jms.xml   |  22 ----
 .../resources/hornetq/server4/hornetq-users.xml |   7 --
 .../hornetq/server5/activemq-configuration.xml  |  75 +++++++++++
 .../resources/hornetq/server5/activemq-jms.xml  |  22 ++++
 .../hornetq/server5/activemq-users.xml          |   7 ++
 .../hornetq/server5/hornetq-configuration.xml   |  75 -----------
 .../resources/hornetq/server5/hornetq-jms.xml   |  22 ----
 .../resources/hornetq/server5/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  50 ++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  50 --------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  43 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  40 ++++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  43 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  40 ------
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  74 +++++++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  31 +++++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  74 -----------
 .../resources/hornetq/server0/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server1/activemq-configuration.xml  |  74 +++++++++++
 .../resources/hornetq/server1/activemq-jms.xml  |  31 +++++
 .../hornetq/server1/activemq-users.xml          |   7 ++
 .../hornetq/server1/hornetq-configuration.xml   |  74 -----------
 .../resources/hornetq/server1/hornetq-jms.xml   |  31 -----
 .../resources/hornetq/server1/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  19 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  19 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../hornetq/server0/activemq-configuration.xml  |  42 +++++++
 .../resources/hornetq/server0/activemq-jms.xml  |  20 +++
 .../hornetq/server0/activemq-users.xml          |   7 ++
 .../hornetq/server0/hornetq-configuration.xml   |  42 -------
 .../resources/hornetq/server0/hornetq-jms.xml   |  20 ---
 .../resources/hornetq/server0/hornetq-users.xml |   7 --
 .../normal/server0/activemq-configuration.xml   |  38 ++++++
 examples/soak/normal/server0/activemq-jms.xml   |  23 ++++
 .../normal/server0/hornetq-configuration.xml    |  38 ------
 examples/soak/normal/server0/hornetq-jms.xml    |  23 ----
 .../config/server-start-stop-backup-config1.xml |   2 +-
 .../server-start-stop-backup-jms-config1.xml    |   2 +-
 tests/config/server-start-stop-live-config1.xml |   2 +-
 .../server-start-stop-live-jms-config1.xml      |   2 +-
 .../colocated-server-start-stop-config1.xml     |   2 +-
 .../colocated-server-start-stop-config2.xml     |   2 +-
 .../colocated-server-start-stop-jms-config1.xml |   2 +-
 .../colocated-server-start-stop-jms-config2.xml |   2 +-
 .../hornetq-jms-for-JMSServerDeployerTest.xml   |   2 +-
 .../hornetq-jms-for-JMSServerDeployerTest2.xml  |   2 +-
 .../resources/server-start-stop-config1.xml     |   2 +-
 .../resources/server-start-stop-jms-config1.xml |   2 +-
 .../test/resources/spring-hornetq-config.xml    |   2 +-
 .../src/test/resources/spring-hornetq-jms.xml   |   2 +-
 .../test/resources/activemq-configuration.xml   |  38 ++++++
 .../src/test/resources/activemq-jms.xml         | 126 +++++++++++++++++++
 .../src/test/resources/activemq-users.xml       |  10 ++
 .../test/resources/hornetq-configuration.xml    |  38 ------
 .../src/test/resources/hornetq-jms.xml          | 126 -------------------
 .../src/test/resources/hornetq-queues.xml       |   2 +-
 .../src/test/resources/hornetq-users.xml        |  10 --
 .../impl/ConfigurationValidationTest.java       |   4 +-
 921 files changed, 13011 insertions(+), 13060 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
index 6987dc5..ae5730a 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
@@ -80,7 +80,7 @@ public class JMSServerDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-jms.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-jms.xsd");
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-rest/src/test/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/activemq-configuration.xml b/activemq-rest/src/test/resources/activemq-configuration.xml
new file mode 100644
index 0000000..3004a78
--- /dev/null
+++ b/activemq-rest/src/test/resources/activemq-configuration.xml
@@ -0,0 +1,34 @@
+<configuration xmlns="urn:activemq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+
+    <persistence-enabled>false</persistence-enabled>
+    <!-- Connectors -->
+
+    <connectors>
+        <connector name="in-vm">
+            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+        </connector>
+    </connectors>
+
+    <acceptors>
+        <acceptor name="in-vm">
+            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+        </acceptor>
+    </acceptors>
+
+    <!-- Other config -->
+
+    <security-settings>
+        <!--security for example queue-->
+        <security-setting match="jms.queue.exampleQueue">
+            <permission type="createDurableQueue" roles="guest"/>
+            <permission type="deleteDurableQueue" roles="guest"/>
+            <permission type="createNonDurableQueue" roles="guest"/>
+            <permission type="deleteNonDurableQueue" roles="guest"/>
+            <permission type="consume" roles="guest"/>
+            <permission type="send" roles="guest"/>
+        </security-setting>
+    </security-settings>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-rest/src/test/resources/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/activemq-jms.xml b/activemq-rest/src/test/resources/activemq-jms.xml
new file mode 100644
index 0000000..cc3fde7
--- /dev/null
+++ b/activemq-rest/src/test/resources/activemq-jms.xml
@@ -0,0 +1,19 @@
+<configuration xmlns="urn:activemq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+    <!--the connection factory used by the example-->
+    <connection-factory name="ConnectionFactory">
+        <connectors>
+            <connector-ref connector-name="in-vm"/>
+        </connectors>
+        <entries>
+            <entry name="ConnectionFactory"/>
+        </entries>
+    </connection-factory>
+
+    <!--the queue used by the example-->
+    <queue name="exampleQueue">
+        <entry name="/queue/exampleQueue"/>
+    </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-rest/src/test/resources/activemq-users.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/activemq-users.xml b/activemq-rest/src/test/resources/activemq-users.xml
new file mode 100644
index 0000000..11c115a
--- /dev/null
+++ b/activemq-rest/src/test/resources/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+    <!-- the default user.  this is used where username is null-->
+    <defaultuser name="guest" password="guest">
+        <role name="guest"/>
+    </defaultuser>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-rest/src/test/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/hornetq-configuration.xml b/activemq-rest/src/test/resources/hornetq-configuration.xml
deleted file mode 100644
index 9178580..0000000
--- a/activemq-rest/src/test/resources/hornetq-configuration.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<configuration xmlns="urn:activemq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
-    <persistence-enabled>false</persistence-enabled>
-    <!-- Connectors -->
-
-    <connectors>
-        <connector name="in-vm">
-            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
-        </connector>
-    </connectors>
-
-    <acceptors>
-        <acceptor name="in-vm">
-            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
-        </acceptor>
-    </acceptors>
-
-    <!-- Other config -->
-
-    <security-settings>
-        <!--security for example queue-->
-        <security-setting match="jms.queue.exampleQueue">
-            <permission type="createDurableQueue" roles="guest"/>
-            <permission type="deleteDurableQueue" roles="guest"/>
-            <permission type="createNonDurableQueue" roles="guest"/>
-            <permission type="deleteNonDurableQueue" roles="guest"/>
-            <permission type="consume" roles="guest"/>
-            <permission type="send" roles="guest"/>
-        </security-setting>
-    </security-settings>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-rest/src/test/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/hornetq-jms.xml b/activemq-rest/src/test/resources/hornetq-jms.xml
deleted file mode 100644
index 3461588..0000000
--- a/activemq-rest/src/test/resources/hornetq-jms.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration xmlns="urn:activemq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-    <!--the connection factory used by the example-->
-    <connection-factory name="ConnectionFactory">
-        <connectors>
-            <connector-ref connector-name="in-vm"/>
-        </connectors>
-        <entries>
-            <entry name="ConnectionFactory"/>
-        </entries>
-    </connection-factory>
-
-    <!--the queue used by the example-->
-    <queue name="exampleQueue">
-        <entry name="/queue/exampleQueue"/>
-    </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-rest/src/test/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/hornetq-users.xml b/activemq-rest/src/test/resources/hornetq-users.xml
deleted file mode 100644
index 4a9e49a..0000000
--- a/activemq-rest/src/test/resources/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
-    <!-- the default user.  this is used where username is null-->
-    <defaultuser name="guest" password="guest">
-        <role name="guest"/>
-    </defaultuser>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
index a355114..86ec8c8 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
@@ -32,7 +32,7 @@ public final class FileConfiguration extends ConfigurationImpl
    private static final long serialVersionUID = -4766689627675039596L;
    // Constants ------------------------------------------------------------------------
 
-   private static final String DEFAULT_CONFIGURATION_URL = "hornetq-configuration.xml";
+   private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml";
 
    // For a bridge confirmations must be activated or send acknowledgments won't return
    public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
index 4e3d2ff..8599934 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
@@ -71,7 +71,7 @@ public class AddressSettingsDeployer extends XmlDeployer
    @Override
    public String[] getDefaultConfigFileNames()
    {
-      return new String[]{"hornetq-configuration.xml", "hornetq-queues.xml"};
+      return new String[]{"activemq-configuration.xml", "activemq-queues.xml"};
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
index c1acd0a..c72f90d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
@@ -140,6 +140,6 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
    @Override
    public String[] getDefaultConfigFileNames()
    {
-      return new String[]{"hornetq-users.xml"};
+      return new String[]{"activemq-users.xml"};
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
index b6fecba..739bd4d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
@@ -69,7 +69,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
- * Parses an XML document according to the {@literal hornetq-configuration.xsd} schema.
+ * Parses an XML document according to the {@literal activemq-configuration.xsd} schema.
  *
  * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  * @author <a href="tim.fox@jboss.com">Tim Fox</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
index cc21cc5..ece4fac 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
@@ -87,7 +87,7 @@ public class QueueDeployer extends XmlDeployer
    @Override
    public String[] getDefaultConfigFileNames()
    {
-      return new String[]{"hornetq-configuration.xml", "hornetq-queues.xml"};
+      return new String[]{"activemq-configuration.xml", "activemq-queues.xml"};
    }
 
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
index dece93a..dce1bda 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
@@ -108,6 +108,6 @@ public class SecurityDeployer extends XmlDeployer
    @Override
    public String[] getDefaultConfigFileNames()
    {
-      return new String[]{"hornetq-configuration.xml", SecurityDeployer.QUEUES_XML};
+      return new String[]{"activemq-configuration.xml", SecurityDeployer.QUEUES_XML};
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
index 6c6540b..bd9acde 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
@@ -36,7 +36,7 @@ public class EmbeddedHornetQ
    protected MBeanServer mbeanServer;
 
    /**
-    * Classpath resource for hornetq server config.  Defaults to 'hornetq-configuration.xml'.
+    * Classpath resource for hornetq server config.  Defaults to 'activemq-configuration.xml'.
     *
     * @param filename
     */
@@ -92,7 +92,7 @@ public class EmbeddedHornetQ
    {
       if (configuration == null)
       {
-         if (configResourcePath == null) configResourcePath = "hornetq-configuration.xml";
+         if (configResourcePath == null) configResourcePath = "activemq-configuration.xml";
          FileConfiguration config = new FileConfiguration(configResourcePath);
          config.start();
          configuration = config;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
index 7d98ad8..449cc72 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
@@ -129,7 +129,7 @@ public class FileConfigurationParserTest extends UnitTestCase
    private static String firstPart =
       "<configuration xmlns=\"urn:hornetq\"\n" +
          "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-         "xsi:schemaLocation=\"urn:hornetq /schema/hornetq-configuration.xsd\">\n" +
+         "xsi:schemaLocation=\"urn:hornetq /schema/activemq-configuration.xsd\">\n" +
          "<name>HornetQ.main.config</name>" + "\n" +
          "<backup-group-name>abackupgroupname</backup-group-name>" + "\n" +
          "<scale-down-group-name>ascaledowngroupname</scale-down-group-name>" + "\n" +

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
index bce79e4..610a696 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -62,7 +62,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase
    private static final String configuration =
       "<configuration xmlns=\"urn:hornetq\"\n" +
          "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-         "xsi:schemaLocation=\"urn:hornetq /schema/hornetq-configuration.xsd\">\n" +
+         "xsi:schemaLocation=\"urn:hornetq /schema/activemq-configuration.xsd\">\n" +
          "<name>HornetQ.main.config</name>" + "\n" +
          "<backup-group-name>anodegroupname</backup-group-name>" + "\n" +
          "<log-delegate-factory-class-name>org.apache.activemq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" +

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
index 02454d6..417794f 100644
--- a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
+++ b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
@@ -1,6 +1,6 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-configuration.xsd ">
+   xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-configuration.xsd ">
    <!-- just use the defaults -->
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
index d48240b..c85572d 100644
--- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <resolve-protocols>false</resolve-protocols>
       <clustered>true</clustered>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
index 9a857de..80f3a8a 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
       <thread-pool-max-size>54321</thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
index f9ccd7d..e555561 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
       <thread-pool-max-size>54321</thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
index 27b9c2b..bd87e0f 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
       <thread-pool-max-size>54321</thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
index be9633b..93ccd51 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
       <thread-pool-max-size>54321</thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
index 61d8200..0fab9df 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
       <thread-pool-max-size>54321</thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
index d524a96..3e2cb68 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
@@ -1,7 +1,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
       <thread-pool-max-size>54321</thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/colocated-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml
index df2be09..d262764 100644
--- a/activemq-server/src/test/resources/colocated-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/colocated-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <colocated>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
index 9a6cf5a..ac92bdb 100644
--- a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <shared-store>
          <colocated>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
index 3e2fd17..add9e83 100644
--- a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
+++ b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
    <!-- We need to make it clustered otherwise the bridge won't deploy -->
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/live-only-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
index ff71149..55bd266 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <live-only>
          <scale-down>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
index 3fdc398..13b89b6 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <!--only one of the following-->
       <!--on server shutdown scale down to another live server-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
index 9c9bdba..b4eedd3 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <!--only one of the following-->
       <!--on server shutdown scale down to another live server-->


Mime
View raw message