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/03/31 17:41:42 UTC
svn commit: r643032 -
/incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml
Author: ritchiem
Date: Mon Mar 31 08:41:39 2008
New Revision: 643032
URL: http://svn.apache.org/viewvc?rev=643032&view=rev
Log:
QPID-890 : Removed old references to VHostPrincipalDatabase and an errant old.PrincipalDatabaseAccessManager change.
This file should now work.
Modified:
incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml
Modified: incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml?rev=643032&r1=643031&r2=643032&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/transient_config.xml Mon Mar 31 08:41:39 2008
@@ -50,15 +50,16 @@
<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>
</principal-databases>
+
<access>
<class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
</access>
@@ -75,22 +76,6 @@
<store>
<class>org.apache.qpid.server.store.MemoryMessageStore</class>
</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>