Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to latest openwire code gen 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@420731 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-07-11 05:44:33 +00:00
parent 8a4db98776
commit 829e86f72e
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openwire-c/src/libopenwire/ow_command_types_v1.h
View File

@ -45,6 +45,8 @@ extern "C" {
#define OW_CONTROLCOMMAND_TYPE 14 #define OW_CONTROLCOMMAND_TYPE 14
#define OW_FLUSHCOMMAND_TYPE 15 #define OW_FLUSHCOMMAND_TYPE 15
#define OW_CONNECTIONERROR_TYPE 16 #define OW_CONNECTIONERROR_TYPE 16
#define OW_CONSUMERCONTROL_TYPE 17
#define OW_CONNECTIONCONTROL_TYPE 18
#define OW_MESSAGEDISPATCH_TYPE 21 #define OW_MESSAGEDISPATCH_TYPE 21
#define OW_MESSAGEACK_TYPE 22 #define OW_MESSAGEACK_TYPE 22
@ -70,6 +72,10 @@ extern "C" {
#define OW_JOURNALTRACE_TYPE 53 #define OW_JOURNALTRACE_TYPE 53
#define OW_JOURNALTRANSACTION_TYPE 54 #define OW_JOURNALTRANSACTION_TYPE 54
#define OW_SUBSCRIPTIONINFO_TYPE 55 #define OW_SUBSCRIPTIONINFO_TYPE 55
#define OW_PARTIALCOMMAND_TYPE 60
#define OW_LASTPARTIALCOMMAND_TYPE 61
#define OW_REPLAYCOMMAND_TYPE 65
#define OW_BYTE_TYPE 70 #define OW_BYTE_TYPE 70
#define OW_CHAR_TYPE 71 #define OW_CHAR_TYPE 71
@ -83,7 +89,8 @@ extern "C" {
#define OW_BYTE_ARRAY_TYPE 79 #define OW_BYTE_ARRAY_TYPE 79
#define OW_MESSAGEDISPATCHNOTIFICATION_TYPE 90 #define OW_MESSAGEDISPATCHNOTIFICATION_TYPE 90
#define OW_NETWORKBRIDGEFILTER_TYPE 91
#define OW_ACTIVEMQQUEUE_TYPE 100 #define OW_ACTIVEMQQUEUE_TYPE 100
#define OW_ACTIVEMQTOPIC_TYPE 101 #define OW_ACTIVEMQTOPIC_TYPE 101
#define OW_ACTIVEMQTEMPQUEUE_TYPE 102 #define OW_ACTIVEMQTEMPQUEUE_TYPE 102

24
openwire-c/src/libopenwire/ow_commands_v1.c
View File

@ -1733,9 +1733,7 @@ apr_status_t ow_marshal1_WireFormatInfo(ow_bit_buffer *buffer, ow_WireFormatInfo
ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->marshalledProperties));
ow_bit_buffer_append(buffer, object->marshalledProperties!=0 );
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -1744,7 +1742,7 @@ apr_status_t ow_marshal2_WireFormatInfo(ow_byte_buffer *buffer, ow_bit_buffer *b
ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);
SUCCESS_CHECK(ow_marshal2_byte_array_const_size(buffer, object->magic, 8)); 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->version));
SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->marshalledProperties)); SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->marshalledProperties));
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -1754,7 +1752,7 @@ apr_status_t ow_unmarshal_WireFormatInfo(ow_byte_array *buffer, ow_bit_buffer *b
ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, 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_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->version));
SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->marshalledProperties, pool)); SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->marshalledProperties, pool));
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -2351,12 +2349,8 @@ apr_status_t ow_marshal1_Message(ow_bit_buffer *buffer, ow_Message *object)
SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->replyTo)); SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->replyTo));
ow_marshal1_long(buffer, object->timestamp); ow_marshal1_long(buffer, object->timestamp);
ow_marshal1_string(buffer, object->type); ow_marshal1_string(buffer, object->type);
SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->content));
ow_bit_buffer_append(buffer, object->content!=0 ); SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->marshalledProperties));
ow_bit_buffer_append(buffer, object->marshalledProperties!=0 );
SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->dataStructure)); SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->dataStructure));
SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->targetConsumerId)); SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->targetConsumerId));
ow_bit_buffer_append(buffer, object->compressed); ow_bit_buffer_append(buffer, object->compressed);
@ -2386,8 +2380,8 @@ apr_status_t ow_marshal2_Message(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffe
SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->replyTo)); 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_long(buffer, bitbuffer, object->timestamp));
SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->type)); SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->type));
SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->content)); SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->content));
SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->marshalledProperties)); SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->marshalledProperties));
SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->dataStructure)); SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->dataStructure));
SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->targetConsumerId)); SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->targetConsumerId));
ow_bit_buffer_read(bitbuffer); ow_bit_buffer_read(bitbuffer);
@ -2418,8 +2412,8 @@ apr_status_t ow_unmarshal_Message(ow_byte_array *buffer, ow_bit_buffer *bitbuffe
SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->replyTo, pool)); 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_long(buffer, bitbuffer, &object->timestamp, pool));
SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->type, 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_nested_object(buffer, bitbuffer, (ow_DataStructure**)&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->marshalledProperties, pool));
SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->dataStructure, 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)); SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->targetConsumerId, pool));
object->compressed = ow_bit_buffer_read(bitbuffer); object->compressed = ow_bit_buffer_read(bitbuffer);

30
openwire-c/src/libopenwire/ow_commands_v1.h
View File

@ -108,8 +108,8 @@ typedef struct ow_ActiveMQObjectMessage {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;
@ -220,8 +220,8 @@ typedef struct ow_ActiveMQStreamMessage {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;
@ -429,8 +429,8 @@ typedef struct ow_ActiveMQTextMessage {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;
@ -518,8 +518,8 @@ typedef struct ow_ActiveMQBytesMessage {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;
@ -538,7 +538,7 @@ typedef struct ow_WireFormatInfo {
ow_byte structType; ow_byte structType;
ow_byte_array *magic; ow_byte_array *magic;
ow_int version; ow_int version;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
} ow_WireFormatInfo; } ow_WireFormatInfo;
ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool); ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool);
@ -701,8 +701,8 @@ typedef struct ow_Message {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;
@ -806,8 +806,8 @@ typedef struct ow_ActiveMQMapMessage {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;
@ -841,8 +841,8 @@ typedef struct ow_ActiveMQMessage {
struct ow_ActiveMQDestination *replyTo; struct ow_ActiveMQDestination *replyTo;
ow_long timestamp; ow_long timestamp;
ow_string *type; ow_string *type;
ow_byte_array *content; struct ow_ByteSequence *content;
ow_byte_array *marshalledProperties; struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure; struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId; struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed; ow_boolean compressed;