svn commit: r360140 [4/4] - in /incubator/activemq/trunk: activemq-core/src/main/java/org/apache/activemq/ activemq-core/src/main/java/org/apache/activemq/broker/jmx/ activemq-core/src/main/java/org/apache/activemq/command/ activemq-core/src/main/java/...

[chirino]

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h?rev=360140&r1=360139&r2=360140&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h 
(original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h Fri 
Dec 30 10:48:31 2005
@@ -50,26 +50,44 @@
 ow_MessageId *ow_MessageId_create(apr_pool_t *pool);
 ow_boolean ow_is_a_MessageId(ow_DataStructure *object);
 
-typedef struct ow_SubscriptionInfo {
+typedef struct ow_SessionId {
+
+   ow_byte structType;
+   ow_string *connectionId;
+   ow_long sessionId;
+
+} ow_SessionId;
+ow_SessionId *ow_SessionId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_SessionId(ow_DataStructure *object);
+
+typedef struct ow_JournalQueueAck {
 
    ow_byte structType;
-   ow_string *clientId;
    struct ow_ActiveMQDestination *destination;
-   ow_string *selector;
-   ow_string *subcriptionName;
+   struct ow_MessageAck *messageAck;
 
-} ow_SubscriptionInfo;
-ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object);
+} ow_JournalQueueAck;
+ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool);
+ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQDestination {
+typedef struct ow_WireFormatInfo {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_byte_array *magic;
+   ow_int version;
+   ow_int options;
 
-} ow_ActiveMQDestination;
-ow_ActiveMQDestination *ow_ActiveMQDestination_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object);
+} ow_WireFormatInfo;
+ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object);
+
+typedef struct ow_TransactionId {
+
+   ow_byte structType;
+
+} ow_TransactionId;
+ow_TransactionId *ow_TransactionId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_TransactionId(ow_DataStructure *object);
 
 typedef struct ow_ConnectionId {
 
@@ -80,15 +98,6 @@
 ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool);
 ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object);
 
-typedef struct ow_JournalTrace {
-
-   ow_byte structType;
-   ow_string *message;
-
-} ow_JournalTrace;
-ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool);
-ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object);
-
 typedef struct ow_KeepAliveInfo {
 
    ow_byte structType;
@@ -97,90 +106,68 @@
 ow_KeepAliveInfo *ow_KeepAliveInfo_create(apr_pool_t *pool);
 ow_boolean ow_is_a_KeepAliveInfo(ow_DataStructure *object);
 
-typedef struct ow_JournalQueueAck {
+typedef struct ow_BaseCommand {
 
    ow_byte structType;
-   struct ow_ActiveMQDestination *destination;
-   struct ow_MessageAck *messageAck;
+   ow_short commandId;
+   ow_boolean responseRequired;
 
-} ow_JournalQueueAck;
-ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool);
-ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object);
+} ow_BaseCommand;
+ow_BaseCommand *ow_BaseCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_BaseCommand(ow_DataStructure *object);
 
-typedef struct ow_BrokerId {
+typedef struct ow_XATransactionId {
 
    ow_byte structType;
-   ow_string *brokerId;
+   ow_int formatId;
+   ow_byte_array *globalTransactionId;
+   ow_byte_array *branchQualifier;
 
-} ow_BrokerId;
-ow_BrokerId *ow_BrokerId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_BrokerId(ow_DataStructure *object);
+} ow_XATransactionId;
+ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object);
 
-typedef struct ow_BaseCommand {
+typedef struct ow_JournalTrace {
 
    ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
+   ow_string *message;
 
-} ow_BaseCommand;
-ow_BaseCommand *ow_BaseCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_BaseCommand(ow_DataStructure *object);
+} ow_JournalTrace;
+ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool);
+ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object);
 
-typedef struct ow_SessionInfo {
+typedef struct ow_FlushCommand {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
-   struct ow_SessionId *sessionId;
 
-} ow_SessionInfo;
-ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object);
+} ow_FlushCommand;
+ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object);
 
