You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/27 04:59:06 UTC

svn commit: r450293 [3/3] - in /incubator/activemq/sandbox/openwire-c: openwire.xcodeproj/project.pbxproj pom.xml src/libactivemq/amqcs.c src/libactivemq/amqcs.h src/libopenwire/ow_commands_v2.c src/libopenwire/ow_commands_v2.h

Modified: incubator/activemq/sandbox/openwire-c/src/libopenwire/ow_commands_v2.h
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/openwire-c/src/libopenwire/ow_commands_v2.h?view=diff&rev=450293&r1=450292&r2=450293
==============================================================================
--- incubator/activemq/sandbox/openwire-c/src/libopenwire/ow_commands_v2.h (original)
+++ incubator/activemq/sandbox/openwire-c/src/libopenwire/ow_commands_v2.h Tue Sep 26 19:59:05 2006
@@ -29,100 +29,101 @@
 #define OW_COMMANDS_V2_H
 
 #include "ow.h"
-#include "ow_command_types_v2.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
       
 #define OW_WIREFORMAT_VERSION 2
+#define OW_WIREFORMAT_STACK_TRACE_MASK     0x00000001;
+#define OW_WIREFORMAT_TCP_NO_DELAY_MASK    0x00000002;
+#define OW_WIREFORMAT_CACHE_MASK           0x00000004;
+#define OW_WIREFORMAT_COMPRESSION_MASK     0x00000008;
+#define OW_BROKERID_TYPE 124
+#define OW_CONNECTIONID_TYPE 120
+#define OW_CONSUMERID_TYPE 122
+#define OW_DISCOVERYEVENT_TYPE 40
+#define OW_JOURNALQUEUEACK_TYPE 52
+#define OW_JOURNALTOPICACK_TYPE 50
+#define OW_JOURNALTRACE_TYPE 53
+#define OW_JOURNALTRANSACTION_TYPE 54
+#define OW_MESSAGEID_TYPE 110
+#define OW_NETWORKBRIDGEFILTER_TYPE 91
+#define OW_PARTIALCOMMAND_TYPE 60
+#define OW_PRODUCERID_TYPE 123
+#define OW_SESSIONID_TYPE 121
+#define OW_SUBSCRIPTIONINFO_TYPE 55
+#define OW_WIREFORMATINFO_TYPE 1
+#define OW_ACTIVEMQBYTESMESSAGE_TYPE 24
+#define OW_ACTIVEMQMAPMESSAGE_TYPE 25
+#define OW_ACTIVEMQMESSAGE_TYPE 23
+#define OW_ACTIVEMQOBJECTMESSAGE_TYPE 26
+#define OW_ACTIVEMQQUEUE_TYPE 100
+#define OW_ACTIVEMQSTREAMMESSAGE_TYPE 27
+#define OW_ACTIVEMQTEMPQUEUE_TYPE 102
+#define OW_ACTIVEMQTEMPTOPIC_TYPE 103
+#define OW_ACTIVEMQTEXTMESSAGE_TYPE 28
+#define OW_ACTIVEMQTOPIC_TYPE 101
+#define OW_BROKERINFO_TYPE 2
+#define OW_CONNECTIONCONTROL_TYPE 18
+#define OW_CONNECTIONERROR_TYPE 16
+#define OW_CONNECTIONINFO_TYPE 3
+#define OW_CONSUMERCONTROL_TYPE 17
+#define OW_CONSUMERINFO_TYPE 5
+#define OW_CONTROLCOMMAND_TYPE 14
+#define OW_DATAARRAYRESPONSE_TYPE 33
+#define OW_DATARESPONSE_TYPE 32
+#define OW_DESTINATIONINFO_TYPE 8
+#define OW_EXCEPTIONRESPONSE_TYPE 31
+#define OW_FLUSHCOMMAND_TYPE 15
+#define OW_INTEGERRESPONSE_TYPE 34
+#define OW_KEEPALIVEINFO_TYPE 10
+#define OW_LASTPARTIALCOMMAND_TYPE 61
+#define OW_LOCALTRANSACTIONID_TYPE 111
+#define OW_MESSAGEACK_TYPE 22
+#define OW_MESSAGEDISPATCH_TYPE 21
+#define OW_MESSAGEDISPATCHNOTIFICATION_TYPE 90
+#define OW_MESSAGEPULL_TYPE 20
+#define OW_PRODUCERINFO_TYPE 6
+#define OW_REMOVEINFO_TYPE 12
+#define OW_REMOVESUBSCRIPTIONINFO_TYPE 0
+#define OW_REPLAYCOMMAND_TYPE 65
+#define OW_RESPONSE_TYPE 30
+#define OW_SESSIONINFO_TYPE 4
+#define OW_SHUTDOWNINFO_TYPE 11
+#define OW_TRANSACTIONINFO_TYPE 7
+#define OW_XATRANSACTIONID_TYPE 112
       
 apr_status_t ow_bitmarshall(ow_bit_buffer *buffer, ow_DataStructure *object);
 apr_status_t ow_marshall(ow_byte_buffer *buffer, ow_DataStructure *object);
 
