QPID-3789 : [Java Broker] Remove duplication between two password file database implementations

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

11 files changed, 606 insertions, 936 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
new file mode 100644
index 0000000000..9277b80b99
--- /dev/null
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
@@ -0,0 +1,477 @@
+/*
+ *
+ * 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.server.security.auth.database;
+
+import org.apache.log4j.Logger;
+import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
+import org.apache.qpid.server.security.auth.sasl.UsernamePasswordInitialiser;
+import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
+
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.login.AccountNotFoundException;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Pattern;
+
+public abstract class AbstractPasswordFilePrincipalDatabase<U extends PasswordPrincipal> implements PrincipalDatabase
+{
+    private final Pattern _regexp = Pattern.compile(":");
+
+    private final Map<String, AuthenticationProviderInitialiser> _saslServers =
+            new HashMap<String, AuthenticationProviderInitialiser>();
+
+    protected static final String DEFAULT_ENCODING = "utf-8";
+    private final Map<String, U> _userMap = new HashMap<String, U>();
+    private final ReentrantLock _userUpdate = new ReentrantLock();
+    private final Random _random = new Random();
+    private File _passwordFile;
+
+
+    protected AbstractPasswordFilePrincipalDatabase(UsernamePasswordInitialiser... initialisers)
+    {
+        for(UsernamePasswordInitialiser initialiser : initialisers)
+        {
+            initialiser.initialise(this);
+            _saslServers.put(initialiser.getMechanismName(), initialiser);
+        }
+    }
+
+    public final void setPasswordFile(String passwordFile) throws IOException
+    {
+        File f = new File(passwordFile);
+        getLogger().info("PasswordFile using file " + f.getAbsolutePath());
+        _passwordFile = f;
+        if (!f.exists())
+        {
+            throw new FileNotFoundException("Cannot find password file " + f);
+        }
+        if (!f.canRead())
+        {
+            throw new FileNotFoundException("Cannot read password file " + f +
+                                            ". Check permissions.");
+        }
+
+        loadPasswordFile();
+    }
+
+    /**
+     * SASL Callback Mechanism - sets the Password in the PasswordCallback based on the value in the PasswordFile
+     * If you want to change the password for a user, use updatePassword instead.
+     *
+     * @param principal The Principal to set the password for
+     * @param callback  The PasswordCallback to call setPassword on
+     *
+     * @throws javax.security.auth.login.AccountNotFoundException If the Principal cannot be found in this Database
+     */
+    public final void setPassword(Principal principal, PasswordCallback callback) throws AccountNotFoundException
+    {
+        if (_passwordFile == null)
+        {
+            throw new AccountNotFoundException("Unable to locate principal since no password file was specified during initialisation");
+        }
+        if (principal == null)
+        {
+            throw new IllegalArgumentException("principal must not be null");
+        }
+        char[] pwd = lookupPassword(principal.getName());
+
+        if (pwd != null)
+        {
+            callback.setPassword(pwd);
+        }
+        else
+        {
+            throw new AccountNotFoundException("No account found for principal " + principal);
+        }
+    }
+
+
+    /**
+     * Looks up the password for a specified user in the password file. Note this code is <b>not</b> secure since it
+     * creates strings of passwords. It should be modified to create only char arrays which get nulled out.
+     *
+     * @param name The principal name to lookup
+     *
+     * @return a char[] for use in SASL.
+     */
+    protected final char[] lookupPassword(String name)
+    {
+        U user = _userMap.get(name);
+        if (user == null)
+        {
+            return null;
+        }
+        else
+        {
+            return user.getPassword();
+        }
+    }
+
+    protected boolean compareCharArray(char[] a, char[] b)
+    {
+        boolean equal = false;
+        if (a.length == b.length)
+        {
+            equal = true;
+            int index = 0;
+            while (equal && index < a.length)
+            {
+                equal = a[index] == b[index];
+                index++;
+            }
+        }
+        return equal;
+    }
+
+    /**
+     * Changes the password for the specified user
+     *
+     * @param principal to change the password for
+     * @param password plaintext password to set the password too
+     */
+    public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
+    {
+        U user = _userMap.get(principal.getName());
+
+        if (user == null)
+        {
+            throw new AccountNotFoundException(principal.getName());
+        }
+
+        char[] orig = user.getPassword();
+        _userUpdate.lock();
+        try
+        {
+            user.setPassword(password);
+
+            savePasswordFile();
+
+            return true;
+        }
+        catch (IOException e)
+        {
+            getLogger().error("Unable to save password file due to '" + e.getMessage()
+                              + "', password change for user '" + principal + "' discarded");
+            //revert the password change
+            user.restorePassword(orig);
+
+            return false;
+        }
+        finally
+        {
+            _userUpdate.unlock();
+        }
+    }
+
+
+    private void loadPasswordFile() throws IOException
+    {
+        try
+        {
+            _userUpdate.lock();
+            _userMap.clear();
+
+            BufferedReader reader = null;
+            try
+            {
+                reader = new BufferedReader(new FileReader(_passwordFile));
+                String line;
+
+                while ((line = reader.readLine()) != null)
+                {
+                    String[] result = _regexp.split(line);
+                    if (result == null || result.length < 2 || result[0].startsWith("#"))
+                    {
+                        continue;
+                    }
+
+                    U user = createUserFromFileData(result);
+                    getLogger().info("Created user:" + user);
+                    _userMap.put(user.getName(), user);
+                }
+            }
+            finally
+            {
+                if (reader != null)
+                {
+                    reader.close();
+                }
+            }
+        }
+        finally
+        {
+            _userUpdate.unlock();
+        }
+    }
+
+    protected abstract U createUserFromFileData(String[] result);
+
+
+    protected abstract Logger getLogger();
+
+    protected File createTempFileOnSameFilesystem()
+    {
+        File liveFile = _passwordFile;
+        File tmp;
+
+        do
+        {
+            tmp = new File(liveFile.getPath() + _random.nextInt() + ".tmp");
+        }
+        while(tmp.exists());
+
+        tmp.deleteOnExit();
+        return tmp;
+    }
+
+    protected void swapTempFileToLive(final File temp) throws IOException
+    {
+        File live = _passwordFile;
+        // Remove any existing ".old" file
+        final File old = new File(live.getAbsoluteFile() + ".old");
+        if (old.exists())
+        {
+            old.delete();
+        }
+
+        // Create an new ".old" file
+        if(!live.renameTo(old))
+        {
+            //unable to rename the existing file to the backup name
+            getLogger().error("Could not backup the existing password file");
+            throw new IOException("Could not backup the existing password file");
+        }
+
+        // Move temp file to be the new "live" file
+        if(!temp.renameTo(live))
+        {
+            //failed to rename the new file to the required filename
+            if(!old.renameTo(live))
+            {
+                //unable to return the backup to required filename
+                getLogger().error(
+                        "Could not rename the new password file into place, and unable to restore original file");
+                throw new IOException("Could not rename the new password file into place, and unable to restore original file");
+            }
+
+            getLogger().error("Could not rename the new password file into place");
+            throw new IOException("Could not rename the new password file into place");
+        }
+    }
+
+    protected void savePasswordFile() throws IOException
+    {
+        try
+        {
+            _userUpdate.lock();
+
+            BufferedReader reader = null;
+            PrintStream writer = null;
+
+            File tmp = createTempFileOnSameFilesystem();
+
+            try
+            {
+                writer = new PrintStream(tmp);
+                reader = new BufferedReader(new FileReader(_passwordFile));
+                String line;
+
+                while ((line = reader.readLine()) != null)
+                {
+                    String[] result = _regexp.split(line);
+                    if (result == null || result.length < 2 || result[0].startsWith("#"))
+                    {
+                        writer.write(line.getBytes(DEFAULT_ENCODING));
+                        writer.println();
+                        continue;
+                    }
+
+                    U user = _userMap.get(result[0]);
+
+                    if (user == null)
+                    {
+                        writer.write(line.getBytes(DEFAULT_ENCODING));
+                        writer.println();
+                    }
+                    else if (!user.isDeleted())
+                    {
+                        if (!user.isModified())
+                        {
+                            writer.write(line.getBytes(DEFAULT_ENCODING));
+                            writer.println();
+                        }
+                        else
+                        {
+                            byte[] encodedPassword = user.getEncodedPassword();
+
+                            writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
+                            writer.write(encodedPassword);
+                            writer.println();
+
+                            user.saved();
+                        }
+                    }
+                }
+
+                for (U user : _userMap.values())
+                {
+                    if (user.isModified())
+                    {
+                        byte[] encodedPassword;
+                        encodedPassword = user.getEncodedPassword();
+                        writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
+                        writer.write(encodedPassword);
+                        writer.println();
+                        user.saved();
+                    }
+                }
+            }
+            catch(IOException e)
+            {
+                getLogger().error("Unable to create the new password file: " + e);
+                throw new IOException("Unable to create the new password file" + e);
+            }
+            finally
+            {
+                if (reader != null)
+                {
+                    reader.close();
+                }
+
+                if (writer != null)
+                {
+                    writer.close();
+                }
+            }
+
+            swapTempFileToLive(tmp);
+        }
+        finally
+        {
+            _userUpdate.unlock();
+        }
+    }
+
+    protected abstract U createUserFromPassword(Principal principal, char[] passwd);
+
+
+    public void reload() throws IOException
+    {
+        loadPasswordFile();
+    }
+
+    public Map<String, AuthenticationProviderInitialiser> getMechanisms()
+    {
+        return _saslServers;
+    }
+
+    public List<Principal> getUsers()
+    {
+        return new LinkedList<Principal>(_userMap.values());
+    }
+
+    public Principal getUser(String username)
+    {
+        if (_userMap.containsKey(username))
+        {
+            return new UsernamePrincipal(username);
+        }
+        return null;
+    }
+
+    public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
+    {
+        U user = _userMap.get(principal.getName());
+
+        if (user == null)
+        {
+            throw new AccountNotFoundException(principal.getName());
+        }
+
+        try
+        {
+            _userUpdate.lock();
+            user.delete();
+
+            try
+            {
+                savePasswordFile();
+            }
+            catch (IOException e)
+            {
+                getLogger().error("Unable to remove user '" + user.getName() + "' from password file.");
+                return false;
+            }
+
+            _userMap.remove(user.getName());
+        }
+        finally
+        {
+            _userUpdate.unlock();
+        }
+
+        return true;
+    }
+
+    public boolean createPrincipal(Principal principal, char[] password)
+    {
+        if (_userMap.get(principal.getName()) != null)
+        {
+            return false;
+        }
+
+        U user = createUserFromPassword(principal, password);
+
+
+        try
+        {
+            _userUpdate.lock();
+            _userMap.put(user.getName(), user);
+
+            try
+            {
+                savePasswordFile();
+                return true;
+            }
+            catch (IOException e)
+            {
+                //remove the use on failure.
+                _userMap.remove(user.getName());
+                return false;
+            }
+        }
+        finally
+        {
+            _userUpdate.unlock();
+        }
+    }
+}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 52ddc092b5..63eb768035 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -22,28 +22,11 @@ package org.apache.qpid.server.security.auth.database;
 
 import org.apache.log4j.Logger;
 
