activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r360140 [3/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/...
Date Fri, 30 Dec 2005 18:49:56 GMT
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c?rev=360140&r1=360139&r2=360140&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c Fri Dec 30 10:48:31 2005
@@ -81,319 +81,269 @@
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_SessionId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_SUBSCRIPTIONINFO_TYPE:
+   case OW_SESSIONID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool) 
+ow_SessionId *ow_SessionId_create(apr_pool_t *pool) 
 {
-   ow_SubscriptionInfo *value = apr_pcalloc(pool,sizeof(ow_SubscriptionInfo));
+   ow_SessionId *value = apr_pcalloc(pool,sizeof(ow_SessionId));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_SUBSCRIPTIONINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_SESSIONID_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_SubscriptionInfo(ow_bit_buffer *buffer, ow_SubscriptionInfo *object)
-{
-   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->clientId);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
-   ow_marshal1_string(buffer, object->selector);
-   ow_marshal1_string(buffer, object->subcriptionName);
-   
-	return APR_SUCCESS;
-}
-apr_status_t ow_marshal2_SubscriptionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object)
-{
-   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->selector));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName));
-   
-	return APR_SUCCESS;
-}
-
-apr_status_t ow_unmarshal_SubscriptionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object, apr_pool_t *pool)
-{
-   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->selector, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool));
-   
-	return APR_SUCCESS;
-}
-
-ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object) {
-   if( object == 0 )
-      return 0;
-      
-   switch(object->structType) {
-   case OW_ACTIVEMQTOPIC_TYPE:
-   case OW_ACTIVEMQQUEUE_TYPE:
-   case OW_ACTIVEMQTEMPTOPIC_TYPE:
-   case OW_ACTIVEMQTEMPQUEUE_TYPE:
-      return 1;
-   }
-   return 0;
-}
-
-
-apr_status_t ow_marshal1_ActiveMQDestination(ow_bit_buffer *buffer, ow_ActiveMQDestination *object)
+apr_status_t ow_marshal1_SessionId(ow_bit_buffer *buffer, ow_SessionId *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->physicalName);
+   ow_marshal1_string(buffer, object->connectionId);
+   ow_marshal1_long(buffer, object->sessionId);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ActiveMQDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object)
+apr_status_t ow_marshal2_SessionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SessionId *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->physicalName));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId));
+   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ActiveMQDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_SessionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SessionId *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->physicalName, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object) {
+ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_CONNECTIONID_TYPE:
+   case OW_JOURNALQUEUEACK_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool) 
+ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool) 
 {
-   ow_ConnectionId *value = apr_pcalloc(pool,sizeof(ow_ConnectionId));
+   ow_JournalQueueAck *value = apr_pcalloc(pool,sizeof(ow_JournalQueueAck));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_CONNECTIONID_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_JOURNALQUEUEACK_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ConnectionId(ow_bit_buffer *buffer, ow_ConnectionId *object)
+apr_status_t ow_marshal1_JournalQueueAck(ow_bit_buffer *buffer, ow_JournalQueueAck *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->connectionId);
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageAck));
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ConnectionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object)
+apr_status_t ow_marshal2_JournalQueueAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalQueueAck *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageAck));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ConnectionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_JournalQueueAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalQueueAck *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageAck, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object) {
+ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_JOURNALTRACE_TYPE:
+   case OW_WIREFORMATINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool) 
+ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool) 
 {
-   ow_JournalTrace *value = apr_pcalloc(pool,sizeof(ow_JournalTrace));
+   ow_WireFormatInfo *value = apr_pcalloc(pool,sizeof(ow_WireFormatInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_JOURNALTRACE_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_WIREFORMATINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_JournalTrace(ow_bit_buffer *buffer, ow_JournalTrace *object)
+apr_status_t ow_marshal1_WireFormatInfo(ow_bit_buffer *buffer, ow_WireFormatInfo *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->message);
+   
+   
+   
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_JournalTrace(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object)
+apr_status_t ow_marshal2_WireFormatInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->message));
+   SUCCESS_CHECK(ow_marshal2_byte_array_const_size(buffer, object->magic, 8));
+   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->version));
+   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->options));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_JournalTrace(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_WireFormatInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->message, pool));
+   SUCCESS_CHECK(ow_unmarshal_byte_array_const_size(buffer, &object->magic, 8, pool));
+   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->version));
+   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->options));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_KeepAliveInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_TransactionId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_KEEPALIVEINFO_TYPE:
+   case OW_XATRANSACTIONID_TYPE:
+   case OW_LOCALTRANSACTIONID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_KeepAliveInfo *ow_KeepAliveInfo_create(apr_pool_t *pool) 
-{
-   ow_KeepAliveInfo *value = apr_pcalloc(pool,sizeof(ow_KeepAliveInfo));
-   if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_KEEPALIVEINFO_TYPE;
-   }
-   return value;
-}
-
-
-apr_status_t ow_marshal1_KeepAliveInfo(ow_bit_buffer *buffer, ow_KeepAliveInfo *object)
+apr_status_t ow_marshal1_TransactionId(ow_bit_buffer *buffer, ow_TransactionId *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_KeepAliveInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_KeepAliveInfo *object)
+apr_status_t ow_marshal2_TransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_KeepAliveInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_KeepAliveInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_TransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object) {
+ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_JOURNALQUEUEACK_TYPE:
+   case OW_CONNECTIONID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool) 
+ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool) 
 {
-   ow_JournalQueueAck *value = apr_pcalloc(pool,sizeof(ow_JournalQueueAck));
+   ow_ConnectionId *value = apr_pcalloc(pool,sizeof(ow_ConnectionId));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_JOURNALQUEUEACK_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_CONNECTIONID_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_JournalQueueAck(ow_bit_buffer *buffer, ow_JournalQueueAck *object)
+apr_status_t ow_marshal1_ConnectionId(ow_bit_buffer *buffer, ow_ConnectionId *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageAck));
+   ow_marshal1_string(buffer, object->connectionId);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_JournalQueueAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalQueueAck *object)
+apr_status_t ow_marshal2_ConnectionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageAck));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_JournalQueueAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalQueueAck *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_ConnectionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageAck, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_BrokerId(ow_DataStructure *object) {
+ow_boolean ow_is_a_KeepAliveInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_BROKERID_TYPE:
+   case OW_KEEPALIVEINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_BrokerId *ow_BrokerId_create(apr_pool_t *pool) 
+ow_KeepAliveInfo *ow_KeepAliveInfo_create(apr_pool_t *pool) 
 {
-   ow_BrokerId *value = apr_pcalloc(pool,sizeof(ow_BrokerId));
+   ow_KeepAliveInfo *value = apr_pcalloc(pool,sizeof(ow_KeepAliveInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_BROKERID_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_KEEPALIVEINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_BrokerId(ow_bit_buffer *buffer, ow_BrokerId *object)
+apr_status_t ow_marshal1_KeepAliveInfo(ow_bit_buffer *buffer, ow_KeepAliveInfo *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->brokerId);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_BrokerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_BrokerId *object)
+apr_status_t ow_marshal2_KeepAliveInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_KeepAliveInfo *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_BrokerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_BrokerId *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_KeepAliveInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_KeepAliveInfo *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerId, pool));
    
 	return APR_SUCCESS;
 }
