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/11/12 02:27:21 UTC

svn commit: r1034234 - in /activemq/activemq-apollo/trunk: apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/ apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/

Author: chirino
Date: Fri Nov 12 01:27:20 2010
New Revision: 1034234

URL: http://svn.apache.org/viewvc?rev=1034234&view=rev
Log:
Converted to from scaml to jade templates since they are more concise.

Added:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade
      - copied, changed from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml
Removed:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml
    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/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.scaml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -19,20 +19,20 @@
 - import helper._
 - import java.util.concurrent.TimeUnit._
 
-%p state: #{state} for #{ uptime(state_since) }
+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 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 Flush Stats
+p flushed message stores: #{flushed_message_counter}
+p flushed message enqueues: #{flushed_enqueue_counter}
 
-%h2 Store Latency Stats
+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
+  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)

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerDTO.jade Fri Nov 12 01:27:20 2010
@@ -19,15 +19,15 @@
 - import org.apache.activemq.apollo.dto.XmlCodec._
 
 .breadcumbs
-  %a(href={strip_resolve("..")}) Back
+  a(href={strip_resolve("..")}) Back
 
-%form(method="post" action={it.rev+1})
-  %div
-    %input(type="submit" value="Update")
-  %div
-    %textarea(rows="40" cols="80" name="config")<
+form(method="post" action={it.rev+1})
+  div
+    input(type="submit" value="Update")
+  div
+    textarea(rows="40" cols="80" name="config")<
       - val baos = new ByteArrayOutputStream
       - marshalBrokerDTO(it, baos, true)
       ~~ new String(baos.toByteArray, "UTF-8")
-  %div
-    %input(type="submit" value="Update")
\ No newline at end of file
+  div
+    input(type="submit" value="Update")
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -18,25 +18,25 @@
 - import helper._
 
 .breadcumbs
-  %a(href={strip_resolve(".")}) Back
+  a(href={strip_resolve(".")}) Back
 
 
-%p state: #{state} for #{ uptime(state_since) }
+p state: #{state} for #{ uptime(state_since) }
 
-%h2 Virtual Hosts
-%ul
+h2 Virtual Hosts
+ul
   - for( x <- virtual_hosts )
-    %li
-      %a(href={ path("virtual-hosts/"+ x.id) }) #{x.label}
+    li
+      a(href={ path("virtual-hosts/"+ x.id) }) #{x.label}
 
-%h2 Connectors
-%ul
+h2 Connectors
+ul
   - for( x <- connectors )
-    %li
-      %a(href={ path("connectors/"+x.id) }) #{x.label}
+    li
+      a(href={ path("connectors/"+x.id) }) #{x.label}
 
-%h2 Connections
-%ul
+h2 Connections
+ul
   - for( x <- connections )
-    %li
-      %a(href={ path("connections/"+x.id) }) #{x.label}
+    li
+      a(href={ path("connections/"+x.id) }) #{x.label}

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.jade Fri Nov 12 01:27:20 2010
@@ -17,6 +17,6 @@
 - import helper._
 
 .breadcumbs
-  %a(href={strip_resolve(".")}) Back
+  a(href={strip_resolve(".")}) Back
 
 .clear
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -18,11 +18,11 @@
 - import helper._
 
 .breadcumbs
-  %a(href={strip_resolve(".")}) Back
+  a(href={strip_resolve(".")}) Back
 
-%p state: #{state} for #{ uptime(state_since) }
-%p remote address: #{remote_address}
-%p protocol: #{protocol}
-%p transport: #{transport}
-%p read counter: #{memory(read_counter)}
-%p write counter: #{memory(write_counter)}
+p state: #{state} for #{ uptime(state_since) }
+p remote address: #{remote_address}
+p protocol: #{protocol}
+p transport: #{transport}
+p read counter: #{memory(read_counter)}
+p write counter: #{memory(write_counter)}

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -15,20 +15,19 @@
 - import it._
 - val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
 - import helper._
-
 .breadcumbs
-  %a(href={strip_resolve("..")}) Back
+  a(href={strip_resolve("..")}) Back
 
-%h1 Connector: #{config.id}
+h1 Connector: #{config.id}
 
-%p state: #{state} for #{ uptime(state_since) }
+p state: #{state} for #{ uptime(state_since) }
 
-%p accepted connections: #{accepted}
+p accepted connections: #{accepted}
 
-%h2 Connections
-%ul
+h2 Connections
+ul
   - for( x <- connections )
-    %li
-      %a(href={ path("../../connections/"+x.id) }) #{x.label}
+    li
+      a(href={ path("../../connections/"+x.id) }) #{x.label}
 
 

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -18,26 +18,26 @@
 - import helper._
 
 .breadcumbs
-  %a(href={strip_resolve(".")}) Back
+  a(href={strip_resolve(".")}) Back
 
-%h1 Destination: #{name}
+h1 Destination: #{name}
 
-%h2 Queues
-%ul
+h2 Queues
+ul
   - for( x <- queues )
-    %li
-      %a(href={ path("queues/"+x.id) }) #{x.label}
+    li
+      a(href={ path("queues/"+x.id) }) #{x.label}
 
