Removing unused classes from the great refactoring period.

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

8 files changed, 0 insertions, 858 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java b/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java
deleted file mode 100644
index 63f67a7857..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid;
-
-import java.util.Map;
-
-/**
- * This interface represents a broker and provides the basic information
- * required for opening a connection with a broker.
- */
-public interface BrokerDetails
-{
-    /**
-     * Those are the supported protocols
-     */
-    public static final String PROTOCOL_TCP = "tcp";
-    public static final String PROTOCOL_TLS = "tls";
-    
-    public static final String VIRTUAL_HOST = "virtualhost";
-    public static final String CLIENT_ID = "client_id";
-    public static final String USERNAME = "username";
-    public static final String PASSWORD = "password";
-
-    /**
-     * Get the broker host name.
-     *
-     * @return The broker host name.
-     */
-    public String getHost();
-
-    /**
-     * Get the broker port number.
-     *
-     * @return The broker port number.
-     */
-    public int getPort();
-
-    /**
-     * Get the virtual host to connect to.
-     *
-     * @return The virtual host of this broker.
-     */
-    public String getVirtualHost();
-
-    /**
-     * Get the user name.
-     *
-     * @return The user name
-     */
-    public String getUserName();
-
-    /**
-     * Get the user password
-     *
-     * @return The user password
-     */
-    public String getPassword();
-
-    /**
-     * Get the protocol used to connect to hise broker.
-     *
-     * @return the protocol used to connect to the broker.
-     */
-    public String getProtocol();
-
-    /**
-     * Set the broker host name.
-     *
-     * @param host The broker host name.
-     */
-    public void setHost(String host);
-
-    /**
-     * Set the broker port number.
-     *
-     * @param port The broker port number.
-     */
-    public void setPort(int port);
-
-    /**
-     * Set the virtual host to connect to.
-     *
-     * @param virtualHost The virtual host of this broker.
-     */
-    public void setVirtualHost(String virtualHost);
-
-    /**
-     * Set the user name.
-     *
-     * @param userName The user name
-     */
-    public void setUserName(String userName);
-
-    /**
-     * Set the user password
-     *
-     * @param password The user password
-     */
-    public void setPassword(String password);
-
-    /**
-     * Set the protocol used to connect to hise broker.
-     *
-     * @param protocol the protocol used to connect to the broker.
-     */
-    public void setProtocol(String protocol);
-    
-    /**
-     * Ex: keystore path
-     * 
-     * @return the Properties associated with this connection.
-     */
-    public Map<String,String> getProperties();
-    
-    /**
-     * Sets the properties associated with this connection
-     * 
-     * @param props the new p[roperties. 
-     */
-    public void setProperties(Map<String,String> props);
-    
-    public void setProperty(String key,String value);
-}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java
deleted file mode 100644
index 201d43e21f..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Implements the interface BrokerDetails
- */
-public class BrokerDetailsImpl implements BrokerDetails
-{
-    //--- Those are the default values
-    private final String DEFAULT_USERNAME = "guest";
-    private final String DEFAULT_PASSWORD = "guest";
-    private final String DEFAULT_VIRTUALHOST = "";
-
-    //---- The brker details
-    private String _host;
-    private int _port = 0;
-    private String _virtualHost;
-    private String _userName = DEFAULT_USERNAME;
-    private String _password = DEFAULT_PASSWORD;
-    private String _protocol;
-    private Map<String, String> _props = new HashMap<String, String>();
-    ;
-
-    //--- Constructors
-
-    public BrokerDetailsImpl()
-    {
-    }
-
-    /**
-     * Create a new broker details given all the reuqired information
-     *
-     * @param protocol    The protocol used for this broker connection
-     * @param host        The host name.
-     * @param port        The port number.
-     * @param virtualHost The virtual host.
-     * @param userName    The user name.
-     * @param password    The user password.
-     */
-    public BrokerDetailsImpl(String protocol, String host, int port, String virtualHost, String userName,
-                             String password, Map<String, String> props)
-    {
-        _protocol = protocol;
-        _host = host;
-        _port = port;
-        _virtualHost = virtualHost;
-        _userName = userName;
-        _password = password;
-        _props = props;
-    }
-
-    /**
-     * Create a new broker details given the host name and the procol type,
-     * default values are used for the other details.
-     *
-     * @param protocol The protocol used for this broker connection
-     * @param host     The host name.
-     */
-    public BrokerDetailsImpl(String protocol, String host)
-    {
-        _protocol = protocol;
-        _host = host;
-        _virtualHost = DEFAULT_VIRTUALHOST;
-        _userName = DEFAULT_USERNAME;
-        _password = DEFAULT_PASSWORD;
-    }
-
-    //--- API BrokerDetails
-    /**
-     * Get the user password
-     *
-     * @return The user password
-     */
-    public String getPassword()
-    {
-        return _password;
-    }
-
-    /**
-     * Get the broker host name.
-     *
-     * @return The broker host name.
-     */
-    public String getHost()
-    {
-        return _host;
-    }
-
-    /**
-     * Get the broker port number.
-     *
-     * @return The broker port number.
-     */
-    public int getPort()
-    {
-        if (_port == 0)
-        {
-            if (getProtocol().equals(BrokerDetails.PROTOCOL_TCP))
-            {
-                _port = 5672;
-            }
-            else if (getProtocol().equals(BrokerDetails.PROTOCOL_TLS))
-            {
-                _port = 5555;
-            }
-        }
-        return _port;
-    }
-
-    /**
-     * Get the virtual host to connect to.
-     *
-     * @return The virtual host of this broker.
-     */
-    public String getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    /**
-     * Get the user name.
-     *
-     * @return The user name
-     */
-    public String getUserName()
-    {
-        return _userName;
-    }
-
-    /**
-     * Get the protocol used to connect to hise broker.
-     *
-     * @return the protocol used to connect to the broker.
-     */
-    public String getProtocol()
-    {
-        return _protocol;
-    }
-
-    /**
-     * Set the broker host name.
-     *
-     * @param host The broker host name.
-     */
-    public void setHost(String host)
-    {
-        _host = host;
-    }
-
-    /**
-     * Set the broker port number.
-     *
-     * @param port The broker port number.
-     */
-    public void setPort(int port)
-    {
-        _port = port;
-    }
-
-    /**
-     * Set the virtual host to connect to.
-     *
-     * @param virtualHost The virtual host of this broker.
-     */
-    public void setVirtualHost(String virtualHost)
-    {
-        _virtualHost = virtualHost;
-    }
-
-    /**
-     * Set the user name.
-     *
-     * @param userName The user name
-     */
-    public void setUserName(String userName)
-    {
-        _userName = userName;
-    }
-
-    /**
-     * Set the user password
-     *
-     * @param password The user password
-     */
-    public void setPassword(String password)
-    {
-        _password = password;
-    }
-
-    /**
-     * Set the protocol used to connect to hise broker.
-     *
-     * @param protocol the protocol used to connect to the broker.
-     */
-    public void setProtocol(String protocol)
-    {
-        _protocol = protocol;
-    }
-
-    /**
-     * Ex: keystore path
-     *
-     * @return the Properties associated with this connection.
-     */
-    public Map<String, String> getProperties()
-    {
-        return _props;
-    }
-
-    /**
-     * Sets the properties associated with this connection
-     *
-     * @param props
-     */
-    public void setProperties(Map<String, String> props)
-    {
-        _props = props;
-    }
-
-    public void setProperty(String key, String value)
-    {
-        _props.put(key, value);
-    }
-
-    public String toString()
-    {
-        StringBuilder b = new StringBuilder();
-        b.append("[username=" + _userName);
-        b.append(",password=" + _password);
-        b.append(",transport=" + _protocol);
-        b.append(",host=" + _host);
-        b.append(",port=" + getPort() + "]");
-        b.append(" - Properties[");
-        if (_props != null)
-        {
-            for (String k : _props.keySet())
-            {
-                b.append(k + "=" + _props.get(k) + ",");
-            }
-        }
-        b.append("]");
-
-        return b.toString();
-    }
-}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java b/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java
deleted file mode 100644
index dda5a6506d..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.qpid.security.AMQPCallbackHandler;
-import org.apache.qpid.security.CallbackHandlerRegistry;
-
-public class SecurityHelper
-{
-    public static String chooseMechanism(List<Object> mechanisms) throws UnsupportedEncodingException
-    {
-        HashSet mechanismSet = new HashSet();
-        for (Object m : mechanisms)
-        {
-            mechanismSet.add(m);
-        }
-
-        String preferredMechanisms = CallbackHandlerRegistry.getInstance().getMechanisms();
-        StringTokenizer prefTokenizer = new StringTokenizer(preferredMechanisms, " ");
-        while (prefTokenizer.hasMoreTokens())
-        {
-            String mech = prefTokenizer.nextToken();
-            if (mechanismSet.contains(mech))
-            {
-                return mech;
-            }
-        }
-        return null;
-    }
-
-    public static AMQPCallbackHandler createCallbackHandler(String mechanism, String username,String password)
-            throws QpidException
-    {
-        Class mechanismClass = CallbackHandlerRegistry.getInstance().getCallbackHandlerClass(mechanism);
-        try
-        {
-            Object instance = mechanismClass.newInstance();
-            AMQPCallbackHandler cbh = (AMQPCallbackHandler) instance;
-            cbh.initialise(username,password);
-            return cbh;
-        }
-        catch (Exception e)
-        {
-            throw new QpidException("Unable to create callback handler: " + e,ErrorCode.UNDEFINED, e.getCause());
-        }
-    }
-
-}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java b/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java
deleted file mode 100644
index 8c80a1b5b7..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.security;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.QpidConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CallbackHandlerRegistry
-{
-    private static final Logger _logger = LoggerFactory.getLogger(CallbackHandlerRegistry.class);
-    private static CallbackHandlerRegistry _instance = new CallbackHandlerRegistry();
-
-    private Map<String,Class> _mechanismToHandlerClassMap = new HashMap<String,Class>();
-
-    private StringBuilder _mechanisms;
-
-    public static CallbackHandlerRegistry getInstance()
-    {
-        return _instance;
-    }
-
-    public Class getCallbackHandlerClass(String mechanism)
-    {
-        return _mechanismToHandlerClassMap.get(mechanism);
-    }
-
-    public String getMechanisms()
-    {
-        return _mechanisms.toString();
-    }
-
-    private CallbackHandlerRegistry()
-    {
-        // first we register any Sasl client factories
-        DynamicSaslRegistrar.registerSaslProviders();
-        registerMechanisms();
-    }
-
-    private void registerMechanisms()
-    {
-        for (QpidConfig.SecurityMechanism  securityMechanism: QpidConfig.get().getSecurityMechanisms() )
-        {
-            Class clazz = null;
-            try
-            {
-                clazz = Class.forName(securityMechanism.getHandler());
-                if (!AMQPCallbackHandler.class.isAssignableFrom(clazz))
-                {
-                    _logger.debug("SASL provider " + clazz + " does not implement " + AMQPCallbackHandler.class +
-                                 ". Skipping");
-                    continue;
-                }
-                _mechanismToHandlerClassMap.put(securityMechanism.getType(), clazz);
-                if (_mechanisms == null)
-                {
-
-                    _mechanisms = new StringBuilder();
-                    _mechanisms.append(securityMechanism.getType());
-                }
-                else
-                {
-                    _mechanisms.append(" " + securityMechanism.getType());
-                }
-            }
-            catch (ClassNotFoundException ex)
-            {
-                _logger.debug("Unable to load class " + securityMechanism.getHandler() + ". Skipping that SASL provider");
-                continue;
-            }
-        }
-    }
-}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java b/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java
deleted file mode 100644
index d2bf979d0a..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.security;
-
-import java.security.Security;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.security.sasl.SaslClientFactory;
-
-import org.apache.qpid.QpidConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DynamicSaslRegistrar
-{
-    private static final Logger _logger = LoggerFactory.getLogger(DynamicSaslRegistrar.class);
-
-    public static void registerSaslProviders()
-    {
-        Map<String, Class> factories = registerSaslClientFactories();
-        if (factories.size() > 0)
-        {
-            if (Security.addProvider(new JCAProvider(factories)) == -1)
-            {
-                _logger.error("Unable to load custom SASL providers. Qpid custom SASL authenticators unavailable.");                
-            }
-            else
-            {
-                _logger.debug("Dynamic SASL provider added as a security provider");
-            }
-        }
-    }
-
-    private static Map<String, Class> registerSaslClientFactories()
-    {
-        TreeMap<String, Class> factoriesToRegister =
-                new TreeMap<String, Class>();
-
-        for (QpidConfig.SaslClientFactory factory: QpidConfig.get().getSaslClientFactories())
-        {
-            String className = factory.getFactoryClass();
-            try
-            {
-                Class clazz = Class.forName(className);
-                if (!(SaslClientFactory.class.isAssignableFrom(clazz)))
-                {
-                    _logger.debug("Class " + clazz + " does not implement " + SaslClientFactory.class + " - skipping");
-                    continue;
-                }
-                factoriesToRegister.put(factory.getType(), clazz);
-            }
-            catch (Exception ex)
-            {
-                _logger.debug("Error instantiating SaslClientFactory calss " + className  + " - skipping");
-            }
-        }
-        return factoriesToRegister;
-    }
-
-
-}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java b/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java
deleted file mode 100644
index 033deb550c..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.security;
-
-import java.security.Provider;
-import java.security.Security;
-import java.util.Map;
-
-public class JCAProvider extends Provider
-{
-    public JCAProvider(Map<String, Class> providerMap)
-    {
-        super("AMQSASLProvider", 1.0, "A JCA provider that registers all " +
-              "AMQ SASL providers that want to be registered");
-        register(providerMap);
-        Security.addProvider(this);
-    }
-
-    private void register(Map<String, Class> providerMap)
-    {
-        for (Map.Entry<String, Class> me :providerMap.entrySet())
-        {
-            put("SaslClientFactory." + me.getKey(), me.getValue().getName());
-        }
-    }
-}
\ No newline at end of file
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java b/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java
deleted file mode 100644
index 81acc66de4..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.security.amqplain;
-
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.FieldTableFactory;
-
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.Callback;
-
-/**
- * Implements the "AMQPlain" authentication protocol that uses FieldTables to send username and pwd.
- *
- */
-public class AmqPlainSaslClient implements SaslClient
-{
-    /**
-     *  The name of this mechanism
-     */
-    public static final String MECHANISM = "AMQPLAIN";
-
-    private CallbackHandler _cbh;
-
-    public AmqPlainSaslClient(CallbackHandler cbh)
-    {
-        _cbh = cbh;
-    }
-
-    public String getMechanismName()
-    {
-        return "AMQPLAIN";
-    }
-
-    public boolean hasInitialResponse()
-    {
-        return true;
-    }
-
-    public byte[] evaluateChallenge(byte[] challenge) throws SaslException
-    {
-        // we do not care about the prompt or the default name
-        NameCallback nameCallback = new NameCallback("prompt", "defaultName");
-        PasswordCallback pwdCallback = new PasswordCallback("prompt", false);
-        Callback[] callbacks = new Callback[]{nameCallback, pwdCallback};
-        try
-        {
-            _cbh.handle(callbacks);
-        }
-        catch (Exception e)
-        {
-            throw new SaslException("Error handling SASL callbacks: " + e, e);
-        }
-        FieldTable table = FieldTableFactory.newFieldTable();
-        table.setString("LOGIN", nameCallback.getName());
-        table.setString("PASSWORD", new String(pwdCallback.getPassword()));
-        return table.getDataAsBytes();
-    }
-
-    public boolean isComplete()
-    {
-        return true;
-    }
-
-    public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException
-    {
-        throw new SaslException("Not supported");
-    }
-
-    public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException
-    {
-        throw new SaslException("Not supported");
-    }
-
-    public Object getNegotiatedProperty(String propName)
-    {
-        return null;
-    }
-
-    public void dispose() throws SaslException
-    {
-        _cbh = null;
-    }
-}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java
deleted file mode 100644
index 6c66c87f4c..0000000000
--- a/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.security.amqplain;
-
-import javax.security.sasl.SaslClientFactory;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.Sasl;
-import javax.security.auth.callback.CallbackHandler;
-import java.util.Map;
-
-public class AmqPlainSaslClientFactory implements SaslClientFactory
-{
-    public SaslClient createSaslClient(String[] mechanisms, String authorizationId, String protocol, String serverName, Map props, CallbackHandler cbh) throws SaslException
-    {
-        for (int i = 0; i < mechanisms.length; i++)
-        {
-            if (mechanisms[i].equals(AmqPlainSaslClient.MECHANISM))
-            {
-                if (cbh == null)
-                {
-                    throw new SaslException("CallbackHandler must not be null");
-                }
-                return new AmqPlainSaslClient(cbh);
-            }
-        }
-        return null;
-    }
-
-    public String[] getMechanismNames(Map props)
-    {
-        if (props.containsKey(Sasl.POLICY_NOPLAINTEXT) ||
-            props.containsKey(Sasl.POLICY_NODICTIONARY) ||
-            props.containsKey(Sasl.POLICY_NOACTIVE))
-        {
-            // returned array must be non null according to interface documentation
-            return new String[0];
-        }
-        else
-        {
-            return new String[]{AmqPlainSaslClient.MECHANISM};
-        }
-    }
-}