@@ -403,31 +353,31 @@
       return 0;
       
    switch(object->structType) {
+   case OW_FLUSHCOMMAND_TYPE:
+   case OW_MESSAGEDISPATCH_TYPE:
+   case OW_PRODUCERINFO_TYPE:
    case OW_SESSIONINFO_TYPE:
-   case OW_SHUTDOWNINFO_TYPE:
-   case OW_DESTINATIONINFO_TYPE:
-   case OW_CONSUMERINFO_TYPE:
-   case OW_CONNECTIONINFO_TYPE:
    case OW_TRANSACTIONINFO_TYPE:
-   case OW_RESPONSE_TYPE:
+   case OW_MESSAGEACK_TYPE:
    case OW_REMOVEINFO_TYPE:
-   case OW_ACTIVEMQMESSAGE_TYPE:
    case OW_CONTROLCOMMAND_TYPE:
-   case OW_FLUSHCOMMAND_TYPE:
-   case OW_INTEGERRESPONSE_TYPE:
-   case OW_REMOVESUBSCRIPTIONINFO_TYPE:
-   case OW_DATAARRAYRESPONSE_TYPE:
    case OW_BROKERINFO_TYPE:
-   case OW_MESSAGEDISPATCH_TYPE:
+   case OW_REMOVESUBSCRIPTIONINFO_TYPE:
+   case OW_DESTINATIONINFO_TYPE:
+   case OW_SHUTDOWNINFO_TYPE:
+   case OW_RESPONSE_TYPE:
+   case OW_CONSUMERINFO_TYPE:
+   case OW_CONNECTIONINFO_TYPE:
+   case OW_ACTIVEMQMESSAGE_TYPE:
    case OW_ACTIVEMQSTREAMMESSAGE_TYPE:
-   case OW_PRODUCERINFO_TYPE:
-   case OW_MESSAGEACK_TYPE:
+   case OW_EXCEPTIONRESPONSE_TYPE:
+   case OW_INTEGERRESPONSE_TYPE:
    case OW_ACTIVEMQBYTESMESSAGE_TYPE:
-   case OW_ACTIVEMQTEXTMESSAGE_TYPE:
-   case OW_ACTIVEMQMAPMESSAGE_TYPE:
    case OW_DATARESPONSE_TYPE:
+   case OW_DATAARRAYRESPONSE_TYPE:
    case OW_ACTIVEMQOBJECTMESSAGE_TYPE:
-   case OW_EXCEPTIONRESPONSE_TYPE:
+   case OW_ACTIVEMQTEXTMESSAGE_TYPE:
+   case OW_ACTIVEMQMAPMESSAGE_TYPE:
       return 1;
    }
    return 0;
