You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/10/04 15:58:21 UTC
svn commit: r1763292 - in /qpid/trunk/qpid/tools/src/java: ./
qpid-broker-plugins-management-qmf2/
qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/
qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/q...
Author: rgodfrey
Date: Tue Oct 4 15:58:21 2016
New Revision: 1763292
URL: http://svn.apache.org/viewvc?rev=1763292&view=rev
Log:
QPID-7446 : Allow the QMF2 plugin to compile against the 6.0.x java codebase
Modified:
qpid/trunk/qpid/tools/src/java/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
qpid/trunk/qpid/tools/src/java/qpid-qmf2-rest/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-qmf2-test/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
qpid/trunk/qpid/tools/src/java/qpid-qmf2/pom.xml
Modified: qpid/trunk/qpid/tools/src/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/pom.xml?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/pom.xml Tue Oct 4 15:58:21 2016
@@ -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>
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml Tue Oct 4 15:58:21 2016
@@ -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>
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java Tue Oct 4 15:58:21 2016
@@ -124,7 +124,7 @@ public class QmfManagementAgent implemen
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 implemen
}
}
}
+
+ @Override
+ public void bulkChangeStart(final ConfiguredObject<?> object)
+ {
+
+ }
+
+ @Override
+ public void bulkChangeEnd(final ConfiguredObject<?> object)
+ {
+
+ }
}
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java Tue Oct 4 15:58:21 2016
@@ -120,7 +120,7 @@ public class QmfManagementPluginImpl ext
protected void onOpen()
{
super.onOpen();
- _defaultVirtualHost = _broker.getDefaultVirtualHost();
+ _defaultVirtualHost = _broker.findDefautVirtualHostNode().getVirtualHost().getName();
}
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java Tue Oct 4 15:58:21 2016
@@ -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
Modified: qpid/trunk/qpid/tools/src/java/qpid-qmf2-rest/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-rest/pom.xml?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-rest/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-rest/pom.xml Tue Oct 4 15:58:21 2016
@@ -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>
Modified: qpid/trunk/qpid/tools/src/java/qpid-qmf2-test/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-test/pom.xml?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-test/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-test/pom.xml Tue Oct 4 15:58:21 2016
@@ -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>
Modified: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/pom.xml Tue Oct 4 15:58:21 2016
@@ -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>
Modified: qpid/trunk/qpid/tools/src/java/qpid-qmf2/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2/pom.xml?rev=1763292&r1=1763291&r2=1763292&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-qmf2/pom.xml (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-qmf2/pom.xml Tue Oct 4 15:58:21 2016
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org