You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2011/04/21 12:49:26 UTC
svn commit: r1095651 - in /qpid/trunk/qpid/java/management:
common/src/main/java/org/apache/qpid/management/common/mbeans/
eclipse-plugin/src/main/java/org/apache/qpid/management/ui/
Author: robbie
Date: Thu Apr 21 10:49:26 2011
New Revision: 1095651
URL: http://svn.apache.org/viewvc?rev=1095651&view=rev
Log:
QPID-2984: increment management API version to allow distinguishing addition of the new functionality
Modified:
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java?rev=1095651&r1=1095650&r2=1095651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java Thu Apr 21 10:49:26 2011
@@ -36,7 +36,7 @@ import org.apache.qpid.management.common
* The ManagedBroker is the management interface to expose management
* features of the Broker.
*
- * @version Qpid JMX API 2.1
+ * @version Qpid JMX API 2.2
* @since Qpid JMX API 1.3
*/
public interface ManagedBroker
@@ -135,7 +135,7 @@ public interface ManagedBroker
/**
* Resets all message and data statistics for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanOperation(name="resetStatistics",
description="Resets all message and data statistics for the virtual host",
@@ -145,7 +145,7 @@ public interface ManagedBroker
/**
* Peak rate of messages delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakMessageDeliveryRate", description=TYPE + " Peak Message Delivery Rate")
double getPeakMessageDeliveryRate();
@@ -153,7 +153,7 @@ public interface ManagedBroker
/**
* Peak rate of bytes delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakDataDeliveryRate", description=TYPE + " Peak Data Delivery Rate")
double getPeakDataDeliveryRate();
@@ -161,7 +161,7 @@ public interface ManagedBroker
/**
* Rate of messages delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="MessageDeliveryRate", description=TYPE + " Message Delivery Rate")
double getMessageDeliveryRate();
@@ -169,7 +169,7 @@ public interface ManagedBroker
/**
* Rate of bytes delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="DataDeliveryRate", description=TYPE + " Data Delivery Rate")
double getDataDeliveryRate();
@@ -177,7 +177,7 @@ public interface ManagedBroker
/**
* Total count of messages delivered for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalMessagesDelivered", description=TYPE + " Total Messages Delivered")
long getTotalMessagesDelivered();
@@ -185,7 +185,7 @@ public interface ManagedBroker
/**
* Total count of bytes for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalDataDelivered", description=TYPE + " Total Data Delivered")
long getTotalDataDelivered();
@@ -193,7 +193,7 @@ public interface ManagedBroker
/**
* Peak rate of messages received per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakMessageReceiptRate", description=TYPE + " Peak Message Receipt Rate")
double getPeakMessageReceiptRate();
@@ -201,7 +201,7 @@ public interface ManagedBroker
/**
* Peak rate of bytes received per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakDataReceiptRate", description=TYPE + " Peak Data Receipt Rate")
double getPeakDataReceiptRate();
@@ -209,7 +209,7 @@ public interface ManagedBroker
/**
* Rate of messages received per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="MessageReceiptRate", description=TYPE + " Message Receipt Rate")
double getMessageReceiptRate();
@@ -217,7 +217,7 @@ public interface ManagedBroker
/**
* Rate of bytes received per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="DataReceiptRate", description=TYPE + " Data Receipt Rate")
double getDataReceiptRate();
@@ -225,7 +225,7 @@ public interface ManagedBroker
/**
* Total count of messages received for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalMessagesReceived", description=TYPE + " Total Messages Received")
long getTotalMessagesReceived();
@@ -233,7 +233,7 @@ public interface ManagedBroker
/**
* Total count of bytes received for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalDataReceived", description=TYPE + " Total Data Received")
long getTotalDataReceived();
@@ -241,7 +241,7 @@ public interface ManagedBroker
/**
* Is statistics collection enabled for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="StatisticsEnabled", description=TYPE + " Statistics Enabled")
boolean isStatisticsEnabled();
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java?rev=1095651&r1=1095650&r2=1095651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java Thu Apr 21 10:49:26 2011
@@ -38,7 +38,7 @@ import org.apache.qpid.management.common
/**
* The management interface exposed to allow management of Connections.
*
- * @version Qpid JMX API 2.1
+ * @version Qpid JMX API 2.2
* @since Qpid JMX API 1.3
*/
public interface ManagedConnection
@@ -150,7 +150,7 @@ public interface ManagedConnection
/**
* Resets message and data statistics for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanOperation(name="resetStatistics",
description="Resets message and data statistics for this connection",
@@ -160,7 +160,7 @@ public interface ManagedConnection
/**
* Peak rate of messages delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakMessageDeliveryRate", description=TYPE + " Peak Message Delivery Rate")
double getPeakMessageDeliveryRate();
@@ -168,7 +168,7 @@ public interface ManagedConnection
/**
* Peak rate of bytes delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakDataDeliveryRate", description=TYPE + " Peak Data Delivery Rate")
double getPeakDataDeliveryRate();
@@ -176,7 +176,7 @@ public interface ManagedConnection
/**
* Rate of messages delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="MessageDeliveryRate", description=TYPE + " Message Delivery Rate")
double getMessageDeliveryRate();
@@ -184,7 +184,7 @@ public interface ManagedConnection
/**
* Rate of bytes delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="DataDeliveryRate", description=TYPE + " Data Delivery Rate")
double getDataDeliveryRate();
@@ -192,7 +192,7 @@ public interface ManagedConnection
/**
* Total count of messages delivered for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalMessagesDelivered", description=TYPE + " Total Messages Delivered")
long getTotalMessagesDelivered();
@@ -200,7 +200,7 @@ public interface ManagedConnection
/**
* Total count of bytes for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalDataDelivered", description=TYPE + " Total Data Delivered")
long getTotalDataDelivered();
@@ -208,7 +208,7 @@ public interface ManagedConnection
/**
* Peak rate of messages received per second for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakMessageReceiptRate", description=TYPE + " Peak Message Receipt Rate")
double getPeakMessageReceiptRate();
@@ -216,7 +216,7 @@ public interface ManagedConnection
/**
* Peak rate of bytes received per second for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakDataReceiptRate", description=TYPE + " Peak Data Receipt Rate")
double getPeakDataReceiptRate();
@@ -224,7 +224,7 @@ public interface ManagedConnection
/**
* Rate of messages received per second for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="MessageReceiptRate", description=TYPE + " Message Receipt Rate")
double getMessageReceiptRate();
@@ -232,7 +232,7 @@ public interface ManagedConnection
/**
* Rate of bytes received per second for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="DataReceiptRate", description=TYPE + " Data Receipt Rate")
double getDataReceiptRate();
@@ -240,7 +240,7 @@ public interface ManagedConnection
/**
* Total count of messages received for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalMessagesReceived", description=TYPE + " Total Messages Received")
long getTotalMessagesReceived();
@@ -248,7 +248,7 @@ public interface ManagedConnection
/**
* Total count of bytes received for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalDataReceived", description=TYPE + " Total Data Received")
long getTotalDataReceived();
@@ -256,10 +256,16 @@ public interface ManagedConnection
/**
* Is statistics collection enabled for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="StatisticsEnabled", description=TYPE + " Statistics Enabled")
boolean isStatisticsEnabled();
-
+
+ /**
+ * Sets statistics collection enabled/disabled for this connection.
+ *
+ * @param enabled
+ * @since Qpid JMX API 2.2
+ */
void setStatisticsEnabled(boolean enabled);
}
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java?rev=1095651&r1=1095650&r2=1095651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java (original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java Thu Apr 21 10:49:26 2011
@@ -30,7 +30,7 @@ import org.apache.qpid.management.common
/**
* Interface for the ServerInformation MBean
*
- * @version Qpid JMX API 2.1
+ * @version Qpid JMX API 2.2
* @since Qpid JMX API 1.3
*/
public interface ServerInformation
@@ -47,7 +47,7 @@ public interface ServerInformation
* Qpid JMX API 1.1 can be assumed.
*/
int QPID_JMX_API_MAJOR_VERSION = 2;
- int QPID_JMX_API_MINOR_VERSION = 1;
+ int QPID_JMX_API_MINOR_VERSION = 2;
/**
@@ -89,7 +89,7 @@ public interface ServerInformation
/**
* Resets all message and data statistics for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanOperation(name="resetStatistics",
description="Resets all message and data statistics for the broker",
@@ -99,7 +99,7 @@ public interface ServerInformation
/**
* Peak rate of messages delivered per second for the virtual host.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakMessageDeliveryRate", description=TYPE + " Peak Message Delivery Rate")
double getPeakMessageDeliveryRate();
@@ -107,7 +107,7 @@ public interface ServerInformation
/**
* Peak rate of bytes delivered per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakDataDeliveryRate", description=TYPE + " Peak Data Delivery Rate")
double getPeakDataDeliveryRate();
@@ -115,7 +115,7 @@ public interface ServerInformation
/**
* Rate of messages delivered per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="MessageDeliveryRate", description=TYPE + " Message Delivery Rate")
double getMessageDeliveryRate();
@@ -123,7 +123,7 @@ public interface ServerInformation
/**
* Rate of bytes delivered per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="DataDeliveryRate", description=TYPE + " Data Delivery Rate")
double getDataDeliveryRate();
@@ -131,7 +131,7 @@ public interface ServerInformation
/**
* Total count of messages delivered for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalMessagesDelivered", description=TYPE + " Total Messages Delivered")
long getTotalMessagesDelivered();
@@ -139,7 +139,7 @@ public interface ServerInformation
/**
* Total count of bytes for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalDataDelivered", description=TYPE + " Total Data Delivered")
long getTotalDataDelivered();
@@ -147,7 +147,7 @@ public interface ServerInformation
/**
* Peak rate of messages received per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakMessageReceiptRate", description=TYPE + " Peak Message Receipt Rate")
double getPeakMessageReceiptRate();
@@ -155,7 +155,7 @@ public interface ServerInformation
/**
* Peak rate of bytes received per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="PeakDataReceiptRate", description=TYPE + " Peak Data Receipt Rate")
double getPeakDataReceiptRate();
@@ -163,7 +163,7 @@ public interface ServerInformation
/**
* Rate of messages received per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="MessageReceiptRate", description=TYPE + " Message Receipt Rate")
double getMessageReceiptRate();
@@ -171,7 +171,7 @@ public interface ServerInformation
/**
* Rate of bytes received per second for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="DataReceiptRate", description=TYPE + " Data Receipt Rate")
double getDataReceiptRate();
@@ -179,7 +179,7 @@ public interface ServerInformation
/**
* Total count of messages received for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalMessagesReceived", description=TYPE + " Total Messages Received")
long getTotalMessagesReceived();
@@ -187,7 +187,7 @@ public interface ServerInformation
/**
* Total count of bytes received for the broker.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="TotalDataReceived", description=TYPE + " Total Data Received")
long getTotalDataReceived();
@@ -195,7 +195,7 @@ public interface ServerInformation
/**
* Is statistics collection enabled for this connection.
*
- * @since Qpid JMX API 2.1
+ * @since Qpid JMX API 2.2
*/
@MBeanAttribute(name="StatisticsEnabled", description=TYPE + " Statistics Enabled")
boolean isStatisticsEnabled();
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java?rev=1095651&r1=1095650&r2=1095651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java Thu Apr 21 10:49:26 2011
@@ -47,7 +47,7 @@ public abstract class ApplicationRegistr
//max supported broker management interface supported by this release of the management console
public static final int SUPPORTED_QPID_JMX_API_MAJOR_VERSION = 2;
- public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 1;
+ public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 2;
public static final String DATA_DIR = System.getProperty("user.home") + File.separator + ".qpidmc";
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org