-typedef struct ow_Message {
+typedef struct ow_RedeliveryPolicy {
 
    ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   struct ow_ProducerId *producerId;
-   struct ow_ActiveMQDestination *destination;
-   struct ow_TransactionId *transactionId;
-   struct ow_ActiveMQDestination *originalDestination;
-   struct ow_MessageId *messageId;
-   struct ow_TransactionId *originalTransactionId;
-   ow_string *groupID;
-   ow_int groupSequence;
-   ow_string *correlationId;
-   ow_boolean persistent;
-   ow_long expiration;
-   ow_byte priority;
-   struct ow_ActiveMQDestination *replyTo;
-   ow_long timestamp;
-   ow_string *type;
-   ow_byte_array *content;
-   ow_byte_array *marshalledProperties;
-   struct ow_DataStructure *dataStructure;
-   struct ow_ConsumerId *targetConsumerId;
-   ow_boolean compressed;
-   ow_int redeliveryCounter;
-   ow_DataStructure_array *brokerPath;
-   ow_long arrival;
-   ow_string *userID;
-   ow_boolean recievedByDFBridge;
+   ow_short backOffMultiplier;
+   ow_long initialRedeliveryDelay;
+   ow_int maximumRedeliveries;
+   ow_boolean useExponentialBackOff;
 
-} ow_Message;
-ow_Message *ow_Message_create(apr_pool_t *pool);
-ow_boolean ow_is_a_Message(ow_DataStructure *object);
+} ow_RedeliveryPolicy;
+ow_RedeliveryPolicy *ow_RedeliveryPolicy_create(apr_pool_t *pool);
+ow_boolean ow_is_a_RedeliveryPolicy(ow_DataStructure *object);
 
-typedef struct ow_ShutdownInfo {
+typedef struct ow_ConsumerId {
 
    ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
+   ow_string *connectionId;
+   ow_long sessionId;
+   ow_long consumerId;
 
-} ow_ShutdownInfo;
-ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object);
+} ow_ConsumerId;
+ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object);
 
 typedef struct ow_JournalTopicAck {
 
@@ -196,100 +183,123 @@
 ow_JournalTopicAck *ow_JournalTopicAck_create(apr_pool_t *pool);
 ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object);
 
-typedef struct ow_DestinationInfo {
+typedef struct ow_BrokerId {
+
+   ow_byte structType;
+   ow_string *brokerId;
+
+} ow_BrokerId;
+ow_BrokerId *ow_BrokerId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_BrokerId(ow_DataStructure *object);
+
+typedef struct ow_MessageDispatch {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
-   struct ow_ConnectionId *connectionId;
+   struct ow_ConsumerId *consumerId;
    struct ow_ActiveMQDestination *destination;
-   ow_byte operationType;
-   ow_long timeout;
-   ow_DataStructure_array *brokerPath;
+   struct ow_Message *message;
+   ow_int redeliveryCounter;
 
-} ow_DestinationInfo;
-ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object);
+} ow_MessageDispatch;
+ow_MessageDispatch *ow_MessageDispatch_create(apr_pool_t *pool);
+ow_boolean ow_is_a_MessageDispatch(ow_DataStructure *object);
 
-typedef struct ow_ConsumerId {
+typedef struct ow_ProducerInfo {
 
    ow_byte structType;
-   ow_string *connectionId;
-   ow_long sessionId;
-   ow_long consumerId;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_ProducerId *producerId;
+   struct ow_ActiveMQDestination *destination;
+   ow_DataStructure_array *brokerPath;
 
-} ow_ConsumerId;
-ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object);
+} ow_ProducerInfo;
+ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object);
 
-typedef struct ow_SessionId {
+typedef struct ow_SubscriptionInfo {
 
    ow_byte structType;
-   ow_string *connectionId;
-   ow_long sessionId;
+   ow_string *clientId;
+   struct ow_ActiveMQDestination *destination;
+   ow_string *selector;
+   ow_string *subcriptionName;
 
-} ow_SessionId;
-ow_SessionId *ow_SessionId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_SessionId(ow_DataStructure *object);
+} ow_SubscriptionInfo;
+ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object);
 
