svn commit: r1099141 - in /activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire: OpenwireProtocolHandler.scala dto/OpenwireConnectionStatusDTO.java

[ch...@apache.org]

Author: chirino
Date: Tue May  3 17:25:40 2011
New Revision: 1099141

URL: http://svn.apache.org/viewvc?rev=1099141&view=rev
Log:
Have the openwire connection return the right type of status dto.

Modified:
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1099141&r1=1099140&r2=1099141&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Tue May  3 17:25:40 2011
@@ -17,6 +17,7 @@
 
 package org.apache.activemq.apollo.openwire
 
+import dto.OpenwireConnectionStatusDTO
 import OpenwireConstants._
 
 import org.fusesource.hawtdispatch._
@@ -113,8 +114,8 @@ class OpenwireProtocolHandler extends Pr
 
 
   override def create_connection_status = {
-    var rc = new StompConnectionStatusDTO
-    rc.protocol_version = if (wire_format == null) "" else wire_format.getVersion.toString
+    var rc = new OpenwireConnectionStatusDTO
+    rc.protocol_version = if (wire_format == null) 0 else wire_format.getVersion
     rc.user = login.map(_.toString).getOrElse(null)
     //    rc.subscription_count = consumers.size
     rc.waiting_on = waiting_on

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=1099141&r1=1099140&r2=1099141&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 Tue May  3 17:25:40 2011
@@ -48,7 +48,7 @@ public class OpenwireConnectionStatusDTO
     /**
      * What the connection is currently waiting on
      */
-    @XmlAttribute(name="waiting-on")
+    @XmlAttribute(name="waiting_on")
 	public String waiting_on;
 
 }