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/07/07 06:19:45 UTC
svn commit: r961207 - in /activemq/sandbox/activemq-apollo-actor:
activemq-dto/src/main/java/org/apache/activemq/apollo/dto/
activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/
activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/...
Author: chirino
Date: Wed Jul 7 04:19:44 2010
New Revision: 961207
URL: http://svn.apache.org/viewvc?rev=961207&view=rev
Log:
standard html views of the status resources are now working.
Added:
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/BrokerResource.index.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ConfigurationResource.index.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml
- copied, changed from r961206, activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/Root.index.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RuntimeResource.index.scaml
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/Broker.index.scaml
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/Root.index.scaml
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/ConfigurationResource.scala
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala
activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java?rev=961207&r1=961206&r2=961207&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java Wed Jul 7 04:19:44 2010
@@ -30,7 +30,8 @@ import java.util.List;
*/
@XmlRootElement(name="broker-status")
@XmlAccessorType(XmlAccessType.FIELD)
-public class BrokerStatusDTO extends ServiceStatusDTO {
+public class
+ BrokerStatusDTO extends ServiceStatusDTO {
/**
* The current time on the broker machine. In milliseconds since the epoch.
@@ -47,13 +48,20 @@ public class BrokerStatusDTO extends Ser
public List<Long> virtualHosts = new ArrayList<Long>();
/**
- * Ids of all the connections running on the broker
+ * Ids of all the connectors running on the broker
*/
@JsonProperty("connectors")
@XmlElement(name="connector")
public List<Long> connectors = new ArrayList<Long>();
/**
+ * Ids of all the connections running on the broker
+ */
+ @JsonProperty("connections")
+ @XmlElement(name="connection")
+ public List<Long> connections = new ArrayList<Long>();
+
+ /**
* The current running configuration of the object
*/
@JsonProperty
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java?rev=961207&r1=961206&r2=961207&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java Wed Jul 7 04:19:44 2010
@@ -83,6 +83,10 @@ public class QueueStatusDTO extends Long
@XmlAttribute(name="flushed-items")
public int flushedItems;
+ @JsonProperty("capacity_used")
+ @XmlAttribute(name="capacity-used")
+ public int capacityUsed;
+
@JsonProperty
@XmlAttribute
public int capacity;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/ConfigurationResource.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/ConfigurationResource.scala?rev=961207&r1=961206&r2=961207&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/ConfigurationResource.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/ConfigurationResource.scala Wed Jul 7 04:19:44 2010
@@ -28,7 +28,8 @@ import java.net.URI
/**
* A broker resource is used to represent the configuration of a broker.
*/
-case class ConfigurationResource(parent:Broker) extends Resource {
+@Produces(Array("application/json", "application/xml","text/xml", "text/html;qs=5"))
+case class ConfigurationResource(parent:BrokerResource) extends Resource {
def store = ConfigStore()
Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala?rev=961207&r1=961206&r2=961207&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RootResource.scala Wed Jul 7 04:19:44 2010
@@ -31,16 +31,22 @@ import java.util.{Arrays, Collections}
import org.apache.activemq.apollo.web.ConfigStore
import org.apache.activemq.apollo.broker.BrokerRegistry
import collection.JavaConversions._
+import com.sun.jersey.api.core.ResourceContext
+import org.fusesource.scalate.RenderContext
/**
* Defines the default representations to be used on resources
*/
@ImplicitProduces(Array("text/html;qs=5"))
@Produces(Array("application/json", "application/xml","text/xml"))
-abstract class Resource extends Logging {
+abstract class Resource(private val parent:Resource=null) extends Logging {
@Context
- val uri_info:UriInfo = null
+ var uri_info:UriInfo = null
+
+ if( parent!=null ) {
+ this.uri_info = parent.uri_info
+ }
def result[T](value:Status, message:Any=null):T = {
val response = Response.status(value)
@@ -50,13 +56,25 @@ abstract class Resource extends Logging
throw new WebApplicationException(response.build)
}
+ def path(value:Any) = uri_info.getAbsolutePathBuilder().path(value.toString).build()
+
+}
+
+class ViewHelper {
+
+ lazy val uri_info = RenderContext().attribute[UriInfo]("uri_info")
+
+ def path(value:Any) = {
+ uri_info.getAbsolutePathBuilder().path(value.toString).build()
+ }
+
}
/**
* Manages a collection of broker resources.
*/
@Path("/brokers")
-class Root() extends Resource {
+class RootResource() extends Resource {
@GET
def brokers = {
@@ -69,13 +87,15 @@ class Root() extends Resource {
}
@Path("{id}")
- def broker(@PathParam("id") id : String): Broker = new Broker(this, id)
+ def broker(@PathParam("id") id : String): BrokerResource = {
+ new BrokerResource(this, id)
+ }
}
/**
* Resource that identifies a managed broker.
*/
-case class Broker(parent:Root, @BeanProperty id: String) extends Resource {
+case class BrokerResource(parent:RootResource, @BeanProperty id: String) extends Resource(parent) {
@GET
def get = {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala?rev=961207&r1=961206&r2=961207&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala Wed Jul 7 04:19:44 2010
@@ -36,7 +36,8 @@ import collection.mutable.ListBuffer
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-case class RuntimeResource(parent:Broker) extends Resource {
+@Produces(Array("application/json", "application/xml","text/xml", "text/html;qs=5"))
+case class RuntimeResource(parent:BrokerResource) extends Resource {
private def with_broker[T](func: (org.apache.activemq.apollo.broker.Broker, Option[T]=>Unit)=>Unit):T = {
val broker:org.apache.activemq.apollo.broker.Broker = BrokerRegistry.get(parent.id)
@@ -75,15 +76,20 @@ case class RuntimeResource(parent:Broker
result.stateSince - broker.serviceState.since
result.config = broker.config
+ broker.virtualHosts.values.foreach{ host=>
+ result.virtualHosts.add( host.id )
+ }
+
broker.connectors.foreach{ c=>
result.connectors.add(c.id)
}
- broker.virtualHosts.values.foreach{ host=>
- result.virtualHosts.add( host.id )
+ broker.connectors.foreach{ connector=>
+ connector.connections.keysIterator.foreach { id =>
+ result.connections.add(id)
+ }
}
-
cb(Some(result))
}
}
@@ -148,6 +154,7 @@ case class RuntimeResource(parent:Broker
val result = new QueueStatusDTO
result.id = q.id
+ result.capacityUsed = q.capacity_used
result.capacity = q.capacity
result.enqueueItemCounter = q.enqueue_item_counter
Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml?rev=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,23 @@
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+
+%p state: #{state} since: #{ new java.util.Date(stateSince) }
+
+%h2 Virtual Hosts
+%ul
+ - for( x <- virtualHosts )
+ %li
+ %a(href="runtime/virtual-hosts/#{x}") #{x}
+
+%h2 Connectors
+%ul
+ - for( x <- connectors )
+ %li
+ %a(href={ path("connectors/"+x) }) #{x}
+
+%h2 Connections
+%ul
+ - for( x <- connections )
+ %li
+ %a(href={ path("connections/"+x) }) #{x}
Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml?rev=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerSummaryDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,2 @@
+-@ import it._
+
Added: 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=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,11 @@
+- import it._
+- 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 transport: #{transport}
+%p protocol: #{protocol}
+%p remote address: #{remoteAddress}
+%p user: #{user}
\ No newline at end of file
Added: 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=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,17 @@
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+
+%h1 Connector: #{config.id}
+
+%p state: #{state} since: #{ new java.util.Date(stateSince) }
+
+%p accepted connections: #{accepted}
+
+%h2 Connections
+%ul
+ - for( x <- connections )
+ %li
+ %a(href={ path("../../connections/"+x) }) #{x}
+
+
Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml?rev=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/DestinationStatusDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,27 @@
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+
+%h1 Destination: #{name}
+
+%p domain: #{domain}
+
+%h2 Queues
+%ul
+ - for( x <- queues )
+ %li
+ %a(href={ path("../../queues/"+x) }) #{x}
+
+%h2 Producers
+%ul
+ - for( x <- producers )
+ %li
+ %a(href={ path("../../../../connections/"+x) }) #{x}
+
+%h2 Consumers
+%ul
+ - for( x <- consumers )
+ %li
+ %a(href={ path("../../../../connections/"+x) }) #{x}
+
+
Added: 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=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,55 @@
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+
+%h1 Queue: #{id}
+
+%h2 Current Size
+
+%p queue size: #{queueItems} messages
+%p queue size: #{queueSize} bytes
+
+%h2 Enqueue/Deqeueue Counters
+
+%p enqueued: #{enqueueItemCounter} messages
+%p enqueued: #{enqueueSizeCounter} bytes
+
+%p dequeued: #{dequeueItemCounter} messages
+%p dequeued: #{dequeueSizeCounter} bytes
+
+%p nacked: #{nackItemCounter} messages
+%p nacked: #{nackSizeCounter} bytes
+
+%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
+
+- if ( entries.isEmpty )
+ %h2
+ Entries Dump
+ %a(href={ id+"?entries=true" }) (Show)
+- else
+ %h2
+ Entries Dump
+ %a(href={ id }) (Hide)
+ %table
+ %tr
+ %th type
+ %th seq
+ %th count
+ %th size
+ %th consumers
+ %th prefetched
+
+ - for( x <- entries )
+ %tr
+ %td #{x.state}
+ %td #{x.seq}
+ %td #{x.count}
+ %td #{x.size}
+ %td #{x.consumerCount}
+ %td #{x.prefetchCount}
+
Added: 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=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,16 @@
+- import it._
+- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
+- import helper._
+
+%h1 Virtual Host: #{config.id}
+
+%p state: #{state} since: #{ new java.util.Date(stateSince) }
+
+%p store type: #{storeType}
+
+%h2 Destinations
+%ul
+ - for( x <- destinations )
+ %li
+ %a(href={ path("destinations/"+x.id) }) #{x.name}
+
Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/BrokerResource.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/BrokerResource.index.scaml?rev=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/BrokerResource.index.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/BrokerResource.index.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,12 @@
+-@ import val it: org.apache.activemq.apollo.web.resources.BrokerResource
+- val broker = it.get
+
+%html
+ %body
+ %h1 Broker: #{broker.id}
+ - if (broker.configurable)
+ %p
+ %a(href={it.path("config")}) configure
+ - if (broker.manageable)
+ %p
+ %a(href={it.path("runtime")}) manage
Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ConfigurationResource.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/ConfigurationResource.index.scaml?rev=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ConfigurationResource.index.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ConfigurationResource.index.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,5 @@
+-@ import val it: org.apache.activemq.apollo.web.resources.ConfigurationResource
+
+%html
+ %body
+ %h1 Broker: #{parent.id}
Copied: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml (from r961206, activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/Root.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?p2=activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RootResource.index.scaml&p1=activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/Root.index.scaml&r1=961206&r2=961207&rev=961207&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/Root.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:19:44 2010
@@ -1,5 +1,4 @@
-!!!
--@ import val it: org.apache.activemq.apollo.web.resources.Root
+-@ import val it: org.apache.activemq.apollo.web.resources.RootResource
%html
%body
%h1 Brokers
Added: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RuntimeResource.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/RuntimeResource.index.scaml?rev=961207&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RuntimeResource.index.scaml (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/RuntimeResource.index.scaml Wed Jul 7 04:19:44 2010
@@ -0,0 +1,7 @@
+-@ import val it: org.apache.activemq.apollo.web.resources.RuntimeResource
+- val broker = it.get
+
+%html
+ %body
+ %h1 Broker: #{broker.config.id}
+ %p state: #{broker.state}