Author: dejanb
Date: Tue Aug 18 12:49:44 2009
New Revision: 805396
URL: http://svn.apache.org/viewvc?rev=805396&view=rev
Log:
fix for https://issues.apache.org/activemq/browse/AMQ-2302 - enqueue/dequeue
count for connections
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp
activemq/trunk/activemq-web-console/src/main/webapp/connections.jsp
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java?rev=805396&r1=805395&r2=805396&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
Tue Aug 18 12:49:44 2009
@@ -63,38 +63,12 @@
}
/**
- * Returns the number of messages to be dispatched to this connection
- */
- public int getDispatchQueueSize() {
- return connection.getDispatchQueueSize();
- }
-
- /**
* Resets the statistics
*/
public void resetStatistics() {
connection.getStatistics().reset();
}
- /**
- * Returns the number of messages enqueued on this connection
- *
- * @return the number of messages enqueued on this connection
- */
- public long getEnqueueCount() {
- return connection.getStatistics().getEnqueues().getCount();
-
- }
-
- /**
- * Returns the number of messages dequeued on this connection
- *
- * @return the number of messages dequeued on this connection
- */
- public long getDequeueCount() {
- return connection.getStatistics().getDequeues().getCount();
- }
-
public String getRemoteAddress() {
return connection.getRemoteAddress();
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java?rev=805396&r1=805395&r2=805396&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
Tue Aug 18 12:49:44 2009
@@ -42,34 +42,12 @@
*/
@MBeanInfo("Connection is active (both connected and receiving messages).")
boolean isActive();
-
- /**
- * Returns the number of messages to be dispatched to this connection
- */
- @MBeanInfo("The number of messages dispatched to this connection")
- int getDispatchQueueSize();
/**
* Resets the statistics
*/
@MBeanInfo("Resets the statistics")
void resetStatistics();
-
- /**
- * Returns the number of messages enqueued on this connection
- *
- * @return the number of messages enqueued on this connection
- */
- @MBeanInfo("Number of messages enqueued on this connection")
- long getEnqueueCount();
-
- /**
- * Returns the number of messages dequeued on this connection
- *
- * @return the number of messages dequeued on this connection
- */
- @MBeanInfo("Number of messages dequeued on this connection")
- long getDequeueCount();
/**
* Returns the source address for this connection
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java?rev=805396&r1=805395&r2=805396&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
Tue Aug 18 12:49:44 2009
@@ -77,23 +77,4 @@
return connector.getStatistics().isEnabled();
}
- /**
- * Returns the number of messages enqueued on this connector
- *
- * @return the number of messages enqueued on this connector
- */
- public long getEnqueueCount() {
- return connector.getStatistics().getEnqueues().getCount();
-
- }
-
- /**
- * Returns the number of messages dequeued on this connector
- *
- * @return the number of messages dequeued on this connector
- */
- public long getDequeueCount() {
- return connector.getStatistics().getDequeues().getCount();
- }
-
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java?rev=805396&r1=805395&r2=805396&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
Tue Aug 18 12:49:44 2009
@@ -46,20 +46,4 @@
@MBeanInfo("Statistics gathering enabled")
boolean isStatisticsEnabled();
- /**
- * Returns the number of messages enqueued on this connector
- *
- * @return the number of messages enqueued on this connector
- */
- @MBeanInfo("Number of messages enqueued on this connector")
- long getEnqueueCount();
-
- /**
- * Returns the number of messages dequeued on this connector
- *
- * @return the number of messages dequeued on this connector
- */
- @MBeanInfo("Number of messages dequeued on this connector")
- long getDequeueCount();
-
}
Modified: activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp?rev=805396&r1=805395&r2=805396&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp
(original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/connection.jsp Tue Aug
18 12:49:44 2009
@@ -61,18 +61,6 @@
<td class="label">Slow</td>
<td>${row.slow}</td>
</tr>
- <tr>
- <td class="label">Enqueue Count</td>
- <td>${row.enqueueCount}</td>
- </tr>
- <tr>
- <td class="label">Dequeue Count</td>
- <td>${row.dequeueCount}</td>
- </tr>
- <tr>
- <td class="label">Dispatch Queue Size</td>
- <td>${row.dispatchQueueSize}</td>
- </tr>
</tbody>
</table>
Modified: activemq/trunk/activemq-web-console/src/main/webapp/connections.jsp
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/connections.jsp?rev=805396&r1=805395&r2=805396&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/connections.jsp
(original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/connections.jsp Tue Aug
18 12:49:44 2009
@@ -30,9 +30,6 @@
<tr>
<th>Name</th>
<th>Remote Address</th>
- <th>Enqueue Count</th>
- <th>Dequeue Count</th>
- <th>Dispatch Queue Size</th>
<th>Active</th>
<th>Slow</th>
</tr>
@@ -43,9 +40,6 @@
<tr>
<td><a href="connection.jsp?connectionID=${conName}">${conName}</a></td>
<td>${con.remoteAddress}</td>
- <td>${con.enqueueCount}</td>
- <td>${con.dequeueCount}</td>
- <td>${con.dispatchQueueSize}</td>
<td>${con.active}</td>
<td>${con.slow}</td>
</tr>
