summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2008-03-31 15:41:39 +0000
committerMartin Ritchie <ritchiem@apache.org>2008-03-31 15:41:39 +0000
commitca7e78333bb9ca8c50c61e972bd3f0e87b6b5d6a (patch)
tree71ddf04ecbc1f6cb08517588d71929dc3c2f74f3
parentc0c3c38f032200e786cf5a4404cfa40a0c95f5e8 (diff)
downloadqpid-python-ca7e78333bb9ca8c50c61e972bd3f0e87b6b5d6a.tar.gz
QPID-890 : Removed old references to VHostPrincipalDatabase and an errant old.PrincipalDatabaseAccessManager change.
This file should now work. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@643032 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/broker/etc/transient_config.xml21
1 files changed, 3 insertions, 18 deletions
diff --git a/java/broker/etc/transient_config.xml b/java/broker/etc/transient_config.xml
index 5b13090f4c..062552ea2d 100644
--- a/java/broker/etc/transient_config.xml
+++ b/java/broker/etc/transient_config.xml
@@ -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>