diff options
| author | Keith Wall <kwall@apache.org> | 2011-11-28 16:38:21 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2011-11-28 16:38:21 +0000 |
| commit | ed7f1fe72e0ffca4b0fc5ddeb189fb555d92c169 (patch) | |
| tree | 9491a94c3101a683ae46b39dbf0fba41fb28c666 /qpid/java | |
| parent | 176267bd4d459ef2919a55e54c819c584344d6c8 (diff) | |
| download | qpid-python-ed7f1fe72e0ffca4b0fc5ddeb189fb555d92c169.tar.gz | |
QPID-3641: rename configuration element aclv2 => acl.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1207407 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java index f7db740ebc..b5c89910a6 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java @@ -45,7 +45,7 @@ public class AccessControlConfiguration extends ConfigurationPlugin public List<String> getParentPaths() { - return Arrays.asList("security.aclv2", "virtualhosts.virtualhost.security.aclv2"); + return Arrays.asList("security.acl", "virtualhosts.virtualhost.security.acl"); } }; diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index 389f380c31..25fda69f68 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -82,9 +82,9 @@ <!-- By default, all authenticated users have permissions to perform all actions --> - <!-- ACL V2 Example + <!-- ACL Example This example illustrates securing the both Management (JMX) and Messaging. - <aclv2>${conf}/broker_example.acl</aclv2> + <acl>${conf}/broker_example.acl</acl> --> <msg-auth>false</msg-auth> diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java index a4155d10e2..ec8d837ee8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java @@ -124,11 +124,11 @@ public abstract class AbstractACLTestCase extends QpidBrokerTestCase implements if (vhost == null) { - testcase.setConfigurationProperty("security.aclv2", aclFile.getAbsolutePath()); + testcase.setConfigurationProperty("security.acl", aclFile.getAbsolutePath()); } else { - testcase.setConfigurationProperty("virtualhosts.virtualhost." + vhost + ".security.aclv2", aclFile.getAbsolutePath()); + testcase.setConfigurationProperty("virtualhosts.virtualhost." + vhost + ".security.acl", aclFile.getAbsolutePath()); } PrintWriter out = new PrintWriter(new FileWriter(aclFile)); |