Author: chirino
Date: Tue Mar 29 15:05:49 2011
New Revision: 1086621
URL: http://svn.apache.org/viewvc?rev=1086621&view=rev
Log:
Fixing xml type names and hierarchy for the DestinationDTOs
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDestinationDTO.java
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDestinationDTO.java
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TopicDestinationDTO.java
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java?rev=1086621&r1=1086620&r2=1086621&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
Tue Mar 29 15:05:49 2011
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.*;
*
* @author <a href="http://hiramchirino.com";>Hiram Chirino</a>
*/
-@XmlType(name = "queue_binding")
+@XmlType(name = "destination")
@XmlSeeAlso({QueueDestinationDTO.class,
DurableSubscriptionDestinationDTO.class})
@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY,
property="@class")
@XmlAccessorType(XmlAccessType.FIELD)
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDestinationDTO.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDestinationDTO.java?rev=1086621&r1=1086620&r2=1086621&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDestinationDTO.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DurableSubscriptionDestinationDTO.java
Tue Mar 29 15:05:49 2011
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRoot
*/
@XmlRootElement(name = "durable_subscription_destination")
@XmlAccessorType(XmlAccessType.FIELD)
-public class DurableSubscriptionDestinationDTO extends DestinationDTO {
+public class DurableSubscriptionDestinationDTO extends TopicDestinationDTO {
@XmlAttribute
public String filter;
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDestinationDTO.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDestinationDTO.java?rev=1086621&r1=1086620&r2=1086621&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDestinationDTO.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDestinationDTO.java
Tue Mar 29 15:05:49 2011
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.*;
*
* @author <a href="http://hiramchirino.com";>Hiram Chirino</a>
*/
-@XmlRootElement(name = "p2p_queue_binding")
+@XmlRootElement(name = "queue_destination")
@XmlAccessorType(XmlAccessType.FIELD)
public class QueueDestinationDTO extends DestinationDTO {
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TopicDestinationDTO.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TopicDestinationDTO.java?rev=1086621&r1=1086620&r2=1086621&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TopicDestinationDTO.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TopicDestinationDTO.java
Tue Mar 29 15:05:49 2011
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.*;
*
* @author <a href="http://hiramchirino.com";>Hiram Chirino</a>
*/
-@XmlRootElement(name = "queue_destination")
+@XmlRootElement(name = "topic_destination")
@XmlAccessorType(XmlAccessType.FIELD)
public class TopicDestinationDTO extends DestinationDTO {
