QPID-5634: Remove virtualhost level attribute, securityAcl, which was made obsolete by this change.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590081 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 1 insertions, 20 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index 48206ccdf4..2936bc62d0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
@@ -42,7 +42,6 @@ public interface VirtualHost<X extends VirtualHost<X, Q, E>, Q extends Queue<?>,
     String STORE_TRANSACTION_OPEN_TIMEOUT_WARN  = "storeTransactionOpenTimeoutWarn";
     String SUPPORTED_EXCHANGE_TYPES             = "supportedExchangeTypes";
     String SUPPORTED_QUEUE_TYPES                = "supportedQueueTypes";
-    String SECURITY_ACL                         = "securityAcl";
     String HOUSE_KEEPING_THREAD_COUNT           = "houseKeepingThreadCount";
     String MESSAGE_STORE_SETTINGS               = "messageStoreSettings";
     String MODEL_VERSION                        = "modelVersion";
@@ -91,9 +90,6 @@ public interface VirtualHost<X extends VirtualHost<X, Q, E>, Q extends Queue<?>,
     @ManagedAttribute( automate = true, defaultValue = "${virtualhost.storeTransactionOpenTimeoutWarn}")
     long getStoreTransactionOpenTimeoutWarn();
 
-    @ManagedAttribute( automate = true )
-    String getSecurityAcl();
-
     @ManagedContextDefault( name = "virtualhost.housekeepingThreadCount")
     public static final RuntimeDefault<Integer> DEFAULT_HOUSEKEEPING_THREAD_COUNT =
             new RuntimeDefault<Integer>()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 35d7bd4793..01bcc01dd1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -155,8 +155,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
     @ManagedAttributeField
     private int _housekeepingThreadCount;
 
-    @ManagedAttributeField
-    private String _securityAcl;
     private MessageDestination _defaultDestination;
 
     public AbstractVirtualHost(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
@@ -1369,12 +1367,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
     }
 
     @Override
-    public String getSecurityAcl()
-    {
-        return _securityAcl;
-    }
-
-    @Override
     public int getHousekeepingThreadCount()
     {
         return _housekeepingThreadCount;
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index 43cf54ae3e..ac38ae7af9 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
@@ -263,12 +263,6 @@ public class MockVirtualHost implements VirtualHostImpl<MockVirtualHost, AMQQueu
     }
 
     @Override
-    public String getSecurityAcl()
-    {
-        return null;
-    }
-
-    @Override
     public int getHousekeepingThreadCount()
     {
         return 0;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index 882e0b60a2..ac3c9251f7 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -65,8 +65,7 @@ public class Asserts
                                 ConfiguredObject.CONTEXT,
                                 VirtualHost.SUPPORTED_QUEUE_TYPES,
                                 VirtualHost.TYPE,
-                                VirtualHost.MESSAGE_STORE_SETTINGS,
-                                VirtualHost.SECURITY_ACL);
+                                VirtualHost.MESSAGE_STORE_SETTINGS);
 
         assertEquals("Unexpected value of attribute " + VirtualHost.NAME,
                      virtualHostName,