summaryrefslogtreecommitdiff
path: root/java/broker/src
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-06-17 15:32:12 +0000
committerRobert Gemmell <robbie@apache.org>2010-06-17 15:32:12 +0000
commit557c5d9e5d3bea0d199cc508e43dc650c92741b8 (patch)
tree670a83f65eb61213b00bd19e96514804389f6443 /java/broker/src
parent097f6a0e13ac6a650b574329fc3b20bfe5553cdd (diff)
downloadqpid-python-557c5d9e5d3bea0d199cc508e43dc650c92741b8.tar.gz
QPID-2654: Add Actor logging to the ACL plugin
Applied patch from Andrew Kennedy <andrew.international@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@955642 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java1
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java6
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java6
3 files changed, 13 insertions, 0 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
index 8364635632..62d8f87641 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
@@ -124,6 +124,7 @@ public class PluginManager implements Closeable
"org.apache.qpid.server.exchange; version=0.7," +
"org.apache.qpid.server.logging; version=0.7," +
"org.apache.qpid.server.logging.actors; version=0.7," +
+ "org.apache.qpid.server.logging.subjects; version=0.7," +
"org.apache.qpid.server.management; version=0.7," +
"org.apache.qpid.server.persistent; version=0.7," +
"org.apache.qpid.server.plugins; version=0.7," +
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
index 66ef388976..1fedc8134a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
@@ -87,4 +87,10 @@ public enum ObjectType
}
throw new IllegalArgumentException("Not a valid object type: " + text);
}
+
+ public String toString()
+ {
+ String name = name();
+ return name.charAt(0) + name.substring(1).toLowerCase();
+ }
}
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
index 7077257d01..06d7f8fd0c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
@@ -46,4 +46,10 @@ public enum Operation
}
throw new IllegalArgumentException("Not a valid operation: " + text);
}
+
+ public String toString()
+ {
+ String name = name();
+ return name.charAt(0) + name.substring(1).toLowerCase();
+ }
} \ No newline at end of file