diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-07-31 22:02:40 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-07-31 22:02:40 +0000 |
| commit | c444bd122c13623bb56389f3d293ba98ee7935ae (patch) | |
| tree | 88e5d0c19cc608c75d4708b57aa1b8d250b9a52e /qpid/java/broker | |
| parent | 83b2835503c6e01997e03e61fc2dbb0250e7e6e8 (diff) | |
| download | qpid-python-c444bd122c13623bb56389f3d293ba98ee7935ae.tar.gz | |
QPID-4167: Fix setting of queue attributes via web management console and rest interfaces. Also import Subscription into the bundle to resolve CDNFExcept ion when viewing a queue with Consumers.
Work by Oleksandr Rudyy, Keith Wall and myself.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1367796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java | 4 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java index 5a5f7435a2..78f6d38d93 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java @@ -51,8 +51,8 @@ final class QueueAdapter extends AbstractAdapter implements Queue, AMQQueue.Subs static { QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.ALERT_REPEAT_GAP, "x-qpid-minimum-alert-repeat-gap"); - QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.ALERT_THRESHOLD_MESSAGE_AGE, "x-qpid-maximum-message-size"); - QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.ALERT_THRESHOLD_MESSAGE_SIZE, "x-qpid-maximum-message-age"); + QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.ALERT_THRESHOLD_MESSAGE_AGE, "x-qpid-maximum-message-age"); + QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.ALERT_THRESHOLD_MESSAGE_SIZE, "x-qpid-maximum-message-size"); QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, "x-qpid-maximum-message-count"); QueueAdapter.ATTRIBUTE_MAPPINGS.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, "x-qpid-maximum-delivery-count"); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties index 4767e1ea6b..6479546355 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties @@ -117,6 +117,7 @@ org.apache.qpid.server.persistent=0.0.0 org.apache.qpid.server.plugins=0.0.0 org.apache.qpid.server.protocol=0.0.0 org.apache.qpid.server.queue=0.0.0 +org.apache.qpid.server.subscription=0.0.0 org.apache.qpid.server.registry=0.0.0 org.apache.qpid.server.security=0.0.0 org.apache.qpid.server.security.access=0.0.0 |