svn commit: r961209 [2/2] - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/ activemq-broker/src/test/scala/org/apache/a...

[ch...@apache.org]

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml?rev=961209&r1=961208&r2=961209&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml Wed Jul  7 04:20:53 2010
@@ -2,10 +2,10 @@
 - val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
 - import helper._
 
-%p state: #{state} since: #{ new java.util.Date(stateSince) }
-%p read counter: #{readCounter}
-%p write counter: #{writeCounter}
+%p state: #{state} for #{ uptime(state_since) }
+%p read counter: #{memory(read_counter)}
+%p write counter: #{memory(write_counter)}
 %p transport: #{transport}
 %p protocol: #{protocol}
-%p remote address: #{remoteAddress}
+%p remote address: #{remote_address}
 %p user: #{user}
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml?rev=961209&r1=961208&r2=961209&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml Wed Jul  7 04:20:53 2010
@@ -4,7 +4,7 @@
 
 %h1 Connector: #{config.id}
 
-%p state: #{state} since: #{ new java.util.Date(stateSince) }
+%p state: #{state} for #{ uptime(state_since) }
 
 %p accepted connections: #{accepted}
 

Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml?rev=961209&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml Wed Jul  7 04:20:53 2010
@@ -0,0 +1,24 @@
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+- import java.util.concurrent.TimeUnit._
+
+%p state: #{state} for #{ uptime(state_since) }
+
+%h2 Cancel Stats
+%p canceled message stores: #{canceled_message_counter}
+%p canceled message enqueues: #{canceled_enqueue_counter}
+
+%h2 Flush Stats
+%p flushed message stores: #{flushed_message_counter}
+%p flushed message enqueues: #{flushed_enqueue_counter}
+
+%h2 Store Latency Stats
+
+- def show(name:String, value:TimeMetricDTO)
+  %p #{name} : average #{value.avg(MILLISECONDS)} ms,  min #{value.min(MILLISECONDS)} ms, max #{value.max(MILLISECONDS)} ms, #{value.count} events
+
+- show("Message load latency", message_load_latency)
+- show("UOW flush latency", flush_latency)
+- show("Journal append latency", journal_append_latency)
+- show("Index update latency", index_update_latency)

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml?rev=961209&r1=961208&r2=961209&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml Wed Jul  7 04:20:53 2010
@@ -6,26 +6,26 @@
 
 %h2 Current Size
 
-%p queue size: #{queueItems} messages
-%p queue size: #{queueSize} bytes
+%p queue size: #{queue_items} messages
+%p queue size: #{memory(queue_size)}
+%p memory used: #{ "%,.2f".format(capacity_used.toFloat*100.0/capacity) } (#{memory(capacity_used)}/#{memory(capacity)})
 
 %h2 Enqueue/Deqeueue Counters
 
-%p enqueued: #{enqueueItemCounter} messages
-%p enqueued: #{enqueueSizeCounter} bytes
+%p enqueued: #{enqueue_item_counter} messages
+%p enqueued: #{memory(enqueue_size_counter)}
 
-%p dequeued: #{dequeueItemCounter} messages
-%p dequeued: #{dequeueSizeCounter} bytes
+%p dequeued: #{dequeue_item_counter} messages
+%p dequeued: #{memory(dequeue_size_counter)}
 
-%p nacked: #{nackItemCounter} messages
-%p nacked: #{nackSizeCounter} bytes
+%p nacked: #{nack_item_counter} messages
+%p nacked: #{memory(nack_size_counter)}
 
 %h2 Memory Mangement
 
-%p memory usage: #{capacityUsed}/#{capacity} bytes ( #{ "%,.2f".format(capacityUsed.toFloat/capacity) } )
-%p loading from the store: #{loadingSize} bytes
-%p flushing out of memory: #{flushingSize} bytes
-%p holding : #{flushedItems} flushed message references
+%p loading from the store: #{memory(loading_size)}
+%p flushing out of memory: #{memory(flushing_size)}
+%p holding : #{flushed_items} flushed message references
 
 - if ( entries.isEmpty )
   %h2
@@ -50,6 +50,6 @@
         %td #{x.seq}
         %td #{x.count}
         %td #{x.size}
-        %td #{x.consumerCount}
-        %td #{x.prefetchCount}
+        %td #{x.consumer_count}
+        %td #{x.prefetch_count}
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml?rev=961209&r1=961208&r2=961209&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml Wed Jul  7 04:20:53 2010
@@ -4,9 +4,12 @@
 
 %h1 Virtual Host: #{config.id}
 
-%p state: #{state} since: #{ new java.util.Date(stateSince) }
+%p state: #{state} for #{ uptime(state_since) }
+
+- if ( store !=null )
+  %p
+    %a(href={ path("store") }) store
 
-%p store type: #{storeType}
 
 %h2 Destinations
 %ul

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml?rev=961209&r1=961208&r2=961209&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml Wed Jul  7 04:20:53 2010
@@ -4,6 +4,6 @@
     %h1 Brokers
 
     %ul
-      - for( brokerId <- brokers.ids )
+      - for( x <- brokers.ids )
         %li
-          %a(href="brokers/#{brokerId}") #{brokerId}
+          %a(href="brokers/#{x}") #{x}