From 57d02ab3610d47360ce32cc91f029203286ce447 Mon Sep 17 00:00:00 2001
From: Martyn Taylor <mtaylor@redhat.com>
Date: Tue, 24 Feb 2015 14:28:18 +0000
Subject: [PATCH] Fix distribution bootstrap configs

Some of the distribution configuration files were outdated, using the
old configuration format.  This patch updates the config to allow the
server to parse and run accordingly.
---
 .../src/main/resources/config/clustered/bootstrap.xml  | 10 ++++++----
 .../src/main/resources/config/replicated/bootstrap.xml | 10 ++++++----
 .../main/resources/config/shared-store/bootstrap.xml   | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index 74608dcf07..fd5ed549e5 100644
--- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
@@ -18,11 +18,13 @@
 
 <broker xmlns="http://activemq.org/schema">
 
-   <core configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"/>
+   <basic-security>
+      <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+      <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+      <default-user>guest</default-user>
+   </basic-security>
 
-   <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"/>
-
-   <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/>
+   <server configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"/>
 
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 54c266c2b3..e296de0ec2 100644
--- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
@@ -18,11 +18,13 @@
 
 <broker xmlns="http://activemq.org/schema">
 
-   <core configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"/>
+   <basic-security>
+      <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+      <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+      <default-user>guest</default-user>
+   </basic-security>
 
-   <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"/>
-
-   <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/>
+   <server configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"/>
 
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
index 9139f5058b..0157e8a8e7 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
@@ -18,11 +18,13 @@
 
 <broker xmlns="http://activemq.org/schema">
 
-   <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"/>
+   <basic-security>
+      <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+      <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+      <default-user>guest</default-user>
+   </basic-security>
 
-   <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"/>
-
-   <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/>
+   <server configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"/>
 
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>