QPID-4596,QPID-4638: Change authentication provider names to shorter names, rename Port#AUTHENTICATION_MANAGER into Port#AUTHENTICATION_PROVIDER

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455919 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 22 insertions, 26 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
index 48d80592f6..3d19e781e2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
@@ -112,7 +112,7 @@ public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker>
         Collection<Port> ports = broker.getPorts();
         for (Port port : ports)
         {
-            String authenticationProviderName = (String) port.getAttribute(Port.AUTHENTICATION_MANAGER);
+            String authenticationProviderName = (String) port.getAttribute(Port.AUTHENTICATION_PROVIDER);
             AuthenticationProvider provider = null;
             if (authenticationProviderName != null)
             {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java
index 2f94c3cab7..33ba34767d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Port.java
@@ -44,11 +44,7 @@ public interface Port extends ConfiguredObject
     String RECEIVE_BUFFER_SIZE                  = "receiveBufferSize";
     String NEED_CLIENT_AUTH                     = "needClientAuth";
     String WANT_CLIENT_AUTH                     = "wantClientAuth";
-
-    /**
-     * TODO: rename it to AUTHENTICATION_MANAGER_ID or introduce relationships
-     */
-    String AUTHENTICATION_MANAGER               = "authenticationManager";
+    String AUTHENTICATION_PROVIDER              = "authenticationProvider";
 
     // Attributes
     public static final Collection<String> AVAILABLE_ATTRIBUTES =
@@ -71,7 +67,7 @@ public interface Port extends ConfiguredObject
                             RECEIVE_BUFFER_SIZE,
                             NEED_CLIENT_AUTH,
                             WANT_CLIENT_AUTH,
-                            AUTHENTICATION_MANAGER
+                            AUTHENTICATION_PROVIDER
                                  ));
 
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
index d77b58458a..16c6cb7e5e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
@@ -217,7 +217,7 @@ public abstract class AuthenticationProviderAdapter<T extends AuthenticationMana
             Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
             for (Port port : ports)
             {
-                if (providerName.equals(port.getAttribute(Port.AUTHENTICATION_MANAGER)))
+                if (providerName.equals(port.getAttribute(Port.AUTHENTICATION_PROVIDER)))
                 {
                     throw new IntegrityViolationException("Authentication provider '" + providerName + "' is set on port " + port.getName());
                 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
index 628ba5a099..291f751a5c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
@@ -462,21 +462,21 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
 
     private AuthenticationProvider createAuthenticationProvider(Map<String, Object> attributes)
     {
-        String type = (String)attributes.get(AuthenticationProvider.TYPE);
-        if (type == null)
-        {
-            throw new IllegalConfigurationException("Authentication provider type is not specified");
-        }
-
         AuthenticationProvider authenticationProvider = null;
         synchronized (_authenticationProviders)
         {
+            String type = (String)attributes.get(AuthenticationProvider.TYPE);
+            if (type == null)
+            {
+                throw new IllegalConfigurationException("Authentication provider type is not specified");
+            }
+
             // 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.
+            // with several user management MBeans as MBean type is used as a name.
 
-            // TODO: Remove this check after fixing the JMX management
+            // TODO: Remove this check after fixing of JMX management
             if (type.equals(PlainPasswordFileAuthenticationManagerFactory.PROVIDER_TYPE)
                     || type.equals(Base64MD5PasswordFileAuthenticationManagerFactory.PROVIDER_TYPE))
             {
@@ -487,7 +487,7 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
                     if (providerType.equals(PlainPasswordFileAuthenticationManagerFactory.PROVIDER_TYPE)
                             || providerType.equals(Base64MD5PasswordFileAuthenticationManagerFactory.PROVIDER_TYPE))
                     {
-                        throw new IllegalConfigurationException("Authentication provider managing users alredy exists ["
+                        throw new IllegalConfigurationException("An authentication provider which can manage users alredy exists ["
                                 + provider.getName() + "]. Only one instance is allowed.");
                     }
                 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
index 298ff05dd1..c3d2c3d791 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
@@ -63,7 +63,7 @@ public class PortAdapter extends AbstractAdapter implements Port
         put(WANT_CLIENT_AUTH, Boolean.class);
         put(BINDING_ADDRESS, String.class);
         put(STATE, State.class);
-        put(AUTHENTICATION_MANAGER, String.class);
+        put(AUTHENTICATION_PROVIDER, String.class);
     }});
 
     private final Broker _broker;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
index 0c6aa75636..91aba71720 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
@@ -27,7 +27,7 @@ import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 
 public class AnonymousAuthenticationManagerFactory implements AuthenticationManagerFactory
 {
-    public static final String PROVIDER_TYPE = AnonymousAuthenticationManager.class.getSimpleName();
+    public static final String PROVIDER_TYPE = "Anonymous";
 
     @Override
     public AuthenticationManager createInstance(Map<String, Object> attributes)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
index c0c0b8e3c1..8b979c324d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.util.ResourceBundleLoader;
 
 public class Base64MD5PasswordFileAuthenticationManagerFactory extends AbstractPrincipalDatabaseAuthManagerFactory
 {
-    public static final String PROVIDER_TYPE = "Base64MD5PasswordFileAuthenticationProvider";
+    public static final String PROVIDER_TYPE = "Base64MD5PasswordFile";
 
     @Override
     public String getType()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
index 29cfb2ad29..64acfafc4a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
@@ -27,7 +27,7 @@ import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 
 public class ExternalAuthenticationManagerFactory implements AuthenticationManagerFactory
 {
-    public static final String PROVIDER_TYPE = ExternalAuthenticationManager.class.getSimpleName();
+    public static final String PROVIDER_TYPE = "External";
 
     @Override
     public AuthenticationManager createInstance(Map<String, Object> attributes)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
index e60f37a18e..a2d5bd4c8e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
@@ -27,7 +27,7 @@ import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 
 public class KerberosAuthenticationManagerFactory implements AuthenticationManagerFactory
 {
-    public static final String PROVIDER_TYPE = KerberosAuthenticationManager.class.getSimpleName();
+    public static final String PROVIDER_TYPE = "Kerberos";
 
     @Override
     public AuthenticationManager createInstance(Map<String, Object> attributes)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
index c08b00f907..5e077cfe79 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.util.ResourceBundleLoader;
 
 public class PlainPasswordFileAuthenticationManagerFactory extends AbstractPrincipalDatabaseAuthManagerFactory
 {
-    public static final String PROVIDER_TYPE = "PlainPasswordFileAuthenticationProvider";
+    public static final String PROVIDER_TYPE = "PlainPasswordFile";
 
     @Override
     public String getType()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
index ff468dc56a..d1f2e9b3ee 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
@@ -32,7 +32,7 @@ public class SimpleLDAPAuthenticationManagerFactory implements AuthenticationMan
     public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationProviderAttributeDescriptions";
     private static final String DEFAULT_LDAP_CONTEXT_FACTORY = "com.sun.jndi.ldap.LdapCtxFactory";
 
-    public static final String PROVIDER_TYPE = SimpleLDAPAuthenticationManager.class.getSimpleName();
+    public static final String PROVIDER_TYPE = "SimpleLDAP";
 
     public static final String ATTRIBUTE_LDAP_CONTEXT_FACTORY = "ldapContextFactory";
     public static final String ATTRIBUTE_SEARCH_FILTER = "searchFilter";
diff --git a/qpid/java/broker/src/main/resources/initial-store.json b/qpid/java/broker/src/main/resources/initial-store.json
index 8e278120fc..9fe72b3601 100644
--- a/qpid/java/broker/src/main/resources/initial-store.json
+++ b/qpid/java/broker/src/main/resources/initial-store.json
@@ -24,7 +24,7 @@
   "defaultVirtualHost" : "default",
   "authenticationproviders" : [ {
     "name" : "passwordFile",
-    "type" : "PlainPasswordFileAuthenticationProvider",
+    "type" : "PlainPasswordFile",
     "path" : "${QPID_HOME}/etc/passwd"
   } ],
   "ports" : [  {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
index 883f88cc36..8e0bfdaeb7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
@@ -245,7 +245,7 @@ public class BrokerRecovererTest extends TestCase
         Port port1 = mock(Port.class);
         when(port1.getName()).thenReturn("port1");
         when(port1.getPort()).thenReturn(5671);
-        when(port1.getAttribute(Port.AUTHENTICATION_MANAGER)).thenReturn("authenticationProvider1");
+        when(port1.getAttribute(Port.AUTHENTICATION_PROVIDER)).thenReturn("authenticationProvider1");
         ConfigurationEntry portEntry2 = mock(ConfigurationEntry.class);
         Port port2 = mock(Port.class);
         when(port2.getName()).thenReturn("port2");