-typedef struct ow_ConsumerInfo {
+typedef struct ow_SessionInfo {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
-   struct ow_ConsumerId *consumerId;
-   ow_boolean browser;
-   struct ow_ActiveMQDestination *destination;
-   ow_int prefetchSize;
-   ow_boolean dispatchAsync;
-   ow_string *selector;
-   ow_string *subcriptionName;
-   ow_boolean noLocal;
-   ow_boolean exclusive;
-   ow_boolean retroactive;
-   ow_byte priority;
-   ow_DataStructure_array *brokerPath;
-   ow_boolean networkSubscription;
+   struct ow_SessionId *sessionId;
 
-} ow_ConsumerInfo;
-ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConsumerInfo(ow_DataStructure *object);
+} ow_SessionInfo;
+ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object);
 
-typedef struct ow_ConnectionInfo {
+typedef struct ow_TransactionInfo {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
    struct ow_ConnectionId *connectionId;
-   ow_string *clientId;
-   ow_string *password;
-   ow_string *userName;
-   ow_DataStructure_array *brokerPath;
+   struct ow_TransactionId *transactionId;
+   ow_byte type;
 
-} ow_ConnectionInfo;
-ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object);
+} ow_TransactionInfo;
+ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTopic {
+typedef struct ow_ActiveMQDestination {
 
    ow_byte structType;
    ow_string *physicalName;
 
-} ow_ActiveMQTopic;
-ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object);
+} ow_ActiveMQDestination;
+ow_ActiveMQDestination *ow_ActiveMQDestination_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object);
 
-typedef struct ow_RedeliveryPolicy {
+typedef struct ow_MessageAck {
 
    ow_byte structType;
-   ow_short backOffMultiplier;
-   ow_long initialRedeliveryDelay;
-   ow_int maximumRedeliveries;
-   ow_boolean useExponentialBackOff;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_ActiveMQDestination *destination;
+   struct ow_TransactionId *transactionId;
+   struct ow_ConsumerId *consumerId;
+   ow_byte ackType;
+   struct ow_MessageId *firstMessageId;
+   struct ow_MessageId *lastMessageId;
+   ow_int messageCount;
 
-} ow_RedeliveryPolicy;
-ow_RedeliveryPolicy *ow_RedeliveryPolicy_create(apr_pool_t *pool);
-ow_boolean ow_is_a_RedeliveryPolicy(ow_DataStructure *object);
+} ow_MessageAck;
+ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool);
+ow_boolean ow_is_a_MessageAck(ow_DataStructure *object);
+
+typedef struct ow_ProducerId {
+
+   ow_byte structType;
+   ow_string *connectionId;
+   ow_long producerId;
+   ow_long sessionId;
+
+} ow_ProducerId;
+ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ProducerId(ow_DataStructure *object);
+
+typedef struct ow_ActiveMQTopic {
+
+   ow_byte structType;
+   ow_string *physicalName;
+
+} ow_ActiveMQTopic;
+ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object);
 
 typedef struct ow_JournalTransaction {
 
@@ -302,16 +312,64 @@
 ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool);
 ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object);
 
