activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961102 - in /activemq/sandbox/activemq-apollo-actor: ./ activemq-dto/ activemq-dto/src/main/java/ activemq-dto/src/main/java/org/ activemq-dto/src/main/java/org/apache/ activemq-dto/src/main/java/org/apache/activemq/ activemq-dto/src/main/...
Date Wed, 07 Jul 2010 03:56:31 GMT
Author: chirino
Date: Wed Jul  7 03:56:30 2010
New Revision: 961102

URL: http://svn.apache.org/viewvc?rev=961102&view=rev
Log:
made the dto module java only added more dtos..

Added:
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummariesDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/ConnectorDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/IdListDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/StoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/package-info.java
      - copied, changed from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/package-info.java
Removed:
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/ConnectorDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/StoreDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/package-info.java
Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-dto/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerStatus.scala
    activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/Root.scala
    activemq/sandbox/activemq-apollo-actor/pom.xml

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/pom.xml?rev=961102&r1=961101&r2=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/pom.xml Wed Jul  7 03:56:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-scala</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 
@@ -31,23 +31,6 @@
 
   <name>ActiveMQ :: Data Transfer Objects</name>
   
-  <pluginRepositories>
-  	<!-- For the schemagen plugin -->
-    <pluginRepository>
-      <id>open.iona.m2</id>
-      <name>IONA Open Source Community Release Repository</name>
-      <url>http://repo.open.iona.com/maven2</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Maven  Repository </name>
-      <url>http://download.java.net/maven/2</url>
-    </pluginRepository>
-  </pluginRepositories>
-  
   <dependencies>
   
     <dependency>
@@ -56,21 +39,6 @@
       <version>${jackson-version}</version>
     </dependency>
 
