You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/02/25 14:30:51 UTC
[2/8] activemq-6 git commit: Fix distribution bootstrap configs
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.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/57d02ab3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/57d02ab3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/57d02ab3
Branch: refs/heads/master
Commit: 57d02ab3610d47360ce32cc91f029203286ce447
Parents: c43e300
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Feb 24 14:28:18 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Feb 24 15:07:05 2015 +0000
----------------------------------------------------------------------
.../src/main/resources/config/clustered/bootstrap.xml | 10 ++++++----
.../src/main/resources/config/replicated/bootstrap.xml | 10 ++++++----
.../src/main/resources/config/shared-store/bootstrap.xml | 10 ++++++----
3 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/57d02ab3/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index 74608dc..fd5ed54 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"/>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/57d02ab3/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 54c266c..e296de0 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"/>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/57d02ab3/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
----------------------------------------------------------------------
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 9139f50..0157e8a 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"/>