diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-23 23:46:55 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-23 23:46:55 +0000 |
| commit | f779c1858f14cc051f4670aa2af521ef8cbcea05 (patch) | |
| tree | e4ec03a4cf2ef6d82f194e65449765a52c9293b5 /qpid/java | |
| parent | 9b5723a1f2a3b72c81c143f78d7b8dc5ee6b7271 (diff) | |
| download | qpid-python-f779c1858f14cc051f4670aa2af521ef8cbcea05.tar.gz | |
QPID-5163: move generation of the ACL log messages to broker-core alongside all the other log message generation
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525743 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties (renamed from qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties) | 2 | ||||
| -rw-r--r-- | qpid/java/broker-plugins/access-control/build.xml | 4 | ||||
| -rw-r--r-- | qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties index 2a5eb7b3be..c953076165 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties @@ -17,8 +17,6 @@ # under the License. # -# org.apache.qpid.server.security.access.logging.AccessControl - # Access Control logging message i18n strings. # 'accept-log' rule message diff --git a/qpid/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml index 0e718c80c9..eea98937d4 100644 --- a/qpid/java/broker-plugins/access-control/build.xml +++ b/qpid/java/broker-plugins/access-control/build.xml @@ -29,10 +29,6 @@ <import file="../../module.xml" /> - <import file="${project.root}/broker-core/build-generate-sources.xml"/> - - <target name="precompile" depends="generate-logmessages"/> - <target name="bundle" depends="bundle-tasks"/> </project> 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 e61370fced..e321e0e8f0 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 @@ -39,12 +39,12 @@ import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.qpid.server.logging.actors.CurrentActor; +import org.apache.qpid.server.logging.messages.AccessControlMessages; import org.apache.qpid.server.security.Result; import org.apache.qpid.server.security.access.ObjectProperties; import org.apache.qpid.server.security.access.ObjectType; import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.security.access.Permission; -import org.apache.qpid.server.security.access.logging.AccessControlMessages; /** * Models the rule configuration for the access control plugin. |