-    <!-- Scala Support -->
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <scope>compile</scope>
-      <version>${scala-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-compiler</artifactId>
-      <version>${scala-version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>junit</groupId>
@@ -79,12 +47,6 @@
       <version>${junit-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
-      <version>${scalatest-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
Wed Jul  7 03:56:30 2010
@@ -18,14 +18,42 @@ package org.apache.activemq.apollo.dto;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
+ * <p>
+ * </p>
+ *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="memory-store")
+@XmlRootElement(name="broker-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MemoryStoreDTO extends StoreDTO {
+public class BrokerStatusDTO {
+
+    /**
+     * A unique id of the broker.
+     */
+	@XmlAttribute(name="id")
+	public String id;
+
+    /**
+     * The state of the object.
+     */
+	@XmlAttribute(name="state")
+	public String state;
+    
+    /**
+     * Since when has the broker in in this state?
+     */
+	@XmlAttribute(name="in-state-since")
+	public String inStateSince;
+
+    /**
+     * The current time on the broker machine.
+     */
+	@XmlAttribute(name="current-time")
+	public String currentTime;
 
 
 }

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummariesDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummariesDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummariesDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummariesDTO.java
Wed Jul  7 03:56:30 2010
@@ -16,29 +16,21 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import java.util.ArrayList;
-
 import javax.xml.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "virtual-host")
+@XmlRootElement(name="broker-summaries")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class VirtualHostDTO {
-	
+public class BrokerSummariesDTO {
+
     /**
-     * A unique id of the virtual host.
+     * The list of broker summaries. 
      */
-	@XmlAttribute(name="id")
-	public String id;
-
-    @XmlElement(name="host-names", required=true)
-    public ArrayList<String> hostNames = new ArrayList<String>();
-
-    @XmlElementRef   
-    public StoreDTO store;
-    
-
+    @XmlElement
+    public List<BrokerSummaryDTO> brokers = new ArrayList<BrokerSummaryDTO>();
 
-}
+}
\ No newline at end of file

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java
Wed Jul  7 03:56:30 2010
@@ -18,14 +18,30 @@ package org.apache.activemq.apollo.dto;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
+ * <p>
+ * </p>
+ *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="memory-store")
+@XmlRootElement(name="broker-summary")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MemoryStoreDTO extends StoreDTO {
+public class BrokerSummaryDTO {
+
+    /**
+     * A unique id of the broker.
+     */
+	@XmlAttribute(name="id")
+	public String id;
+
+    /**
+     * The latest revision of the broker config.
+     */
+	@XmlAttribute(name="rev")
+	public Integer rev;
 
 
 }

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/BrokerDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
Wed Jul  7 03:56:30 2010
@@ -16,57 +16,61 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
+ * <p>
+ * </p>
+ *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="broker")
+@XmlRootElement(name="connection-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class BrokerDTO {
+public class ConnectionStatusDTO {
 
     /**
-     * A unique id of the broker.
+     * A unique id of the connection.
      */
 	@XmlAttribute(name="id")
 	public String id;
 
     /**
-     * Used to track config revisions.
+     * The state of the object.
      */
-    @XmlAttribute(name="rev")
-    public int rev;
+	@XmlAttribute(name="state")
+	public String state;
 
     /**
-     * Used to track who last modified the configuration.
+     * The number of bytes that have been read from the connection.
      */
-    @XmlAttribute(name="modified-by")
-    public String modifiedBy;
+	@XmlAttribute(name="read-counter")
+	public Long readCounter;
+
 
     /**
-     * Used to store any configuration notes.
+     * The number of bytes that have been written to the connection.
      */
-    @XmlElement
-    public String notes;
+	@XmlAttribute(name="write-counter")
+	public Long writeCounter;
 
     /**
-     * A broker can service many virtual hosts.
+     * The protocol the connection is using.
      */
-    @XmlElement(name="virtual-host")
-    public List<VirtualHostDTO> virtualHosts = new ArrayList<VirtualHostDTO>();
+	@XmlAttribute(name="protocol")
+	public String protocol;
 
     /**
-     * A broker accepts connections via it's configured connectors.
+     * The remote address of the connection
      */
-    @XmlElement(name="connectors")
-    public List<ConnectorDTO> connectors = new ArrayList<ConnectorDTO>();
-
+	@XmlAttribute(name="remote-address")
+	public String remoteAddress;
 
+    /**
+     * The connected user
+     */
+	@XmlAttribute(name="user")
+	public String user;
 }

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/ConnectorDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/ConnectorDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java
Wed Jul  7 03:56:30 2010
@@ -18,14 +18,36 @@ package org.apache.activemq.apollo.dto;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
+ * <p>
+ * </p>
+ *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="memory-store")
+@XmlRootElement(name="connector-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MemoryStoreDTO extends StoreDTO {
+public class ConnectorStatusDTO {
 
+    /**
+     * A unique id of the connector.
+     */
+	@XmlAttribute(name="id")
+	public String id;
 
+    /**
+     * The state of the object.
+     */
+	@XmlAttribute(name="state")
+	public String state;
+
+    /**
+     * The number of connections that this connector has accepted.
+     */
+	@XmlAttribute(name="accepted")
+	public Long accepted;
+
+    
 }

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/IdListDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/IdListDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/IdListDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/IdListDTO.java
Wed Jul  7 03:56:30 2010
@@ -18,14 +18,22 @@ 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 java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="memory-store")
+@XmlRootElement(name="id-list")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MemoryStoreDTO extends StoreDTO {
+public class IdListDTO {
 
+    /**
+     * A list of ids.
+     */
+    @XmlElement
+    public List<String> ids = new ArrayList<String>();
 
-}
+}
\ No newline at end of file

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/MemoryStoreDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/StoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/StoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/VirtualHostDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/MemoryStoreDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java
Wed Jul  7 03:56:30 2010
@@ -18,14 +18,29 @@ package org.apache.activemq.apollo.dto;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
+ * <p>
+ * </p>
+ *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="memory-store")
+@XmlRootElement(name="virtual-host-status")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MemoryStoreDTO extends StoreDTO {
-
+public class VirtualHostStatusDTO {
+    
+    /**
+     * A unique id of the virtual host.
+     */
+	@XmlAttribute(name="id")
+	public String id;
 
+    /**
+     * The state of the object.
+     */
+	@XmlAttribute(name="state")
+	public String state;
+    
 }

Copied: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/package-info.java
(from r961101, activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/package-info.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/package-info.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/package-info.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/scala/org/apache/activemq/apollo/dto/package-info.java&r1=961101&r2=961102&rev=961102&view=diff
==============================================================================
    (empty)

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerStatus.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerStatus.scala?rev=961102&r1=961101&r2=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerStatus.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerStatus.scala
Wed Jul  7 03:56:30 2010
@@ -19,6 +19,8 @@ package org.apache.activemq.apollo.web.r
 import java.lang.String
 import javax.ws.rs._
 import reflect.{BeanProperty}
+import org.apache.activemq.apollo.dto.{ConnectionStatusDTO, ConnectorStatusDTO, VirtualHostStatusDTO,
BrokerStatusDTO}
+
 /**
  * <p>
  * The BrokerStatus is the root container of the runtime status of a broker.
@@ -28,7 +30,11 @@ import reflect.{BeanProperty}
  */
 case class BrokerStatus(parent:Broker, @BeanProperty id:String) extends Resource {
   @GET
-  def get() = this
+  def get() = {
+    val rc = new BrokerStatusDTO
+    rc.id = id
+    rc
+  }
 
   @Path("virtual-hosts")
   def virtualHosts :Array[VirtualHostStatus] = null
@@ -47,22 +53,30 @@ case class BrokerStatus(parent:Broker, @
 }
 
 case class VirtualHostStatus(parent:BrokerStatus, @BeanProperty id: String) extends Resource
{
-  var state:String = null
   @GET
-  def get() = this
+  def get() = {
+    val rc = new VirtualHostStatusDTO
+    rc.id = id
+    rc
+  }
 }
 
 case class ConnectorStatus(parent:BrokerStatus, @BeanProperty id: String) extends Resource
{
-  var state:String = "unknown";
-  var accepted:Long = 0;
+
   @GET
-  def get() = this
+  def get() = {
+    val rc = new ConnectorStatusDTO
+    rc.id = id
+    rc
+  }
 }
 
 case class ConnectionStatus(parent:BrokerStatus, @BeanProperty id:String) extends Resource
{
-  var state:String = "unknown";
-  var readCounter:Long = 0;
-  var writeCounter:Long = 0;
+
   @GET
-  def get() = this
+  def get() = {
+    val rc = new ConnectionStatusDTO
+    rc.id = id
+    rc
+  }
 }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/Root.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/Root.scala?rev=961102&r1=961101&r2=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/Root.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/web/resources/Root.scala
Wed Jul  7 03:56:30 2010
@@ -27,7 +27,8 @@ import org.apache.activemq.apollo.{Broke
 import org.fusesource.hawtdispatch.Future
 import Response._
 import Response.Status._
-import org.apache.activemq.apollo.dto.BrokerDTO
+import org.apache.activemq.apollo.dto.{IdListDTO, BrokerSummaryDTO, BrokerDTO}
+import java.util.{Arrays, Collections}
 
 /**
  * Defines the default representations to be used on resources
@@ -56,14 +57,13 @@ class Root() extends Resource {
   var configStore:ConfigStore = BrokerRegistry.configStore;
 
   @GET
-  def get() = this
-
-  case class BrokerRef(@BeanProperty id:String, @BeanProperty href:String)
-
-  def getBrokers: Array[BrokerRef] = {
-    Future[List[String]] { cb=>
+  def get() = {
+    val rc = new IdListDTO
+    val ids = Future[List[String]] { cb=>
       configStore.listBrokerModels(cb)
-    }.map(x=> new BrokerRef(x, x)).toArray[BrokerRef]
+    }.toArray[String]
+    rc.ids.addAll(Arrays.asList(ids: _*))
+    rc
   }
 
   @Path("{id}")
@@ -78,12 +78,13 @@ case class Broker(parent:Root, @BeanProp
   @Context
   var configStore:ConfigStore = BrokerRegistry.configStore;
 
-  case class BrokerSummary(@BeanProperty id:String, @BeanProperty config_rev:Int, @BeanProperty
config_href:String, @BeanProperty status_href:String)
-
   @GET
   def get() = {
     val c = config()
-    new BrokerSummary(id, c.rev, "config/"+c.rev, "status")
+    val rc = new BrokerSummaryDTO
+    rc.id = id
+    rc.rev = c.rev
+    rc
   }
 
   @GET @Path("config")

Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961102&r1=961101&r2=961102&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul  7 03:56:30 2010
@@ -677,8 +677,23 @@
           </snapshots>
         </repository>
       </repositories>
-
+      
       <pluginRepositories>
+        <!-- For the schemagen plugin -->
+        <pluginRepository>
+          <id>open.iona.m2</id>
+          <name>IONA Open Source Community Release Repository</name>
+          <url>http://repo.open.iona.com/maven2</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </pluginRepository>
+        <pluginRepository>
+          <id>maven2-repository.dev.java.net</id>
+          <name>Java.net Maven  Repository </name>
+          <url>http://download.java.net/maven/2</url>
+        </pluginRepository>
+
         <pluginRepository>
           <id>scala</id>
           <name>Scala Tools</name>



Mime
View raw message