activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1133621 - in /activemq/activemq-apollo/trunk: apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/ apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto...
Date Thu, 09 Jun 2011 01:12:54 GMT
Author: chirino
Date: Thu Jun  9 01:12:53 2011
New Revision: 1133621

URL: http://svn.apache.org/viewvc?rev=1133621&view=rev
Log:
Move more fields into the Connection base class, expose all the new fields in the html view.

Modified:
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/webapp/WEB-INF/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java?rev=1133621&r1=1133620&r2=1133621&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
Thu Jun  9 01:12:53 2011
@@ -70,6 +70,12 @@ public class ConnectionStatusDTO extends
 	public String protocol;
 
     /**
+     * The version of the protocol being used.
+     */
+	@XmlAttribute
+	public String protocol_version;
+
+    /**
      * The remote address of the connection
      */
 	@XmlAttribute(name="remote_address")
@@ -80,4 +86,22 @@ public class ConnectionStatusDTO extends
      */
 	@XmlAttribute(name="local_address")
 	public String local_address;
+
+    /**
+     * The connected user
+     */
+	@XmlAttribute
+	public String user;
+
+    /**
+     * What the connection is currently waiting on
+     */
+    @XmlAttribute(name="waiting_on")
+	public String waiting_on;
+
+    /**
+     * Opens subscriptions that the connection has created.
+     */
+    @XmlAttribute(name="subscription_count")
+	public int subscription_count;
 }

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java?rev=1133621&r1=1133620&r2=1133621&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java
Thu Jun  9 01:12:53 2011
@@ -33,22 +33,4 @@ import javax.xml.bind.annotation.XmlRoot
 @XmlAccessorType(XmlAccessType.FIELD)
 public class OpenwireConnectionStatusDTO extends ConnectionStatusDTO {
 
-    /**
-     * The version of the STOMP protocol being used.
-     */
-	@XmlAttribute
-	public int protocol_version;
-
-    /**
-     * The connected user
-     */
-	@XmlAttribute
-	public String user;
-
-    /**
-     * What the connection is currently waiting on
-     */
-    @XmlAttribute(name="waiting_on")
-	public String waiting_on;
-
 }

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java?rev=1133621&r1=1133620&r2=1133621&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java
Thu Jun  9 01:12:53 2011
@@ -33,29 +33,4 @@ import javax.xml.bind.annotation.XmlRoot
 @XmlAccessorType(XmlAccessType.FIELD)
 public class StompConnectionStatusDTO extends ConnectionStatusDTO {
 
-    /**
-     * The version of the STOMP protocol being used.
-     */
-	@XmlAttribute
-	public String protocol_version;
-
-    /**
-     * The connected user
-     */
-	@XmlAttribute
-	public String user;
-
-    /**
-     * What the connection is currently waiting on
-     */
-    @XmlAttribute(name="waiting_on")
-	public String waiting_on;
-
-    /**
-     * Opens subscriptions that the connection has created.
-     */
-    @XmlAttribute(name="subscription_count")
-	public int subscription_count;
-
-
 }

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/webapp/WEB-INF/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/webapp/WEB-INF/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.jade?rev=1133621&r1=1133620&r2=1133621&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/webapp/WEB-INF/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.jade
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/webapp/WEB-INF/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.jade
Thu Jun  9 01:12:53 2011
@@ -26,13 +26,15 @@ p state: #{state} #{ uptime(state_since)
   form(method="post" action={path("action/shutdown")})
     input(type="submit" value="shutdown")
 
+p local address: #{local_address}
 p remote address: #{remote_address}
 p protocol: #{protocol}
+p protocol version: #{protocol_version}
 p transport: #{transport}
 p read counter: #{memory(read_counter)}
 p write counter: #{memory(write_counter)}
-
-p protocol version: #{protocol_version}
+p last read size: #{memory(last_read_size)}
+p last write size: #{memory(last_write_size)}
 p user: #{user}
 p waiting on: #{waiting_on}
 p subscription count: #{subscription_count}

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade?rev=1133621&r1=1133620&r2=1133621&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade
Thu Jun  9 01:12:53 2011
@@ -25,8 +25,15 @@ p state: #{state} #{ uptime(state_since)
   form(method="post" action={path("action/shutdown")})
     input(type="submit" value="shutdown")
 
+p local address: #{local_address}
 p remote address: #{remote_address}
 p protocol: #{protocol}
+p protocol version: #{protocol_version}
 p transport: #{transport}
 p read counter: #{memory(read_counter)}
 p write counter: #{memory(write_counter)}
+p last read size: #{memory(last_read_size)}
+p last write size: #{memory(last_write_size)}
+p user: #{user}
+p waiting on: #{waiting_on}
+p subscription count: #{subscription_count}



Mime
View raw message