From 0a2e143de50ec6506b6bcce6fe9427cd2fbf9f4c Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Fri, 15 Dec 2017 20:52:20 +0100
Subject: [PATCH] ARTEMIS-1463 Fix broker's mBean domain name

---
 .../artemis/cli/commands/etc/management.xml        |  4 ++--
 .../server/management/JMXAccessControlList.java    | 10 +++++-----
 docs/user-manual/en/management.md                  | 14 +++++++-------
 .../main/resources/activemq/server0/management.xml |  4 ++--
 .../main/resources/activemq/server0/management.xml |  4 ++--
 .../main/resources/activemq/server0/management.xml |  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
index 1dd751098f..6ca565ddc1 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
@@ -29,7 +29,7 @@
          <access method="*" roles="amq"/>
       </default-access>
       <role-access>
-         <match domain="org.apache.activemq.apache">
+         <match domain="org.apache.activemq.artemis">
             <access method="list*" roles="view,update,amq"/>
             <access method="get*" roles="view,update,amq"/>
             <access method="is*" roles="view,update,amq"/>
@@ -37,7 +37,7 @@
             <access method="*" roles="amq"/>
          </match>
          <!--example of how to configure a specific object-->
-         <!--<match domain="org.apache.activemq.apache" key="subcomponent=queues">
+         <!--<match domain="org.apache.activemq.artemis" key="subcomponent=queues">
             <access method="list*" roles="view,update,amq"/>
             <access method="get*" roles="view,update,amq"/>
             <access method="is*" roles="view,update,amq"/>
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JMXAccessControlList.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JMXAccessControlList.java
index 0cafeb059a..e9644c0d0f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JMXAccessControlList.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JMXAccessControlList.java
@@ -186,11 +186,11 @@ public class JMXAccessControlList {
 
       accessControlList.addToWhiteList("hawtio", "type=*");
 
-      accessControlList.addToRoleAccess("org.apache.activemq.apache", null, "list*", "view", "update", "amq");
-      accessControlList.addToRoleAccess("org.apache.activemq.apache", null,"get*", "view", "update", "amq");
-      accessControlList.addToRoleAccess("org.apache.activemq.apache", null,"is*", "view", "update", "amq");
-      accessControlList.addToRoleAccess("org.apache.activemq.apache", null,"set*","update", "amq");
-      accessControlList.addToRoleAccess("org.apache.activemq.apache", null,"*", "amq");
+      accessControlList.addToRoleAccess("org.apache.activemq.artemis", null, "list*", "view", "update", "amq");
+      accessControlList.addToRoleAccess("org.apache.activemq.artemis", null,"get*", "view", "update", "amq");
+      accessControlList.addToRoleAccess("org.apache.activemq.artemis", null,"is*", "view", "update", "amq");
+      accessControlList.addToRoleAccess("org.apache.activemq.artemis", null,"set*","update", "amq");
+      accessControlList.addToRoleAccess("org.apache.activemq.artemis", null,"*", "amq");
 
       accessControlList.addToDefaultAccess("list*", "view", "update", "amq");
       accessControlList.addToDefaultAccess("get*", "view", "update", "amq");
diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md
index 8b17d8795a..10db2747dc 100644
--- a/docs/user-manual/en/management.md
+++ b/docs/user-manual/en/management.md
@@ -329,7 +329,7 @@ the default configuration looks like:
 
 ```xml 
 <role-access>
-    <match domain="org.apache.activemq.apache">
+    <match domain="org.apache.activemq.artemis">
        <access method="list*" roles="view,update,amq"/>
        <access method="get*" roles="view,update,amq"/>
        <access method="is*" roles="view,update,amq"/>
@@ -338,11 +338,11 @@ the default configuration looks like:
     </match>
 </role-access>
 ```
-This contains 1 match and will be applied to any mBean that has the domain `org.apache.activemq.apache`.
+This contains 1 match and will be applied to any mBean that has the domain `org.apache.activemq.artemis`.
 Any access to any mBeans that have this domain are controlled by the `access` elements which contain a
 method and a set of roles. The method being invoked will be used to pick the closest matching method and
 the roles for this will be applied for access. For instance if you try the invoke a method called `listMessages` on an mBean 
-with the `org.apache.activemq.apache` domain then this would match the `access` with the method of `list*`.
+with the `org.apache.activemq.artemis` domain then this would match the `access` with the method of `list*`.
 You could also explicitly configure this by using the full method name, like so:
 
 ```xml
@@ -352,7 +352,7 @@ You can also match specific mBeans within a domain by adding a key attribute tha
 on the mBean, like:
 
 ```xml
-<match domain="org.apache.activemq.apache" key="subcomponent=queues">
+<match domain="org.apache.activemq.artemis" key="subcomponent=queues">
    <access method="list*" roles="view,update,amq"/>
    <access method="get*" roles="view,update,amq"/>
    <access method="is*" roles="view,update,amq"/>
@@ -367,7 +367,7 @@ You could also match a specific queue for instance :
 by configuring:
 
 ```xml
-<match domain="org.apache.activemq.apache" key="queue=exampleQueue">
+<match domain="org.apache.activemq.artemis" key="queue=exampleQueue">
    <access method="list*" roles="view,update,amq"/>
    <access method="get*" roles="view,update,amq"/>
    <access method="is*" roles="view,update,amq"/>
@@ -377,7 +377,7 @@ by configuring:
 ```
 
 Access to JMX mBean attributes are converted to method calls so these are controlled via the `set*`, `get*` and `is*`. 
-The `*` access is the catch all for everything other method that isnt specifically matched.
+The `*` access is the catch all for everything other method that isn't specifically matched.
 
 The `default-access` element is basically the catch all for every method call that isn't handled via the `role-access` configuration.
 This has teh same semantics as a `match` element.
@@ -393,7 +393,7 @@ either have to disable authentication, by removing the `authentication` element
 By default remote JMX access to Artemis is disabled for security reasons.
 
 Artemis has a JMX agent which allows access to JMX mBeans remotely. This is configured via the `connector` element in the
-`management.xml` configuration file. To enable this you simpl ad the following xml:
+`management.xml` configuration file. To enable this you simply add the following xml:
 
 ```xml
 <connector connector-port="1099"/>
diff --git a/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml b/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
index 9d31f6a1b4..0bf2b62e8d 100644
--- a/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
+++ b/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
@@ -36,7 +36,7 @@
          <access method="*" roles="amq,guest"/>
       </default-access>
       <role-access>
-         <match domain="org.apache.activemq.apache">
+         <match domain="org.apache.activemq.artemis">
             <access method="list*" roles="view,update,amq,guest"/>
             <access method="get*" roles="view,update,amq,guest"/>
             <access method="is*" roles="view,update,amq,guest"/>
@@ -44,7 +44,7 @@
             <access method="*" roles="amq,guest"/>
          </match>
          <!--example of how to configure a specific object-->
-         <!--<match domain="org.apache.activemq.apache" key="subcomponent=queues">
+         <!--<match domain="org.apache.activemq.artemis" key="subcomponent=queues">
             <access method="list*" roles="view,update,amq"/>
             <access method="get*" roles="view,update,amq"/>
             <access method="is*" roles="view,update,amq"/>
diff --git a/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml b/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
index 86d29a1fe3..2b71162e71 100644
--- a/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
+++ b/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
@@ -29,7 +29,7 @@
          <access method="*" roles="amq,guest"/>
       </default-access>
       <role-access>
-         <match domain="org.apache.activemq.apache">
+         <match domain="org.apache.activemq.artemis">
             <access method="list*" roles="view,update,amq,guest"/>
             <access method="get*" roles="view,update,amq,guest"/>
             <access method="is*" roles="view,update,amq,guest"/>
@@ -37,7 +37,7 @@
             <access method="*" roles="amq,guest"/>
          </match>
          <!--example of how to configure a specific object-->
-         <!--<match domain="org.apache.activemq.apache" key="subcomponent=queues">
+         <!--<match domain="org.apache.activemq.artemis" key="subcomponent=queues">
             <access method="list*" roles="view,update,amq"/>
             <access method="get*" roles="view,update,amq"/>
             <access method="is*" roles="view,update,amq"/>
diff --git a/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml b/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
index 0eca170559..ee917718ac 100644
--- a/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
+++ b/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
@@ -29,7 +29,7 @@
          <access method="*" roles="amq, guest"/>
       </default-access>
       <role-access>
-         <match domain="org.apache.activemq.apache">
+         <match domain="org.apache.activemq.artemis">
             <access method="list*" roles="view,update,amq,guest"/>
             <access method="get*" roles="view,update,amq,guest"/>
             <access method="is*" roles="view,update,amq,guest"/>
@@ -37,7 +37,7 @@
             <access method="*" roles="amq,guest"/>
          </match>
          <!--example of how to configure a specific object-->
-         <!--<match domain="org.apache.activemq.apache" key="subcomponent=queues">
+         <!--<match domain="org.apache.activemq.artemis" key="subcomponent=queues">
             <access method="list*" roles="view,update,amq"/>
             <access method="get*" roles="view,update,amq"/>
             <access method="is*" roles="view,update,amq"/>