diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-07-11 17:16:16 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-07-11 17:16:16 +0000 |
| commit | 165e64979e09cbc2a1812623d1ff0a56046af3f7 (patch) | |
| tree | 232facb5963305fabbaa7ce36aa12a045246c478 /qpid/java/broker-plugins | |
| parent | 458c517069481fe2ef82d1b21c97efc79f3b9b83 (diff) | |
| download | qpid-python-165e64979e09cbc2a1812623d1ff0a56046af3f7.tar.gz | |
QPID-1927: move mbean interfaces to management-common, make broker module depend on management-common, modify build system to copy management-common.jar when required (eg for binary releases).
QPID-1928: remove unused AMQException throws clause and import from ManagedQueue,UserManagement.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
| -rw-r--r-- | qpid/java/broker-plugins/build.xml | 2 | ||||
| -rw-r--r-- | qpid/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/build.xml b/qpid/java/broker-plugins/build.xml index 9787eeebc3..b12b3e3132 100644 --- a/qpid/java/broker-plugins/build.xml +++ b/qpid/java/broker-plugins/build.xml @@ -20,7 +20,7 @@ nn - or more contributor license agreements. See the NOTICE file --> <project name="AMQ Broker-Plugins" default="build"> - <property name="module.depends" value="client broker common junit-toolkit"/> + <property name="module.depends" value="client management/common broker common junit-toolkit"/> <property name="module.manifest" value="MANIFEST.MF"/> <property name="module.plugin" value="true"/> diff --git a/qpid/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java b/qpid/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java index 027d220538..aa64fab6cd 100644 --- a/qpid/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java +++ b/qpid/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java @@ -34,12 +34,12 @@ import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.server.exchange.AbstractExchange; -import org.apache.qpid.server.management.MBeanConstructor; -import org.apache.qpid.server.management.MBeanDescription; import org.apache.qpid.server.queue.IncomingMessage; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.junit.extensions.util.SizeOf; +import org.apache.qpid.management.common.mbeans.annotations.MBeanConstructor; +import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription; /** * |