diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-08-08 15:08:08 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-08-08 15:08:08 +0000 |
| commit | 9d67cc147702172afbe8c93b88311cd2e5eb6bab (patch) | |
| tree | 1d2d66e67f691f1ac569e3c0352c4eb9ed203a16 /qpid/java/broker-plugins/access-control/src | |
| parent | 9bbdb51f3d9975d713a93933ffad1be4fe934ab5 (diff) | |
| download | qpid-python-9d67cc147702172afbe8c93b88311cd2e5eb6bab.tar.gz | |
QPID-5980: yet more javadoc fixups
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control/src')
2 files changed, 2 insertions, 5 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java index 4fff0bebf5..e09935cf5c 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java @@ -33,8 +33,8 @@ import org.apache.qpid.server.security.access.Operation; * * An action consists of an {@link Operation} on an {@link ObjectType} with certain properties, stored in a {@link java.util.Map}. * The operation and object should be an allowable combination, based on the {@link ObjectType#isAllowed(Operation)} - * method of the object, which is exposed as the {@link #isAllowed()} method here. The internal {@link #propertiesMatch(Map)} - * and {@link #valueMatches(String, String)} methods are used to determine wildcarded matching of properties, with + * method of the object, which is exposed as the {@link #isAllowed()} method here. The internal #propertiesMatch(Map) + * and #valueMatches(String, String) methods are used to determine wildcarded matching of properties, with * the empty string or "*" matching all values, and "*" at the end of a rule value indicating prefix matching. * <p> * The {@link #matches(Action)} method is intended to be used when determining precedence of rules, and diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java index 7bf5626197..fd122ef8d2 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java @@ -49,9 +49,6 @@ import org.apache.qpid.server.security.access.Permission; /** * Models the rule configuration for the access control plugin. - * - * The access control rule definitions are loaded from an external configuration file, passed in as the - * target to the {@link load(ConfigurationFile)} method. The file specified */ public class RuleSet implements EventLoggerProvider { |