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 2013/02/08 15:43:34 UTC
svn commit: r1444030 - in
/activemq/activemq-apollo/trunk/apollo-web/src/main:
scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
webapp/console/index.html webapp/console/js/app.js
Author: chirino
Date: Fri Feb 8 14:43:20 2013
New Revision: 1444030
URL: http://svn.apache.org/r1444030
Log:
Fixing bugs where you could not browse topics or durable subs.
Also display memory sizes better.
Modified:
activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala?rev=1444030&r1=1444029&r2=1444030&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala Fri Feb 8 14:43:20 2013
@@ -669,7 +669,7 @@ class BrokerResource() extends Resource
}
@GET @Path("/virtual-hosts/{id}/queues/{name:.*}/messages")
@ApiOperation(value = "Gets a list of messages that exist on the queue.")
- def queue_messagesx(@PathParam("id") id : String, @PathParam("name") name : String,
+ def queue_messages(@PathParam("id") id : String, @PathParam("name") name : String,
@QueryParam("from") _from:java.lang.Long,
@QueryParam("to") _to:java.lang.Long,
@QueryParam("max") _max:java.lang.Long,
@@ -812,7 +812,7 @@ class BrokerResource() extends Resource
}
}
- @GET @Path("/virtual-hosts/{id}/dsub/{name:.*}/messages")
+ @GET @Path("/virtual-hosts/{id}/dsubs/{name:.*}/messages")
@ApiOperation(value = "Gets a list of the messages that exist on the durable sub.")
def dsub_messages(@PathParam("id") id : String, @PathParam("name") name : String,
@QueryParam("from") _from:java.lang.Long,
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html?rev=1444030&r1=1444029&r2=1444030&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html Fri Feb 8 14:43:20 2013
@@ -183,7 +183,7 @@
<tr>
<td>{{view Ember.Checkbox checkedBinding="checked"}}</td>
<td><a href="#" {{action "select" . target="App.DestinationsController" on="click"}}><i class=" icon-zoom-in"></i> {{[0]}}</a></td>
- <td>{{[1]}}</td><td>{{[2]}}</td><td>{{[3]}}</td><td>{{[4]}}</td>
+ <td>{{[1]}}</td><td>{{memory [2]}}</td><td>{{[3]}}</td><td>{{[4]}}</td>
</tr>
{{/each}}
</tbody>
@@ -310,7 +310,7 @@
<td>{{expiration}}</td>
<td>{{entry.is_prefetched}}</td>
<td>{{entry.acquirer}}</td>
- <td>{{entry.size}}</td>
+ <td>{{memory entry.size}}</td>
</tr>
{{#if show_details}}
<tr>
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js?rev=1444030&r1=1444029&r2=1444030&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js Fri Feb 8 14:43:20 2013
@@ -613,7 +613,9 @@ App.DestinationController = Em.Controlle
});
data.consumers.forEach(function(value){
value.enqueue_date = date_to_string(value.enqueue_ts);
- value.ack_item_rate = value.ack_item_rate.toFixed(2);
+ if( value.ack_item_rate ) {
+ value.ack_item_rate = value.ack_item_rate.toFixed(2);
+ }
});
App.set('destination', data);
App.MessagesController.auto_refresh();