Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c?rev=420809&r1=420808&r2=420809&view=diff ============================================================================== --- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c (original) +++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c Tue Jul 11 05:07:03 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <sandesha2_in_memory_seq_property_mgr.h> +#include <sandesha2_seq_property_mgr.h> #include <sandesha2_constants.h> #include <sandesha2_error.h> #include <sandesha2_utils.h> @@ -23,15 +23,15 @@ #include <axis2_thread.h> #include <axis2_property.h> -typedef struct sandesha2_in_memory_seq_property_mgr_impl sandesha2_in_memory_seq_property_mgr_impl_t; +typedef struct sandesha2_seq_property_mgr_impl sandesha2_seq_property_mgr_impl_t; /** * @brief Sandesha Sequence Report Struct Impl * Sandesha Sequence Report */ -struct sandesha2_in_memory_seq_property_mgr_impl +struct sandesha2_seq_property_mgr_impl { - sandesha2_in_memory_seq_property_mgr_t seq_property; + sandesha2_seq_property_mgr_t seq_property; axis2_hash_t *table; axis2_array_list_t *values; @@ -39,92 +39,92 @@ }; -#define SANDESHA2_INTF_TO_IMPL(seq_property) ((sandesha2_in_memory_seq_property_mgr_impl_t *) seq_property) +#define SANDESHA2_INTF_TO_IMPL(seq_property) ((sandesha2_seq_property_mgr_impl_t *) seq_property) axis2_status_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_free( +sandesha2_seq_property_mgr_free( void *seq_property, const axis2_env_t *envv); axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_insert( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_insert( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean); axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_remove( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_remove( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, axis2_char_t *seq_id, axis2_char_t *name); sandesha2_sequence_property_bean_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_retrieve( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_retrieve( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, axis2_char_t *seq_id, axis2_char_t *name); axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_update( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_update( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean); axis2_array_list_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_find( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_find( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean); sandesha2_sequence_property_bean_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_find_unique( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_find_unique( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean); axis2_array_list_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_retrieve_all( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_retrieve_all( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env); axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_update_or_insert( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_update_or_insert( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean); static axis2_char_t * -sandesha2_in_memory_seq_property_mgr_get_id( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_get_id( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean); -AXIS2_EXTERN sandesha2_in_memory_seq_property_mgr_t * AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_create( +AXIS2_EXTERN sandesha2_seq_property_mgr_t * AXIS2_CALL +sandesha2_seq_property_mgr_create( const axis2_env_t *env, axis2_ctx_t *ctx) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_property_t *property = NULL; AXIS2_ENV_CHECK(env, NULL); seq_property_impl = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_in_memory_seq_property_mgr_impl_t)); + sizeof(sandesha2_seq_property_mgr_impl_t)); seq_property_impl->table = NULL; seq_property_impl->values = NULL; seq_property_impl->mutex = NULL; seq_property_impl->seq_property.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_in_memory_seq_property_mgr_ops_t)); + sizeof(sandesha2_seq_property_mgr_ops_t)); seq_property_impl->mutex = axis2_thread_mutex_create(env->allocator, AXIS2_THREAD_MUTEX_DEFAULT); if(!seq_property_impl->mutex) { - sandesha2_in_memory_seq_property_mgr_free(&(seq_property_impl->seq_property), env); + sandesha2_seq_property_mgr_free(&(seq_property_impl->seq_property), env); return NULL; } @@ -147,33 +147,33 @@ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_SEQUENCE_PROPERTY, property, AXIS2_FALSE); } - seq_property_impl->seq_property.ops->free = sandesha2_in_memory_seq_property_mgr_free; + seq_property_impl->seq_property.ops->free = sandesha2_seq_property_mgr_free; seq_property_impl->seq_property.ops->insert = - sandesha2_in_memory_seq_property_mgr_insert; + sandesha2_seq_property_mgr_insert; seq_property_impl->seq_property.ops->remove = - sandesha2_in_memory_seq_property_mgr_remove; + sandesha2_seq_property_mgr_remove; seq_property_impl->seq_property.ops->retrieve = - sandesha2_in_memory_seq_property_mgr_retrieve; + sandesha2_seq_property_mgr_retrieve; seq_property_impl->seq_property.ops->update = - sandesha2_in_memory_seq_property_mgr_update; + sandesha2_seq_property_mgr_update; seq_property_impl->seq_property.ops->find = - sandesha2_in_memory_seq_property_mgr_find; + sandesha2_seq_property_mgr_find; seq_property_impl->seq_property.ops->find_unique = - sandesha2_in_memory_seq_property_mgr_find_unique; + sandesha2_seq_property_mgr_find_unique; seq_property_impl->seq_property.ops->retrieve_all = - sandesha2_in_memory_seq_property_mgr_retrieve_all; + sandesha2_seq_property_mgr_retrieve_all; seq_property_impl->seq_property.ops->update_or_insert = - sandesha2_in_memory_seq_property_mgr_update_or_insert; + sandesha2_seq_property_mgr_update_or_insert; return &(seq_property_impl->seq_property); } axis2_status_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_free( +sandesha2_seq_property_mgr_free( void *seq_property, const axis2_env_t *env) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property); @@ -210,12 +210,12 @@ } axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_insert( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_insert( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_char_t *seq_id = NULL; axis2_char_t *id = NULL; axis2_char_t *name = NULL; @@ -247,13 +247,13 @@ } axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_remove( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_remove( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, axis2_char_t *seq_id, axis2_char_t *name) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; sandesha2_sequence_property_bean_t *bean = NULL; axis2_char_t *key = NULL; @@ -264,7 +264,7 @@ axis2_thread_mutex_lock(seq_property_impl->mutex); - bean = sandesha2_in_memory_seq_property_mgr_retrieve(seq_property, env, + bean = sandesha2_seq_property_mgr_retrieve(seq_property, env, seq_id, name); key = axis2_strcat(env, seq_id, ":", name, NULL); axis2_hash_set(seq_property_impl->table, key, AXIS2_HASH_KEY_STRING, NULL); @@ -276,13 +276,13 @@ } sandesha2_sequence_property_bean_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_retrieve( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_retrieve( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, axis2_char_t *seq_id, axis2_char_t *name) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; sandesha2_sequence_property_bean_t *bean = NULL; axis2_char_t *key = NULL; @@ -302,12 +302,12 @@ } axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_update( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_update( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_char_t *id = NULL; sandesha2_sequence_property_bean_t *bean_l = NULL; @@ -316,7 +316,7 @@ seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property); axis2_thread_mutex_lock(seq_property_impl->mutex); - id = sandesha2_in_memory_seq_property_mgr_get_id(seq_property, env, bean); + id = sandesha2_seq_property_mgr_get_id(seq_property, env, bean); if(!id) { axis2_thread_mutex_unlock(seq_property_impl->mutex); @@ -337,12 +337,12 @@ } axis2_array_list_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_find( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_find( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_array_list_t *beans = NULL; axis2_hash_index_t *i = NULL; @@ -408,12 +408,12 @@ } sandesha2_sequence_property_bean_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_find_unique( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_find_unique( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_array_list_t *beans = NULL; int i = 0, size = 0; sandesha2_sequence_property_bean_t *ret = NULL; @@ -424,7 +424,7 @@ axis2_thread_mutex_lock(seq_property_impl->mutex); - beans = sandesha2_in_memory_seq_property_mgr_find(seq_property, env, + beans = sandesha2_seq_property_mgr_find(seq_property, env, bean); if(beans) size = AXIS2_ARRAY_LIST_SIZE(beans, env); @@ -448,11 +448,11 @@ } axis2_array_list_t *AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_retrieve_all( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_retrieve_all( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_hash_index_t *i = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); @@ -476,12 +476,12 @@ } axis2_bool_t AXIS2_CALL -sandesha2_in_memory_seq_property_mgr_update_or_insert( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_update_or_insert( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_char_t *id = NULL; sandesha2_sequence_property_bean_t *bean_l = NULL; @@ -489,7 +489,7 @@ seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property); axis2_thread_mutex_lock(seq_property_impl->mutex); - id = sandesha2_in_memory_seq_property_mgr_get_id(seq_property, env, bean); + id = sandesha2_seq_property_mgr_get_id(seq_property, env, bean); if(!id) { axis2_thread_mutex_unlock(seq_property_impl->mutex); @@ -510,12 +510,12 @@ } static axis2_char_t * -sandesha2_in_memory_seq_property_mgr_get_id( - sandesha2_in_memory_seq_property_mgr_t *seq_property, +sandesha2_seq_property_mgr_get_id( + sandesha2_seq_property_mgr_t *seq_property, const axis2_env_t *env, sandesha2_sequence_property_bean_t *bean) { - sandesha2_in_memory_seq_property_mgr_impl_t *seq_property_impl = NULL; + sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL; axis2_char_t *seq_id = NULL; axis2_char_t *name = NULL; axis2_char_t *id = NULL;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c?rev=420809&r1=420808&r2=420809&view=diff ============================================================================== --- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c (original) +++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c Tue Jul 11 05:07:03 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <sandesha2_in_memory_storage_mgr.h> +#include <sandesha2_storage_mgr.h> #include <sandesha2_constants.h> #include <sandesha2_error.h> #include <sandesha2_utils.h> @@ -23,45 +23,45 @@ #include <axis2_thread.h> #include <axis2_property.h> -typedef struct sandesha2_in_memory_storage_mgr_impl sandesha2_in_memory_storage_mgr_impl_t; +typedef struct sandesha2_storage_mgr_impl sandesha2_storage_mgr_impl_t; /** * @brief Sandesha2 Storage Manager Struct Impl * Sandesha2 Storage Manager */ -struct sandesha2_in_memory_storage_mgr_impl +struct sandesha2_storage_mgr_impl { - sandesha2_in_memory_storage_mgr_t storage; + sandesha2_storage_mgr_t storage; - sandesha2_in_memory_storage_mgr_t *instance; + sandesha2_storage_mgr_t *instance; axis2_char_t *SANDESHA2_MSG_MAP_KEY; - sandesha2_in_memory_create_seq_mgr_t *create_seq_mgr; - sandesha2_in_memory_next_msg_mgr_t *next_msg_mgr; - sandesha2_in_memory_seq_property_mgr_t *seq_property_mgr; - sandesha2_in_memory_sender_mgr_t *sender_mgr; - sandesha2_in_memory_invoker_mgr_t *invoker_mgr; + sandesha2_create_seq_mgr_t *create_seq_mgr; + sandesha2_next_msg_mgr_t *next_msg_mgr; + sandesha2_seq_property_mgr_t *seq_property_mgr; + sandesha2_sender_mgr_t *sender_mgr; + sandesha2_invoker_mgr_t *invoker_mgr; axis2_conf_ctx_t *conf_ctx = NULL; }; -#define SANDESHA2_INTF_TO_IMPL(storage) ((sandesha2_in_memory_storage_mgr_impl_t *) storage) +#define SANDESHA2_INTF_TO_IMPL(storage) ((sandesha2_storage_mgr_impl_t *) storage) axis2_status_t AXIS2_CALL -sandesha2_in_memory_storage_mgr_free( +sandesha2_storage_mgr_free( void *storage, const axis2_env_t *envv); -AXIS2_EXTERN sandesha2_in_memory_storage_mgr_t * AXIS2_CALL -sandesha2_in_memory_storage_mgr_create( +AXIS2_EXTERN sandesha2_storage_mgr_t * AXIS2_CALL +sandesha2_storage_mgr_create( const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; axis2_ctx_t *ctx = NULL; AXIS2_ENV_CHECK(env, NULL); storage_impl = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_in_memory_storage_mgr_impl_t)); + sizeof(sandesha2_storage_mgr_impl_t)); storage_impl->instance = NULL; storage_impl->SANDESHA2_MSG_MAP_KEY = AXIS2_STRDUP("Sandesha2MessageMap", env); @@ -73,44 +73,44 @@ storage_impl->conf_ctx = NULL; storage_impl->storage.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_in_memory_storage_mgr_ops_t)); + sizeof(sandesha2_storage_mgr_ops_t)); ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env); - storage_impl->create_seq_mgr = sandesha2_in_memory_create_seq_mgr_create(env, ctx); - storage_impl->next_msg_mgr = sandesha2_in_memory_next_msg_mgr_create(env, ctx); - storage_impl->seq_property_mgr = sandesha2_in_memory_seq_property_mgr_create(env, ctx); - storage_impl->sender_mgr = sandesha2_in_memory_sender_mgr_create(env, ctx); - storage_impl->invoker_mgr = sandesha2_in_memory_invoker_mgr_create(env, ctx); + storage_impl->create_seq_mgr = sandesha2_create_seq_mgr_create(env, ctx); + storage_impl->next_msg_mgr = sandesha2_next_msg_mgr_create(env, ctx); + storage_impl->seq_property_mgr = sandesha2_seq_property_mgr_create(env, ctx); + storage_impl->sender_mgr = sandesha2_sender_mgr_create(env, ctx); + storage_impl->invoker_mgr = sandesha2_invoker_mgr_create(env, ctx); - storage_impl->storage.ops->free = sandesha2_in_memory_storage_mgr_free; + storage_impl->storage.ops->free = sandesha2_storage_mgr_free; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; storage_impl->storage.ops-> = - sandesha2_in_memory_storage_mgr_; + sandesha2_storage_mgr_; return &(storage_impl->storage); } axis2_status_t AXIS2_CALL -sandesha2_in_memory_storage_mgr_free( +sandesha2_storage_mgr_free( void *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -122,27 +122,27 @@ } if(storage_impl->create_seq_mgr) { - SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_FREE(storage_impl->creat_seq_mgr, env); + SANDESHA2_CREATE_SEQ_MGR_FREE(storage_impl->creat_seq_mgr, env); storage_impl->create_seq_mgr = NULL; } if(storage_impl->next_msg_mgr) { - SANDESHA2_IN_MEMORY_NEXT_MSG_MGR_FREE(storage_impl->next_msg_mgr, env); + SANDESHA2_NEXT_MSG_MGR_FREE(storage_impl->next_msg_mgr, env); storage_impl->next_msg_mgr = NULL; } if(storage_impl->sender_mgr) { - SANDESHA2_IN_MEMORY_SENDER_MGR_FREE(storage_impl->sender_mgr, env); + SANDESHA2_SENDER_MGR_FREE(storage_impl->sender_mgr, env); storage_impl->sender_mgr = NULL; } if(storage_impl->seq_property_mgr) { - SANDESHA2_IN_MEMORY_SEQ_PROPERTY_MGR_FREE(storage_impl->seq_property_mgr, env); + SANDESHA2_SEQ_PROPERTY_MGR_FREE(storage_impl->seq_property_mgr, env); storage_impl->seq_property_mgr = NULL; } if(storage_impl->invoker_mgr) { - SANDESHA2_IN_MEMORY_INVOKER_MGR_FREE(storage_impl->invoker_mgr, env); + SANDESHA2_INVOKER_MGR_FREE(storage_impl->invoker_mgr, env); storage_impl->invoker_mgr = NULL; } if(storage_impl->SANDESHA2_MSG_MAP_KEY) @@ -166,11 +166,11 @@ } sandesha2_transaction_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_transaction( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_get_transaction( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -178,12 +178,12 @@ return sandesha2_transaction_mgr_create(env); } -sandesha2_in_memory_create_seq_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_create_seq_mgr( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_create_seq_mgr_t *AXIS2_CALL +sandesha2_storage_mgr_get_create_seq_mgr( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -191,12 +191,12 @@ return storage_impl->create_seq_mgr; } -sandesha2_in_memory_next_msg_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_next_msg_mgr( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_next_msg_mgr_t *AXIS2_CALL +sandesha2_storage_mgr_get_next_msg_mgr( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -204,12 +204,12 @@ return storage_impl->next_msg_mgr; } -sandesha2_in_memory_sender_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_retransmitter_mgr( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_sender_mgr_t *AXIS2_CALL +sandesha2_storage_mgr_get_retransmitter_mgr( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -217,12 +217,12 @@ return storage_impl->sender_mgr; } -sandesha2_in_memory_seq_property_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_seq_property_mgr( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_seq_property_mgr_t *AXIS2_CALL +sandesha2_storage_mgr_get_seq_property_mgr( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -230,12 +230,12 @@ return storage_impl->seq_property_mgr; } -sandesha2_in_memory_invoker_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_storage_map_mgr( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_invoker_mgr_t *AXIS2_CALL +sandesha2_storage_mgr_get_storage_map_mgr( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); @@ -244,12 +244,12 @@ } axis2_status_t AXIS2_CALL -sandesha2_in_memory_storage_mgr_set_ctx( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_set_ctx( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); @@ -261,12 +261,12 @@ } axis2_conf_ctx_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_ctx( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_get_ctx( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL); @@ -277,48 +277,48 @@ } axis2_status_t AXIS2_CALL -sandesha2_in_memory_storage_mgr_init( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_init( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); - sandesha2_in_memory_storage_mgr_set_ctx(storage, env, conf_ctx); + sandesha2_storage_mgr_set_ctx(storage, env, conf_ctx); return AXIS2_SUCCESS; } -sandesha2_in_memory_storage_mgr_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_get_instance( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_t *AXIS2_CALL +sandesha2_storage_mgr_get_instance( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); if(!storage_impl->instance) { - storage_impl->instance = sandesha2_in_memory_storage_mgr_create(env, conf_ctx); + storage_impl->instance = sandesha2_storage_mgr_create(env, conf_ctx); } return storage_impl->instance; } axis2_msg_ctx_t *AXIS2_CALL -sandesha2_in_memory_storage_mgr_retrieve_msg_ctx( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_retrieve_msg_ctx( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_char_t *key, axis2_conf_ctx_t *conf_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; axis2_hash_t *storage_map = NULL; axis2_property_t *property = NULL; axis2_conf_ctx_t *conf_ctx = NULL; @@ -327,7 +327,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); - conf_ctx = sandesha2_in_memory_storage_mgr_get_ctx(storage, env); + conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env); ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env); property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY); storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env); @@ -338,13 +338,13 @@ } axis2_status_t AXIS2_CALL -sandesha2_in_memory_storage_mgr_store_msg_ctx( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_store_msg_ctx( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_char_t *key, axis2_msg_ctx_t *msg_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; axis2_hash_t *storage_map = NULL; axis2_property_t *property = NULL; axis2_conf_ctx_t *conf_ctx = NULL; @@ -353,7 +353,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); - conf_ctx = sandesha2_in_memory_storage_mgr_get_ctx(storage, env); + conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env); ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env); property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY); if(!property) @@ -376,13 +376,13 @@ } axis2_status_t AXIS2_CALL -sandesha2_in_memory_storage_mgr_update_msg_ctx( - sandesha2_in_memory_storage_mgr_t *storage, +sandesha2_storage_mgr_update_msg_ctx( + sandesha2_storage_mgr_t *storage, const axis2_env_t *env, axis2_char_t *key, axis2_msg_ctx_t *msg_ctx) { - sandesha2_in_memory_storage_mgr_impl_t *storage_impl = NULL; + sandesha2_storage_mgr_impl_t *storage_impl = NULL; axis2_hash_t *storage_map = NULL; axis2_property_t *property = NULL; axis2_conf_ctx_t *conf_ctx = NULL; @@ -391,7 +391,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FALSE); storage_impl = SANDESHA2_INTF_TO_IMPL(storage); - conf_ctx = sandesha2_in_memory_storage_mgr_get_ctx(storage, env); + conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env); ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env); property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY); if(!property) @@ -414,7 +414,7 @@ AXIS2_FAILURE); return AXIS2_FAILURE; } - return sandesha2_in_memory_storage_mgr + return sandesha2_storage_mgr return AXIS2_SUCCESS; } Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c?rev=420809&r1=420808&r2=420809&view=diff ============================================================================== --- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c (original) +++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c Tue Jul 11 05:07:03 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <sandesha2_in_memory_transaction.h> +#include <sandesha2_transaction.h> #include <sandesha2_constants.h> #include <sandesha2_error.h> #include <axis2_log.h> @@ -22,63 +22,63 @@ #include <axis2_thread.h> #include <axis2_property.h> -typedef struct sandesha2_in_memory_transaction_impl sandesha2_in_memory_transaction_impl_t; +typedef struct sandesha2_transaction_impl sandesha2_transaction_impl_t; /** * @brief Sandesha Sequence Report Struct Impl * Sandesha Sequence Report */ -struct sandesha2_in_memory_transaction_impl +struct sandesha2_transaction_impl { - sandesha2_in_memory_transaction_t transaction; + sandesha2_transaction_t transaction; }; -#define SANDESHA2_INTF_TO_IMPL(transaction) ((sandesha2_in_memory_transaction_impl_t *) transaction) +#define SANDESHA2_INTF_TO_IMPL(transaction) ((sandesha2_transaction_impl_t *) transaction) axis2_status_t AXIS2_CALL -sandesha2_in_memory_transaction_free( +sandesha2_transaction_free( void *transaction, const axis2_env_t *envv); axis2_status_t AXIS2_CALL -sandesha2_in_memory_transaction_commit( - sandesha2_in_memory_transaction_t *transaction, +sandesha2_transaction_commit( + sandesha2_transaction_t *transaction, const axis2_env_t *env); axis2_status_t AXIS2_CALL -sandesha2_in_memory_transaction_rollback( - sandesha2_in_memory_transaction_t *transaction, +sandesha2_transaction_rollback( + sandesha2_transaction_t *transaction, const axis2_env_t *env); -sandesha2_in_memory_transaction_t * -sandesha2_in_memory_transaction_create( +sandesha2_transaction_t * +sandesha2_transaction_create( const axis2_env_t *env) { - sandesha2_in_memory_transaction_impl_t *transaction_impl = NULL; + sandesha2_transaction_impl_t *transaction_impl = NULL; AXIS2_ENV_CHECK(env, NULL); transaction_impl = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_in_memory_transaction_impl_t)); + sizeof(sandesha2_transaction_impl_t)); transaction_impl->transaction.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_in_memory_transaction_ops_t)); + sizeof(sandesha2_transaction_ops_t)); - transaction_impl->transaction.ops->free = sandesha2_in_memory_transaction_free; + transaction_impl->transaction.ops->free = sandesha2_transaction_free; transaction_impl->transaction.ops->commit = - sandesha2_in_memory_transaction_commit; + sandesha2_transaction_commit; transaction_impl->transaction.ops->rollback = - sandesha2_in_memory_transaction_rollback; + sandesha2_transaction_rollback; return &(transaction_impl->transaction); } axis2_status_t AXIS2_CALL -sandesha2_in_memory_transaction_free( +sandesha2_transaction_free( void *transaction, const axis2_env_t *env) { - sandesha2_in_memory_transaction_impl_t *transaction_impl = NULL; + sandesha2_transaction_impl_t *transaction_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); transaction_impl = SANDESHA2_INTF_TO_IMPL(transaction); @@ -98,16 +98,16 @@ } axis2_status_t AXIS2_CALL -sandesha2_in_memory_transaction_commit( - sandesha2_in_memory_transaction_t *transaction, +sandesha2_transaction_commit( + sandesha2_transaction_t *transaction, const axis2_env_t *env) { return AXIS2_SUCCESS; } axis2_status_t AXIS2_CALL -sandesha2_in_memory_transaction_rollback( - sandesha2_in_memory_transaction_t *transaction, +sandesha2_transaction_rollback( + sandesha2_transaction_t *transaction, const axis2_env_t *env) { return AXIS2_SUCCESS; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
