NO-JIRA : AMQP-1-0 sandbox updates - merge from trunkrg-amqp-1-0-sandbox

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1299257 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 38 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
index e35e999766..83369a84c7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
@@ -20,53 +20,17 @@
  */
 package org.apache.qpid.server.security.auth.sasl.anonymous;
 
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.sasl.SaslServerFactory;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
 import org.apache.qpid.server.security.auth.sasl.UsernamePasswordInitialiser;
 
-import java.io.IOException;
-import java.util.Map;
+import javax.security.sasl.SaslServerFactory;
 
-public class AnonymousInitialiser implements AuthenticationProviderInitialiser
+public class AnonymousInitialiser extends UsernamePasswordInitialiser
 {
     public String getMechanismName()
     {
         return "ANONYMOUS";
     }
 
-    public void initialise(String baseConfigPath, Configuration configuration, Map<String, PrincipalDatabase> principalDatabases) throws Exception
-    {
-    }
-
-    public void initialise(PrincipalDatabase db)
-    {
-    }
-
-    public CallbackHandler getCallbackHandler()
-    {
-        return new CallbackHandler()
-        {
-
-            public Callback[] _callbacks;
-
-            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-            {
-                _callbacks =callbacks;
-            }
-        };
-    }
-
-    public Map<String, ?> getProperties()
-    {
-        return null;
-    }
-
     public Class<? extends SaslServerFactory> getServerFactoryClassForJCARegistration()
     {
         return AnonymousSaslServerFactory.class;