You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/02/26 17:57:30 UTC

svn commit: r631296 - /incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml

Author: ritchiem
Date: Tue Feb 26 08:57:29 2008
New Revision: 631296

URL: http://svn.apache.org/viewvc?rev=631296&view=rev
Log:
QPID-107 : Fixed the left over old AccessManager/PrincipalDatabase references.

Modified:
    incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml

Modified: incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml?rev=631296&r1=631295&r2=631296&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/persistent_config.xml Tue Feb 26 08:57:29 2008
@@ -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>