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:15:39 UTC

svn commit: r961188 - in /activemq/sandbox/activemq-apollo-actor: activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ activemq-web/

Author: chirino
Date: Wed Jul  7 04:15:39 2010
New Revision: 961188

URL: http://svn.apache.org/viewvc?rev=961188&view=rev
Log:
add a readme file

Added:
    activemq/sandbox/activemq-apollo-actor/activemq-web/readme.md
Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationSummaryDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java?rev=961188&r1=961187&r2=961188&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java Wed Jul  7 04:15:39 2010
@@ -16,7 +16,12 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -24,19 +29,25 @@ import javax.xml.bind.annotation.*;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="destination-summary")
+@XmlRootElement(name="destination-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DestinationStatusDTO extends IdDTO<Long> {
+public class DestinationStatusDTO extends DestinationSummaryDTO {
 
     /**
-     * The destination name
+     * Ids of all connections that are producing to the destination
      */
-    @XmlElement(name="name")
-    public String name;
+    @XmlElement(name="producer")
+    public List<Long> producers = new ArrayList<Long>();
 
     /**
-     * The routing domain
+     * Ids of all connections that are consuming from the destination
      */
-    @XmlElement(name="domain")
-    public String domain;
+    @XmlElement(name="consumer")
+    public List<Long> consumers = new ArrayList<Long>();
+
+    /**
+     * Ids of all queues that are associated with the destination
+     */
+    @XmlElement(name="queue")
+    public List<Long> queues = new ArrayList<Long>();
 }
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationSummaryDTO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationSummaryDTO.java?rev=961188&r1=961187&r2=961188&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationSummaryDTO.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationSummaryDTO.java Wed Jul  7 04:15:39 2010
@@ -17,8 +17,6 @@
 package org.apache.activemq.apollo.dto;
 
 import javax.xml.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * <p>
@@ -26,20 +24,20 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="virtual-host-status")
+@XmlRootElement(name="destination-summary")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DestinationSummaryDTO extends ServiceStatusDTO {
+public class DestinationSummaryDTO extends LongIdDTO {
 
     /**
-     * The type of store the virtual host is using.
+     * The destination name
      */
-    @XmlAttribute(name="store-type")
-    public String storeType;
+    @XmlElement(name="name")
+    public String name;
 
     /**
-     * Ids of all the destinations running on the broker
+     * The routing domain
      */
-    @XmlElement(name="destination")
-    public List<Long> destinations = new ArrayList<Long>();
-
+    @XmlElement(name="domain")
+    public String domain;
+    
 }
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java?rev=961188&r1=961187&r2=961188&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java Wed Jul  7 04:15:39 2010
@@ -27,42 +27,29 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="destination-status")
+@XmlRootElement(name="entry-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class EntryStatusDTO extends IdDTO<Long> {
+public class EntryStatusDTO {
 
     /**
      * A unique id of the object within it's container
      */
-	@XmlAttribute(name="enqueue-item-counter")
-	public long id;
+	@XmlAttribute(name="seq")
+	public long seq;
 
-    @XmlAttribute(name="enqueue-item-counter")
-    public long enqueueItemCounter;
-    @XmlAttribute(name="dequeue-item-counter")
-    public long dequeueItemCounter;
-    @XmlAttribute(name="enqueue-size-counter")
-    public long enqueueSizeCounter;
-    @XmlAttribute(name="dequeue-size-counter")
-    public long dequeueSizeCounter;
-    @XmlAttribute(name="nack-item-counter")
-    public long nackItemCounter;
-    @XmlAttribute(name="nack-size-counter")
-    public long nackSizeCounter;
-
-    @XmlAttribute(name="queue-size")
-    public long queueSize;
-    @XmlAttribute(name="queue-items")
-    public long queueItems;
-
-    @XmlAttribute(name="loading-size")
-    public int loadingSize;
-    @XmlAttribute(name="flushing-size")
-    public int flushingSize;
-    @XmlAttribute(name="flushed-items")
-    public int flushedItems;
+    @XmlAttribute(name="count")
+    public int count;
 
-    @XmlAttribute(name="capacity")
-    public int capacity;
+    @XmlAttribute(name="size")
+    public int size;
+
+    @XmlAttribute(name="state")
+    public String state;
+
+    @XmlAttribute(name="consumers")
+    public int consumers;
+
+    @XmlAttribute(name="prefetched")
+    public int prefetched;
 
 }
\ No newline at end of file

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=961188&r1=961187&r2=961188&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:15:39 2010
@@ -16,10 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,25 +26,49 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="destination-status")
+@XmlRootElement(name="queue-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class QueueStatusDTO extends DestinationSummaryDTO {
+public class QueueStatusDTO extends LongIdDTO {
 
     /**
-     * Ids of all connections that are producing to the destination
+     * A unique id of the object within it's container
      */
-    @XmlElement(name="producer")
-    public List<Long> producers = new ArrayList<Long>();
+	@XmlAttribute(name="enqueue-item-counter")
+	public long id;
 
-    /**
-     * Ids of all connections that are consuming from the destination
-     */
-    @XmlElement(name="consumer")
-    public List<Long> consumers = new ArrayList<Long>();
+    @XmlAttribute(name="enqueue-item-counter")
+    public long enqueueItemCounter;
+    @XmlAttribute(name="dequeue-item-counter")
+    public long dequeueItemCounter;
+    @XmlAttribute(name="enqueue-size-counter")
+    public long enqueueSizeCounter;
+    @XmlAttribute(name="dequeue-size-counter")
+    public long dequeueSizeCounter;
+    @XmlAttribute(name="nack-item-counter")
+    public long nackItemCounter;
+    @XmlAttribute(name="nack-size-counter")
+    public long nackSizeCounter;
+
+    @XmlAttribute(name="queue-size")
+    public long queueSize;
+    @XmlAttribute(name="queue-items")
+    public long queueItems;
+
+    @XmlAttribute(name="loading-size")
+    public int loadingSize;
+    @XmlAttribute(name="flushing-size")
+    public int flushingSize;
+    @XmlAttribute(name="flushed-items")
+    public int flushedItems;
+
+    @XmlAttribute(name="capacity")
+    public int capacity;
 
     /**
-     * Ids of all queues that are associated with the destination
+     * Status of the entries in the queue
      */
-    @XmlElement(name="queue")
-    public List<Long> queues = new ArrayList<Long>();
+    @XmlElement(name="entry")
+    public List<EntryStatusDTO> entries = new ArrayList<EntryStatusDTO>();
+
+
 }
\ No newline at end of file

Added: activemq/sandbox/activemq-apollo-actor/activemq-web/readme.md
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/readme.md?rev=961188&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/readme.md (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/readme.md Wed Jul  7 04:15:39 2010
@@ -0,0 +1,7 @@
+### Using
+
+Run with ./run
+
+test with a json client.. perhaps curl like this:
+
+curl -i -H "Accept: application/json" localhost:8080/default
\ No newline at end of file