You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/09/14 13:44:34 UTC
svn commit: r996851 - in /activemq/activemq-apollo/trunk:
apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/
apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/
apollo-web/src/main/webapp/css/
Author: chirino
Date: Tue Sep 14 11:44:33 2010
New Revision: 996851
URL: http://svn.apache.org/viewvc?rev=996851&view=rev
Log:
Improved rendering of the queue entries in the web console.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/css/style.css
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=996851&r1=996850&r2=996851&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Tue Sep 14 11:44:33 2010
@@ -922,7 +922,17 @@ class QueueEntry(val queue:Queue, val se
var acquired = false
var flushing = false
- def label = "loaded"
+ def label = {
+ var rc = "loaded"
+ if( acquired ) {
+ rc += "|aquired"
+ }
+ if( flushing ) {
+ rc += "|flushing"
+ }
+ rc
+ }
+
override def toString = { "loaded:{ stored: "+stored+", flushing: "+flushing+", acquired: "+acquired+", size:"+size+"}" }
override def count = 1
@@ -1124,7 +1134,13 @@ class QueueEntry(val queue:Queue, val se
override def is_flushed_or_flushing = true
- def label = "flushed"
+ def label = {
+ var rc = "flushed"
+ if( loading ) {
+ rc += "|loading"
+ }
+ rc
+ }
override def toString = { "flushed:{ loading: "+loading+", size:"+size+"}" }
override def load() = {
@@ -1220,7 +1236,13 @@ class QueueEntry(val queue:Queue, val se
override def is_flushed_or_flushing = true
- def label = "flushed_range"
+ def label = {
+ var rc = "flushed_range"
+ if( loading ) {
+ rc = "flushed_range|loading"
+ }
+ rc
+ }
override def toString = { "flushed_range:{ loading: "+loading+", count: "+count+", size: "+size+"}" }
override def load() = {
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml?rev=996851&r1=996850&r2=996851&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml Tue Sep 14 11:44:33 2010
@@ -66,21 +66,17 @@
%h2
Entries Dump
%a(href={ id }) (Hide)
- %table
+ %table.queue-entries
%tr
- %th type
- %th seq
- %th count
- %th size
- %th consumers
- %th prefetched
+ %th State
+ %th Size
+ %th consumers, prefetched
+ %th position:count
- for( x <- entries )
%tr
%td #{x.state}
- %td #{x.seq}
- %td #{x.count}
- %td #{x.size}
- %td #{x.consumer_count}
- %td #{x.prefetch_count}
+ %td #{memory(x.size)}
+ %td #{x.consumer_count}, #{x.prefetch_count}
+ %td #{x.seq}:#{x.count}
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/css/style.css?rev=996851&r1=996850&r2=996851&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/css/style.css (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/css/style.css Tue Sep 14 11:44:33 2010
@@ -104,34 +104,21 @@ img {
text-align:left;
}
-#blog { width: 100%; float: left; }
-#blog .wrapper { min-width: 600px; width: 600px; margin: 0 auto; }
-#blog h1 {
- font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;
- font-size: 18pt; color: #993333;
-}
-#blog h2 {
- border-bottom: thin dashed #DDD;
- font-size: 16pt;
- margin-bottom: 5px;
-}
-#blog div.post p {
- padding-left: 10px;
-}
-#blog div.post .details {
- padding-top: 5px;
- color: #ccc;
- font-size: 10pt;
- font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;
-}
-
-#content .post h2 {
- margin-bottom:5px;
-}
-#content .post .details {
- color: #ccc;
- font-size: 10pt;
- font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;
- margin-top:0px;
-}
-
+/* ================================================== */
+/* Queue Entries */
+/* ================================================== */
+table.queue-entries {
+ width:100%;
+}
+table.queue-entries tr th {
+ text-align: center;
+ background-color: #993333;
+ color: white;
+ padding: 2px;
+}
+table.queue-entries tr td {
+ text-align: left;
+ background-color: #ddd;
+ padding: 2px;
+ font-size: 90%
+}
\ No newline at end of file