-import org.apache.qpid.server.security.auth.management.AMQUserManagementMBean;
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
 import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedInitialiser;
 import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HexInitialiser;
 
-import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.login.AccountNotFoundException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
 import java.security.Principal;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.regex.Pattern;
 
 /**
  * Represents a user database where the account information is stored in a simple flat file.
@@ -52,91 +35,19 @@ import java.util.regex.Pattern;
  *
  * where a carriage return separates each username/password pair. Passwords are assumed to be in plain text.
  */
-public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
+public class Base64MD5PasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<HashedUser>
 {
-    private static final Logger _logger = Logger.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
-
-    private File _passwordFile;
-
-    private Pattern _regexp = Pattern.compile(":");
-
-    private Map<String, AuthenticationProviderInitialiser> _saslServers;
-
-    private AMQUserManagementMBean _mbean;
-    public static final String DEFAULT_ENCODING = "utf-8";
-    private Map<String, HashedUser> _users = new HashMap<String, HashedUser>();
-    private ReentrantLock _userUpdate = new ReentrantLock();
+    private final Logger _logger = Logger.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
 
     public Base64MD5PasswordFilePrincipalDatabase()
     {
-        _saslServers = new HashMap<String, AuthenticationProviderInitialiser>();
-
         /**
          *  Create Authenticators for MD5 Password file.
          */
+        super(new CRAMMD5HashedInitialiser(), new CRAMMD5HexInitialiser());
 
-        // Accept Plain incomming and hash it for comparison to the file.
-        CRAMMD5HashedInitialiser cram = new CRAMMD5HashedInitialiser();
-        cram.initialise(this);
-        _saslServers.put(cram.getMechanismName(), cram);
-
-        //Add the Hex initialiser
-        CRAMMD5HexInitialiser cramHex = new CRAMMD5HexInitialiser();
-        cramHex.initialise(this);
-        _saslServers.put(cramHex.getMechanismName(), cramHex);
-
-        //fixme The PDs should setup a PD Mangement MBean
     }
 
-    public void setPasswordFile(String passwordFile) throws IOException
-    {
-        File f = new File(passwordFile);
-        _logger.info("PasswordFilePrincipalDatabase using file " + f.getAbsolutePath());
-        _passwordFile = f;
-        if (!f.exists())
-        {
-            throw new FileNotFoundException("Cannot find password file " + f);
-        }
-        if (!f.canRead())
-        {
-            throw new FileNotFoundException("Cannot read password file " + f +
-                                            ". Check permissions.");
-        }
-
-        loadPasswordFile();
-    }
-
-    /**
-     * SASL Callback Mechanism - sets the Password in the PasswordCallback based on the value in the PasswordFile
-     * If you want to change the password for a user, use updatePassword instead.
-     *
-     * @param principal The Principal to set the password for
-     * @param callback  The PasswordCallback to call setPassword on
-     *
-     * @throws AccountNotFoundException If the Principal cannont be found in this Database
-     */
-    public void setPassword(Principal principal, PasswordCallback callback) throws AccountNotFoundException
-    {
-        if (_passwordFile == null)
-        {
-            throw new AccountNotFoundException("Unable to locate principal since no password file was specified during initialisation");
-        }
-        if (principal == null)
-        {
-            throw new IllegalArgumentException("principal must not be null");
-        }
-
-        char[] pwd = lookupPassword(principal.getName());
-
-        if (pwd != null)
-        {
-            callback.setPassword(pwd);
-        }
-        else
-        {
-            throw new AccountNotFoundException("No account found for principal " + principal);
-        }
-    }
 
     /**
      * Used to verify that the presented Password is correct. Currently only used by Management Console
@@ -171,7 +82,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         catch (Exception e1)
         {
-            _logger.warn("Unable to hash password for user '" + principal + "' for comparison");
+            getLogger().warn("Unable to hash password for user '" + principal + "' for comparison");
             return false;
         }
         
@@ -185,374 +96,21 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
 
         return compareCharArray(pwd, hashedPassword);
     }
-    
-    private boolean compareCharArray(char[] a, char[] b)
-    {
-        boolean equal = false;
-        if (a.length == b.length)
-        {
-            equal = true;
-            int index = 0;
-            while (equal && index < a.length)
-            {
-                equal = a[index] == b[index];
-                index++;
-            }
-        }
-        return equal;
-    }
-
-    /**
-     * Changes the password for the specified user
-     * 
-     * @param principal to change the password for
-     * @param password plaintext password to set the password too
-     */
-    public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
-    {
-        HashedUser user = _users.get(principal.getName());
-
-        if (user == null)
-        {
-            throw new AccountNotFoundException(principal.getName());
-        }
-
-        try
-        {
-            try
-            {
-                _userUpdate.lock();
-                char[] orig = user.getPassword();
-                user.setPassword(password,false);
-
-                try
-                {
-                    savePasswordFile();
-                }
-                catch (IOException e)
-                {
-                    _logger.error("Unable to save password file, password change for user'"
-                                  + principal + "' will revert at restart");
-                    //revert the password change
-                    user.setPassword(orig,true);
-                    return false;
-                }
-                return true;
-            }
-            finally
-            {
-                _userUpdate.unlock();
-            }
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-    }
-
-    public boolean createPrincipal(Principal principal, char[] password)
-    {
-        if (_users.get(principal.getName()) != null)
-        {
-            return false;
-        }
-
-        HashedUser user;
-        try
-        {
-            user = new HashedUser(principal.getName(), password);
-        }
-        catch (Exception e1)
-        {
-            _logger.warn("Unable to create new user '" + principal.getName() + "'");
-            return false;
-        }
-
-
-        try
-        {
-            _userUpdate.lock();
-            _users.put(user.getName(), user);
-
-            try
-            {
-                savePasswordFile();
-                return true;
-            }
-            catch (IOException e)
-            {
-                //remove the use on failure.
-                _users.remove(user.getName());
-                return false;
-            }
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-    }
-
-    public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
-    {
-        HashedUser user = _users.get(principal.getName());
-
-        if (user == null)
-        {
-            throw new AccountNotFoundException(principal.getName());
-        }
-
-        try
-        {
-            _userUpdate.lock();
-            user.delete();
-
-            try
-            {
-                savePasswordFile();
-            }
-            catch (IOException e)
-            {
-                _logger.warn("Unable to remove user '" + user.getName() + "' from password file.");
-                return false;
-            }
-
-            _users.remove(user.getName());
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-
-        return true;
-    }
-
-    public Map<String, AuthenticationProviderInitialiser> getMechanisms()
-    {
-        return _saslServers;
-    }
-
-    public List<Principal> getUsers()
-    {
-        return new LinkedList<Principal>(_users.values());
-    }
-
-    public Principal getUser(String username)
-    {
-        if (_users.containsKey(username))
-        {
-            return new UsernamePrincipal(username);
-        }
-        return null;
-    }
 
-    /**
-     * Looks up the password for a specified user in the password file. Note this code is <b>not</b> secure since it
-     * creates strings of passwords. It should be modified to create only char arrays which get nulled out.
-     *
-     * @param name The principal name to lookup
-     *
-     * @return a char[] for use in SASL.
-     */
-    private char[] lookupPassword(String name)
+    protected HashedUser createUserFromPassword(Principal principal, char[] passwd)
     {
-        HashedUser user = _users.get(name);
-        if (user == null)
-        {
-            return null;
-        }
-        else
-        {
-            return user.getPassword();
-        }
+        return new HashedUser(principal.getName(), passwd);
     }
 
-    private void loadPasswordFile() throws IOException
-    {
-        try
-        {
-            _userUpdate.lock();
-            _users.clear();
-
-            BufferedReader reader = null;
-            try
-            {
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2 || result[0].startsWith("#"))
-                    {
-                        continue;
-                    }
 
-                    HashedUser user = new HashedUser(result);
-                    _logger.info("Created user:" + user);
-                    _users.put(user.getName(), user);
-                }
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-            }
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-    }
-
-    private void savePasswordFile() throws IOException
+    protected HashedUser createUserFromFileData(String[] result)
     {
-        try
-        {
-            _userUpdate.lock();
-
-            BufferedReader reader = null;
-            PrintStream writer = null;
-            
-            Random r = new Random();
-            File tmp;
-            do
-            {
-                tmp = new File(_passwordFile.getPath() + r.nextInt() + ".tmp");
-            }
-            while(tmp.exists());
-            
-            tmp.deleteOnExit();
-
-            try
-            {
-                writer = new PrintStream(tmp);
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2 || result[0].startsWith("#"))
-                    {
-                        writer.write(line.getBytes(DEFAULT_ENCODING));
-                        writer.println();
-                        continue;
-                    }
-
-                    HashedUser user = _users.get(result[0]);
-
-                    if (user == null)
-                    {
-                        writer.write(line.getBytes(DEFAULT_ENCODING));
-                        writer.println();
-                    }
-                    else if (!user.isDeleted())
-                    {
-                        if (!user.isModified())
-                        {
-                            writer.write(line.getBytes(DEFAULT_ENCODING));
-                            writer.println();
-                        }
-                        else
-                        {
-                            try
-                            {
-                                byte[] encodedPassword = user.getEncodedPassword();
-
-                                writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
-                                writer.write(encodedPassword);
-                                writer.println();
-
-                                user.saved();
-                            }
-                            catch (Exception e)
-                            {
-                                _logger.warn("Unable to encode new password reverting to old password.");
-                                writer.write(line.getBytes(DEFAULT_ENCODING));
-                                writer.println();
-                            }
-                        }
-                    }
-                }
-
-                for (HashedUser user : _users.values())
-                {
-                    if (user.isModified())
-                    {
-                        byte[] encodedPassword;
-                        try
-                        {
-                            encodedPassword = user.getEncodedPassword();
-                            writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
-                            writer.write(encodedPassword);
-                            writer.println();
-                            user.saved();
-                        }
-                        catch (Exception e)
-                        {
-                            _logger.warn("Unable to get Encoded password for user'" + user.getName() + "' password not saved");
-                        }
-                    }
-                }
-            }
-            catch(IOException e)
-            {
-                _logger.error("Unable to create the new password file: " + e);
-                throw new IOException("Unable to create the new password file" + e);
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-
-                if (writer != null)
-                {
-                    writer.close();
-                }
-            }
-            
-            // Swap temp file to main password file.
-            File old = new File(_passwordFile.getAbsoluteFile() + ".old");
-            if (old.exists())
-            {
-                old.delete();
-            }
-            
-            if(!_passwordFile.renameTo(old))
-            {
-                //unable to rename the existing file to the backup name 
-                _logger.error("Could not backup the existing password file");
-                throw new IOException("Could not backup the existing password file");
-            }
-
-            if(!tmp.renameTo(_passwordFile))
-            {
-                //failed to rename the new file to the required filename
-                
-                if(!old.renameTo(_passwordFile))
-                {
-                    //unable to return the backup to required filename
-                    _logger.error("Could not rename the new password file into place, and unable to restore original file");
-                    throw new IOException("Could not rename the new password file into place, and unable to restore original file");
-                }
-                
-                _logger.error("Could not rename the new password file into place");
-                throw new IOException("Could not rename the new password file into place");
-            }
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
+        return new HashedUser(result);
     }
 
-    public void reload() throws IOException
+    protected Logger getLogger()
     {
-        loadPasswordFile();
+        return _logger;
     }
 
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index de76e31280..b9de1587b5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
@@ -20,16 +20,15 @@
  */
 package org.apache.qpid.server.security.auth.database;
 
-import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.Principal;
 
-public class HashedUser implements Principal
+
+public class HashedUser implements PasswordPrincipal
 {
     private static final Logger _logger = Logger.getLogger(HashedUser.class);
 
@@ -39,7 +38,7 @@ public class HashedUser implements Principal
     private boolean _modified = false;
     private boolean _deleted = false;
 
-    HashedUser(String[] data) throws UnsupportedEncodingException
+    HashedUser(String[] data)
     {
         if (data.length != 2)
         {
@@ -48,7 +47,15 @@ public class HashedUser implements Principal
 
         _name = data[0];
 
-        byte[] encoded_password = data[1].getBytes(Base64MD5PasswordFilePrincipalDatabase.DEFAULT_ENCODING);
+        byte[] encoded_password;
+        try
+        {
+            encoded_password = data[1].getBytes(Base64MD5PasswordFilePrincipalDatabase.DEFAULT_ENCODING);
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            throw new RuntimeException("MD5 encoding not supported, even though the Java standard requires it",e);
+        }
 
         Base64 b64 = new Base64();
         byte[] decoded = b64.decode(encoded_password);
@@ -64,15 +71,23 @@ public class HashedUser implements Principal
         }
     }
 
-    public HashedUser(String name, char[] password) throws UnsupportedEncodingException, NoSuchAlgorithmException
+    public HashedUser(String name, char[] password)
     {
         _name = name;
         setPassword(password,false);
     }
 
-    public static byte[] getMD5(byte[] data) throws NoSuchAlgorithmException, UnsupportedEncodingException
+    public static byte[] getMD5(byte[] data)
     {
-        MessageDigest md = MessageDigest.getInstance("MD5");
+        MessageDigest md = null;
+        try
+        {
+            md = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            throw new RuntimeException("MD5 not supported although Java compliance requires it");
+        }
 
         for (byte b : data)
         {
@@ -92,12 +107,22 @@ public class HashedUser implements Principal
         return _name;
     }
 
-    char[] getPassword()
+    public char[] getPassword()
     {
         return _password;
     }
 
-    void setPassword(char[] password, boolean alreadyHashed) throws UnsupportedEncodingException,  NoSuchAlgorithmException
+    public void setPassword(char[] password)
+    {
+        setPassword(password, false);
+    }
+
+    public void restorePassword(char[] password)
+    {
+        setPassword(password, true);
+    }
+
+    void setPassword(char[] password, boolean alreadyHashed)
     {
         if(alreadyHashed){
             _password = password;
@@ -126,7 +151,7 @@ public class HashedUser implements Principal
         _encodedPassword = null;
     }
 
-    byte[] getEncodedPassword() throws EncoderException, UnsupportedEncodingException, NoSuchAlgorithmException
+    public byte[] getEncodedPassword()
     {
         if (_encodedPassword == null)
         {
@@ -135,7 +160,7 @@ public class HashedUser implements Principal
         return _encodedPassword;
     }
 
-    private void encodePassword() throws EncoderException, UnsupportedEncodingException, NoSuchAlgorithmException
+    private void encodePassword()
     {
         byte[] byteArray = new byte[_password.length];
         int index = 0;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java
new file mode 100644
index 0000000000..8e12d5f0a3
--- /dev/null
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PasswordPrincipal.java
@@ -0,0 +1,40 @@
+/*
+ *
+ * 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.server.security.auth.database;
+
+import java.security.Principal;
+
+interface PasswordPrincipal extends Principal
+{
+    char[] getPassword();
+    byte[] getEncodedPassword();
+
+    void setPassword(char[] password);
+    void restorePassword(char[] password);
+
+    boolean isDeleted();
+
+    boolean isModified();
+
+    void saved();
+
+    void delete();
+}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index ecf3f24ce1..bfd04adb3f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
@@ -22,28 +22,12 @@ package org.apache.qpid.server.security.auth.database;
 
 import org.apache.log4j.Logger;
 
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
 import org.apache.qpid.server.security.auth.sasl.amqplain.AmqPlainInitialiser;
 import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5Initialiser;
 import org.apache.qpid.server.security.auth.sasl.plain.PlainInitialiser;
 
-import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.login.AccountNotFoundException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
 import java.security.Principal;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.regex.Pattern;
 
 /**
  * Represents a user database where the account information is stored in a simple flat file.
@@ -52,94 +36,19 @@ import java.util.regex.Pattern;
  *
  * where a carriage return separates each username/password pair. Passwords are assumed to be in plain text.
  */
-public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
+public class PlainPasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<PlainUser>
 {
-    public static final String DEFAULT_ENCODING = "utf-8";
-    
-    private static final Logger _logger = Logger.getLogger(PlainPasswordFilePrincipalDatabase.class);
 
-    private File _passwordFile;
-
-    private Pattern _regexp = Pattern.compile(":");
-
-    private Map<String, AuthenticationProviderInitialiser> _saslServers;    
-    
-    private Map<String, PlainUser> _users = new HashMap<String, PlainUser>();
-    private ReentrantLock _userUpdate = new ReentrantLock();
+    private final Logger _logger = Logger.getLogger(PlainPasswordFilePrincipalDatabase.class);
 
     public PlainPasswordFilePrincipalDatabase()
     {
-        _saslServers = new HashMap<String, AuthenticationProviderInitialiser>();
-
         /**
          *  Create Authenticators for Plain Password file.
          */
-
-        // Accept AMQPlain incomming and compare it to the file.
-        AmqPlainInitialiser amqplain = new AmqPlainInitialiser();
-        amqplain.initialise(this);
-
-        // Accept Plain incomming and compare it to the file.
-        PlainInitialiser plain = new PlainInitialiser();
-        plain.initialise(this);
-
-        //  Accept MD5 incomming and Hash file value for comparison
-        CRAMMD5Initialiser cram = new CRAMMD5Initialiser();
-        cram.initialise(this);
-
-        _saslServers.put(amqplain.getMechanismName(), amqplain);
-        _saslServers.put(plain.getMechanismName(), plain);
-        _saslServers.put(cram.getMechanismName(), cram);
+        super(new AmqPlainInitialiser(), new PlainInitialiser(), new CRAMMD5Initialiser());
     }
 
-    public void setPasswordFile(String passwordFile) throws IOException
-    {
-        File f = new File(passwordFile);
-        _logger.info("PlainPasswordFile using file " + f.getAbsolutePath());
-        _passwordFile = f;
-        if (!f.exists())
-        {
-            throw new FileNotFoundException("Cannot find password file " + f);
-        }
-        if (!f.canRead())
-        {
-            throw new FileNotFoundException("Cannot read password file " + f +
-                                            ". Check permissions.");
-        }
-        
-        loadPasswordFile();
-    }
-
-    /**
-     * SASL Callback Mechanism - sets the Password in the PasswordCallback based on the value in the PasswordFile
-     * If you want to change the password for a user, use updatePassword instead.
-     *
-     * @param principal The Principal to set the password for
-     * @param callback  The PasswordCallback to call setPassword on
-     *
-     * @throws AccountNotFoundException If the Principal cannot be found in this Database
-     */
-    public void setPassword(Principal principal, PasswordCallback callback) throws AccountNotFoundException
-    {
-        if (_passwordFile == null)
-        {
-            throw new AccountNotFoundException("Unable to locate principal since no password file was specified during initialisation");
-        }
-        if (principal == null)
-        {
-            throw new IllegalArgumentException("principal must not be null");
-        }
-        char[] pwd = lookupPassword(principal.getName());
-        
-        if (pwd != null)
-        {
-            callback.setPassword(pwd);
-        }
-        else
-        {
-            throw new AccountNotFoundException("No account found for principal " + principal);
-        }
-    }
 
     /**
      * Used to verify that the presented Password is correct. Currently only used by Management Console
@@ -165,352 +74,21 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
 
     }
 
-    /**
-     * Changes the password for the specified user
-     * 
-     * @param principal to change the password for
-     * @param password plaintext password to set the password too
-     */
-    public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
-    {
-        PlainUser user = _users.get(principal.getName());
-
-        if (user == null)
-        {
-            throw new AccountNotFoundException(principal.getName());
-        }
-
-        char[] orig = user.getPassword();
-        _userUpdate.lock();
-        try
-        {
-            user.setPassword(password);
-
-            savePasswordFile();
-
-            return true;
-        }
-        catch (IOException e)
-        {
-            _logger.error("Unable to save password file due to '"+e.getMessage()
-                          +"', password change for user '" + principal + "' discarded");
-            //revert the password change
-            user.setPassword(orig);
-            return false;
-        }
-        finally
-        {                                   
-            _userUpdate.unlock();
-        }
-    }
-
-    public boolean createPrincipal(Principal principal, char[] password)
-    {
-        if (_users.get(principal.getName()) != null)
-        {
-            return false;
-        }
-
-        PlainUser user = new PlainUser(principal.getName(), password);
-
-        try
-        {
-            _userUpdate.lock();
-            _users.put(user.getName(), user);
-
-            try
-            {
-                savePasswordFile();
-                return true;
-            }
-            catch (IOException e)
-            {
-                //remove the use on failure.
-                _users.remove(user.getName());
-                _logger.warn("Unable to create user '" + user.getName());
-                return false;
-            }
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-    }
-
-    public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
-    {
-        PlainUser user = _users.get(principal.getName());
-
-        if (user == null)
-        {
-            throw new AccountNotFoundException(principal.getName());
-        }
-
-        try
-        {
-            _userUpdate.lock();
-            user.delete();
-
-            try
-            {
-                savePasswordFile();
-            }
-            catch (IOException e)
-            {
-                _logger.error("Unable to remove user '" + user.getName() + "' from password file.");
-                return false;
-            }
-
-            _users.remove(user.getName());
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-
-        return true;
-    }
-
-    public Map<String, AuthenticationProviderInitialiser> getMechanisms()
+    protected PlainUser createUserFromPassword(Principal principal, char[] passwd)
     {
-        return _saslServers;
+        return new PlainUser(principal.getName(), passwd);
     }
 
-    public List<Principal> getUsers()
-    {
-        return new LinkedList<Principal>(_users.values());
-    }
-
-    public Principal getUser(String username)
-    {
-        if (_users.containsKey(username))
-        {
-            return new UsernamePrincipal(username);
-        }
-        return null;
-    }
 
-    private boolean compareCharArray(char[] a, char[] b)
+    @Override
+    protected PlainUser createUserFromFileData(String[] result)
     {
-        boolean equal = false;
-        if (a.length == b.length)
-        {
-            equal = true;
-            int index = 0;
-            while (equal && index < a.length)
-            {
-                equal = a[index] == b[index];
-                index++;
-            }
-        }
-        return equal;
+        return new PlainUser(result);
     }
 
 
-    /**
-     * Looks up the password for a specified user in the password file. Note this code is <b>not</b> secure since it
-     * creates strings of passwords. It should be modified to create only char arrays which get nulled out.
-     *
-     * @param name The principal name to lookup
-     *
-     * @return a char[] for use in SASL.
-     */
-    private char[] lookupPassword(String name)
-    {
-        PlainUser user = _users.get(name);
-        if (user == null)
-        {
-            return null;
-        }
-        else
-        {
-            return user.getPassword();
-        }
-    }
-
-    private void loadPasswordFile() throws IOException
-    {
-        try
-        {
-            _userUpdate.lock();
-            _users.clear();
-
-            BufferedReader reader = null;
-            try
-            {
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2 || result[0].startsWith("#"))
-                    {
-                        continue;
-                    }
-
-                    PlainUser user = new PlainUser(result);
-                    _logger.info("Created user:" + user);
-                    _users.put(user.getName(), user);
-                }
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-            }
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-    }
-
-    private void savePasswordFile() throws IOException
-    {
-        try
-        {
-            _userUpdate.lock();
-
-            BufferedReader reader = null;
-            PrintStream writer = null;
-
-            final File tmp = createTempFileOnSameFilesystem(_passwordFile);
-
-            try
-            {
-                writer = new PrintStream(tmp);
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2 || result[0].startsWith("#"))
-                    {
-                        writer.write(line.getBytes(DEFAULT_ENCODING));
-                        writer.println();
-                        continue;
-                    }
-
-                    PlainUser user = _users.get(result[0]);
-
-                    if (user == null)
-                    {
-                        writer.write(line.getBytes(DEFAULT_ENCODING));
-                        writer.println();
-                    }
-                    else if (!user.isDeleted())
-                    {
-                        if (!user.isModified())
-                        {
-                            writer.write(line.getBytes(DEFAULT_ENCODING));
-                            writer.println();
-                        }
-                        else
-                        {
-                            byte[] password = user.getPasswordBytes();
-
-                            writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
-                            writer.write(password);
-                            writer.println();
-
-                            user.saved();
-                        }
-                    }
-                }
-
-                for (PlainUser user : _users.values())
-                {
-                    if (user.isModified())
-                    {
-                        byte[] password;
-                        password = user.getPasswordBytes();
-                        writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
-                        writer.write(password);
-                        writer.println();
-                        user.saved();
-                    }
-                }
-            }
-            catch(IOException e)
-            {
-                _logger.error("Unable to create the new password file: " + e);
-                throw new IOException("Unable to create the new password file" + e);
-            }
-            finally
-            {
-                if (writer != null)
-                {
-                    writer.close();
-                }
-                if (reader != null)
-                {
-                    reader.close();
-                }
-            }
-
-            swapTempFileToLive(_passwordFile, tmp);
-
-        }
-        finally
-        {
-            _userUpdate.unlock();
-        }
-    }
-
-    private void swapTempFileToLive(final File live, final File temp) throws IOException
-    {
-        // Remove any existing ".old" file
-        final File old = new File(live.getAbsoluteFile() + ".old");
-        if (old.exists())
-        {
-            old.delete();
-        }
-
-        // Create an new ".old" file
-        if(!live.renameTo(old))
-        {
-            //unable to rename the existing file to the backup name
-            _logger.error("Could not backup the existing password file");
-            throw new IOException("Could not backup the existing password file");
-        }
-
-        // Move temp file to be the new "live" file
-        if(!temp.renameTo(live))
-        {
-            //failed to rename the new file to the required filename
-            if(!old.renameTo(live))
-            {
-                //unable to return the backup to required filename
-                _logger.error("Could not rename the new password file into place, and unable to restore original file");
-                throw new IOException("Could not rename the new password file into place, and unable to restore original file");
-            }
-
-            _logger.error("Could not rename the new password file into place");
-            throw new IOException("Could not rename the new password file into place");
-        }
-    }
-
-    private File createTempFileOnSameFilesystem(final File liveFile)
-    {
-        File tmp;
-        final Random r = new Random();
-
-        do
-        {
-            tmp = new File(liveFile.getPath() + r.nextInt() + ".tmp");
-        }
-        while(tmp.exists());
-
-        tmp.deleteOnExit();
-        return tmp;
-    }
-    
-    public void reload() throws IOException
+    protected Logger getLogger()
     {
-        loadPasswordFile();
+        return _logger;
     }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
index 50a10745b6..bf9bfc6c99 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
@@ -20,9 +20,7 @@
  */
 package org.apache.qpid.server.security.auth.database;
 
-import java.security.Principal;
-
-public class PlainUser implements Principal
+public class PlainUser implements PasswordPrincipal
 {
     private String _name;
     private char[] _password;
@@ -59,12 +57,12 @@ public class PlainUser implements Principal
         return _name;
     }
 
-    char[] getPassword()
+    public char[] getPassword()
     {
         return _password;
     }
     
-    byte[] getPasswordBytes()
+    public byte[] getEncodedPassword()
     {
         byte[] byteArray = new byte[_password.length];
         int index = 0;
@@ -75,7 +73,14 @@ public class PlainUser implements Principal
         return byteArray;
     }
 
-    void setPassword(char[] password)
+
+
+    public void restorePassword(char[] password)
+    {
+        setPassword(password);
+    }
+
+    public void setPassword(char[] password)
     {
         _password = password;
         _modified = true;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index f687cc4a09..abb0b15a76 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -45,49 +45,39 @@ public class HashedUserTest extends TestCase
         {
             assertEquals("User Data should be length 2, username, password", e.getMessage());
         }
-        catch (UnsupportedEncodingException e)
-        {
-            fail(e.getMessage());
-        }
+
     }
 
     public void testArrayConstructor()
     {
-        try
-        {
-            HashedUser user = new HashedUser(new String[]{USERNAME, B64_ENCODED_PASSWORD});
-            assertEquals("Username incorrect", USERNAME, user.getName());
-            int index = 0;
-
-            char[] hash = B64_ENCODED_PASSWORD.toCharArray();
-
-            try
-            {
-                for (byte c : user.getEncodedPassword())
-                {
-                    assertEquals("Password incorrect", hash[index], (char) c);
-                    index++;
-                }
-            }
-            catch (Exception e)
-            {
-                fail(e.getMessage());
-            }
+        HashedUser user = new HashedUser(new String[]{USERNAME, B64_ENCODED_PASSWORD});
+        assertEquals("Username incorrect", USERNAME, user.getName());
+        int index = 0;
 
-            hash = PASSWORD.toCharArray();
+        char[] hash = B64_ENCODED_PASSWORD.toCharArray();
 
-            index=0;
-            for (char c : user.getPassword())
+        try
+        {
+            for (byte c : user.getEncodedPassword())
             {
-                assertEquals("Password incorrect", hash[index], c);
+                assertEquals("Password incorrect", hash[index], (char) c);
                 index++;
             }
-
         }
-        catch (UnsupportedEncodingException e)
+        catch (Exception e)
         {
             fail(e.getMessage());
         }
+
+        hash = PASSWORD.toCharArray();
+
+        index=0;
+        for (char c : user.getPassword())
+        {
+            assertEquals("Password incorrect", hash[index], c);
+            index++;
+        }
+
     }
 }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
index a739f78958..44faa57dbe 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
@@ -54,7 +54,7 @@ public class PlainUserTest extends TestCase
 
         try            
         {
-            for (byte c : user.getPasswordBytes())
+            for (byte c : user.getEncodedPassword())
             {
                 assertEquals("Password incorrect", password[index], (char) c);
                 index++;
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
index 58b52a3cc9..c8cb49b53e 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
@@ -22,7 +22,6 @@ package org.apache.qpid.client;
 
 import javax.jms.*;
 import javax.jms.IllegalStateException;
-import java.io.Serializable;
 
 /**
  * Need this adaptor class to conform to JMS spec and throw IllegalStateException
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
index 6e0c658db7..0f44ac5501 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
@@ -22,7 +22,6 @@ package org.apache.qpid.client;
 
 import javax.jms.*;
 import javax.jms.IllegalStateException;
-import java.io.Serializable;
 
 class AMQTopicSessionAdaptor extends AMQSessionAdapter<TopicSession> implements TopicSession
 {
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index 6b59a69bc9..d380402da7 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
@@ -58,7 +58,6 @@ import org.apache.qpid.thread.Threading;
 import org.apache.qpid.transport.Sender;
 import org.apache.qpid.transport.network.NetworkConnection;
 
-import java.io.DataOutput;
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;