@@ -460,322 +410,198 @@
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_SESSIONINFO_TYPE:
+   case OW_XATRANSACTIONID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool) 
+ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool) 
 {
-   ow_SessionInfo *value = apr_pcalloc(pool,sizeof(ow_SessionInfo));
+   ow_XATransactionId *value = apr_pcalloc(pool,sizeof(ow_XATransactionId));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_SESSIONINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_XATRANSACTIONID_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_SessionInfo(ow_bit_buffer *buffer, ow_SessionInfo *object)
+apr_status_t ow_marshal1_XATransactionId(ow_bit_buffer *buffer, ow_XATransactionId *object)
 {
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->sessionId));
+   ow_marshal1_TransactionId(buffer, (ow_TransactionId*)object);
+   
+   
+                        ow_bit_buffer_append(buffer,  object->globalTransactionId!=0 );
+                        
+   
+                        ow_bit_buffer_append(buffer,  object->branchQualifier!=0 );
+                        
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_SessionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object)
+apr_status_t ow_marshal2_XATransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_XATransactionId *object)
 {
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->sessionId));
+   ow_marshal2_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object);   
+   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->formatId));
+   SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->globalTransactionId));
+   SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->branchQualifier));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_SessionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_XATransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_XATransactionId *object, apr_pool_t *pool)
 {
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->sessionId, pool));
-   
-	return APR_SUCCESS;
-}
-
-ow_boolean ow_is_a_Message(ow_DataStructure *object) {
-   if( object == 0 )
-      return 0;
-      
-   switch(object->structType) {
-   case OW_ACTIVEMQMESSAGE_TYPE:
-   case OW_ACTIVEMQSTREAMMESSAGE_TYPE:
-   case OW_ACTIVEMQBYTESMESSAGE_TYPE:
-   case OW_ACTIVEMQTEXTMESSAGE_TYPE:
-   case OW_ACTIVEMQMAPMESSAGE_TYPE:
-   case OW_ACTIVEMQOBJECTMESSAGE_TYPE:
-      return 1;
-   }
-   return 0;
-}
-
-
-apr_status_t ow_marshal1_Message(ow_bit_buffer *buffer, ow_Message *object)
-{
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->producerId));
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId));
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->originalDestination));
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageId));
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->originalTransactionId));
-   ow_marshal1_string(buffer, object->groupID);
-   
-   ow_marshal1_string(buffer, object->correlationId);
-   ow_bit_buffer_append(buffer, object->persistent);
-   ow_marshal1_long(buffer, object->expiration);
-   
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->replyTo));
-   ow_marshal1_long(buffer, object->timestamp);
-   ow_marshal1_string(buffer, object->type);
-   
-                        ow_bit_buffer_append(buffer,  object->content!=0 );
-                        
-   
-                        ow_bit_buffer_append(buffer,  object->marshalledProperties!=0 );
-                        
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->dataStructure));
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->targetConsumerId));
-   ow_bit_buffer_append(buffer, object->compressed);
-   
-   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
-   ow_marshal1_long(buffer, object->arrival);
-   ow_marshal1_string(buffer, object->userID);
-   ow_bit_buffer_append(buffer, object->recievedByDFBridge);
-   
-	return APR_SUCCESS;
-}
-apr_status_t ow_marshal2_Message(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_Message *object)
-{
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->producerId));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->originalDestination));
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageId));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->originalTransactionId));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->groupID));
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->groupSequence));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->correlationId));
-   ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->expiration));
-   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->priority));
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->replyTo));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->timestamp));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->type));
-   SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->content));
-   SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->marshalledProperties));
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->dataStructure));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->targetConsumerId));
-   ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->redeliveryCounter));
-   SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->arrival));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userID));
-   ow_bit_buffer_read(bitbuffer);
-   
-	return APR_SUCCESS;
-}
-
-apr_status_t ow_unmarshal_Message(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_Message *object, apr_pool_t *pool)
-{
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->producerId, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->originalDestination, pool));
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageId, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->originalTransactionId, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->groupID, pool));
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->groupSequence));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->correlationId, pool));
-   object->persistent = ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->expiration, pool));
-   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->priority));
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->replyTo, pool));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->timestamp, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->type, pool));
-   SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->content, pool));
-   SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->marshalledProperties, pool));
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->dataStructure, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->targetConsumerId, pool));
-   object->compressed = ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->redeliveryCounter));
-   SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->arrival, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userID, pool));
-   object->recievedByDFBridge = ow_bit_buffer_read(bitbuffer);
+   ow_unmarshal_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object, pool);   
+   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->formatId));
+   SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->globalTransactionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->branchQualifier, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_SHUTDOWNINFO_TYPE:
+   case OW_JOURNALTRACE_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool) 
+ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool) 
 {
-   ow_ShutdownInfo *value = apr_pcalloc(pool,sizeof(ow_ShutdownInfo));
+   ow_JournalTrace *value = apr_pcalloc(pool,sizeof(ow_JournalTrace));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_SHUTDOWNINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_JOURNALTRACE_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ShutdownInfo(ow_bit_buffer *buffer, ow_ShutdownInfo *object)
+apr_status_t ow_marshal1_JournalTrace(ow_bit_buffer *buffer, ow_JournalTrace *object)
 {
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
+   ow_marshal1_string(buffer, object->message);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ShutdownInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ShutdownInfo *object)
+apr_status_t ow_marshal2_JournalTrace(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object)
 {
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->message));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ShutdownInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ShutdownInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_JournalTrace(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object, apr_pool_t *pool)
 {
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->message, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object) {
+ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_JOURNALTOPICACK_TYPE:
+   case OW_FLUSHCOMMAND_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_JournalTopicAck *ow_JournalTopicAck_create(apr_pool_t *pool) 
+ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool) 
 {
-   ow_JournalTopicAck *value = apr_pcalloc(pool,sizeof(ow_JournalTopicAck));
+   ow_FlushCommand *value = apr_pcalloc(pool,sizeof(ow_FlushCommand));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_JOURNALTOPICACK_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_FLUSHCOMMAND_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_JournalTopicAck(ow_bit_buffer *buffer, ow_JournalTopicAck *object)
+apr_status_t ow_marshal1_FlushCommand(ow_bit_buffer *buffer, ow_FlushCommand *object)
 {
-   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageId));
-   ow_marshal1_long(buffer, object->messageSequenceId);
-   ow_marshal1_string(buffer, object->subscritionName);
-   ow_marshal1_string(buffer, object->clientId);
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId));
+   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_JournalTopicAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTopicAck *object)
+apr_status_t ow_marshal2_FlushCommand(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_FlushCommand *object)
 {
-   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageId));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->messageSequenceId));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subscritionName));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId));
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
+   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_JournalTopicAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTopicAck *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_FlushCommand(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_FlushCommand *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageId, pool));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->messageSequenceId, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subscritionName, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool));
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
+   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_RedeliveryPolicy(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_DESTINATIONINFO_TYPE:
+   case OW_REDELIVERYPOLICY_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool) 
+ow_RedeliveryPolicy *ow_RedeliveryPolicy_create(apr_pool_t *pool) 
 {
-   ow_DestinationInfo *value = apr_pcalloc(pool,sizeof(ow_DestinationInfo));
+   ow_RedeliveryPolicy *value = apr_pcalloc(pool,sizeof(ow_RedeliveryPolicy));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_DESTINATIONINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_REDELIVERYPOLICY_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_DestinationInfo(ow_bit_buffer *buffer, ow_DestinationInfo *object)
+apr_status_t ow_marshal1_RedeliveryPolicy(ow_bit_buffer *buffer, ow_RedeliveryPolicy *object)
 {
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId));
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    
-   ow_marshal1_long(buffer, object->timeout);
-   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
+   ow_marshal1_long(buffer, object->initialRedeliveryDelay);
+   
+   ow_bit_buffer_append(buffer, object->useExponentialBackOff);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_DestinationInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_DestinationInfo *object)
+apr_status_t ow_marshal2_RedeliveryPolicy(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RedeliveryPolicy *object)
 {
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId));
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->operationType));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->timeout));
-   SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
+   SUCCESS_CHECK(ow_byte_buffer_append_short(buffer, object->backOffMultiplier));
+   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->initialRedeliveryDelay));
+   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->maximumRedeliveries));
+   ow_bit_buffer_read(bitbuffer);
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_DestinationInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_DestinationInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_RedeliveryPolicy(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RedeliveryPolicy *object, apr_pool_t *pool)
 {
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool));
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
-   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->operationType));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->timeout, pool));
-   SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
+   SUCCESS_CHECK(ow_byte_array_read_short(buffer, &object->backOffMultiplier));
+   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->initialRedeliveryDelay, pool));
+   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->maximumRedeliveries));
+   object->useExponentialBackOff = ow_bit_buffer_read(bitbuffer);
    
 	return APR_SUCCESS;
 }
