From 415b561cf26fea311870d352c14f236c21fe44ea Mon Sep 17 00:00:00 2001
From: "Adrian T. Co" <aco@apache.org>
Date: Thu, 16 Nov 2006 17:42:46 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-1036 Backported
 web-console fix to 4.1 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.1@475831 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/WEB-INF/dispatcher-servlet.xml        | 1 +
 activemq-web-console/src/main/webapp/queues.jsp           | 8 ++++----
 activemq-web-console/src/main/webapp/xml/queues.jsp       | 6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index a0976b955b..1a6296b0d1 100644
--- a/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -31,6 +31,7 @@
   <bean name="/createSubscriber.action" class="org.apache.activemq.web.controller.CreateSubscriber" autowire="constructor"  singleton="false"/>
   <bean name="/deleteSubscriber.action" class="org.apache.activemq.web.controller.DeleteSubscriber" autowire="constructor"  singleton="false"/>
   <bean name="/sendMessage.action" class="org.apache.activemq.web.controller.SendMessage" autowire="constructor"  singleton="false"/>
+  <bean name="/purgeDestination.action" class="org.apache.activemq.web.controller.PurgeDestination" autowire="constructor"  singleton="false"/>
   
   <!--
     - This bean resolves specific types of exception to corresponding error views.
diff --git a/activemq-web-console/src/main/webapp/queues.jsp b/activemq-web-console/src/main/webapp/queues.jsp
index c06fa1a56a..c8db570870 100644
--- a/activemq-web-console/src/main/webapp/queues.jsp
+++ b/activemq-web-console/src/main/webapp/queues.jsp
@@ -54,10 +54,10 @@
 <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
 <tr>
 <td><a href="browse.jsp?JMSDestination=${row.name}">${row.name}</a></td>
-<td>${row.queueSize}</td>
-<td>${row.consumerCount}</td>
-<td>${row.enqueueCount}</td>
-<td>${row.dequeueCount}</td>
+<td>${row.destinationStatistics.messages.count}</td>
+<td>${row.destinationStatistics.consumers.count}</td>
+<td>${row.destinationStatistics.enqueues.count}</td>
+<td>${row.destinationStatistics.dequeues.count}</td>
 <td>
     <a href="browse.jsp?JMSDestination=${row.name}">Browse</a>
 <%--    
diff --git a/activemq-web-console/src/main/webapp/xml/queues.jsp b/activemq-web-console/src/main/webapp/xml/queues.jsp
index 455cff6e3e..e90af7e2de 100644
--- a/activemq-web-console/src/main/webapp/xml/queues.jsp
+++ b/activemq-web-console/src/main/webapp/xml/queues.jsp
@@ -19,7 +19,11 @@
 <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
 <queue name="${row.name}">
 
-  <stats size="${row.queueSize}" consumerCount="${row.consumerCount}" enqueueCount="${row.enqueueCount}" dequeueCount="${row.dequeueCount}"/>
+  <stats size="${row.destinationStatistics.messages.count}"
+         consumerCount="${row.destinationStatistics.consumers.count}"
+         enqueueCount="${row.destinationStatistics.enqueues.count}"
+         dequeueCount="${row.destinationStatistics.dequeues.count}"/>
+
 
   <feed>
     <atom><c:url value="queueBrowse/${row.name}?view=rss&amp;feedType=atom_1.0"/></atom>