summaryrefslogtreecommitdiff
path: root/qpid/java/management
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-05-01 12:14:40 +0000
committerRobert Gemmell <robbie@apache.org>2013-05-01 12:14:40 +0000
commitd5b676fcd2b16ba2d416963b39df2d22828fc7d5 (patch)
treeba7b945356484f704c701269908045344e8a8ae1 /qpid/java/management
parentdf37800ef7d66d4f02eb99a36e272cd967f7bf07 (diff)
downloadqpid-python-d5b676fcd2b16ba2d416963b39df2d22828fc7d5.tar.gz
QPID-4795: update naming of the UserManagement MBeans to remove restriction preventing there being multiple AuthenticationProviders capable of user management
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1477965 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management')
-rw-r--r--qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java2
-rw-r--r--qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java9
2 files changed, 9 insertions, 2 deletions
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
index 1a4715224f..43249ea004 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
@@ -46,7 +46,7 @@ public interface ServerInformation
* Qpid JMX API 1.1 can be assumed.
*/
int QPID_JMX_API_MAJOR_VERSION = 2;
- int QPID_JMX_API_MINOR_VERSION = 5;
+ int QPID_JMX_API_MINOR_VERSION = 6;
/**
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
index 540ae3ee6a..657f9f90e4 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.management.common.mbeans;
+import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute;
import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation;
import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter;
@@ -118,5 +119,11 @@ public interface UserManagement
impact = MBeanOperationInfo.INFO)
TabularData viewUsers();
-
+ /**
+ * The type of the underlying authentication provider being managed.
+ *
+ * @since Qpid JMX API 2.6
+ */
+ @MBeanAttribute(name="AuthenticationProviderType", description="The type of the underlying authentication provider being managed.")
+ String getAuthenticationProviderType();
}