-typedef struct ow_LocalTransactionId {
-
-   ow_byte structType;
-   ow_long value;
-   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_PartialCommand {
+typedef struct ow_ActiveMQDestination {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_byte_array *data;
+   ow_string *physicalName;
 
-} ow_PartialCommand;
-ow_PartialCommand *ow_PartialCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_PartialCommand(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_IntegerResponse {
+typedef struct ow_BaseCommand {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_int 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_ActiveMQQueue {
-
-   ow_byte structType;
-   ow_string *physicalName;
-
-} ow_ActiveMQQueue;
-ow_ActiveMQQueue *ow_ActiveMQQueue_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQQueue(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);
+} ow_BaseCommand;
+ow_BaseCommand *ow_BaseCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_BaseCommand(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQObjectMessage {
+typedef struct ow_BrokerId {
 
    ow_byte structType;
-   ow_int 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;
-   struct ow_ByteSequence *content;
-   struct ow_ByteSequence *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_string *value;
 
-} ow_ActiveMQObjectMessage;
-ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQObjectMessage(ow_DataStructure *object);
+} ow_BrokerId;
+ow_BrokerId *ow_BrokerId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_BrokerId(ow_DataStructure *object);
 
 typedef struct ow_ConnectionId {
 
@@ -133,136 +134,70 @@
 ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool);
 ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object);
 
-typedef struct ow_ConnectionInfo {
+typedef struct ow_ConsumerId {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   struct ow_ConnectionId *connectionId;
-   ow_string *clientId;
-   ow_string *password;
-   ow_string *userName;
-   ow_DataStructure_array *brokerPath;
-   ow_boolean brokerMasterConnector;
-   ow_boolean manageable;
+   ow_string *connectionId;
+   ow_long sessionId;
+   ow_long value;
 
-} ow_ConnectionInfo;
-ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConnectionInfo(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_ProducerInfo {
+typedef struct ow_DiscoveryEvent {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   struct ow_ProducerId *producerId;
-   struct ow_ActiveMQDestination *destination;
-   ow_DataStructure_array *brokerPath;
+   ow_string *serviceName;
+   ow_string *brokerName;
 
-} ow_ProducerInfo;
-ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object);
+} ow_DiscoveryEvent;
+ow_DiscoveryEvent *ow_DiscoveryEvent_create(apr_pool_t *pool);
+ow_boolean ow_is_a_DiscoveryEvent(ow_DataStructure *object);
 
-typedef struct ow_MessageDispatchNotification {
+typedef struct ow_JournalQueueAck {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   struct ow_ConsumerId *consumerId;
    struct ow_ActiveMQDestination *destination;
-   ow_long deliverySequenceId;
-   struct ow_MessageId *messageId;
-
-} ow_MessageDispatchNotification;
-ow_MessageDispatchNotification *ow_MessageDispatchNotification_create(apr_pool_t *pool);
-ow_boolean ow_is_a_MessageDispatchNotification(ow_DataStructure *object);
-
-typedef struct ow_SessionInfo {
-
-   ow_byte structType;
-   ow_int 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);
-
-typedef struct ow_TransactionInfo {
-
-   ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   struct ow_ConnectionId *connectionId;
-   struct ow_TransactionId *transactionId;
-   ow_byte type;
+   struct ow_MessageAck *messageAck;
 
-} ow_TransactionInfo;
-ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_TransactionInfo(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_ActiveMQStreamMessage {
+typedef struct ow_JournalTopicAck {
 
    ow_byte structType;
-   ow_int 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;
-   struct ow_ByteSequence *content;
-   struct ow_ByteSequence *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_long messageSequenceId;
+   ow_string *subscritionName;
+   ow_string *clientId;
+   struct ow_TransactionId *transactionId;
 
-} ow_ActiveMQStreamMessage;
-ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object);
+} ow_JournalTopicAck;
+ow_JournalTopicAck *ow_JournalTopicAck_create(apr_pool_t *pool);
+ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object);
 
-typedef struct ow_MessageAck {
+typedef struct ow_JournalTrace {
 
    ow_byte structType;
-   ow_int 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_string *message;
 
-} ow_MessageAck;
-ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool);
-ow_boolean ow_is_a_MessageAck(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_ProducerId {
+typedef struct ow_JournalTransaction {
 
    ow_byte structType;
-   ow_string *connectionId;
-   ow_long value;
-   ow_long sessionId;
+   struct ow_TransactionId *transactionId;
+   ow_byte type;
+   ow_boolean wasPrepared;
 
-} ow_ProducerId;
-ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ProducerId(ow_DataStructure *object);
+} ow_JournalTransaction;
+ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool);
+ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object);
 
 typedef struct ow_MessageId {
 
@@ -275,27 +210,36 @@
 ow_MessageId *ow_MessageId_create(apr_pool_t *pool);
 ow_boolean ow_is_a_MessageId(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTempQueue {
+typedef struct ow_NetworkBridgeFilter {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_int networkTTL;
+   struct ow_BrokerId *networkBrokerId;
 
-} ow_ActiveMQTempQueue;
-ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object);
+} ow_NetworkBridgeFilter;
+ow_NetworkBridgeFilter *ow_NetworkBridgeFilter_create(apr_pool_t *pool);
+ow_boolean ow_is_a_NetworkBridgeFilter(ow_DataStructure *object);
 
-typedef struct ow_RemoveSubscriptionInfo {
+typedef struct ow_PartialCommand {
 
    ow_byte structType;
    ow_int commandId;
-   ow_boolean responseRequired;
-   struct ow_ConnectionId *connectionId;
-   ow_string *subcriptionName;
-   ow_string *clientId;
+   ow_byte_array *data;
 
-} ow_RemoveSubscriptionInfo;
-ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object);
+} ow_PartialCommand;
+ow_PartialCommand *ow_PartialCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_PartialCommand(ow_DataStructure *object);
+
+typedef struct ow_ProducerId {
+
+   ow_byte structType;
+   ow_string *connectionId;
+   ow_long value;
+   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_SessionId {
 
@@ -307,110 +251,187 @@
 ow_SessionId *ow_SessionId_create(apr_pool_t *pool);
 ow_boolean ow_is_a_SessionId(ow_DataStructure *object);
 
-typedef struct ow_DataArrayResponse {
+typedef struct ow_SubscriptionInfo {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   ow_int correlationId;
-   ow_DataStructure_array *data;
+   ow_string *clientId;
+   struct ow_ActiveMQDestination *destination;
+   ow_string *selector;
+   ow_string *subcriptionName;
 
-} ow_DataArrayResponse;
-ow_DataArrayResponse *ow_DataArrayResponse_create(apr_pool_t *pool);
-ow_boolean ow_is_a_DataArrayResponse(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_JournalQueueAck {
+typedef struct ow_TransactionId {
 
    ow_byte structType;
-   struct ow_ActiveMQDestination *destination;
-   struct ow_MessageAck *messageAck;
 
-} ow_JournalQueueAck;
-ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool);
-ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object);
+} ow_TransactionId;
+ow_TransactionId *ow_TransactionId_create(apr_pool_t *pool);
+ow_boolean ow_is_a_TransactionId(ow_DataStructure *object);
 
-typedef struct ow_Response {
+typedef struct ow_WireFormatInfo {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   ow_int correlationId;
+   ow_byte_array *magic;
+   ow_int version;
+   struct ow_ByteSequence *marshalledProperties;
 
-} ow_Response;
-ow_Response *ow_Response_create(apr_pool_t *pool);
-ow_boolean ow_is_a_Response(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_ConnectionError {
+typedef struct ow_ActiveMQBytesMessage {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_throwable *exception;
-   struct ow_ConnectionId *connectionId;
+   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;
+   struct ow_ByteSequence *content;
+   struct ow_ByteSequence *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_ConnectionError;
-ow_ConnectionError *ow_ConnectionError_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConnectionError(ow_DataStructure *object);
+} ow_ActiveMQBytesMessage;
+ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQBytesMessage(ow_DataStructure *object);
 
-typedef struct ow_ConsumerInfo {
+typedef struct ow_ActiveMQMapMessage {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   struct ow_ConsumerId *consumerId;
-   ow_boolean browser;
+   struct ow_ProducerId *producerId;
    struct ow_ActiveMQDestination *destination;
-   ow_int prefetchSize;
-   ow_int maximumPendingMessageLimit;
-   ow_boolean dispatchAsync;
-   ow_string *selector;
-   ow_string *subcriptionName;
-   ow_boolean noLocal;
-   ow_boolean exclusive;
-   ow_boolean retroactive;
+   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;
+   struct ow_ByteSequence *content;
+   struct ow_ByteSequence *marshalledProperties;
+   struct ow_DataStructure *dataStructure;
+   struct ow_ConsumerId *targetConsumerId;
+   ow_boolean compressed;
+   ow_int redeliveryCounter;
    ow_DataStructure_array *brokerPath;
-   struct ow_BooleanExpression *additionalPredicate;
-   ow_boolean networkSubscription;
-   ow_boolean optimizedAcknowledge;
-   ow_boolean noRangeAcks;
+   ow_long arrival;
+   ow_string *userID;
+   ow_boolean recievedByDFBridge;
 
-} ow_ConsumerInfo;
-ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConsumerInfo(ow_DataStructure *object);
+} ow_ActiveMQMapMessage;
+ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQMapMessage(ow_DataStructure *object);
 
-typedef struct ow_XATransactionId {
+typedef struct ow_ActiveMQMessage {
 
    ow_byte structType;
-   ow_int formatId;
-   ow_byte_array *globalTransactionId;
-   ow_byte_array *branchQualifier;
+   ow_int 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;
+   struct ow_ByteSequence *content;
+   struct ow_ByteSequence *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_XATransactionId;
-ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object);
+} ow_ActiveMQMessage;
+ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQMessage(ow_DataStructure *object);
 
-typedef struct ow_JournalTrace {
+typedef struct ow_ActiveMQObjectMessage {
 
    ow_byte structType;
-   ow_string *message;
+   ow_int 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;
+   struct ow_ByteSequence *content;
+   struct ow_ByteSequence *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_JournalTrace;
-ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool);
-ow_boolean ow_is_a_JournalTrace(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_ConsumerId {
+typedef struct ow_ActiveMQQueue {
 
    ow_byte structType;
-   ow_string *connectionId;
-   ow_long sessionId;
-   ow_long value;
+   ow_string *physicalName;
 
-} ow_ConsumerId;
-ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object);
+} ow_ActiveMQQueue;
+ow_ActiveMQQueue *ow_ActiveMQQueue_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQQueue(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTextMessage {
+typedef struct ow_ActiveMQStreamMessage {
 
    ow_byte structType;
    ow_int commandId;
@@ -441,78 +462,38 @@
    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);
-
-typedef struct ow_SubscriptionInfo {
-
-   ow_byte structType;
-   ow_string *clientId;
-   struct ow_ActiveMQDestination *destination;
-   ow_string *selector;
-   ow_string *subcriptionName;
-
-} ow_SubscriptionInfo;
-ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object);
-
-typedef struct ow_JournalTransaction {
-
-   ow_byte structType;
-   struct ow_TransactionId *transactionId;
-   ow_byte type;
-   ow_boolean wasPrepared;
-
-} ow_JournalTransaction;
-ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool);
-ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object);
-
-typedef struct ow_ControlCommand {
-
-   ow_byte structType;
-   ow_int 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);
+} ow_ActiveMQStreamMessage;
+ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object);
 
-typedef struct ow_LastPartialCommand {
+typedef struct ow_ActiveMQTempDestination {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_byte_array *data;
+   ow_string *physicalName;
 
-} ow_LastPartialCommand;
-ow_LastPartialCommand *ow_LastPartialCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_LastPartialCommand(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_NetworkBridgeFilter {
+typedef struct ow_ActiveMQTempQueue {
 
    ow_byte structType;
-   ow_int networkTTL;
-   struct ow_BrokerId *networkBrokerId;
+   ow_string *physicalName;
 
-} ow_NetworkBridgeFilter;
-ow_NetworkBridgeFilter *ow_NetworkBridgeFilter_create(apr_pool_t *pool);
-ow_boolean ow_is_a_NetworkBridgeFilter(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_MessagePull {
+typedef struct ow_ActiveMQTempTopic {
 
    ow_byte structType;
-   ow_int commandId;
-   ow_boolean responseRequired;
-   struct ow_ConsumerId *consumerId;
-   struct ow_ActiveMQDestination *destination;
-   ow_long timeout;
+   ow_string *physicalName;
 
-} ow_MessagePull;
-ow_MessagePull *ow_MessagePull_create(apr_pool_t *pool);
-ow_boolean ow_is_a_MessagePull(ow_DataStructure *object);
+} ow_ActiveMQTempTopic;
+ow_ActiveMQTempTopic *ow_ActiveMQTempTopic_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQTempTopic(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQBytesMessage {
+typedef struct ow_ActiveMQTextMessage {
 
    ow_byte structType;
    ow_int commandId;
@@ -543,95 +524,154 @@
    ow_string *userID;
    ow_boolean recievedByDFBridge;
 
-} ow_ActiveMQBytesMessage;
-ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQBytesMessage(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_WireFormatInfo {
+typedef struct ow_ActiveMQTopic {
 
    ow_byte structType;
-   ow_byte_array *magic;
-   ow_int version;
-   struct ow_ByteSequence *marshalledProperties;
+   ow_string *physicalName;
 
-} ow_WireFormatInfo;
-ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object);
+} ow_ActiveMQTopic;
+ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTempTopic {
+typedef struct ow_BrokerInfo {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   struct ow_BrokerId *brokerId;
+   ow_string *brokerURL;
+   ow_DataStructure_array *peerBrokerInfos;
+   ow_string *brokerName;
+   ow_boolean slaveBroker;
+   ow_boolean masterBroker;
+   ow_boolean faultTolerantConfiguration;
 
-} ow_ActiveMQTempTopic;
-ow_ActiveMQTempTopic *ow_ActiveMQTempTopic_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTempTopic(ow_DataStructure *object);
+} ow_BrokerInfo;
+ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object);
 
-typedef struct ow_DiscoveryEvent {
+typedef struct ow_ConnectionControl {
 
    ow_byte structType;
-   ow_string *serviceName;
-   ow_string *brokerName;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   ow_boolean close;
+   ow_boolean exit;
+   ow_boolean faultTolerant;
+   ow_boolean resume;
+   ow_boolean suspend;
 
-} ow_DiscoveryEvent;
-ow_DiscoveryEvent *ow_DiscoveryEvent_create(apr_pool_t *pool);
-ow_boolean ow_is_a_DiscoveryEvent(ow_DataStructure *object);
+} ow_ConnectionControl;
+ow_ConnectionControl *ow_ConnectionControl_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ConnectionControl(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTempDestination {
+typedef struct ow_ConnectionError {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   ow_throwable *exception;
+   struct ow_ConnectionId *connectionId;
 
-} ow_ActiveMQTempDestination;
-ow_ActiveMQTempDestination *ow_ActiveMQTempDestination_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object);
+} ow_ConnectionError;
+ow_ConnectionError *ow_ConnectionError_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ConnectionError(ow_DataStructure *object);
 
-typedef struct ow_ReplayCommand {
+typedef struct ow_ConnectionInfo {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_int firstNakNumber;
-   ow_int lastNakNumber;
+   struct ow_ConnectionId *connectionId;
+   ow_string *clientId;
+   ow_string *password;
+   ow_string *userName;
+   ow_DataStructure_array *brokerPath;
+   ow_boolean brokerMasterConnector;
+   ow_boolean manageable;
 
-} ow_ReplayCommand;
-ow_ReplayCommand *ow_ReplayCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ReplayCommand(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_ActiveMQDestination {
+typedef struct ow_ConsumerControl {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   ow_boolean close;
+   struct ow_ConsumerId *consumerId;
+   ow_int prefetch;
 
-} ow_ActiveMQDestination;
-ow_ActiveMQDestination *ow_ActiveMQDestination_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object);
+} ow_ConsumerControl;
+ow_ConsumerControl *ow_ConsumerControl_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ConsumerControl(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQTopic {
+typedef struct ow_ConsumerInfo {
 
    ow_byte structType;
-   ow_string *physicalName;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   struct ow_ConsumerId *consumerId;
+   ow_boolean browser;
+   struct ow_ActiveMQDestination *destination;
+   ow_int prefetchSize;
+   ow_int maximumPendingMessageLimit;
+   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;
+   struct ow_BooleanExpression *additionalPredicate;
+   ow_boolean networkSubscription;
+   ow_boolean optimizedAcknowledge;
+   ow_boolean noRangeAcks;
 
-} ow_ActiveMQTopic;
-ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQTopic(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_BrokerInfo {
+typedef struct ow_ControlCommand {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   struct ow_BrokerId *brokerId;
-   ow_string *brokerURL;
-   ow_DataStructure_array *peerBrokerInfos;
-   ow_string *brokerName;
-   ow_boolean slaveBroker;
-   ow_boolean masterBroker;
-   ow_boolean faultTolerantConfiguration;
+   ow_string *command;
 
-} ow_BrokerInfo;
-ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object);
+} ow_ControlCommand;
+ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object);
+
+typedef struct ow_DataArrayResponse {
+
+   ow_byte structType;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   ow_int 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_DataResponse {
+
+   ow_byte structType;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   ow_int 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_DestinationInfo {
 
@@ -648,42 +688,39 @@
 ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool);
 ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object);
 
-typedef struct ow_ShutdownInfo {
+typedef struct ow_ExceptionResponse {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
+   ow_int correlationId;
+   ow_throwable *exception;
 
-} ow_ShutdownInfo;
-ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ShutdownInfo(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_DataResponse {
+typedef struct ow_FlushCommand {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_int 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);
+} ow_FlushCommand;
+ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object);
 
-typedef struct ow_ConnectionControl {
+typedef struct ow_IntegerResponse {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_boolean close;
-   ow_boolean exit;
-   ow_boolean faultTolerant;
-   ow_boolean resume;
-   ow_boolean suspend;
+   ow_int correlationId;
+   ow_int result;
 
-} ow_ConnectionControl;
-ow_ConnectionControl *ow_ConnectionControl_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConnectionControl(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_KeepAliveInfo {
 
@@ -695,6 +732,26 @@
 ow_KeepAliveInfo *ow_KeepAliveInfo_create(apr_pool_t *pool);
 ow_boolean ow_is_a_KeepAliveInfo(ow_DataStructure *object);
 
+typedef struct ow_LastPartialCommand {
+
+   ow_byte structType;
+   ow_int commandId;
+   ow_byte_array *data;
+
+} ow_LastPartialCommand;
+ow_LastPartialCommand *ow_LastPartialCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_LastPartialCommand(ow_DataStructure *object);
+
+typedef struct ow_LocalTransactionId {
+
+   ow_byte structType;
+   ow_long value;
+   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_Message {
 
    ow_byte structType;
@@ -730,168 +787,168 @@
 ow_Message *ow_Message_create(apr_pool_t *pool);
 ow_boolean ow_is_a_Message(ow_DataStructure *object);
 
-typedef struct ow_BaseCommand {
+typedef struct ow_MessageAck {
 
    ow_byte structType;
    ow_int 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_BaseCommand;
-ow_BaseCommand *ow_BaseCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_BaseCommand(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_FlushCommand {
+typedef struct ow_MessageDispatch {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
+   struct ow_ConsumerId *consumerId;
+   struct ow_ActiveMQDestination *destination;
+   struct ow_Message *message;
+   ow_int redeliveryCounter;
 
-} ow_FlushCommand;
-ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool);
-ow_boolean ow_is_a_FlushCommand(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_ConsumerControl {
+typedef struct ow_MessageDispatchNotification {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_boolean close;
    struct ow_ConsumerId *consumerId;
-   ow_int prefetch;
+   struct ow_ActiveMQDestination *destination;
+   ow_long deliverySequenceId;
+   struct ow_MessageId *messageId;
 
-} ow_ConsumerControl;
-ow_ConsumerControl *ow_ConsumerControl_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ConsumerControl(ow_DataStructure *object);
+} ow_MessageDispatchNotification;
+ow_MessageDispatchNotification *ow_MessageDispatchNotification_create(apr_pool_t *pool);
+ow_boolean ow_is_a_MessageDispatchNotification(ow_DataStructure *object);
 
-typedef struct ow_JournalTopicAck {
+typedef struct ow_MessagePull {
 
    ow_byte structType;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   struct ow_ConsumerId *consumerId;
    struct ow_ActiveMQDestination *destination;
-   struct ow_MessageId *messageId;
-   ow_long messageSequenceId;
-   ow_string *subscritionName;
-   ow_string *clientId;
-   struct ow_TransactionId *transactionId;
+   ow_long timeout;
 
-} ow_JournalTopicAck;
-ow_JournalTopicAck *ow_JournalTopicAck_create(apr_pool_t *pool);
-ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object);
+} ow_MessagePull;
+ow_MessagePull *ow_MessagePull_create(apr_pool_t *pool);
+ow_boolean ow_is_a_MessagePull(ow_DataStructure *object);
 
-typedef struct ow_BrokerId {
+typedef struct ow_ProducerInfo {
 
    ow_byte structType;
-   ow_string *value;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   struct ow_ProducerId *producerId;
+   struct ow_ActiveMQDestination *destination;
+   ow_DataStructure_array *brokerPath;
 
-} ow_BrokerId;
-ow_BrokerId *ow_BrokerId_create(apr_pool_t *pool);
-ow_boolean ow_is_a_BrokerId(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_MessageDispatch {
+typedef struct ow_RemoveInfo {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   struct ow_ConsumerId *consumerId;
-   struct ow_ActiveMQDestination *destination;
-   struct ow_Message *message;
-   ow_int redeliveryCounter;
+   struct ow_DataStructure *objectId;
 
-} ow_MessageDispatch;
-ow_MessageDispatch *ow_MessageDispatch_create(apr_pool_t *pool);
-ow_boolean ow_is_a_MessageDispatch(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_ActiveMQMapMessage {
+typedef struct ow_RemoveSubscriptionInfo {
 
    ow_byte structType;
    ow_int 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;
-   struct ow_ByteSequence *content;
-   struct ow_ByteSequence *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;
+   struct ow_ConnectionId *connectionId;
+   ow_string *subcriptionName;
+   ow_string *clientId;
 
-} ow_ActiveMQMapMessage;
-ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQMapMessage(ow_DataStructure *object);
+} ow_RemoveSubscriptionInfo;
+ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object);
 
-typedef struct ow_ActiveMQMessage {
+typedef struct ow_ReplayCommand {
 
    ow_byte structType;
    ow_int 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;
-   struct ow_ByteSequence *content;
-   struct ow_ByteSequence *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_int firstNakNumber;
+   ow_int lastNakNumber;
 
-} ow_ActiveMQMessage;
-ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ActiveMQMessage(ow_DataStructure *object);
+} ow_ReplayCommand;
+ow_ReplayCommand *ow_ReplayCommand_create(apr_pool_t *pool);
+ow_boolean ow_is_a_ReplayCommand(ow_DataStructure *object);
 
-typedef struct ow_RemoveInfo {
+typedef struct ow_Response {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   struct ow_DataStructure *objectId;
+   ow_int correlationId;
 
-} ow_RemoveInfo;
-ow_RemoveInfo *ow_RemoveInfo_create(apr_pool_t *pool);
-ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object);
+} ow_Response;
+ow_Response *ow_Response_create(apr_pool_t *pool);
+ow_boolean ow_is_a_Response(ow_DataStructure *object);
 
-typedef struct ow_ExceptionResponse {
+typedef struct ow_SessionInfo {
 
    ow_byte structType;
    ow_int commandId;
    ow_boolean responseRequired;
-   ow_int correlationId;
-   ow_throwable *exception;
+   struct ow_SessionId *sessionId;
 
-} ow_ExceptionResponse;
-ow_ExceptionResponse *ow_ExceptionResponse_create(apr_pool_t *pool);
-ow_boolean ow_is_a_ExceptionResponse(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_ShutdownInfo {
+
+   ow_byte structType;
+   ow_int 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_TransactionInfo {
+
+   ow_byte structType;
+   ow_int commandId;
+   ow_boolean responseRequired;
+   struct ow_ConnectionId *connectionId;
+   struct ow_TransactionId *transactionId;
+   ow_byte type;
+
+} ow_TransactionInfo;
+ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool);
+ow_boolean ow_is_a_TransactionInfo(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);
 
 #ifdef __cplusplus
 }