-typedef struct ow_ProducerId {
+typedef struct ow_RemoveInfo {
 
    ow_byte structType;
-   ow_string *connectionId;
-   ow_long producerId;
-   ow_long sessionId;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_DataStructure *objectId;
 
-} ow_ProducerId;
-ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ProducerId(ow_DataStructure *object);
+} ow_RemoveInfo;
+ow_RemoveInfo *ow_RemoveInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object);
+
+typedef struct ow_ControlCommand {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   ow_string *command;
+
+} ow_ControlCommand;
+ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object);
+
+typedef struct ow_BrokerInfo {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_BrokerId *brokerId;
+   ow_string *brokerURL;
+   ow_DataStructure_array *peerBrokerInfos;
+   ow_string *brokerName;
+
+} ow_BrokerInfo;
+ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object);
+
+typedef struct ow_LocalTransactionId {
+
+   ow_byte structType;
+   ow_long transactionId;
+   struct ow_ConnectionId *connectionId;
+
+} ow_LocalTransactionId;
+ow_LocalTransactionId *ow_LocalTransactionId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_LocalTransactionId(ow_DataStructure *object);
+
+typedef struct ow_RemoveSubscriptionInfo {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_ConnectionId *connectionId;
+   ow_string *subcriptionName;
+   ow_string *clientId;
+
+} ow_RemoveSubscriptionInfo;
+ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object);
 
 typedef struct ow_ActiveMQQueue {
 
@@ -322,18 +380,30 @@
 ow_ActiveMQQueue *ow_ActiveMQQueue_create(apr_pool_t *pool);
 ow_boolean ow_is_a_ActiveMQQueue(ow_DataStructure *object);
 
-typedef struct ow_TransactionInfo {
+typedef struct ow_DestinationInfo {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
    struct ow_ConnectionId *connectionId;
-   struct ow_TransactionId *transactionId;
-   ow_byte type;
+   struct ow_ActiveMQDestination *destination;
+   ow_byte operationType;
+   ow_long timeout;
+   ow_DataStructure_array *brokerPath;
 
-} ow_TransactionInfo;
-ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object);
+} ow_DestinationInfo;
+ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object);
+
+typedef struct ow_ShutdownInfo {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+
+} ow_ShutdownInfo;
+ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object);
 
 typedef struct ow_Response {
 
@@ -346,35 +416,87 @@
 ow_Response *ow_Response_create(apr_pool_t *pool);
 ow_boolean ow_is_a_Response(ow_DataStructure *object);
 
-typedef struct ow_RemoveInfo {
+typedef struct ow_ConsumerInfo {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
-   struct ow_DataStructure *objectId;
+   struct ow_ConsumerId *consumerId;
+   ow_boolean browser;
+   struct ow_ActiveMQDestination *destination;
+   ow_int prefetchSize;
+   ow_boolean dispatchAsync;
+   ow_string *selector;
+   ow_string *subcriptionName;
+   ow_boolean noLocal;
+   ow_boolean exclusive;
+   ow_boolean retroactive;
+   ow_byte priority;
+   ow_DataStructure_array *brokerPath;
+   ow_boolean networkSubscription;
 
-} ow_RemoveInfo;
-ow_RemoveInfo *ow_RemoveInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object);
+} ow_ConsumerInfo;
+ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ConsumerInfo(ow_DataStructure *object);
 
-typedef struct ow_WireFormatInfo {
+typedef struct ow_ConnectionInfo {
 
    ow_byte structType;
-   ow_byte_array *magic;
-   ow_int version;
-   ow_int options;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_ConnectionId *connectionId;
+   ow_string *clientId;
+   ow_string *password;
+   ow_string *userName;
+   ow_DataStructure_array *brokerPath;
 
-} ow_WireFormatInfo;
-ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object);
+} ow_ConnectionInfo;
+ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object);
 
-typedef struct ow_TransactionId {
+typedef struct ow_Message {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   struct ow_ProducerId *producerId;
+   struct ow_ActiveMQDestination *destination;
+   struct ow_TransactionId *transactionId;
+   struct ow_ActiveMQDestination *originalDestination;
+   struct ow_MessageId *messageId;
+   struct ow_TransactionId *originalTransactionId;
+   ow_string *groupID;
+   ow_int groupSequence;
+   ow_string *correlationId;
+   ow_boolean persistent;
+   ow_long expiration;
+   ow_byte priority;
+   struct ow_ActiveMQDestination *replyTo;
+   ow_long timestamp;
+   ow_string *type;
+   ow_byte_array *content;
+   ow_byte_array *marshalledProperties;
+   struct ow_DataStructure *dataStructure;
+   struct ow_ConsumerId *targetConsumerId;
+   ow_boolean compressed;
+   ow_int redeliveryCounter;
+   ow_DataStructure_array *brokerPath;
+   ow_long arrival;
+   ow_string *userID;
+   ow_boolean recievedByDFBridge;
+
+} ow_Message;
+ow_Message *ow_Message_create(apr_pool_t *pool);
+ow_boolean ow_is_a_Message(ow_DataStructure *object);
+
+typedef struct ow_ActiveMQTempDestination {
 
    ow_byte structType;
+   ow_string *physicalName;
 
-} ow_TransactionId;
-ow_TransactionId *ow_TransactionId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_TransactionId(ow_DataStructure *object);
+} ow_ActiveMQTempDestination;
+ow_ActiveMQTempDestination *ow_ActiveMQTempDestination_create(apr_pool_t 
*pool);
+ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object);
 
 typedef struct ow_ActiveMQMessage {
 
@@ -411,102 +533,6 @@
 ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool);
 ow_boolean ow_is_a_ActiveMQMessage(ow_DataStructure *object);
 
