activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r475831 - in /incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp: WEB-INF/dispatcher-servlet.xml queues.jsp xml/queues.jsp
Date Thu, 16 Nov 2006 17:42:48 GMT
Author: aco
Date: Thu Nov 16 09:42:46 2006
New Revision: 475831

URL: http://svn.apache.org/viewvc?view=rev&rev=475831
Log:
https://issues.apache.org/activemq/browse/AMQ-1036
Backported web-console fix to 4.1 branch

Modified:
    incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
    incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
    incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/xml/queues.jsp

Modified: incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml?view=diff&rev=475831&r1=475830&r2=475831
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(original)
+++ incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Thu Nov 16 09:42:46 2006
@@ -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.

Modified: incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp?view=diff&rev=475831&r1=475830&r2=475831
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
(original)
+++ incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/queues.jsp
Thu Nov 16 09:42:46 2006
@@ -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>
 <%--    

Modified: incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/xml/queues.jsp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/xml/queues.jsp?view=diff&rev=475831&r1=475830&r2=475831
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/xml/queues.jsp
(original)
+++ incubator/activemq/branches/activemq-4.1/activemq-web-console/src/main/webapp/xml/queues.jsp
Thu Nov 16 09:42:46 2006
@@ -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>



Mime
View raw message