You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2017/12/18 11:30:29 UTC
[1/2] activemq-artemis git commit: This closes #1723
Repository: activemq-artemis
Updated Branches:
refs/heads/master 4928269ad -> aa3b29080
This closes #1723
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/aa3b2908
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/aa3b2908
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/aa3b2908
Branch: refs/heads/master
Commit: aa3b29080c8551b6652b8d2b9a9b2043e2c9ebcb
Parents: 4928269 0a2e143
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Dec 18 11:30:18 2017 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Dec 18 11:30:18 2017 +0000
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/etc/management.xml | 4 ++--
.../core/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(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1463 Fix broker's mBean
domain name
Posted by ma...@apache.org.
ARTEMIS-1463 Fix broker's mBean domain name
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0a2e143d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0a2e143d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0a2e143d
Branch: refs/heads/master
Commit: 0a2e143de50ec6506b6bcce6fe9427cd2fbf9f4c
Parents: 4928269
Author: Jiri Danek <jd...@redhat.com>
Authored: Fri Dec 15 20:52:20 2017 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Dec 18 11:30:18 2017 +0000
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/etc/management.xml | 4 ++--
.../core/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
----------------------------------------------------------------------
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 1dd7510..6ca565d 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"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JMXAccessControlList.java
----------------------------------------------------------------------
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 0cafeb0..e9644c0 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");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/docs/user-manual/en/management.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md
index 8b17d87..10db274 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"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
----------------------------------------------------------------------
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 9d31f6a..0bf2b62 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"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
----------------------------------------------------------------------
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 86d29a1..2b71162 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"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
----------------------------------------------------------------------
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 0eca170..ee91771 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"/>