1 files changed, 11 insertions, 8 deletions
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 46a78a55aa..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,11 +20,7 @@
  */
 package org.apache.qpid.server.security.auth.database;
 
-import org.apache.log4j.Logger;
-
-import java.security.Principal;
-
-public class PlainUser implements Principal
+public class PlainUser implements PasswordPrincipal
 {
     private String _name;
     private char[] _password;
@@ -61,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;
@@ -77,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;