From d5b676fcd2b16ba2d416963b39df2d22828fc7d5 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Wed, 1 May 2013 12:14:40 +0000 Subject: 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 --- .../model/adapter/AuthenticationProviderFactory.java | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'qpid/java/broker/src/main') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java index 4dfcaab8ef..7efb71d78b 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java @@ -88,20 +88,6 @@ public class AuthenticationProviderFactory AuthenticationProviderAdapter authenticationProvider; if (manager instanceof PrincipalDatabaseAuthenticationManager) { - // a temporary restriction to prevent creation of several instances - // of PlainPasswordFileAuthenticationProvider/Base64MD5PasswordFileAuthenticationProvider - // due to current limitation of JMX management which cannot cope - // with several user management MBeans as MBean type is used as a name. - - // TODO: Remove this check after fixing of JMX management - for (AuthenticationProvider provider : broker.getAuthenticationProviders()) - { - if (provider instanceof PasswordCredentialManagingAuthenticationProvider) - { - throw new IllegalConfigurationException("An authentication provider which can manage users already exists [" - + provider.getName() + "]. Only one instance is allowed."); - } - } authenticationProvider = new PrincipalDatabaseAuthenticationManagerAdapter(id, broker, (PrincipalDatabaseAuthenticationManager) manager, attributes, factory.getAttributeNames()); } -- cgit v1.2.1