@@ -831,704 +657,652 @@
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_SessionId(ow_DataStructure *object) {
+ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_SESSIONID_TYPE:
+   case OW_JOURNALTOPICACK_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_SessionId *ow_SessionId_create(apr_pool_t *pool) 
+ow_JournalTopicAck *ow_JournalTopicAck_create(apr_pool_t *pool) 
 {
-   ow_SessionId *value = apr_pcalloc(pool,sizeof(ow_SessionId));
+   ow_JournalTopicAck *value = apr_pcalloc(pool,sizeof(ow_JournalTopicAck));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_SESSIONID_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_JOURNALTOPICACK_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_SessionId(ow_bit_buffer *buffer, ow_SessionId *object)
+apr_status_t ow_marshal1_JournalTopicAck(ow_bit_buffer *buffer, ow_JournalTopicAck *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->connectionId);
-   ow_marshal1_long(buffer, object->sessionId);
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageId));
+   ow_marshal1_long(buffer, object->messageSequenceId);
+   ow_marshal1_string(buffer, object->subscritionName);
+   ow_marshal1_string(buffer, object->clientId);
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId));
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_SessionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SessionId *object)
+apr_status_t ow_marshal2_JournalTopicAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTopicAck *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageId));
+   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->messageSequenceId));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subscritionName));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_SessionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SessionId *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_JournalTopicAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTopicAck *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageId, pool));
+   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->messageSequenceId, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subscritionName, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ConsumerInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_BrokerId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_CONSUMERINFO_TYPE:
+   case OW_BROKERID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool) 
+ow_BrokerId *ow_BrokerId_create(apr_pool_t *pool) 
 {
-   ow_ConsumerInfo *value = apr_pcalloc(pool,sizeof(ow_ConsumerInfo));
+   ow_BrokerId *value = apr_pcalloc(pool,sizeof(ow_BrokerId));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_CONSUMERINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_BROKERID_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ConsumerInfo(ow_bit_buffer *buffer, ow_ConsumerInfo *object)
+apr_status_t ow_marshal1_BrokerId(ow_bit_buffer *buffer, ow_BrokerId *object)
 {
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId));
-   ow_bit_buffer_append(buffer, object->browser);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
-   
-   ow_bit_buffer_append(buffer, object->dispatchAsync);
-   ow_marshal1_string(buffer, object->selector);
-   ow_marshal1_string(buffer, object->subcriptionName);
-   ow_bit_buffer_append(buffer, object->noLocal);
-   ow_bit_buffer_append(buffer, object->exclusive);
-   ow_bit_buffer_append(buffer, object->retroactive);
-   
-   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
-   ow_bit_buffer_append(buffer, object->networkSubscription);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
+   ow_marshal1_string(buffer, object->brokerId);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ConsumerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConsumerInfo *object)
+apr_status_t ow_marshal2_BrokerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_BrokerId *object)
 {
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId));
-   ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->prefetchSize));
-   ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->selector));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName));
-   ow_bit_buffer_read(bitbuffer);
-   ow_bit_buffer_read(bitbuffer);
-   ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->priority));
-   SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
-   ow_bit_buffer_read(bitbuffer);
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ConsumerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConsumerInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_BrokerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_BrokerId *object, apr_pool_t *pool)
 {
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool));
-   object->browser = ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->prefetchSize));
-   object->dispatchAsync = ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->selector, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool));
-   object->noLocal = ow_bit_buffer_read(bitbuffer);
-   object->exclusive = ow_bit_buffer_read(bitbuffer);
-   object->retroactive = ow_bit_buffer_read(bitbuffer);
-   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->priority));
-   SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
-   object->networkSubscription = ow_bit_buffer_read(bitbuffer);
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerId, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_MessageDispatch(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_CONNECTIONINFO_TYPE:
+   case OW_MESSAGEDISPATCH_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool) 
+ow_MessageDispatch *ow_MessageDispatch_create(apr_pool_t *pool) 
 {
-   ow_ConnectionInfo *value = apr_pcalloc(pool,sizeof(ow_ConnectionInfo));
+   ow_MessageDispatch *value = apr_pcalloc(pool,sizeof(ow_MessageDispatch));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_CONNECTIONINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_MESSAGEDISPATCH_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ConnectionInfo(ow_bit_buffer *buffer, ow_ConnectionInfo *object)
+apr_status_t ow_marshal1_MessageDispatch(ow_bit_buffer *buffer, ow_MessageDispatch *object)
 {
    ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId));