-typedef struct ow_ControlCommand {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   ow_string *command;
-
-} ow_ControlCommand;
-ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object);
-
-typedef struct ow_FlushCommand {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-
-} ow_FlushCommand;
-ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object);
-
-typedef struct ow_IntegerResponse {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   ow_short correlationId;
-   ow_int result;
-
-} ow_IntegerResponse;
-ow_IntegerResponse *ow_IntegerResponse_create(apr_pool_t *pool);
-ow_boolean ow_is_a_IntegerResponse(ow_DataStructure *object);
-
-typedef struct ow_RemoveSubscriptionInfo {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   struct ow_ConnectionId *connectionId;
-   ow_string *subcriptionName;
-   ow_string *clientId;
-
-} ow_RemoveSubscriptionInfo;
-ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object);
-
-typedef struct ow_ActiveMQTempDestination {
-
-   ow_byte structType;
-   ow_string *physicalName;
-
-} ow_ActiveMQTempDestination;
-ow_ActiveMQTempDestination *ow_ActiveMQTempDestination_create(apr_pool_t 
*pool);
-ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object);
-
-typedef struct ow_DataArrayResponse {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   ow_short correlationId;
-   ow_DataStructure_array *data;
-
-} ow_DataArrayResponse;
-ow_DataArrayResponse *ow_DataArrayResponse_create(apr_pool_t *pool);
-ow_boolean ow_is_a_DataArrayResponse(ow_DataStructure *object);
-
-typedef struct ow_BrokerInfo {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   struct ow_BrokerId *brokerId;
-   ow_string *brokerURL;
-   ow_DataStructure_array *peerBrokerInfos;
-   struct ow_RedeliveryPolicy *redeliveryPolicy;
-   ow_string *brokerName;
-
-} ow_BrokerInfo;
-ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object);
-
-typedef struct ow_MessageDispatch {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   struct ow_ConsumerId *consumerId;
-   struct ow_ActiveMQDestination *destination;
-   struct ow_Message *message;
-   ow_int redeliveryCounter;
-
-} ow_MessageDispatch;
-ow_MessageDispatch *ow_MessageDispatch_create(apr_pool_t *pool);
-ow_boolean ow_is_a_MessageDispatch(ow_DataStructure *object);
-
 typedef struct ow_ActiveMQStreamMessage {
 
    ow_byte structType;
@@ -542,44 +568,38 @@
 ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool);
 ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTempTopic {
+typedef struct ow_ExceptionResponse {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   ow_short correlationId;
+   ow_throwable *exception;
 
-} ow_ActiveMQTempTopic;
-ow_ActiveMQTempTopic *ow_ActiveMQTempTopic_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTempTopic(ow_DataStructure *object);
+} ow_ExceptionResponse;
+ow_ExceptionResponse *ow_ExceptionResponse_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ExceptionResponse(ow_DataStructure *object);
 
-typedef struct ow_ProducerInfo {
+typedef struct ow_ActiveMQTempQueue {
 
    ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   struct ow_ProducerId *producerId;
-   struct ow_ActiveMQDestination *destination;
-   ow_DataStructure_array *brokerPath;
+   ow_string *physicalName;
 
-} ow_ProducerInfo;
-ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object);
+} ow_ActiveMQTempQueue;
+ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object);
 
