activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1124430 - in /activemq/activemq-apollo/trunk: apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/ apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ a...
Date Wed, 18 May 2011 21:15:58 GMT
Author: chirino
Date: Wed May 18 21:15:58 2011
New Revision: 1124430

URL: http://svn.apache.org/viewvc?rev=1124430&view=rev
Log:
Fixes https://issues.apache.org/jira/browse/APLO-15 : Rename the ref field to id.

Modified:
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LinkDTO.java
    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/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/management-api.md

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LinkDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LinkDTO.java?rev=1124430&r1=1124429&r2=1124430&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LinkDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LinkDTO.java
Wed May 18 21:15:58 2011
@@ -31,7 +31,7 @@ public class LinkDTO {
     public String kind;
 
     @XmlAttribute
-    public String ref;
+    public String id;
 
     @XmlAttribute
     public String label;

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=1124430&r1=1124429&r2=1124430&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
Wed May 18 21:15:58 2011
@@ -196,7 +196,7 @@ case class BrokerResource() extends Reso
   def link(connection:BrokerConnection) = {
     val link = new LinkDTO()
     link.kind = "connection"
-    link.ref = connection.id.toString
+    link.id = connection.id.toString
     link.label = connection.transport.getRemoteAddress
     link
   }
@@ -204,7 +204,7 @@ case class BrokerResource() extends Reso
   def link(queue:Queue) = {
     val link = new LinkDTO()
     link.kind = "queue"
-    link.ref = queue.id.toString
+    link.id = queue.id.toString
     link.label = queue.binding.label
     link
   }

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade?rev=1124430&r1=1124429&r2=1124430&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
Wed May 18 21:15:58 2011
@@ -75,7 +75,7 @@ ul
     - x.kind match
       - case "connection" =>
         li.producer
-          a(href={ path("../../../../connections/"+x.ref) }) #{x.label}
+          a(href={ path("../../../../connections/"+x.id) }) #{x.label}
       - case _ =>
 
 
@@ -85,7 +85,7 @@ ul
     - import consumer._
     li.consumer
       - if( link !=null )
-        a(href={ path("../../../../connections/"+link.ref ) }) #{link.label}
+        a(href={ path("../../../../connections/"+link.id ) }) #{link.label}
 
       p next message seq: #{position}
       p acquired: #{acquired_count} messages (#{memory(acquired_size)})

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade?rev=1124430&r1=1124429&r2=1124430&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade
Wed May 18 21:15:58 2011
@@ -30,7 +30,7 @@ ul
     - x.kind match
       - case "connection" =>
         li
-          a(href={ path("../../../../connections/"+x.ref) }) #{x.label}
+          a(href={ path("../../../../connections/"+x.id) }) #{x.label}
       - case _ =>
 
 h4 Subscribers
@@ -39,10 +39,10 @@ ul
     - x.kind match
       - case "queue" =>
         li
-          a(href={ path("../../queues/"+x.ref) }) #{x.label}
+          a(href={ path("../../queues/"+x.id) }) #{x.label}
       - case "connection" =>
         li
-          a(href={ path("../../../../connections/"+x.ref) }) #{x.label}
+          a(href={ path("../../../../connections/"+x.id) }) #{x.label}
       - case _ =>
 
 h4 Durable Subscribers

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/management-api.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/management-api.md?rev=1124430&r1=1124429&r2=1124430&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/management-api.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/management-api.md Wed
May 18 21:15:58 2011
@@ -280,14 +280,14 @@ Results in a [Queue Status](./api/apollo
   "producers":[
     {
       "kind":"connection",
-      "ref":"1",
+      "id":"1",
       "label":"/127.0.0.1:52690"
     }
   ],"consumers":[
     {
       "link":{
         "kind":"connection",
-        "ref":"2",
+        "id":"2",
         "label":"/127.0.0.1:52691"
       },
       "position":37828414,
@@ -332,14 +332,14 @@ Results in a [Topic Status](./api/apollo
   "producers":[
     {
       "kind":"connection",
-      "ref":"3",
+      "id":"3",
       "label":"/127.0.0.1:52772"
     }
   ],
   "consumers":[
     {
       "kind":"connection",
-      "ref":"4",
+      "id":"4",
       "label":"/127.0.0.1:52773"
     }
   ],



Mime
View raw message