-   ow_marshal1_string(buffer, object->clientId);
-   ow_marshal1_string(buffer, object->password);
-   ow_marshal1_string(buffer, object->userName);
-   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId));
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->message));
+   
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ConnectionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionInfo *object)
+apr_status_t ow_marshal2_MessageDispatch(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageDispatch *object)
 {
    ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->password));
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userName));
-   SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->message));
+   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->redeliveryCounter));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ConnectionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_MessageDispatch(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageDispatch *object, apr_pool_t *pool)
 {
    ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->password, pool));
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userName, pool));
-   SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->message, pool));
+   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->redeliveryCounter));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object) {
+ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_ACTIVEMQTOPIC_TYPE:
+   case OW_PRODUCERINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool) 
+ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool) 
 {
-   ow_ActiveMQTopic *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTopic));
+   ow_ProducerInfo *value = apr_pcalloc(pool,sizeof(ow_ProducerInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTOPIC_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_PRODUCERINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ActiveMQTopic(ow_bit_buffer *buffer, ow_ActiveMQTopic *object)
+apr_status_t ow_marshal1_ProducerInfo(ow_bit_buffer *buffer, ow_ProducerInfo *object)
 {
-   ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object);
+   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->producerId));
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ActiveMQTopic(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object)
+apr_status_t ow_marshal2_ProducerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerInfo *object)
 {
-   ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object);   
+   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->producerId));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ActiveMQTopic(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_ProducerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerInfo *object, apr_pool_t *pool)
 {
-   ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool);   
+   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->producerId, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
+   SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_RedeliveryPolicy(ow_DataStructure *object) {
+ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_REDELIVERYPOLICY_TYPE:
+   case OW_SUBSCRIPTIONINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_RedeliveryPolicy *ow_RedeliveryPolicy_create(apr_pool_t *pool) 
+ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool) 
 {
-   ow_RedeliveryPolicy *value = apr_pcalloc(pool,sizeof(ow_RedeliveryPolicy));
+   ow_SubscriptionInfo *value = apr_pcalloc(pool,sizeof(ow_SubscriptionInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_REDELIVERYPOLICY_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_SUBSCRIPTIONINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_RedeliveryPolicy(ow_bit_buffer *buffer, ow_RedeliveryPolicy *object)
+apr_status_t ow_marshal1_SubscriptionInfo(ow_bit_buffer *buffer, ow_SubscriptionInfo *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   
-   ow_marshal1_long(buffer, object->initialRedeliveryDelay);
-   
-   ow_bit_buffer_append(buffer, object->useExponentialBackOff);
+   ow_marshal1_string(buffer, object->clientId);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
+   ow_marshal1_string(buffer, object->selector);
+   ow_marshal1_string(buffer, object->subcriptionName);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_RedeliveryPolicy(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RedeliveryPolicy *object)
+apr_status_t ow_marshal2_SubscriptionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_byte_buffer_append_short(buffer, object->backOffMultiplier));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->initialRedeliveryDelay));
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->maximumRedeliveries));
-   ow_bit_buffer_read(bitbuffer);
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->selector));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_RedeliveryPolicy(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RedeliveryPolicy *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_SubscriptionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_byte_array_read_short(buffer, &object->backOffMultiplier));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->initialRedeliveryDelay, pool));
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->maximumRedeliveries));
-   object->useExponentialBackOff = ow_bit_buffer_read(bitbuffer);
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->selector, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object) {
+ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_JOURNALTRANSACTION_TYPE:
+   case OW_SESSIONINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool) 
+ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool) 
 {
-   ow_JournalTransaction *value = apr_pcalloc(pool,sizeof(ow_JournalTransaction));
+   ow_SessionInfo *value = apr_pcalloc(pool,sizeof(ow_SessionInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_JOURNALTRANSACTION_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_SESSIONINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_JournalTransaction(ow_bit_buffer *buffer, ow_JournalTransaction *object)
+apr_status_t ow_marshal1_SessionInfo(ow_bit_buffer *buffer, ow_SessionInfo *object)
 {
-   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId));
-   
-   ow_bit_buffer_append(buffer, object->wasPrepared);
+   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->sessionId));
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_JournalTransaction(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object)
+apr_status_t ow_marshal2_SessionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object)
 {
-   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
-   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type));
-   ow_bit_buffer_read(bitbuffer);
+   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->sessionId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_JournalTransaction(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_SessionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
-   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type));
-   object->wasPrepared = ow_bit_buffer_read(bitbuffer);
+   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->sessionId, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ProducerId(ow_DataStructure *object) {
+ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_PRODUCERID_TYPE:
+   case OW_TRANSACTIONINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool) 
+ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool) 
 {
-   ow_ProducerId *value = apr_pcalloc(pool,sizeof(ow_ProducerId));
+   ow_TransactionInfo *value = apr_pcalloc(pool,sizeof(ow_TransactionInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_PRODUCERID_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_TRANSACTIONINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ProducerId(ow_bit_buffer *buffer, ow_ProducerId *object)
+apr_status_t ow_marshal1_TransactionInfo(ow_bit_buffer *buffer, ow_TransactionInfo *object)
 {
-   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-   ow_marshal1_string(buffer, object->connectionId);
-   ow_marshal1_long(buffer, object->producerId);
-   ow_marshal1_long(buffer, object->sessionId);
+   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId));
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId));
    
