diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2016-10-04 15:58:21 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2016-10-04 15:58:21 +0000 |
commit | 6ef298b70650ab03859b91acf8e2f962d595eaed (patch) | |
tree | 9281a2cea9b054a0c47b0e7b6eb84d169fb0ee91 | |
parent | f160cb6566c17945f7ebc4f3a752b2cc6a051685 (diff) | |
download | qpid-python-6ef298b70650ab03859b91acf8e2f962d595eaed.tar.gz |
QPID-7446 : Allow the QMF2 plugin to compile against the 6.0.x java codebase
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1763292 13f79535-47bb-0310-9956-ffa450edef68
9 files changed, 22 insertions, 10 deletions
diff --git a/qpid/tools/src/java/pom.xml b/qpid/tools/src/java/pom.xml index 5d8fcbb0ad..782ab3d333 100644 --- a/qpid/tools/src/java/pom.xml +++ b/qpid/tools/src/java/pom.xml @@ -27,7 +27,7 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-qmf2-parent</artifactId> <name>Qpid QMF2 Parent</name> - <version>0.32-SNAPSHOT</version> + <version>6.0.5-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml index 6af69a6875..6c7fad1e49 100644 --- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml +++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-qmf2-parent</artifactId> - <version>0.32-SNAPSHOT</version> + <version>6.0.5-SNAPSHOT</version> </parent> <artifactId>qpid-broker-plugins-management-qmf2</artifactId> diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java index 1e10170700..2a95f59b6c 100644 --- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java +++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java @@ -124,7 +124,7 @@ public class QmfManagementAgent implements ConfigurationChangeListener, QmfEvent public QmfManagementAgent(final String url, final Broker broker) { _broker = broker; - _defaultVirtualHost = broker.getDefaultVirtualHost(); + _defaultVirtualHost = broker.findDefautVirtualHostNode().getVirtualHost().getName(); try { @@ -644,4 +644,16 @@ public class QmfManagementAgent implements ConfigurationChangeListener, QmfEvent } } } + + @Override + public void bulkChangeStart(final ConfiguredObject<?> object) + { + + } + + @Override + public void bulkChangeEnd(final ConfiguredObject<?> object) + { + + } } diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java index 52ea0afa10..0cbbecab2d 100644 --- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java +++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java @@ -120,7 +120,7 @@ public class QmfManagementPluginImpl extends AbstractPluginAdapter<QmfManagement protected void onOpen() { super.onOpen(); - _defaultVirtualHost = _broker.getDefaultVirtualHost(); + _defaultVirtualHost = _broker.findDefautVirtualHostNode().getVirtualHost().getName(); } diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java index 5c4dcc6b06..9602d8eb49 100644 --- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java +++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java @@ -352,7 +352,7 @@ public class Broker extends QmfAgentData super(getSchema()); _broker = broker; - _defaultVirtualHost = broker.getDefaultVirtualHost(); + _defaultVirtualHost = broker.findDefautVirtualHostNode().getVirtualHost().getName(); int amqpPort = 5672; // Default AMQP Port. // Search through the available Ports on this Broker looking for the AMQP Port using the TCP Transport @@ -419,7 +419,7 @@ public class Broker extends QmfAgentData setValue("mgmtPublish", true); setValue("mgmtPubInterval", 10); - setValue("version", org.apache.qpid.common.QpidProperties.getReleaseVersion()); + setValue("version", broker.getProductVersion()); setValue("dataDir", System.getProperty("QPID_WORK")); // ObjectId needs to be set here in Broker because the QMF2 version of qpid-config uses a hardcoded diff --git a/qpid/tools/src/java/qpid-qmf2-rest/pom.xml b/qpid/tools/src/java/qpid-qmf2-rest/pom.xml index b0735250d9..ade7515fa9 100644 --- a/qpid/tools/src/java/qpid-qmf2-rest/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2-rest/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-qmf2-parent</artifactId> - <version>0.32-SNAPSHOT</version> + <version>6.0.5-SNAPSHOT</version> </parent> <artifactId>qpid-qmf2-rest</artifactId> diff --git a/qpid/tools/src/java/qpid-qmf2-test/pom.xml b/qpid/tools/src/java/qpid-qmf2-test/pom.xml index 8b71c093cf..bc3aad5b89 100644 --- a/qpid/tools/src/java/qpid-qmf2-test/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2-test/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-qmf2-parent</artifactId> - <version>0.32-SNAPSHOT</version> + <version>6.0.5-SNAPSHOT</version> </parent> <artifactId>qpid-qmf2-test</artifactId> diff --git a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml index a83cae1cf5..65a964472c 100644 --- a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-qmf2-parent</artifactId> - <version>0.32-SNAPSHOT</version> + <version>6.0.5-SNAPSHOT</version> </parent> <artifactId>qpid-qmf2-tools</artifactId> diff --git a/qpid/tools/src/java/qpid-qmf2/pom.xml b/qpid/tools/src/java/qpid-qmf2/pom.xml index 5d8a58e920..5225424d6a 100644 --- a/qpid/tools/src/java/qpid-qmf2/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-qmf2-parent</artifactId> - <version>0.32-SNAPSHOT</version> + <version>6.0.5-SNAPSHOT</version> </parent> <artifactId>qpid-qmf2</artifactId> |