From 2e072e012318bead7975e39e6fdaa9397119c74e Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 28 Nov 2011 16:38:21 +0000
Subject: QPID-3641: rename configuration element aclv2 => acl.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1207407 13f79535-47bb-0310-9956-ffa450edef68
---
 .../server/security/access/plugins/AccessControlConfiguration.java    | 2 +-
 java/broker/etc/config.xml                                            | 4 ++--
 .../java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
index f7db740ebc..b5c89910a6 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
+++ b/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/java/broker/etc/config.xml b/java/broker/etc/config.xml
index 389f380c31..25fda69f68 100644
--- a/java/broker/etc/config.xml
+++ b/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/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
index a4155d10e2..ec8d837ee8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
+++ b/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));
-- 
cgit v1.2.1