You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2006/01/05 10:30:33 UTC
svn commit: r366136 - in
/incubator/activemq/trunk/openwire-c/src/libopenwire: ow_commands_v1.c
ow_commands_v1.h
Author: jstrachan
Date: Thu Jan 5 01:30:29 2006
New Revision: 366136
URL: http://svn.apache.org/viewcvs?rev=366136&view=rev
Log:
removed redeliverypolicy from the openwire protocol
Modified:
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_commands_v1.c
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c?rev=366136&r1=366135&r2=366136&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 Thu Jan 5 01:30:29 2006
@@ -552,60 +552,6 @@
return APR_SUCCESS;
}
-ow_boolean ow_is_a_RedeliveryPolicy(ow_DataStructure *object) {
- if( object == 0 )
- return 0;
-
- switch(object->structType) {
- case OW_REDELIVERYPOLICY_TYPE:
- return 1;
- }
- return 0;
-}
-
-
-ow_RedeliveryPolicy *ow_RedeliveryPolicy_create(apr_pool_t *pool)
-{
- ow_RedeliveryPolicy *value = apr_pcalloc(pool,sizeof(ow_RedeliveryPolicy));
- if( value!=0 ) {
- ((ow_DataStructure*)value)->structType = OW_REDELIVERYPOLICY_TYPE;
- }
- return value;
-}
-
-
-apr_status_t ow_marshal1_RedeliveryPolicy(ow_bit_buffer *buffer, ow_RedeliveryPolicy *object)
-{
- ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
-
- ow_marshal1_long(buffer, object->initialRedeliveryDelay);
-
- ow_bit_buffer_append(buffer, object->useExponentialBackOff);
-
- return APR_SUCCESS;
-}
-apr_status_t ow_marshal2_RedeliveryPolicy(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RedeliveryPolicy *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);
-
- return APR_SUCCESS;
-}
-
-apr_status_t ow_unmarshal_RedeliveryPolicy(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RedeliveryPolicy *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);
-
- return APR_SUCCESS;
-}
-
ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object) {
if( object == 0 )
return 0;
@@ -2516,7 +2462,6 @@
case OW_XATRANSACTIONID_TYPE: return (ow_DataStructure *)ow_XATransactionId_create(pool);
case OW_JOURNALTRACE_TYPE: return (ow_DataStructure *)ow_JournalTrace_create(pool);
case OW_FLUSHCOMMAND_TYPE: return (ow_DataStructure *)ow_FlushCommand_create(pool);
- case OW_REDELIVERYPOLICY_TYPE: return (ow_DataStructure *)ow_RedeliveryPolicy_create(pool);
case OW_CONSUMERID_TYPE: return (ow_DataStructure *)ow_ConsumerId_create(pool);
case OW_JOURNALTOPICACK_TYPE: return (ow_DataStructure *)ow_JournalTopicAck_create(pool);
case OW_BROKERID_TYPE: return (ow_DataStructure *)ow_BrokerId_create(pool);
@@ -2569,7 +2514,6 @@
case OW_XATRANSACTIONID_TYPE: return ow_marshal1_XATransactionId(buffer, (ow_XATransactionId*)object);
case OW_JOURNALTRACE_TYPE: return ow_marshal1_JournalTrace(buffer, (ow_JournalTrace*)object);
case OW_FLUSHCOMMAND_TYPE: return ow_marshal1_FlushCommand(buffer, (ow_FlushCommand*)object);
- case OW_REDELIVERYPOLICY_TYPE: return ow_marshal1_RedeliveryPolicy(buffer, (ow_RedeliveryPolicy*)object);
case OW_CONSUMERID_TYPE: return ow_marshal1_ConsumerId(buffer, (ow_ConsumerId*)object);
case OW_JOURNALTOPICACK_TYPE: return ow_marshal1_JournalTopicAck(buffer, (ow_JournalTopicAck*)object);
case OW_BROKERID_TYPE: return ow_marshal1_BrokerId(buffer, (ow_BrokerId*)object);
@@ -2622,7 +2566,6 @@
case OW_XATRANSACTIONID_TYPE: return ow_marshal2_XATransactionId(buffer, bitbuffer, (ow_XATransactionId*)object);
case OW_JOURNALTRACE_TYPE: return ow_marshal2_JournalTrace(buffer, bitbuffer, (ow_JournalTrace*)object);
case OW_FLUSHCOMMAND_TYPE: return ow_marshal2_FlushCommand(buffer, bitbuffer, (ow_FlushCommand*)object);
- case OW_REDELIVERYPOLICY_TYPE: return ow_marshal2_RedeliveryPolicy(buffer, bitbuffer, (ow_RedeliveryPolicy*)object);
case OW_CONSUMERID_TYPE: return ow_marshal2_ConsumerId(buffer, bitbuffer, (ow_ConsumerId*)object);
case OW_JOURNALTOPICACK_TYPE: return ow_marshal2_JournalTopicAck(buffer, bitbuffer, (ow_JournalTopicAck*)object);
case OW_BROKERID_TYPE: return ow_marshal2_BrokerId(buffer, bitbuffer, (ow_BrokerId*)object);
@@ -2675,7 +2618,6 @@
case OW_XATRANSACTIONID_TYPE: return ow_unmarshal_XATransactionId(buffer, bitbuffer, (ow_XATransactionId*)object, pool);
case OW_JOURNALTRACE_TYPE: return ow_unmarshal_JournalTrace(buffer, bitbuffer, (ow_JournalTrace*)object, pool);
case OW_FLUSHCOMMAND_TYPE: return ow_unmarshal_FlushCommand(buffer, bitbuffer, (ow_FlushCommand*)object, pool);
- case OW_REDELIVERYPOLICY_TYPE: return ow_unmarshal_RedeliveryPolicy(buffer, bitbuffer, (ow_RedeliveryPolicy*)object, pool);
case OW_CONSUMERID_TYPE: return ow_unmarshal_ConsumerId(buffer, bitbuffer, (ow_ConsumerId*)object, pool);
case OW_JOURNALTOPICACK_TYPE: return ow_unmarshal_JournalTopicAck(buffer, bitbuffer, (ow_JournalTopicAck*)object, pool);
case OW_BROKERID_TYPE: return ow_unmarshal_BrokerId(buffer, bitbuffer, (ow_BrokerId*)object, pool);
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h?rev=366136&r1=366135&r2=366136&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 Thu Jan 5 01:30:29 2006
@@ -146,18 +146,6 @@
ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool);
ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object);
-typedef struct ow_RedeliveryPolicy {
-
- ow_byte structType;
- ow_short backOffMultiplier;
- ow_long initialRedeliveryDelay;
- ow_int maximumRedeliveries;
- ow_boolean useExponentialBackOff;
-
-} ow_RedeliveryPolicy;
-ow_RedeliveryPolicy *ow_RedeliveryPolicy_create(apr_pool_t *pool);
-ow_boolean ow_is_a_RedeliveryPolicy(ow_DataStructure *object);
-
typedef struct ow_ConsumerId {
ow_byte structType;