Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 47431 invoked from network); 16 Dec 2010 04:45:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Dec 2010 04:45:53 -0000 Received: (qmail 35262 invoked by uid 500); 16 Dec 2010 04:45:53 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 35198 invoked by uid 500); 16 Dec 2010 04:45:52 -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 35191 invoked by uid 99); 16 Dec 2010 04:45:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 04:45:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 16 Dec 2010 04:45:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2E8EF238897A; Thu, 16 Dec 2010 04:45:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1049782 - in /activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto: AuthenticationDTO.java QueueDTO.java Date: Thu, 16 Dec 2010 04:45:31 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101216044531.2E8EF238897A@eris.apache.org> Author: chirino Date: Thu Dec 16 04:45:30 2010 New Revision: 1049782 URL: http://svn.apache.org/viewvc?rev=1049782&view=rev Log: Fix up the xml mapping. Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java?rev=1049782&r1=1049781&r2=1049782&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java Thu Dec 16 04:45:30 2010 @@ -42,7 +42,7 @@ public class AuthenticationDTO { * The class names for the types of principles that * the acl lists check against. */ - @XmlElement(name="acl-principal-kinds") + @XmlElement(name="acl-principal-kind") public List acl_principal_kinds = new ArrayList(); public List acl_principal_kinds() { @@ -58,7 +58,7 @@ public class AuthenticationDTO { * The class names for the types of principles that * the user name is extracted from. */ - @XmlElement(name="user-principal-kinds") + @XmlElement(name="user-principal-kind") public List user_principal_kinds = new ArrayList(); public List user_principal_kinds() { Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java?rev=1049782&r1=1049781&r2=1049782&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java Thu Dec 16 04:45:30 2010 @@ -34,8 +34,7 @@ public class QueueDTO { public String name; /* - * The kind of queue. It may be "ptp" for standard - * point to point queues or "ds" for durable subscriptions. + * The kind of queue. I * If not set, then this configuration applies to all queue types. */ @XmlAttribute