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<String> acl_principal_kinds = new ArrayList<String>();
public List<String> 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<String> user_principal_kinds = new ArrayList<String>();
public List<String> 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