activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [12/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas
Date Tue, 18 Nov 2014 12:34:27 GMT
ACTIVEMQ6-4 - refactor schemas

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

Refactor all the schemas to use an activemq namespace and rename schema 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/574c8fe9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/574c8fe9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/574c8fe9

Branch: refs/heads/master
Commit: 574c8fe997eb8d866fb62b1984dd45ef3e8838e1
Parents: d0d686b
Author: Andy Taylor <andytaylor@apache.org>
Authored: Mon Nov 17 13:54:11 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Tue Nov 18 11:27:10 2014 +0000

----------------------------------------------------------------------
 .../server/impl/JMSServerConfigParserImpl.java  |    2 +-
 .../src/main/resources/schema/activemq-jms.xsd  |  267 ++
 .../src/main/resources/schema/hornetq-jms.xsd   |  267 --
 .../src/main/resources/schema/hornetq-rest.xsd  |    2 +-
 .../test/resources/hornetq-configuration.xml    |    2 +-
 .../src/test/resources/hornetq-jms.xml          |    2 +-
 .../src/test/resources/hornetq-users.xml        |    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 +-
 .../resources/schema/activemq-configuration.xsd | 2292 +++++++++++++++++
 .../main/resources/schema/activemq-users.xsd    |   29 +
 .../resources/schema/hornetq-configuration.xsd  | 2319 ------------------
 .../src/main/resources/schema/hornetq-users.xsd |   29 -
 .../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 +-
 distribution/activemq/pom.xml                   |   48 +-
 .../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/configuration-index.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/pom.xml                        |    6 +-
 .../src/main/resources/schemaToTable.xsl        |   42 +-
 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 +-
 .../hornetq-configuration-messaging-lab.xml     |    2 +-
 .../resources/server0/hornetq-configuration.xml |    2 +-
 .../resources/server0/hornetq-configuration.xml |    2 +-
 .../src/main/resources/server0/hornetq-jms.xml  |    2 +-
 .../main/resources/server0/hornetq-users.xml    |    2 +-
 .../resources/server0/hornetq-configuration.xml |    2 +-
 .../src/main/resources/server0/hornetq-jms.xml  |    2 +-
 .../main/resources/server0/hornetq-users.xml    |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server3/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq-configuration-messaging-lab.xml     |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../src/main/resources/hornetq-client.xml       |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../dup-send/src/main/resources/hornetq-jms.xml |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../src/main/resources/hornetq-client.xml       |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../push/src/main/resources/hornetq-client.xml  |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../push/src/main/resources/hornetq-jms.xml     |    2 +-
 .../push/src/main/resources/hornetq-users.xml   |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server3/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-users.xml |    2 +-
 .../hornetq/server4/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server4/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server4/hornetq-users.xml |    2 +-
 .../hornetq/server5/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server5/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server5/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../normal/server0/hornetq-configuration.xml    |    2 +-
 examples/soak/normal/server0/hornetq-jms.xml    |    2 +-
 .../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/hornetq-configuration.xml    |    2 +-
 .../src/test/resources/hornetq-jms.xml          |    2 +-
 .../src/test/resources/hornetq-queues.xml       |    2 +-
 .../src/test/resources/hornetq-users.xml        |    2 +-
 507 files changed, 3136 insertions(+), 3163 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
index 0c9d47f..0ecb5de 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
@@ -78,7 +78,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
 
       Element e = (Element) rootnode;
 
-      org.apache.activemq.utils.XMLUtil.validate(rootnode, "schema/hornetq-jms.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootnode, "schema/activemq-jms.xsd");
 
       String[] elements = new String[]{JMSServerDeployer.QUEUE_NODE_NAME,
          JMSServerDeployer.TOPIC_NODE_NAME,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
new file mode 100644
index 0000000..a7864eb
--- /dev/null
+++ b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
@@ -0,0 +1,267 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="urn:activemq"
+            xmlns="urn:activemq"
+            xmlns:amq="urn:org.apache.activemq"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified"
+            version="1.0">
+
+   <xsd:element name="configuration" amq:schema="hornetq-jms-configuration">
+   	<xsd:complexType>
+   	  <xsd:sequence>
+            <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"
+                         minOccurs="0" maxOccurs="1"/>
+   	    <xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"/>
+   	    <xsd:choice maxOccurs="unbounded" minOccurs="0">
+   	      <xsd:element ref="queue" maxOccurs="1" minOccurs="1"/>
+              <xsd:element ref="topic" maxOccurs="1" minOccurs="1"/>
+            </xsd:choice>
+          </xsd:sequence>
+   	</xsd:complexType>
+   </xsd:element>
+
+   <xsd:element name="connection-factory">
+        <xsd:annotation amq:linkend="using-jms.server.configuration">
+          <xsd:documentation>a list of connection factories to create and add to
+          JNDI</xsd:documentation>
+        </xsd:annotation>
+   	<xsd:complexType>
+          <xsd:all>
+            <xsd:element name="xa" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:linkend="using-jms.configure.factory.types"
+                              amq:id="configuration.connection-factory.signature.xa">
+                <xsd:documentation>Whether this is an XA connection factory</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0">
+            </xsd:element>
+
+            <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:linkend="clusters">
+                <xsd:documentation>A sequence of connectors used by the connection factory
+                </xsd:documentation>
+              </xsd:annotation>
+            <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="connector-ref" maxOccurs="unbounded" minOccurs="1">
+                    <xsd:annotation>
+                      <xsd:documentation>A connector reference
+                      </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                      <xsd:attribute name="connector-name" type="xsd:string" use="required">
+                        <xsd:annotation>
+                          <xsd:documentation>Name of the connector to connect to the live server
+                          </xsd:documentation>
+                        </xsd:annotation>
+                      </xsd:attribute>
+                    </xsd:complexType>
+                  </xsd:element>
+                </xsd:sequence>
+              </xsd:complexType>
+              </xsd:element>
+
+            <xsd:element name="entries" maxOccurs="1" minOccurs="0">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1">
+                  </xsd:element>
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="client-failure-check-period" type="xsd:long" default="30000"
+                         maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.client-failure-check-period"
+                              amq:linkend="dead.connections" amq:default="(ms)">
+                <xsd:documentation>
+                  the period (in ms) after which the client will consider the connection failed
+                  after not receiving packets from the server. -1 disables this setting.
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="connection-ttl" type="xsd:long" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.connection-ttl"
+                              amq:linkend="dead.connections">
+                <xsd:documentation>the time to live (in ms) for connections
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="call-timeout" type="xsd:long" default="30000"
+                         maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.call-timeout">
+                <xsd:documentation>
+                  the timeout (in ms) for remote calls
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+   			 <xsd:element name="call-failover-timeout" type="xsd:long"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="consumer-window-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="consumer-max-rate" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="confirmation-window-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="producer-window-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="producer-max-rate" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="cache-large-message-client" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="min-large-message-size" type="xsd:long"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="compress-large-messages" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+
+            <xsd:element name="client-id" type="xsd:string" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.client-id"
+                              amq:linkend="using-jms.clientid">
+                <xsd:documentation>
+                  the pre-configured client ID for the connection factory
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="dups-ok-batch-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="transaction-batch-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+         <xsd:element name="block-on-acknowledge" type="xsd:boolean" default="false"
+                      maxOccurs="1" minOccurs="0">
+           <xsd:annotation amq:linkend="send-guarantees.nontrans.acks"
+                           amq:id="configuration.connection-factory.block-on-acknowledge">
+             <xsd:documentation>
+               whether or not messages are acknowledged synchronously
+             </xsd:documentation>
+           </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="block-on-non-durable-send" type="xsd:boolean" default="false"
+                      maxOccurs="1" minOccurs="0">
+           <xsd:annotation amq:id="configuration.connection-factory.block-on-non-durable-send"
+                           amq:linkend="non-transactional-sends">
+             <xsd:documentation>
+               whether or not non-durable messages are sent synchronously
+             </xsd:documentation>
+           </xsd:annotation>
+         </xsd:element>
+            <xsd:element name="block-on-durable-send" type="xsd:boolean" default="true"
+                         maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.block-on-durable-send"
+                              amq:linkend="non-transactional-sends">
+                <xsd:documentation>
+                  whether or not durable messages are sent synchronously
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="auto-group" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.auto-group"
+                              amq:linkend="message-grouping.jmsconfigure">
+                <xsd:documentation>whether or not message grouping is automatically used
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="pre-acknowledge" type="xsd:boolean"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+            <xsd:element name="retry-interval" type="xsd:long"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+   			<xsd:element name="retry-interval-multiplier" type="xsd:float"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+   			<xsd:element name="max-retry-interval" type="xsd:long"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+            <xsd:element name="reconnect-attempts" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="failover-on-initial-connection" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="failover-on-server-shutdown" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="connection-load-balancing-policy-class-name" type="xsd:string"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="use-global-pools" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="thread-pool-max-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="group-id" type="xsd:string"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="ha" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+   		</xsd:all>
+   		<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
+   		<xsd:attribute name="signature" type="xsd:string">
+                  <xsd:annotation amq:id="configuration.connection-factory.signature"
+                                  amq:linkend="using-jms.configure.factory.types"
+                                  amq:default="generic"> <!-- XXX -->
+                    <xsd:documentation>Type of connection factory</xsd:documentation>
+                  </xsd:annotation>
+                </xsd:attribute>
+   	</xsd:complexType>
+   </xsd:element>
+
+    <xsd:complexType name="entryType">
+    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="discovery-group-refType">
+    	<xsd:attribute name="discovery-group-name" type="xsd:string" use="required">
+          <xsd:annotation>
+          <xsd:documentation>
+            Name of discovery group used by this connection factory
+          </xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="queue" type="queueType"></xsd:element>
+
+    <xsd:element name="topic" type="topicType"></xsd:element>
+
+   <xsd:complexType name="queueType">
+    	<xsd:sequence>
+    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+          <xsd:element name="selector" maxOccurs="1" minOccurs="0">
+                <xsd:complexType>
+                   <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
+    	</xsd:sequence>
+    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="topicType">
+    	<xsd:sequence>
+    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+    	</xsd:sequence>
+    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
+</xsd:schema>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd b/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd
deleted file mode 100644
index c12a257..0000000
--- a/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="urn:hornetq"
-            xmlns="urn:hornetq"
-            xmlns:hq="urn:org.apache.activemq"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="1.0">
-
-   <xsd:element name="configuration" hq:schema="hornetq-jms-configuration">
-   	<xsd:complexType>
-   	  <xsd:sequence>
-            <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"
-                         minOccurs="0" maxOccurs="1"/>
-   	    <xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"/>
-   	    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-   	      <xsd:element ref="queue" maxOccurs="1" minOccurs="1"/>
-              <xsd:element ref="topic" maxOccurs="1" minOccurs="1"/>
-            </xsd:choice>
-          </xsd:sequence>
-   	</xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="connection-factory">
-        <xsd:annotation hq:linkend="using-jms.server.configuration">
-          <xsd:documentation>a list of connection factories to create and add to
-          JNDI</xsd:documentation>
-        </xsd:annotation>
-   	<xsd:complexType>
-          <xsd:all>
-            <xsd:element name="xa" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:linkend="using-jms.configure.factory.types"
-                              hq:id="configuration.connection-factory.signature.xa">
-                <xsd:documentation>Whether this is an XA connection factory</xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0">
-            </xsd:element>
-
-            <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:linkend="clusters">
-                <xsd:documentation>A sequence of connectors used by the connection factory
-                </xsd:documentation>
-              </xsd:annotation>
-            <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="connector-ref" maxOccurs="unbounded" minOccurs="1">
-                    <xsd:annotation>
-                      <xsd:documentation>A connector reference
-                      </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                      <xsd:attribute name="connector-name" type="xsd:string" use="required">
-                        <xsd:annotation>
-                          <xsd:documentation>Name of the connector to connect to the live server
-                          </xsd:documentation>
-                        </xsd:annotation>
-                      </xsd:attribute>
-                    </xsd:complexType>
-                  </xsd:element>
-                </xsd:sequence>
-              </xsd:complexType>
-              </xsd:element>
-
-            <xsd:element name="entries" maxOccurs="1" minOccurs="0">
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1">
-                  </xsd:element>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element name="client-failure-check-period" type="xsd:long" default="30000"
-                         maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.client-failure-check-period"
-                              hq:linkend="dead.connections" hq:default="(ms)">
-                <xsd:documentation>
-                  the period (in ms) after which the client will consider the connection failed
-                  after not receiving packets from the server. -1 disables this setting.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="connection-ttl" type="xsd:long" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.connection-ttl"
-                              hq:linkend="dead.connections">
-                <xsd:documentation>the time to live (in ms) for connections
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="call-timeout" type="xsd:long" default="30000"
-                         maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.call-timeout">
-                <xsd:documentation>
-                  the timeout (in ms) for remote calls
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-   			 <xsd:element name="call-failover-timeout" type="xsd:long"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="consumer-window-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="consumer-max-rate" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="confirmation-window-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="producer-window-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="producer-max-rate" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="cache-large-message-client" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="min-large-message-size" type="xsd:long"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="compress-large-messages" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-
-            <xsd:element name="client-id" type="xsd:string" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.client-id"
-                              hq:linkend="using-jms.clientid">
-                <xsd:documentation>
-                  the pre-configured client ID for the connection factory
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="dups-ok-batch-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="transaction-batch-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-         <xsd:element name="block-on-acknowledge" type="xsd:boolean" default="false"
-                      maxOccurs="1" minOccurs="0">
-           <xsd:annotation hq:linkend="send-guarantees.nontrans.acks"
-                           hq:id="configuration.connection-factory.block-on-acknowledge">
-             <xsd:documentation>
-               whether or not messages are acknowledged synchronously
-             </xsd:documentation>
-           </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="block-on-non-durable-send" type="xsd:boolean" default="false"
-                      maxOccurs="1" minOccurs="0">
-           <xsd:annotation hq:id="configuration.connection-factory.block-on-non-durable-send"
-                           hq:linkend="non-transactional-sends">
-             <xsd:documentation>
-               whether or not non-durable messages are sent synchronously
-             </xsd:documentation>
-           </xsd:annotation>
-         </xsd:element>
-            <xsd:element name="block-on-durable-send" type="xsd:boolean" default="true"
-                         maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.block-on-durable-send"
-                              hq:linkend="non-transactional-sends">
-                <xsd:documentation>
-                  whether or not durable messages are sent synchronously
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="auto-group" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.auto-group"
-                              hq:linkend="message-grouping.jmsconfigure">
-                <xsd:documentation>whether or not message grouping is automatically used
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="pre-acknowledge" type="xsd:boolean"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-            <xsd:element name="retry-interval" type="xsd:long"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-   			<xsd:element name="retry-interval-multiplier" type="xsd:float"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-   			<xsd:element name="max-retry-interval" type="xsd:long"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-            <xsd:element name="reconnect-attempts" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="failover-on-initial-connection" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="failover-on-server-shutdown" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="connection-load-balancing-policy-class-name" type="xsd:string"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="use-global-pools" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="thread-pool-max-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="group-id" type="xsd:string"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="ha" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-   		</xsd:all>
-   		<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-   		<xsd:attribute name="signature" type="xsd:string">
-                  <xsd:annotation hq:id="configuration.connection-factory.signature"
-                                  hq:linkend="using-jms.configure.factory.types"
-                                  hq:default="generic"> <!-- XXX -->
-                    <xsd:documentation>Type of connection factory</xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-   	</xsd:complexType>
-   </xsd:element>
-
-    <xsd:complexType name="entryType">
-    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:complexType name="discovery-group-refType">
-    	<xsd:attribute name="discovery-group-name" type="xsd:string" use="required">
-          <xsd:annotation>
-          <xsd:documentation>
-            Name of discovery group used by this connection factory
-          </xsd:documentation>
-          </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:element name="queue" type="queueType"></xsd:element>
-
-    <xsd:element name="topic" type="topicType"></xsd:element>
-
-   <xsd:complexType name="queueType">
-    	<xsd:sequence>
-    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-          <xsd:element name="selector" maxOccurs="1" minOccurs="0">
-                <xsd:complexType>
-                   <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
-    	</xsd:sequence>
-    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:complexType name="topicType">
-    	<xsd:sequence>
-    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-    	</xsd:sequence>
-    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
index b2f20c3..063e71c 100644
--- a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
+++ b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="urn:hornetq" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xsd:schema xmlns="urn:activemq" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq">
 
     <xsd:element name="rest-messaging">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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
index 2a78da0..9178580 100644
--- a/activemq-rest/src/test/resources/hornetq-configuration.xml
+++ b/activemq-rest/src/test/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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
index bc4af35..3461588 100644
--- a/activemq-rest/src/test/resources/hornetq-jms.xml
+++ b/activemq-rest/src/test/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<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-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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
index 880a966..4a9e49a 100644
--- a/activemq-rest/src/test/resources/hornetq-users.xml
+++ b/activemq-rest/src/test/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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 8ea5e3f..4e3d2ff 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
@@ -50,7 +50,7 @@ public class AddressSettingsDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd");
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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 3acc995..c1acd0a 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
@@ -63,7 +63,7 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-users.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-users.xsd");
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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 7b3744d..b6fecba 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
@@ -80,7 +80,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
    // Constants -----------------------------------------------------
 
-   private static final String CONFIGURATION_SCHEMA_URL = "schema/hornetq-configuration.xsd";
+   private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd";
 
    // Security Parsing
    public static final String SECURITY_ELEMENT_NAME = "security-setting";

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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 9005085..cc21cc5 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
@@ -52,7 +52,7 @@ public class QueueDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd");
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/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 6c1fb70..dece93a 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
@@ -60,7 +60,7 @@ public class SecurityDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd");
    }
 
    /**


Mime
View raw message