Author: kwall
Date: Fri Apr 25 17:00:47 2014
New Revision: 1590081
URL: http://svn.apache.org/r1590081
Log:
QPID-5634: Remove virtualhost level attribute, securityAcl, which was made
obsolete by this change.
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1590081&r1=1590080&r2=1590081&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
Fri Apr 25 17:00:47 2014
@@ -42,7 +42,6 @@ public interface VirtualHost<X extends V
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 V
@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>()
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1590081&r1=1590080&r2=1590081&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Fri Apr 25 17:00:47 2014
@@ -155,8 +155,6 @@ public abstract class AbstractVirtualHos
@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 AbstractVirtualHos
}
@Override
- public String getSecurityAcl()
- {
- return _securityAcl;
- }
-
- @Override
public int getHousekeepingThreadCount()
{
return _housekeepingThreadCount;
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1590081&r1=1590080&r2=1590081&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
Fri Apr 25 17:00:47 2014
@@ -263,12 +263,6 @@ public class MockVirtualHost implements
}
@Override
- public String getSecurityAcl()
- {
- return null;
- }
-
- @Override
public int getHousekeepingThreadCount()
{
return 0;
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1590081&r1=1590080&r2=1590081&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
Fri Apr 25 17:00:47 2014
@@ -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,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
