You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/07/01 12:30:03 UTC
svn commit: r1607034 - in
/qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata:
Exchange.java Queue.java Session.java Subscription.java
Author: kwall
Date: Tue Jul 1 10:30:02 2014
New Revision: 1607034
URL: http://svn.apache.org/r1607034
Log:
QPID-5820: [Java QMF2 Plugin] changes to plugin owing to the Java Broker model updates made during 0.29
* Used model getters rather than named attributes wherever possible
Work done by Andrew MacBean <ma...@apache.org> and me.
Modified:
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java
qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.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/Exchange.java?rev=1607034&r1=1607033&r2=1607034&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java Tue Jul 1 10:30:02 2014
@@ -137,14 +137,14 @@ public class Exchange extends QmfAgentDa
// DELETE_ON_SESSION_END, DELETE_ON_NO_OUTBOUND_LINKS, DELETE_ON_NO_LINKS, IN_USE
// We map these to a boolean value to be consistent with the C++ Broker QMF value.
// TODO The C++ and Java Brokers should really return consistent information.
- LifetimePolicy lifetimePolicy = (LifetimePolicy)_exchange.getAttribute("lifetimePolicy");
+ LifetimePolicy lifetimePolicy = _exchange.getLifetimePolicy();
boolean autoDelete = (lifetimePolicy != LifetimePolicy.PERMANENT) ? true : false;
// TODO vhostRef - currently just use its name to try and get things working with standard command line tools.
setValue("name", _name);
- setValue("type", _exchange.getAttribute("type"));
- setValue("durable", _exchange.getAttribute("durable"));
+ setValue("type", _exchange.getType());
+ setValue("durable", _exchange.isDurable());
setValue("autoDelete", autoDelete);
// TODO altExchange and arguments properties.
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.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/Queue.java?rev=1607034&r1=1607033&r2=1607034&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java Tue Jul 1 10:30:02 2014
@@ -144,19 +144,19 @@ public class Queue extends QmfAgentData
// DELETE_ON_SESSION_END, DELETE_ON_NO_OUTBOUND_LINKS, DELETE_ON_NO_LINKS, IN_USE
// We map these to a boolean value to be consistent with the C++ Broker QMF value.
// TODO The C++ and Java Brokers should really return consistent information.
- LifetimePolicy lifetimePolicy = (LifetimePolicy)_queue.getAttribute("lifetimePolicy");
+ LifetimePolicy lifetimePolicy = _queue.getLifetimePolicy();
boolean autoDelete = (lifetimePolicy != LifetimePolicy.PERMANENT) ? true : false;
// In the Java Broker exclusivity may be NONE, SESSION, CONNECTION, CONTAINER, PRINCIPAL, LINK
// We map these to a boolean value to be consistent with the C++ Broker QMF value.
// TODO The C++ and Java Brokers should really return consistent information.
- ExclusivityPolicy exclusivityPolicy = (ExclusivityPolicy)_queue.getAttribute("exclusive");
+ ExclusivityPolicy exclusivityPolicy = _queue.getExclusive();
boolean exclusive = (exclusivityPolicy != ExclusivityPolicy.NONE) ? true : false;
// TODO vhostRef - currently just use its name to try and get things working with standard command line tools.
setValue("name", name);
- setValue("durable", _queue.getAttribute("durable"));
+ setValue("durable", _queue.isDurable());
setValue("autoDelete", autoDelete);
setValue("exclusive", exclusive);
@@ -247,7 +247,7 @@ public class Queue extends QmfAgentData
// too late to populate the "altEx" property of the queueDeclareEvent.
if (_alternateExchange == null)
{
- Exchange altEx = (Exchange)_queue.getAttribute("alternateExchange");
+ Exchange altEx = _queue.getAlternateExchange();
if (altEx != null)
{
_alternateExchangeName = _vhostName + altEx.getName();
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.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/Session.java?rev=1607034&r1=1607033&r2=1607034&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java Tue Jul 1 10:30:02 2014
@@ -89,7 +89,7 @@ public class Session extends QmfAgentDat
super(getSchema());
_session = session;
- setValue("name", session.getAttribute("id")); // Use ID to be consistent with C++ Broker.
+ setValue("name", session.getId()); // Use ID to be consistent with C++ Broker.
setValue("channelId", session.getName()); // The Java Broker name uses the channelId.
setRefValue("connectionRef", connectionRef);
}
Modified: qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.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/Subscription.java?rev=1607034&r1=1607033&r2=1607034&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java (original)
+++ qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java Tue Jul 1 10:30:02 2014
@@ -153,7 +153,7 @@ public class Subscription extends QmfAge
// In the Java Broker exclusivity may be NONE, SESSION, CONNECTION, CONTAINER, PRINCIPAL, LINK
// We map these to a boolean value to be consistent with the C++ Broker QMF values.
// TODO The C++ and Java Brokers should really return consistent information.
- ExclusivityPolicy exclusivityPolicy = (ExclusivityPolicy)queue.getAttribute("exclusive");
+ ExclusivityPolicy exclusivityPolicy = queue.getExclusive();
_exclusive = (exclusivityPolicy != ExclusivityPolicy.NONE) ? true : false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org