Author: grkvlt
Date: Mon Dec 6 13:00:04 2010
New Revision: 1042615
URL: http://svn.apache.org/viewvc?rev=1042615&view=rev
Log:
QPID-2932: Fix JMX versions
Modified:
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
Modified:
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java?rev=1042615&r1=1042614&r2=1042615&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
Mon Dec 6 13:00:04 2010
@@ -35,7 +35,8 @@ import org.apache.qpid.management.common
* The ManagedBroker is the management interface to expose management
* features of the Broker.
*
- * @since Qpid JMX API 1.9
+ * @version Qpid JMX API 1.9
+ * @since Qpid JMX API 1.1
*/
public interface ManagedBroker
{
@@ -137,7 +138,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakMessageDeliveryRate", description=TYPE + " Peak
Message Delivery Rate")
+ @MBeanAttribute(name="PeakMessageDeliveryRate", description=TYPE + " Peak
Message Delivery Rate")
double getPeakMessageDeliveryRate();
/**
@@ -145,7 +146,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakDataDeliveryRate", description=TYPE + " Peak
Data Delivery Rate")
+ @MBeanAttribute(name="PeakDataDeliveryRate", description=TYPE + " Peak
Data Delivery Rate")
double getPeakDataDeliveryRate();
/**
@@ -153,7 +154,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="messageDeliveryRate", description=TYPE + " Message
Delivery Rate")
+ @MBeanAttribute(name="MessageDeliveryRate", description=TYPE + " Message
Delivery Rate")
double getMessageDeliveryRate();
/**
@@ -161,7 +162,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="dataDeliveryRate", description=TYPE + " Data
Delivery Rate")
+ @MBeanAttribute(name="DataDeliveryRate", description=TYPE + " Data
Delivery Rate")
double getDataDeliveryRate();
/**
@@ -169,7 +170,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalMessagesDelivery", description=TYPE + " Total
Messages Delivered")
+ @MBeanAttribute(name="TotalMessagesDelivered", description=TYPE + " Total
Messages Delivered")
long getTotalMessagesDelivered();
/**
@@ -177,7 +178,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalDataDelivered", description=TYPE + " Total Data
Delivered")
+ @MBeanAttribute(name="TotalDataDelivered", description=TYPE + " Total Data
Delivered")
long getTotalDataDelivered();
/**
@@ -185,7 +186,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakMessageReceiptRate", description=TYPE + " Peak
Message Receipt Rate")
+ @MBeanAttribute(name="PeakMessageReceiptRate", description=TYPE + " Peak
Message Receipt Rate")
double getPeakMessageReceiptRate();
/**
@@ -193,7 +194,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakDataReceiptRate", description=TYPE + " Peak Data
Receipt Rate")
+ @MBeanAttribute(name="PeakDataReceiptRate", description=TYPE + " Peak Data
Receipt Rate")
double getPeakDataReceiptRate();
/**
@@ -201,7 +202,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="messageReceiptRate", description=TYPE + " Message
Receipt Rate")
+ @MBeanAttribute(name="MessageReceiptRate", description=TYPE + " Message
Receipt Rate")
double getMessageReceiptRate();
/**
@@ -209,7 +210,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="dataReceiptRate", description=TYPE + " Data Receipt
Rate")
+ @MBeanAttribute(name="DataReceiptRate", description=TYPE + " Data Receipt
Rate")
double getDataReceiptRate();
/**
@@ -217,7 +218,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalMessagesReceived", description=TYPE + " Total
Messages Received")
+ @MBeanAttribute(name="TotalMessagesReceived", description=TYPE + " Total
Messages Received")
long getTotalMessagesReceived();
/**
@@ -225,7 +226,7 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalDataReceived", description=TYPE + " Total Data
Received")
+ @MBeanAttribute(name="TotalDataReceived", description=TYPE + " Total Data
Received")
long getTotalDataReceived();
/**
@@ -233,6 +234,6 @@ public interface ManagedBroker
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="statisticsEnabled", description=TYPE + " Statistics
Enabled")
+ @MBeanAttribute(name="StatisticsEnabled", description=TYPE + " Statistics
Enabled")
boolean isStatisticsEnabled();
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java?rev=1042615&r1=1042614&r2=1042615&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
Mon Dec 6 13:00:04 2010
@@ -36,7 +36,8 @@ import org.apache.qpid.management.common
/**
* The management interface exposed to allow management of Connections.
*
- * @since Qpid JMX API 1.9
+ * @version Qpid JMX API 1.9
+ * @since Qpid JMX API 1.1
*/
public interface ManagedConnection
{
@@ -155,7 +156,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakMessageDeliveryRate", description=TYPE + " Peak
Message Delivery Rate")
+ @MBeanAttribute(name="PeakMessageDeliveryRate", description=TYPE + " Peak
Message Delivery Rate")
double getPeakMessageDeliveryRate();
/**
@@ -163,7 +164,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakDataDeliveryRate", description=TYPE + " Peak
Data Delivery Rate")
+ @MBeanAttribute(name="PeakDataDeliveryRate", description=TYPE + " Peak
Data Delivery Rate")
double getPeakDataDeliveryRate();
/**
@@ -171,7 +172,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="messageDeliveryRate", description=TYPE + " Message
Delivery Rate")
+ @MBeanAttribute(name="MessageDeliveryRate", description=TYPE + " Message
Delivery Rate")
double getMessageDeliveryRate();
/**
@@ -179,7 +180,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="dataDeliveryRate", description=TYPE + " Data
Delivery Rate")
+ @MBeanAttribute(name="DataDeliveryRate", description=TYPE + " Data
Delivery Rate")
double getDataDeliveryRate();
/**
@@ -187,7 +188,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalMessagesDelivery", description=TYPE + " Total
Messages Delivered")
+ @MBeanAttribute(name="TotalMessagesDelivered", description=TYPE + " Total
Messages Delivered")
long getTotalMessagesDelivered();
/**
@@ -195,7 +196,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalDataDelivered", description=TYPE + " Total Data
Delivered")
+ @MBeanAttribute(name="TotalDataDelivered", description=TYPE + " Total Data
Delivered")
long getTotalDataDelivered();
/**
@@ -203,7 +204,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakMessageReceiptRate", description=TYPE + " Peak
Message Receipt Rate")
+ @MBeanAttribute(name="PeakMessageReceiptRate", description=TYPE + " Peak
Message Receipt Rate")
double getPeakMessageReceiptRate();
/**
@@ -211,7 +212,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakDataReceiptRate", description=TYPE + " Peak Data
Receipt Rate")
+ @MBeanAttribute(name="PeakDataReceiptRate", description=TYPE + " Peak Data
Receipt Rate")
double getPeakDataReceiptRate();
/**
@@ -219,7 +220,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="messageReceiptRate", description=TYPE + " Message
Receipt Rate")
+ @MBeanAttribute(name="MessageReceiptRate", description=TYPE + " Message
Receipt Rate")
double getMessageReceiptRate();
/**
@@ -227,7 +228,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="dataReceiptRate", description=TYPE + " Data Receipt
Rate")
+ @MBeanAttribute(name="DataReceiptRate", description=TYPE + " Data Receipt
Rate")
double getDataReceiptRate();
/**
@@ -235,7 +236,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalMessagesReceived", description=TYPE + " Total
Messages Received")
+ @MBeanAttribute(name="TotalMessagesReceived", description=TYPE + " Total
Messages Received")
long getTotalMessagesReceived();
/**
@@ -243,7 +244,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalDataReceived", description=TYPE + " Total Data
Received")
+ @MBeanAttribute(name="TotalDataReceived", description=TYPE + " Total Data
Received")
long getTotalDataReceived();
/**
@@ -251,7 +252,7 @@ public interface ManagedConnection
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="statisticsEnabled", description=TYPE + " Statistics
Enabled")
+ @MBeanAttribute(name="StatisticsEnabled", description=TYPE + " Statistics
Enabled")
boolean isStatisticsEnabled();
void setStatisticsEnabled(boolean enabled);
Modified:
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java?rev=1042615&r1=1042614&r2=1042615&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
Mon Dec 6 13:00:04 2010
@@ -33,9 +33,9 @@ import org.apache.qpid.management.common
/**
* The management interface exposed to allow management of a queue.
- * @author Robert J. Greig
- * @author Bhupendra Bhardwaj
- * @version 0.1
+ *
+ * @version Qpid JMX API 1.6
+ * @since Qpid JMX API 1.1
*/
public interface ManagedQueue
{
@@ -269,7 +269,7 @@ public interface ManagedQueue
/**
* Sets the FlowResumeCapacity in bytes below which flow resumes.
*
- * @since Qpid JMX API 1.6
+ * @since 1.6
* @param value of the resume capacity in bytes
* @throws IOException
* @throws IllegalArgumentException If the given value exceeds the queue
Capacity
@@ -293,7 +293,7 @@ public interface ManagedQueue
* Returns a subset of all the messages stored in the queue. The messages
* are returned based on the given index numbers.
*
- * Deprecated as of Qpid JMX API 1.3
+ * @deprecated Qpid JMX API 1.3
* @param fromIndex
* @param toIndex
* @return
@@ -335,7 +335,7 @@ public interface ManagedQueue
/**
* Deletes the first message from top.
*
- * Deprecated as of Qpid JMX API 1.3
+ * @deprecated Qpid JMX API 1.3
* @throws IOException
* @throws JMException
*/
Modified:
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java?rev=1042615&r1=1042614&r2=1042615&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
Mon Dec 6 13:00:04 2010
@@ -30,7 +30,8 @@ import org.apache.qpid.management.common
/**
* Interface for the ServerInformation MBean
*
- * @since Qpid JMX API 1.9
+ * @version Qpid JMX API 1.9
+ * @since Qpid JMX API 1.3
*/
public interface ServerInformation
{
@@ -46,7 +47,7 @@ public interface ServerInformation
* Qpid JMX API 1.1 can be assumed.
*/
int QPID_JMX_API_MAJOR_VERSION = 1;
- int QPID_JMX_API_MINOR_VERSION = 8;
+ int QPID_JMX_API_MINOR_VERSION = 9;
/**
@@ -100,7 +101,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakMessageDeliveryRate", description=TYPE + " Peak
Message Delivery Rate")
+ @MBeanAttribute(name="PeakMessageDeliveryRate", description=TYPE + " Peak
Message Delivery Rate")
double getPeakMessageDeliveryRate();
/**
@@ -108,7 +109,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakDataDeliveryRate", description=TYPE + " Peak
Data Delivery Rate")
+ @MBeanAttribute(name="PeakDataDeliveryRate", description=TYPE + " Peak
Data Delivery Rate")
double getPeakDataDeliveryRate();
/**
@@ -116,7 +117,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="messageDeliveryRate", description=TYPE + " Message
Delivery Rate")
+ @MBeanAttribute(name="MessageDeliveryRate", description=TYPE + " Message
Delivery Rate")
double getMessageDeliveryRate();
/**
@@ -124,7 +125,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="dataDeliveryRate", description=TYPE + " Data
Delivery Rate")
+ @MBeanAttribute(name="DataDeliveryRate", description=TYPE + " Data
Delivery Rate")
double getDataDeliveryRate();
/**
@@ -132,7 +133,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalMessagesDelivery", description=TYPE + " Total
Messages Delivered")
+ @MBeanAttribute(name="TotalMessagesDelivered", description=TYPE + " Total
Messages Delivered")
long getTotalMessagesDelivered();
/**
@@ -140,7 +141,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalDataDelivered", description=TYPE + " Total Data
Delivered")
+ @MBeanAttribute(name="TotalDataDelivered", description=TYPE + " Total Data
Delivered")
long getTotalDataDelivered();
/**
@@ -148,7 +149,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakMessageReceiptRate", description=TYPE + " Peak
Message Receipt Rate")
+ @MBeanAttribute(name="PeakMessageReceiptRate", description=TYPE + " Peak
Message Receipt Rate")
double getPeakMessageReceiptRate();
/**
@@ -156,7 +157,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="peakDataReceiptRate", description=TYPE + " Peak Data
Receipt Rate")
+ @MBeanAttribute(name="PeakDataReceiptRate", description=TYPE + " Peak Data
Receipt Rate")
double getPeakDataReceiptRate();
/**
@@ -164,7 +165,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="messageReceiptRate", description=TYPE + " Message
Receipt Rate")
+ @MBeanAttribute(name="MessageReceiptRate", description=TYPE + " Message
Receipt Rate")
double getMessageReceiptRate();
/**
@@ -172,7 +173,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="dataReceiptRate", description=TYPE + " Data Receipt
Rate")
+ @MBeanAttribute(name="DataReceiptRate", description=TYPE + " Data Receipt
Rate")
double getDataReceiptRate();
/**
@@ -180,7 +181,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalMessagesReceived", description=TYPE + " Total
Messages Received")
+ @MBeanAttribute(name="TotalMessagesReceived", description=TYPE + " Total
Messages Received")
long getTotalMessagesReceived();
/**
@@ -188,7 +189,7 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="totalDataReceived", description=TYPE + " Total Data
Received")
+ @MBeanAttribute(name="TotalDataReceived", description=TYPE + " Total Data
Received")
long getTotalDataReceived();
/**
@@ -196,6 +197,6 @@ public interface ServerInformation
*
* @since Qpid JMX API 1.9
*/
- @MBeanAttribute(name="statisticsEnabled", description=TYPE + " Statistics
Enabled")
+ @MBeanAttribute(name="StatisticsEnabled", description=TYPE + " Statistics
Enabled")
boolean isStatisticsEnabled();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
