summaryrefslogtreecommitdiff
path: root/java/management/common/src
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
commit23973109351c29388f3d45a0e275295f3df46cd1 (patch)
tree44517f3da3612447e48ccdd29b40f2637dd36abf /java/management/common/src
parent4ce34b5e1943c3e3ad383c90f4ce3f30a7c4af1d (diff)
downloadqpid-python-23973109351c29388f3d45a0e275295f3df46cd1.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/qpid@1477965 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/management/common/src')
-rw-r--r--java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java2
-rw-r--r--java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java9
2 files changed, 9 insertions, 2 deletions
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
index 1a4715224f..43249ea004 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
+++ b/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/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
index 540ae3ee6a..657f9f90e4 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
+++ b/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();
}