You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/11 07:44:33 UTC
svn commit: r420731 - in
/incubator/activemq/trunk/openwire-c/src/libopenwire: ow_command_types_v1.h
ow_commands_v1.c ow_commands_v1.h
Author: chirino
Date: Mon Jul 10 22:44:33 2006
New Revision: 420731
URL: http://svn.apache.org/viewvc?rev=420731&view=rev
Log:
Updated to latest openwire code gen
Modified:
incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h
incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h?rev=420731&r1=420730&r2=420731&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h Mon Jul 10 22:44:33 2006
@@ -45,6 +45,8 @@
#define OW_CONTROLCOMMAND_TYPE 14
#define OW_FLUSHCOMMAND_TYPE 15
#define OW_CONNECTIONERROR_TYPE 16
+#define OW_CONSUMERCONTROL_TYPE 17
+#define OW_CONNECTIONCONTROL_TYPE 18
#define OW_MESSAGEDISPATCH_TYPE 21
#define OW_MESSAGEACK_TYPE 22
@@ -70,6 +72,10 @@
#define OW_JOURNALTRACE_TYPE 53
#define OW_JOURNALTRANSACTION_TYPE 54
#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_CHAR_TYPE 71
@@ -83,7 +89,8 @@
#define OW_BYTE_ARRAY_TYPE 79
#define OW_MESSAGEDISPATCHNOTIFICATION_TYPE 90
-
+#define OW_NETWORKBRIDGEFILTER_TYPE 91
+
#define OW_ACTIVEMQQUEUE_TYPE 100
#define OW_ACTIVEMQTOPIC_TYPE 101
#define OW_ACTIVEMQTEMPQUEUE_TYPE 102
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c?rev=420731&r1=420730&r2=420731&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 Mon Jul 10 22:44:33 2006
@@ -1733,9 +1733,7 @@
ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-
- ow_bit_buffer_append(buffer, object->marshalledProperties!=0 );
-
+ SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->marshalledProperties));
return APR_SUCCESS;
}
@@ -1744,7 +1742,7 @@
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_marshal2_byte_array(buffer, bitbuffer, object->marshalledProperties));
+ SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->marshalledProperties));
return APR_SUCCESS;
}
@@ -1754,7 +1752,7 @@
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_unmarshal_byte_array(buffer, bitbuffer, &object->marshalledProperties, pool));
+ SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->marshalledProperties, pool));
return APR_SUCCESS;
}
@@ -2351,12 +2349,8 @@
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->content));
+ SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->marshalledProperties));
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);
@@ -2386,8 +2380,8 @@
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->content));
+ 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_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->targetConsumerId));
ow_bit_buffer_read(bitbuffer);
@@ -2418,8 +2412,8 @@
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->content, 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_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->targetConsumerId, pool));
object->compressed = ow_bit_buffer_read(bitbuffer);
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h?rev=420731&r1=420730&r2=420731&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h Mon Jul 10 22:44:33 2006
@@ -108,8 +108,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;
@@ -220,8 +220,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;
@@ -429,8 +429,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;
@@ -518,8 +518,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;
@@ -538,7 +538,7 @@
ow_byte structType;
ow_byte_array *magic;
ow_int version;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *marshalledProperties;
} ow_WireFormatInfo;
ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool);
@@ -701,8 +701,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;
@@ -806,8 +806,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;
@@ -841,8 +841,8 @@
struct ow_ActiveMQDestination *replyTo;
ow_long timestamp;
ow_string *type;
- ow_byte_array *content;
- ow_byte_array *marshalledProperties;
+ struct ow_ByteSequence *content;
+ struct ow_ByteSequence *marshalledProperties;
struct ow_DataStructure *dataStructure;
struct ow_ConsumerId *targetConsumerId;
ow_boolean compressed;