-	return APR_SUCCESS;
-}
-apr_status_t ow_marshal2_ProducerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object)
-{
-   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->producerId));
-   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId));
    
 	return APR_SUCCESS;
 }
-
-apr_status_t ow_unmarshal_ProducerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object, apr_pool_t *pool)
+apr_status_t ow_marshal2_TransactionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object)
 {
-   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->producerId, pool));
-   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool));
+   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
+   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ActiveMQQueue(ow_DataStructure *object) {
+apr_status_t ow_unmarshal_TransactionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object, apr_pool_t *pool)
+{
+   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
+   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type));
+   
+	return APR_SUCCESS;
+}
+
+ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
+   case OW_ACTIVEMQTOPIC_TYPE:
    case OW_ACTIVEMQQUEUE_TYPE:
+   case OW_ACTIVEMQTEMPQUEUE_TYPE:
+   case OW_ACTIVEMQTEMPTOPIC_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ActiveMQQueue *ow_ActiveMQQueue_create(apr_pool_t *pool) 
-{
-   ow_ActiveMQQueue *value = apr_pcalloc(pool,sizeof(ow_ActiveMQQueue));
-   if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_ACTIVEMQQUEUE_TYPE;
-   }
-   return value;
-}
-
-
-apr_status_t ow_marshal1_ActiveMQQueue(ow_bit_buffer *buffer, ow_ActiveMQQueue *object)
+apr_status_t ow_marshal1_ActiveMQDestination(ow_bit_buffer *buffer, ow_ActiveMQDestination *object)
 {
-   ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
+   ow_marshal1_string(buffer, object->physicalName);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ActiveMQQueue(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQQueue *object)
+apr_status_t ow_marshal2_ActiveMQDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object)
 {
-   ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->physicalName));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ActiveMQQueue(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQQueue *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_ActiveMQDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object, apr_pool_t *pool)
 {
-   ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->physicalName, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_MessageAck(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_TRANSACTIONINFO_TYPE:
+   case OW_MESSAGEACK_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool) 
+ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool) 
 {
-   ow_TransactionInfo *value = apr_pcalloc(pool,sizeof(ow_TransactionInfo));
+   ow_MessageAck *value = apr_pcalloc(pool,sizeof(ow_MessageAck));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_TRANSACTIONINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_MESSAGEACK_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_TransactionInfo(ow_bit_buffer *buffer, ow_TransactionInfo *object)
+apr_status_t ow_marshal1_MessageAck(ow_bit_buffer *buffer, ow_MessageAck *object)
 {
    ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId));
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination));
    SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId));
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId));
+   
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->firstMessageId));
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->lastMessageId));
    
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_TransactionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object)
+apr_status_t ow_marshal2_MessageAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageAck *object)
 {
    ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
    SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
-   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId));
+   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->ackType));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->firstMessageId));
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->lastMessageId));
+   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->messageCount));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_TransactionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_MessageAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageAck *object, apr_pool_t *pool)
 {
    ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
    SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
-   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool));
+   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->ackType));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->firstMessageId, pool));
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->lastMessageId, pool));
+   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->messageCount));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_Response(ow_DataStructure *object) {
+ow_boolean ow_is_a_ProducerId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_RESPONSE_TYPE:
-   case OW_INTEGERRESPONSE_TYPE:
-   case OW_DATAARRAYRESPONSE_TYPE:
-   case OW_DATARESPONSE_TYPE:
-   case OW_EXCEPTIONRESPONSE_TYPE:
+   case OW_PRODUCERID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_Response *ow_Response_create(apr_pool_t *pool) 
+ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool) 
 {
-   ow_Response *value = apr_pcalloc(pool,sizeof(ow_Response));
+   ow_ProducerId *value = apr_pcalloc(pool,sizeof(ow_ProducerId));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_RESPONSE_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_PRODUCERID_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_Response(ow_bit_buffer *buffer, ow_Response *object)
+apr_status_t ow_marshal1_ProducerId(ow_bit_buffer *buffer, ow_ProducerId *object)
 {
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
+   ow_marshal1_string(buffer, object->connectionId);
+   ow_marshal1_long(buffer, object->producerId);
+   ow_marshal1_long(buffer, object->sessionId);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_Response(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_Response *object)
+apr_status_t ow_marshal2_ProducerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object)
 {
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_byte_buffer_append_short(buffer, object->correlationId));
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId));
+   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->producerId));
+   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_Response(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_Response *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_ProducerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object, apr_pool_t *pool)
 {
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_byte_array_read_short(buffer, &object->correlationId));
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->producerId, pool));
+   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_REMOVEINFO_TYPE:
+   case OW_ACTIVEMQTOPIC_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_RemoveInfo *ow_RemoveInfo_create(apr_pool_t *pool) 
+ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool) 
 {
-   ow_RemoveInfo *value = apr_pcalloc(pool,sizeof(ow_RemoveInfo));
+   ow_ActiveMQTopic *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTopic));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_REMOVEINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTOPIC_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_RemoveInfo(ow_bit_buffer *buffer, ow_RemoveInfo *object)
+apr_status_t ow_marshal1_ActiveMQTopic(ow_bit_buffer *buffer, ow_ActiveMQTopic *object)
 {
-   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
-   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->objectId));
+   ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_RemoveInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RemoveInfo *object)
+apr_status_t ow_marshal2_ActiveMQTopic(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object)
 {
-   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
-   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->objectId));
+   ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object);   
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_RemoveInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RemoveInfo *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_ActiveMQTopic(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object, apr_pool_t *pool)
 {
-   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->objectId, pool));
+   ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool);   
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object) {
+ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_WIREFORMATINFO_TYPE:
+   case OW_JOURNALTRANSACTION_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool) 
+ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool) 
 {
-   ow_WireFormatInfo *value = apr_pcalloc(pool,sizeof(ow_WireFormatInfo));
+   ow_JournalTransaction *value = apr_pcalloc(pool,sizeof(ow_JournalTransaction));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_WIREFORMATINFO_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_JOURNALTRANSACTION_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_WireFormatInfo(ow_bit_buffer *buffer, ow_WireFormatInfo *object)
+apr_status_t ow_marshal1_JournalTransaction(ow_bit_buffer *buffer, ow_JournalTransaction *object)
 {
    ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
+   SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId));
    
