diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-05-02 20:32:16 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-05-02 20:32:16 +0000 |
| commit | db543bd85497285b1911c7250a9a1f76522f318b (patch) | |
| tree | 0a88c2e19a1a8e3e4bedf49ab0a4ef7248d25603 /qpid/java/broker-plugins/access-control | |
| parent | 1af82f62bbf94323e61a415c182adf2d66ac99f0 (diff) | |
| download | qpid-python-db543bd85497285b1911c7250a9a1f76522f318b.tar.gz | |
QPID-5746 : [Java Broker] Split attribute annotations into separate annotations for derived and automated, and allow derived attributes to be persisted
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592030 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control')
2 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/ACLFileAccessControlProvider.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java index d54f226a00..b8509ebd39 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java @@ -27,6 +27,6 @@ import org.apache.qpid.server.model.ManagedObject; @ManagedObject( category = false, type="AclFile" ) public interface ACLFileAccessControlProvider<X extends ACLFileAccessControlProvider<X>> extends AccessControlProvider<X> { - @ManagedAttribute( automate = true, mandatory = true, description = "File location" ) + @ManagedAttribute( mandatory = true, description = "File location" ) String getPath(); } diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index 554f2f46c5..91e64e5334 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -69,9 +69,9 @@ public class ACLFileAccessControlProviderImpl } @Override - public void validate() + public void onValidate() { - super.validate(); + super.onValidate(); if(!isDurable()) { throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable"); @@ -124,7 +124,7 @@ public class ACLFileAccessControlProviderImpl } @Override - public boolean setState(State currentState, State desiredState) + public boolean setState(State desiredState) throws IllegalStateTransitionException, AccessControlException { State state = _state.get(); @@ -186,7 +186,7 @@ public class ACLFileAccessControlProviderImpl } @Override - protected void authoriseSetDesiredState(State currentState, State desiredState) throws AccessControlException + protected void authoriseSetDesiredState(State desiredState) throws AccessControlException { if(desiredState == State.DELETED) { |