-%h3 Broadcast Producers
-%ul
+h3 Broadcast Producers
+ul
   - for( x <- producers )
-    %li
-      %a(href={ path("../../../../connections/"+x.id) }) #{x.label}
+    li
+      a(href={ path("../../../../connections/"+x.id) }) #{x.label}
 
-%h3 Broadcast Consumers
-%ul
+h3 Broadcast Consumers
+ul
   - for( x <- consumers )
-    %li
-      %a(href={ path("../../../../connections/"+x.id) }) #{x.label}
+    li
+      a(href={ path("../../../../connections/"+x.id) }) #{x.label}
 
 

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -19,22 +19,22 @@
 - import java.util.concurrent.TimeUnit._
 
 .breadcumbs
-  %a(href={strip_resolve(".")}) Back
+  a(href={strip_resolve(".")}) Back
 
-%p state: #{state} for #{ uptime(state_since) }
+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 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 Flush Stats
+p flushed message stores: #{flushed_message_counter}
+p flushed message enqueues: #{flushed_enqueue_counter}
 
-%h2 Store Latency Stats
+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
+  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)

Added: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade?rev=1034234&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade (added)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -0,0 +1,85 @@
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-# 
+-# http://www.apache.org/licenses/LICENSE-2.0
+-# 
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+
+.breadcumbs
+  a(href={strip_resolve("..")}) Back
+
+h1 Queue: #{label}
+
+h2 Current Size
+
+p queue size: #{queue_items} messages
+p queue size: #{memory(queue_size)}
+- if( capacity > 0 )
+  p memory used: #{ "%,.2f".format(capacity_used.toFloat*100.0/capacity) }% (#{memory(capacity_used)}/#{memory(capacity)})
+- else
+  p memory used: #{ "%,.2f".format(0f) }% (#{memory(capacity_used)}/#{memory(capacity)})
+
+h2 Enqueue/Deqeueue Counters
+
+p enqueued: #{enqueue_item_counter} messages
+p enqueued: #{memory(enqueue_size_counter)}
+
+p dequeued: #{dequeue_item_counter} messages
+p dequeued: #{memory(dequeue_size_counter)}
+
+p nacked: #{nack_item_counter} messages
+p nacked: #{memory(nack_size_counter)}
+
+h2 Swap Status
+
+p loading from the store: #{memory(loading_size)}
+p flushing out of memory: #{memory(flushing_size)}
+p holding : #{flushed_items} flushed message references
+
+h3 Producers
+ul
+  - for( x <- producers )
+    li
+      a(href={ path("../../../../../../connections/"+x.id) }) #{x.label}
+
+h3 Consumers
+ul
+  - for( x <- consumers )
+    li
+      a(href={ path("../../../../../../connections/"+x.id) }) #{x.label}
+
+
+- if ( entries.isEmpty )
+  h2
+    Entries Dump
+    a(href={ id+"?entries=true" }) (Show)
+- else
+  h2
+    Entries Dump
+    a(href={ id })  (Hide)
+  table.queue-entries
+    tr
+      th State
+      th Size
+      th consumers, prefetched
+      th position:count
+
+    - for( x <- entries )
+      tr
+        td #{x.state}
+        td #{memory(x.size)}
+        td #{x.consumer_count}, #{x.prefetch_count}
+        td #{x.seq}:#{x.count}
+

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -18,16 +18,16 @@
 - import helper._
 
 .breadcumbs
-  %a(href={strip_resolve(".")}) Back
+  a(href={strip_resolve(".")}) Back
 
-%p state: #{state} for #{ uptime(state_since) }
-%p remote address: #{remote_address}
-%p protocol: #{protocol}
-%p transport: #{transport}
-%p read counter: #{memory(read_counter)}
-%p write counter: #{memory(write_counter)}
+p state: #{state} for #{ uptime(state_since) }
+p remote address: #{remote_address}
+p protocol: #{protocol}
+p transport: #{transport}
+p read counter: #{memory(read_counter)}
+p write counter: #{memory(write_counter)}
 
-%p protocol version: #{protocol_version}
-%p user: #{user}
-%p waiting on: #{waiting_on}
-%p subscription count: #{subscription_count}
+p protocol version: #{protocol_version}
+p user: #{user}
+p waiting on: #{waiting_on}
+p subscription count: #{subscription_count}

Copied: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade (from r1034233, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml&r1=1034233&r2=1034234&rev=1034234&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade Fri Nov 12 01:27:20 2010
@@ -18,19 +18,19 @@
 - import helper._
 
 .breadcumbs
-  %a(href={strip_resolve("..")}) Back
+  a(href={strip_resolve("..")}) Back
 
-%h1 Virtual Host: #{config.id}
+h1 Virtual Host: #{config.id}
 
-%p state: #{state} for #{ uptime(state_since) }
+p state: #{state} for #{ uptime(state_since) }
 
 - if ( store !=null )
-  %p
-    %a(href={ path("store") }) store
+  p
+    a(href={ path("store") }) store
 
-%h2 Destinations
-%ul
+h2 Destinations
+ul
   - for( x <- destinations )
-    %li
-      %a(href={ path("destinations/"+x.id) }) #{x.label}
+    li
+      a(href={ path("destinations/"+x.id) }) #{x.label}