-   
-   
-   
-	return APR_SUCCESS;
-}
-apr_status_t ow_marshal2_WireFormatInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object)
-{
-   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
-   SUCCESS_CHECK(ow_marshal2_byte_array_const_size(buffer, object->magic, 8));
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->version));
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->options));
-   
-	return APR_SUCCESS;
-}
-
-apr_status_t ow_unmarshal_WireFormatInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object, apr_pool_t *pool)
-{
-   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
-   SUCCESS_CHECK(ow_unmarshal_byte_array_const_size(buffer, &object->magic, 8, pool));
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->version));
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->options));
-   
-	return APR_SUCCESS;
-}
-
-ow_boolean ow_is_a_TransactionId(ow_DataStructure *object) {
-   if( object == 0 )
-      return 0;
-      
-   switch(object->structType) {
-   case OW_XATRANSACTIONID_TYPE:
-   case OW_LOCALTRANSACTIONID_TYPE:
-      return 1;
-   }
-   return 0;
-}
-
-
-apr_status_t ow_marshal1_TransactionId(ow_bit_buffer *buffer, ow_TransactionId *object)
-{
-   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
+   ow_bit_buffer_append(buffer, object->wasPrepared);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_TransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object)
+apr_status_t ow_marshal2_JournalTransaction(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object)
 {
    ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
+   SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
+   SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type));
+   ow_bit_buffer_read(bitbuffer);
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_TransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_JournalTransaction(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object, apr_pool_t *pool)
 {
    ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
+   SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type));
+   object->wasPrepared = ow_bit_buffer_read(bitbuffer);
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ActiveMQMessage(ow_DataStructure *object) {
+ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_ACTIVEMQMESSAGE_TYPE:
-   case OW_ACTIVEMQSTREAMMESSAGE_TYPE:
-   case OW_ACTIVEMQBYTESMESSAGE_TYPE:
-   case OW_ACTIVEMQTEXTMESSAGE_TYPE:
-   case OW_ACTIVEMQMAPMESSAGE_TYPE:
-   case OW_ACTIVEMQOBJECTMESSAGE_TYPE:
+   case OW_REMOVEINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool) 
+ow_RemoveInfo *ow_RemoveInfo_create(apr_pool_t *pool) 
 {
-   ow_ActiveMQMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQMessage));
+   ow_RemoveInfo *value = apr_pcalloc(pool,sizeof(ow_RemoveInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_ACTIVEMQMESSAGE_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_REMOVEINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_ActiveMQMessage(ow_bit_buffer *buffer, ow_ActiveMQMessage *object)
+apr_status_t ow_marshal1_RemoveInfo(ow_bit_buffer *buffer, ow_RemoveInfo *object)
 {
-   ow_marshal1_Message(buffer, (ow_Message*)object);
+   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->objectId));
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ActiveMQMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQMessage *object)
+apr_status_t ow_marshal2_RemoveInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RemoveInfo *object)
 {
-   ow_marshal2_Message(buffer, bitbuffer, (ow_Message*)object);   
+   ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->objectId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ActiveMQMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQMessage *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_RemoveInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RemoveInfo *object, apr_pool_t *pool)
 {
-   ow_unmarshal_Message(buffer, bitbuffer, (ow_Message*)object, pool);   
+   ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->objectId, pool));
    
 	return APR_SUCCESS;
 }
@@ -1578,89 +1352,104 @@
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object) {
+ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_FLUSHCOMMAND_TYPE:
+   case OW_BROKERINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool) 
+ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool) 
 {
-   ow_FlushCommand *value = apr_pcalloc(pool,sizeof(ow_FlushCommand));
+   ow_BrokerInfo *value = apr_pcalloc(pool,sizeof(ow_BrokerInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_FLUSHCOMMAND_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_BROKERINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_FlushCommand(ow_bit_buffer *buffer, ow_FlushCommand *object)
+apr_status_t ow_marshal1_BrokerInfo(ow_bit_buffer *buffer, ow_BrokerInfo *object)
 {
    ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->brokerId));
+   ow_marshal1_string(buffer, object->brokerURL);
+   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->peerBrokerInfos));
+   ow_marshal1_string(buffer, object->brokerName);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_FlushCommand(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_FlushCommand *object)
+apr_status_t ow_marshal2_BrokerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_BrokerInfo *object)
 {
    ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);   
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->brokerId));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerURL));
+   SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->peerBrokerInfos));
+   SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerName));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_FlushCommand(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_FlushCommand *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_BrokerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_BrokerInfo *object, apr_pool_t *pool)
 {
    ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->brokerId, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerURL, pool));
