Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 13B1D62BD for ; Wed, 18 May 2011 21:16:25 +0000 (UTC) Received: (qmail 65903 invoked by uid 500); 18 May 2011 21:16:25 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 65867 invoked by uid 500); 18 May 2011 21:16:25 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 65860 invoked by uid 99); 18 May 2011 21:16:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 May 2011 21:16:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 May 2011 21:16:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5521F23888E4; Wed, 18 May 2011 21:15:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110518211559.5521F23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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" } ],