-typedef struct ow_MessageAck {
+typedef struct ow_IntegerResponse {
 
    ow_byte structType;
    ow_short commandId;
    ow_boolean responseRequired;
-   struct ow_ActiveMQDestination *destination;
-   struct ow_TransactionId *transactionId;
-   struct ow_ConsumerId *consumerId;
-   ow_byte ackType;
-   struct ow_MessageId *firstMessageId;
-   struct ow_MessageId *lastMessageId;
-   ow_int messageCount;
+   ow_short correlationId;
+   ow_int result;
 
-} ow_MessageAck;
-ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool);
-ow_boolean ow_is_a_MessageAck(ow_DataStructure *object);
+} ow_IntegerResponse;
+ow_IntegerResponse *ow_IntegerResponse_create(apr_pool_t *pool);
+ow_boolean ow_is_a_IntegerResponse(ow_DataStructure *object);
 
 typedef struct ow_ActiveMQBytesMessage {
 
@@ -616,7 +636,31 @@
 ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool);
 ow_boolean ow_is_a_ActiveMQBytesMessage(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTextMessage {
+typedef struct ow_DataResponse {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   ow_short correlationId;
+   struct ow_DataStructure *data;
+
+} ow_DataResponse;
+ow_DataResponse *ow_DataResponse_create(apr_pool_t *pool);
+ow_boolean ow_is_a_DataResponse(ow_DataStructure *object);
+
+typedef struct ow_DataArrayResponse {
+
+   ow_byte structType;
+   ow_short commandId;
+   ow_boolean responseRequired;
+   ow_short correlationId;
+   ow_DataStructure_array *data;
+
+} ow_DataArrayResponse;
+ow_DataArrayResponse *ow_DataArrayResponse_create(apr_pool_t *pool);
+ow_boolean ow_is_a_DataArrayResponse(ow_DataStructure *object);
+
+typedef struct ow_ActiveMQObjectMessage {
 
    ow_byte structType;
    ow_short commandId;
@@ -647,11 +691,20 @@
    ow_string *userID;
    ow_boolean recievedByDFBridge;
 
-} ow_ActiveMQTextMessage;
-ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTextMessage(ow_DataStructure *object);
+} ow_ActiveMQObjectMessage;
+ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQObjectMessage(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQMapMessage {
+typedef struct ow_ActiveMQTempTopic {
+
+   ow_byte structType;
+   ow_string *physicalName;
+
+} ow_ActiveMQTempTopic;
+ow_ActiveMQTempTopic *ow_ActiveMQTempTopic_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQTempTopic(ow_DataStructure *object);
+
+typedef struct ow_ActiveMQTextMessage {
 
    ow_byte structType;
    ow_short commandId;
@@ -682,34 +735,11 @@
    ow_string *userID;
    ow_boolean recievedByDFBridge;
 
-} ow_ActiveMQMapMessage;
-ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQMapMessage(ow_DataStructure *object);
-
-typedef struct ow_DataResponse {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   ow_short correlationId;
-   struct ow_DataStructure *data;
-
-} ow_DataResponse;
-ow_DataResponse *ow_DataResponse_create(apr_pool_t *pool);
-ow_boolean ow_is_a_DataResponse(ow_DataStructure *object);
-
-typedef struct ow_XATransactionId {
-
-   ow_byte structType;
-   ow_int formatId;
-   ow_byte_array *globalTransactionId;
-   ow_byte_array *branchQualifier;
-
-} ow_XATransactionId;
-ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object);
+} ow_ActiveMQTextMessage;
+ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQTextMessage(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQObjectMessage {
+typedef struct ow_ActiveMQMapMessage {
 
    ow_byte structType;
    ow_short commandId;
@@ -740,40 +770,9 @@
    ow_string *userID;
    ow_boolean recievedByDFBridge;
 
-} ow_ActiveMQObjectMessage;
-ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQObjectMessage(ow_DataStructure *object);
-
-typedef struct ow_ExceptionResponse {
-
-   ow_byte structType;
-   ow_short commandId;
-   ow_boolean responseRequired;
-   ow_short correlationId;
-   ow_throwable *exception;
-
-} ow_ExceptionResponse;
-ow_ExceptionResponse *ow_ExceptionResponse_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ExceptionResponse(ow_DataStructure *object);
-
-typedef struct ow_ActiveMQTempQueue {
-
-   ow_byte structType;
-   ow_string *physicalName;
-
-} ow_ActiveMQTempQueue;
-ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object);
-
-typedef struct ow_LocalTransactionId {
-
-   ow_byte structType;
-   ow_long transactionId;
-   struct ow_ConnectionId *connectionId;
-
-} ow_LocalTransactionId;
-ow_LocalTransactionId *ow_LocalTransactionId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_LocalTransactionId(ow_DataStructure *object);
+} ow_ActiveMQMapMessage;
+ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQMapMessage(ow_DataStructure *object);
 
 #ifdef __cplusplus
 }