+   SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->peerBrokerInfos, pool));
+   SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerName, pool));
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_IntegerResponse(ow_DataStructure *object) {
+ow_boolean ow_is_a_LocalTransactionId(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_INTEGERRESPONSE_TYPE:
+   case OW_LOCALTRANSACTIONID_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_IntegerResponse *ow_IntegerResponse_create(apr_pool_t *pool) 
+ow_LocalTransactionId *ow_LocalTransactionId_create(apr_pool_t *pool) 
 {
-   ow_IntegerResponse *value = apr_pcalloc(pool,sizeof(ow_IntegerResponse));
+   ow_LocalTransactionId *value = apr_pcalloc(pool,sizeof(ow_LocalTransactionId));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_INTEGERRESPONSE_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_LOCALTRANSACTIONID_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_IntegerResponse(ow_bit_buffer *buffer, ow_IntegerResponse *object)
+apr_status_t ow_marshal1_LocalTransactionId(ow_bit_buffer *buffer, ow_LocalTransactionId *object)
 {
-   ow_marshal1_Response(buffer, (ow_Response*)object);
-   
+   ow_marshal1_TransactionId(buffer, (ow_TransactionId*)object);
+   ow_marshal1_long(buffer, object->transactionId);
+   SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId));
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_IntegerResponse(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_IntegerResponse *object)
+apr_status_t ow_marshal2_LocalTransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_LocalTransactionId *object)
 {
-   ow_marshal2_Response(buffer, bitbuffer, (ow_Response*)object);   
-   SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->result));
+   ow_marshal2_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object);   
+   SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->transactionId));
+   SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId));
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_IntegerResponse(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_IntegerResponse *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_LocalTransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_LocalTransactionId *object, apr_pool_t *pool)
 {
-   ow_unmarshal_Response(buffer, bitbuffer, (ow_Response*)object, pool);   
-   SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->result));
+   ow_unmarshal_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object, pool);   
+   SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->transactionId, pool));
+   SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool));
    
 	return APR_SUCCESS;
 }
@@ -1716,615 +1505,832 @@
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object) {
+ow_boolean ow_is_a_ActiveMQQueue(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_ACTIVEMQTEMPTOPIC_TYPE:
-   case OW_ACTIVEMQTEMPQUEUE_TYPE:
+   case OW_ACTIVEMQQUEUE_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-apr_status_t ow_marshal1_ActiveMQTempDestination(ow_bit_buffer *buffer, ow_ActiveMQTempDestination *object)
+ow_ActiveMQQueue *ow_ActiveMQQueue_create(apr_pool_t *pool) 
+{
+   ow_ActiveMQQueue *value = apr_pcalloc(pool,sizeof(ow_ActiveMQQueue));
+   if( value!=0 ) {
+      ((ow_DataStructure*)value)->structType = OW_ACTIVEMQQUEUE_TYPE;
+   }
+   return value;
+}
+
+
+apr_status_t ow_marshal1_ActiveMQQueue(ow_bit_buffer *buffer, ow_ActiveMQQueue *object)
 {
    ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object);
    
 	return APR_SUCCESS;
 }
-apr_status_t ow_marshal2_ActiveMQTempDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempDestination *object)
+apr_status_t ow_marshal2_ActiveMQQueue(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQQueue *object)
 {
    ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object);   
    
 	return APR_SUCCESS;
 }
 
-apr_status_t ow_unmarshal_ActiveMQTempDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempDestination *object, apr_pool_t *pool)
+apr_status_t ow_unmarshal_ActiveMQQueue(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQQueue *object, apr_pool_t *pool)
 {
    ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool);   
    
 	return APR_SUCCESS;
 }
 
-ow_boolean ow_is_a_DataArrayResponse(ow_DataStructure *object) {
+ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object) {
    if( object == 0 )
       return 0;
       
    switch(object->structType) {
-   case OW_DATAARRAYRESPONSE_TYPE:
+   case OW_DESTINATIONINFO_TYPE:
       return 1;
    }
    return 0;
 }
 
 
-ow_DataArrayResponse *ow_DataArrayResponse_create(apr_pool_t *pool) 
+ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool) 
 {
-   ow_DataArrayResponse *value = apr_pcalloc(pool,sizeof(ow_DataArrayResponse));
+   ow_DestinationInfo *value = apr_pcalloc(pool,sizeof(ow_DestinationInfo));
    if( value!=0 ) {
-      ((ow_DataStructure*)value)->structType = OW_DATAARRAYRESPONSE_TYPE;
+      ((ow_DataStructure*)value)->structType = OW_DESTINATIONINFO_TYPE;
    }
    return value;
 }
 
 
-apr_status_t ow_marshal1_DataArrayResponse(ow_bit_buffer *buffer, ow_DataArrayResponse *object)
+apr_status_t ow_marshal1_DestinationInfo(ow_bit_buffer *buffer, ow_DestinationInfo *object)
 {
-   ow_marshal1_Response(buffer, (ow_Response*)object);
-   SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->data));
+   ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);

[... 1448 lines stripped ...]


Mime
View raw message