From 87d7a6e06b75851d07884fcbc828cf3e8e486078 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Tue, 26 Feb 2008 16:57:29 +0000
Subject: QPID-107 : Fixed the left over old AccessManager/PrincipalDatabase
 references.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@631296 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/etc/persistent_config.xml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'java')

diff --git a/java/broker/etc/persistent_config.xml b/java/broker/etc/persistent_config.xml
index 5e929c153d..0c9552fd27 100644
--- a/java/broker/etc/persistent_config.xml
+++ b/java/broker/etc/persistent_config.xml
@@ -51,11 +51,11 @@
         <principal-databases>
             <principal-database>
                 <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordVhostFilePrincipalDatabase</class>
+                <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
                 <attributes>
                     <attribute>
                         <name>passwordFile</name>
-                        <value>${conf}/passwdVhost</value>
+                        <value>${conf}/passwd</value>
                     </attribute>
                 </attributes>
             </principal-database>
@@ -78,22 +78,6 @@
                     <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
                     <environment-path>${work}/bdbstore/localhost-store</environment-path>
                 </store>
-
-                <security>
-                    <access>
-                        <class>org.apache.qpid.server.security.old.PrincipalDatabaseAccessManager</class>
-                        <attributes>
-                            <attribute>
-                                <name>principalDatabase</name>
-                                <value>passwordfile</value>
-                            </attribute>
-                            <attribute>
-                                <name>defaultAccessManager</name>
-                                <value>DenyAll</value>
-                            </attribute>
-                        </attributes>
-                    </access>
-                </security>
             </localhost>
         </virtualhost>
 
-- 
cgit v1.2.1