You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2006/11/09 10:50:07 UTC
svn commit: r472834 [2/3] - in /webservices/sandesha/trunk/c: include/
src/client/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
Modified: webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c Thu Nov 9 01:50:04 2006
@@ -19,14 +19,8 @@
#include <axis2_string.h>
#include <axis2_utils.h>
-
-/* create_seq_bean struct */
-typedef struct sandesha2_invoker_bean_impl sandesha2_invoker_bean_impl_t;
-
-struct sandesha2_invoker_bean_impl
+struct sandesha2_invoker_bean_t
{
-
- sandesha2_invoker_bean_t o_bean;
/* This is the messageContextRefKey that is obtained after saving a message context in a storage. */
axis2_char_t *msg_context_ref_key;
@@ -41,59 +35,15 @@
};
-#define AXIS2_INTF_TO_IMPL(invoker) ((sandesha2_invoker_bean_impl_t*)invoker)
-
-
-/************* FUNCTION prototypes ***************/
-axis2_status_t AXIS2_CALL
-sandesha2_invoker_bean_free (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
-sandesha2_invoker_bean_get_msg_context_ref_key(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_invoker_bean_set_msg_context_ref_key(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env, axis2_char_t* context_ref_id) ;
-
-long AXIS2_CALL
-sandesha2_invoker_bean_get_msg_no(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_invoker_bean_set_msg_no(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env, long msgno) ;
-
-axis2_char_t* AXIS2_CALL
-sandesha2_invoker_bean_get_seq_id(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_invoker_bean_set_seq_id(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env, axis2_char_t* int_seq_id);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_invoker_bean_is_invoked (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_invoker_bean_set_invoked( sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env,
- axis2_bool_t invoked);
-
-
-
-
-
AXIS2_EXTERN sandesha2_invoker_bean_t* AXIS2_CALL
-sandesha2_invoker_bean_create(const axis2_env_t *env )
+sandesha2_invoker_bean_create(
+ const axis2_env_t *env )
{
- sandesha2_invoker_bean_impl_t *bean = NULL;
+ sandesha2_invoker_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean = (sandesha2_invoker_bean_impl_t *) AXIS2_MALLOC( env->allocator,
- sizeof(sandesha2_invoker_bean_impl_t) );
+ bean = (sandesha2_invoker_bean_t *) AXIS2_MALLOC( env->allocator,
+ sizeof(sandesha2_invoker_bean_t) );
if (!bean)
{
@@ -107,41 +57,22 @@
bean->seq_id = NULL;
bean->invoked = AXIS2_FALSE;
- bean->o_bean.ops = NULL;
- bean->o_bean.ops = (sandesha2_invoker_bean_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_invoker_bean_ops_t));
-
- if(!bean->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean);
- return NULL;
- }
-
- bean->o_bean.ops->free = sandesha2_invoker_bean_free;
- bean->o_bean.ops->get_msg_context_ref_key= sandesha2_invoker_bean_get_msg_context_ref_key;
- bean->o_bean.ops->set_msg_context_ref_key= sandesha2_invoker_bean_set_msg_context_ref_key;
- bean->o_bean.ops->get_msg_no = sandesha2_invoker_bean_get_msg_no;
- bean->o_bean.ops->set_msg_no = sandesha2_invoker_bean_set_msg_no;
- bean->o_bean.ops->get_seq_id = sandesha2_invoker_bean_get_seq_id;
- bean->o_bean.ops->set_seq_id= sandesha2_invoker_bean_set_seq_id;
- bean->o_bean.ops->is_invoked = sandesha2_invoker_bean_is_invoked;
- bean->o_bean.ops->set_invoked = sandesha2_invoker_bean_set_invoked;
-
- return &(bean->o_bean);
+ return bean;
}
AXIS2_EXTERN sandesha2_invoker_bean_t* AXIS2_CALL
-sandesha2_invoker_bean_create_with_data(const axis2_env_t *env,
- axis2_char_t *ref_key,
- long msg_no,
- axis2_char_t *seq_id,
- axis2_bool_t invoked)
+sandesha2_invoker_bean_create_with_data(
+ const axis2_env_t *env,
+ axis2_char_t *ref_key,
+ long msg_no,
+ axis2_char_t *seq_id,
+ axis2_bool_t invoked)
{
- sandesha2_invoker_bean_impl_t *bean = NULL;
+ sandesha2_invoker_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean = (sandesha2_invoker_bean_impl_t *) AXIS2_MALLOC( env->allocator,
- sizeof(sandesha2_invoker_bean_impl_t) );
+ bean = (sandesha2_invoker_bean_t *) AXIS2_MALLOC( env->allocator,
+ sizeof(sandesha2_invoker_bean_t) );
if (!bean)
{
@@ -163,138 +94,100 @@
bean->msg_no = msg_no;
bean->invoked = invoked;
-
- bean->o_bean.ops = NULL;
- bean->o_bean.ops = (sandesha2_invoker_bean_ops_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_invoker_bean_ops_t));
-
- if(!bean->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean);
- return NULL;
- }
-
- bean->o_bean.ops->free = sandesha2_invoker_bean_free;
- bean->o_bean.ops->get_msg_context_ref_key= sandesha2_invoker_bean_get_msg_context_ref_key;
- bean->o_bean.ops->set_msg_context_ref_key= sandesha2_invoker_bean_set_msg_context_ref_key;
- bean->o_bean.ops->get_msg_no = sandesha2_invoker_bean_get_msg_no;
- bean->o_bean.ops->set_msg_no = sandesha2_invoker_bean_set_msg_no;
- bean->o_bean.ops->get_seq_id = sandesha2_invoker_bean_get_seq_id;
- bean->o_bean.ops->set_seq_id= sandesha2_invoker_bean_set_seq_id;
- bean->o_bean.ops->is_invoked = sandesha2_invoker_bean_is_invoked;
- bean->o_bean.ops->set_invoked = sandesha2_invoker_bean_set_invoked;
-
- return &(bean->o_bean);
+ return bean;
}
axis2_status_t AXIS2_CALL
-sandesha2_invoker_bean_free (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env)
+sandesha2_invoker_bean_free(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- if(bean_impl->msg_context_ref_key)
+ if(invoker->msg_context_ref_key)
{
- AXIS2_FREE(env->allocator, bean_impl->msg_context_ref_key);
- bean_impl->msg_context_ref_key= NULL;
+ AXIS2_FREE(env->allocator, invoker->msg_context_ref_key);
+ invoker->msg_context_ref_key= NULL;
}
- if(!bean_impl->seq_id)
+ if(!invoker->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id= NULL;
+ AXIS2_FREE(env->allocator, invoker->seq_id);
+ invoker->seq_id= NULL;
}
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_invoker_bean_get_msg_context_ref_key(sandesha2_invoker_bean_t *invoker,
+sandesha2_invoker_bean_get_msg_ctx_ref_key(
+ sandesha2_invoker_bean_t *invoker,
const axis2_env_t *env)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- return bean_impl->msg_context_ref_key;
+ return invoker->msg_context_ref_key;
}
void AXIS2_CALL
-sandesha2_invoker_bean_set_msg_context_ref_key(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env, axis2_char_t* context_ref_id)
+sandesha2_invoker_bean_set_msg_context_ref_key(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env, axis2_char_t* context_ref_id)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- if(bean_impl->msg_context_ref_key)
- AXIS2_FREE(env->allocator, bean_impl->msg_context_ref_key);
+ if(invoker->msg_context_ref_key)
+ AXIS2_FREE(env->allocator, invoker->msg_context_ref_key);
- bean_impl->msg_context_ref_key = (axis2_char_t*)AXIS2_STRDUP(context_ref_id, env);
+ invoker->msg_context_ref_key =
+ (axis2_char_t*)AXIS2_STRDUP(context_ref_id, env);
}
long AXIS2_CALL
-sandesha2_invoker_bean_get_msg_no(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env)
+sandesha2_invoker_bean_get_msg_no(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- return bean_impl->msg_no;
+ return invoker->msg_no;
}
void AXIS2_CALL
-sandesha2_invoker_bean_set_msg_no(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env, long msgno)
+sandesha2_invoker_bean_set_msg_no(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env, long msgno)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- bean_impl->msg_no = msgno;
+ invoker->msg_no = msgno;
}
axis2_char_t* AXIS2_CALL
-sandesha2_invoker_bean_get_seq_id(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env)
+sandesha2_invoker_bean_get_seq_id(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- return bean_impl->seq_id;
+ return invoker->seq_id;
}
void AXIS2_CALL
-sandesha2_invoker_bean_set_seq_id(sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env, axis2_char_t* int_seq_id)
+sandesha2_invoker_bean_set_seq_id(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env, axis2_char_t* int_seq_id)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- bean_impl->seq_id = (axis2_char_t*)AXIS2_STRDUP(int_seq_id, env);
+ invoker->seq_id = (axis2_char_t*)AXIS2_STRDUP(int_seq_id, env);
}
axis2_bool_t AXIS2_CALL
-sandesha2_invoker_bean_is_invoked (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env)
+sandesha2_invoker_bean_is_invoked (
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- return bean_impl->invoked;
+ return invoker->invoked;
}
void AXIS2_CALL
-sandesha2_invoker_bean_set_invoked( sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env,
- axis2_bool_t invoked)
+sandesha2_invoker_bean_set_invoked(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env,
+ axis2_bool_t invoked)
{
- sandesha2_invoker_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_invoker_bean_impl_t*)invoker;
-
- bean_impl->invoked = invoked;
+ invoker->invoked = invoked;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c Thu Nov 9 01:50:04 2006
@@ -192,7 +192,7 @@
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
- msg_id = SANDESHA2_CREATE_SEQ_BEAN_GET_CREATE_SEQ_MSG_ID(bean, env);
+ msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
axis2_hash_set(seq_mgr_impl->table, msg_id, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -249,7 +249,7 @@
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
- msg_id = SANDESHA2_CREATE_SEQ_BEAN_GET_CREATE_SEQ_MSG_ID(bean, env);
+ msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
if(!msg_id)
{
return AXIS2_FALSE;
@@ -297,21 +297,21 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_create_seq_bean_t *) v;
- msg_id = SANDESHA2_CREATE_SEQ_BEAN_GET_CREATE_SEQ_MSG_ID(bean, env);
- temp_msg_id = SANDESHA2_CREATE_SEQ_BEAN_GET_CREATE_SEQ_MSG_ID(temp, env);
+ msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
+ temp_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(temp, env);
if(msg_id && temp_msg_id && 0 != AXIS2_STRCMP(msg_id, temp_msg_id))
{
equal = AXIS2_FALSE;
}
- seq_id = SANDESHA2_CREATE_SEQ_BEAN_GET_SEQ_ID(bean, env);
- temp_seq_id = SANDESHA2_CREATE_SEQ_BEAN_GET_SEQ_ID(temp, env);
+ seq_id = sandesha2_create_seq_bean_get_seq_id(bean, env);
+ temp_seq_id = sandesha2_create_seq_bean_get_seq_id(temp, env);
if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
- internal_seq_id = SANDESHA2_CREATE_SEQ_BEAN_GET_INTERNAL_SEQ_ID(bean,
+ internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(bean,
env);
- temp_internal_seq_id = SANDESHA2_CREATE_SEQ_BEAN_GET_INTERNAL_SEQ_ID(
+ temp_internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(
temp, env);
if(internal_seq_id && temp_internal_seq_id && 0 != AXIS2_STRCMP(
internal_seq_id, temp_internal_seq_id))
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c Thu Nov 9 01:50:04 2006
@@ -22,16 +22,12 @@
#include <axis2_thread.h>
#include <axis2_property.h>
-typedef struct sandesha2_invoker_mgr_impl sandesha2_invoker_mgr_impl_t;
-
/**
* @brief Sandesha Sequence Report Struct Impl
* Sandesha Sequence Report
*/
-struct sandesha2_invoker_mgr_impl
+struct sandesha2_invoker_mgr_t
{
- sandesha2_invoker_mgr_t invoker;
-
axis2_hash_t *table;
axis2_thread_mutex_t *mutex;
@@ -39,161 +35,93 @@
#define SANDESHA2_INTF_TO_IMPL(invoker) ((sandesha2_invoker_mgr_impl_t *) invoker)
-axis2_status_t AXIS2_CALL
-sandesha2_invoker_mgr_free(
- void *invoker,
- const axis2_env_t *envv);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_invoker_mgr_insert(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_invoker_mgr_remove(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *ref_key);
-
-sandesha2_invoker_bean_t *AXIS2_CALL
-sandesha2_invoker_mgr_retrieve(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *ref_key);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_invoker_mgr_update(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
-axis2_array_list_t *AXIS2_CALL
-sandesha2_invoker_mgr_find(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
-sandesha2_invoker_bean_t *AXIS2_CALL
-sandesha2_invoker_mgr_find_unique(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
AXIS2_EXTERN sandesha2_invoker_mgr_t * AXIS2_CALL
sandesha2_invoker_mgr_create(
- const axis2_env_t *env,
- axis2_ctx_t *ctx)
+ const axis2_env_t *env,
+ axis2_ctx_t *ctx)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
+ sandesha2_invoker_mgr_t *invoker = NULL;
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- invoker_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_invoker_mgr_impl_t));
+ invoker = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_invoker_mgr_t));
- invoker_impl->table = NULL;
- invoker_impl->mutex = NULL;
+ invoker->table = NULL;
+ invoker->mutex = NULL;
- invoker_impl->invoker.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_invoker_mgr_ops_t));
-
- invoker_impl->mutex = axis2_thread_mutex_create(env->allocator,
+ invoker->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- if(!invoker_impl->mutex)
+ if(!invoker->mutex)
{
- sandesha2_invoker_mgr_free(&(invoker_impl->invoker), env);
+ sandesha2_invoker_mgr_free(invoker, env);
return NULL;
}
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_STORAGE_MAP, AXIS2_FALSE);
if(NULL != property)
- invoker_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(!invoker_impl->table)
+ invoker->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(!invoker->table)
{
axis2_property_t *property = NULL;
property = axis2_property_create(env);
- invoker_impl->table = axis2_hash_make(env);
- if(!property || !invoker_impl->table)
+ invoker->table = axis2_hash_make(env);
+ if(!property || !invoker->table)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, invoker_impl->table);
+ AXIS2_PROPERTY_SET_VALUE(property, env, invoker->table);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_STORAGE_MAP,
property, AXIS2_FALSE);
}
- invoker_impl->invoker.ops->free = sandesha2_invoker_mgr_free;
- invoker_impl->invoker.ops->insert =
- sandesha2_invoker_mgr_insert;
- invoker_impl->invoker.ops->remove =
- sandesha2_invoker_mgr_remove;
- invoker_impl->invoker.ops->retrieve =
- sandesha2_invoker_mgr_retrieve;
- invoker_impl->invoker.ops->update =
- sandesha2_invoker_mgr_update;
- invoker_impl->invoker.ops->find =
- sandesha2_invoker_mgr_find;
- invoker_impl->invoker.ops->find_unique =
- sandesha2_invoker_mgr_find_unique;
- return &(invoker_impl->invoker);
+ return invoker;
}
axis2_status_t AXIS2_CALL
sandesha2_invoker_mgr_free(
- void *invoker,
- const axis2_env_t *env)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- if(invoker_impl->mutex)
- {
- axis2_thread_mutex_destroy(invoker_impl->mutex);
- invoker_impl->mutex = NULL;
- }
- if(invoker_impl->table)
+ if(invoker->mutex)
{
- axis2_hash_free(invoker_impl->table, env);
- invoker_impl->table = NULL;
+ axis2_thread_mutex_destroy(invoker->mutex);
+ invoker->mutex = NULL;
}
-
- if((&(invoker_impl->invoker))->ops)
+ if(invoker->table)
{
- AXIS2_FREE(env->allocator, (&(invoker_impl->invoker))->ops);
- (&(invoker_impl->invoker))->ops = NULL;
+ axis2_hash_free(invoker->table, env);
+ invoker->table = NULL;
}
- if(invoker_impl)
+ if(invoker)
{
- AXIS2_FREE(env->allocator, invoker_impl);
- invoker_impl = NULL;
+ AXIS2_FREE(env->allocator, invoker);
+ invoker = NULL;
}
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
sandesha2_invoker_mgr_insert(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
axis2_char_t *ref_key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- ref_key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(bean, env);
- axis2_hash_set(invoker_impl->table, ref_key, AXIS2_HASH_KEY_STRING, bean);
+ ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
+ axis2_hash_set(invoker->table, ref_key, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
@@ -201,17 +129,15 @@
axis2_bool_t AXIS2_CALL
sandesha2_invoker_mgr_remove(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *key)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ axis2_char_t *key)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- axis2_hash_set(invoker_impl->table, key, AXIS2_HASH_KEY_STRING, NULL);
+ axis2_hash_set(invoker->table, key, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_TRUE;
@@ -219,18 +145,16 @@
sandesha2_invoker_bean_t *AXIS2_CALL
sandesha2_invoker_mgr_retrieve(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *key)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ axis2_char_t *key)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
sandesha2_invoker_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- bean = (sandesha2_invoker_bean_t *) axis2_hash_get(invoker_impl->table,
+ bean = (sandesha2_invoker_bean_t *) axis2_hash_get(invoker->table,
key, AXIS2_HASH_KEY_STRING);
return bean;
@@ -238,41 +162,37 @@
axis2_bool_t AXIS2_CALL
sandesha2_invoker_mgr_update(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
axis2_char_t *ref_key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- ref_key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(bean, env);
+ ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
if(!ref_key)
{
return AXIS2_FALSE;
}
- axis2_hash_set(invoker_impl->table, ref_key, AXIS2_HASH_KEY_STRING, bean);
+ axis2_hash_set(invoker->table, ref_key, AXIS2_HASH_KEY_STRING, bean);
return AXIS2_TRUE;
}
axis2_array_list_t *AXIS2_CALL
sandesha2_invoker_mgr_find(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
axis2_array_list_t *beans = NULL;
axis2_hash_index_t *i = NULL;
sandesha2_invoker_bean_t *temp = NULL;
void *v = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
beans = axis2_array_list_create(env, 0);
if(!beans)
@@ -284,7 +204,7 @@
{
return beans;
}
- for (i = axis2_hash_first (invoker_impl->table, env); i;
+ for (i = axis2_hash_first (invoker->table, env); i;
i = axis2_hash_next (env, i))
{
axis2_bool_t select = AXIS2_TRUE;
@@ -299,26 +219,26 @@
axis2_hash_this (i, NULL, NULL, &v);
temp = (sandesha2_invoker_bean_t *) v;
- ref_key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(bean, env);
- temp_ref_key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(temp, env);
+ ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
+ temp_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(temp, env);
if(ref_key && temp_ref_key && 0 != AXIS2_STRCMP(ref_key, temp_ref_key))
{
select = AXIS2_FALSE;
}
- seq_id = SANDESHA2_INVOKER_BEAN_GET_SEQ_ID(bean, env);
- temp_seq_id = SANDESHA2_INVOKER_BEAN_GET_SEQ_ID(temp, env);
+ seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
+ temp_seq_id = sandesha2_invoker_bean_get_seq_id(temp, env);
if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
{
select = AXIS2_FALSE;
}
- msg_no = SANDESHA2_INVOKER_BEAN_GET_MSG_NO(bean, env);
- temp_msg_no = SANDESHA2_INVOKER_BEAN_GET_MSG_NO(temp, env);
+ msg_no = sandesha2_invoker_bean_get_msg_no(bean, env);
+ temp_msg_no = sandesha2_invoker_bean_get_msg_no(temp, env);
if(msg_no != 0 && (msg_no != temp_msg_no))
{
select = AXIS2_FALSE;
}
- is_invoked = SANDESHA2_INVOKER_BEAN_IS_INVOKED(bean, env);
- temp_is_invoked = SANDESHA2_INVOKER_BEAN_IS_INVOKED(temp, env);
+ is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
+ temp_is_invoked = sandesha2_invoker_bean_is_invoked(temp, env);
if(is_invoked != temp_is_invoked)
{
select = AXIS2_FALSE;
@@ -335,19 +255,16 @@
sandesha2_invoker_bean_t *AXIS2_CALL
sandesha2_invoker_mgr_find_unique(
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean)
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean)
{
- sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
axis2_array_list_t *beans = NULL;
int i = 0, size = 0;
sandesha2_invoker_bean_t *ret = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
-
beans = sandesha2_invoker_mgr_find(invoker, env, bean);
if(beans)
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Thu Nov 9 01:50:04 2006
@@ -32,16 +32,12 @@
#include <axis2_uuid_gen.h>
#include <axis2_conf_ctx.h>
-typedef struct sandesha2_storage_mgr_impl sandesha2_storage_mgr_impl_t;
-
/**
* @brief Sandesha2 Storage Manager Struct Impl
* Sandesha2 Storage Manager
*/
-struct sandesha2_storage_mgr_impl
+struct sandesha2_storage_mgr_t
{
- sandesha2_storage_mgr_t storage;
-
sandesha2_storage_mgr_t *instance;
axis2_char_t *SANDESHA2_MSG_MAP_KEY;
sandesha2_create_seq_mgr_t *create_seq_mgr;
@@ -52,56 +48,51 @@
axis2_conf_ctx_t *conf_ctx;
};
-#define SANDESHA2_INTF_TO_IMPL(storage) ((sandesha2_storage_mgr_impl_t *) storage)
-
AXIS2_EXTERN sandesha2_storage_mgr_t * AXIS2_CALL
sandesha2_storage_mgr_create(
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
axis2_ctx_t *ctx = NULL;
AXIS2_ENV_CHECK(env, NULL);
- storage_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_storage_mgr_impl_t));
+ storage_mgr = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_storage_mgr_t));
- storage_impl->instance = NULL;
- storage_impl->SANDESHA2_MSG_MAP_KEY = AXIS2_STRDUP("Sandesha2MessageMap", env);
- storage_impl->create_seq_mgr = NULL;
- storage_impl->next_msg_mgr = NULL;
- storage_impl->seq_property_mgr = NULL;
- storage_impl->sender_mgr = NULL;
- storage_impl->invoker_mgr = NULL;
- storage_impl->conf_ctx = conf_ctx;
+ storage_mgr->instance = NULL;
+ storage_mgr->SANDESHA2_MSG_MAP_KEY = AXIS2_STRDUP("Sandesha2MessageMap", env);
+ storage_mgr->create_seq_mgr = NULL;
+ storage_mgr->next_msg_mgr = NULL;
+ storage_mgr->seq_property_mgr = NULL;
+ storage_mgr->sender_mgr = NULL;
+ storage_mgr->invoker_mgr = NULL;
+ storage_mgr->conf_ctx = conf_ctx;
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- 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_mgr->create_seq_mgr = sandesha2_create_seq_mgr_create(env, ctx);
+ storage_mgr->next_msg_mgr = sandesha2_next_msg_mgr_create(env, ctx);
+ storage_mgr->seq_property_mgr = sandesha2_seq_property_mgr_create(env, ctx);
+ storage_mgr->sender_mgr = sandesha2_sender_mgr_create(env, ctx);
+ storage_mgr->invoker_mgr = sandesha2_invoker_mgr_create(env, ctx);
- return &(storage_impl->storage);
+ return storage_mgr;
}
sandesha2_storage_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_instance(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
- 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)
+ if(!storage_mgr->instance)
{
- storage_impl->instance = sandesha2_storage_mgr_create(env, conf_ctx);
+ storage_mgr->instance = sandesha2_storage_mgr_create(env, conf_ctx);
}
- return storage_impl->instance;
+ return storage_mgr->instance;
}
axis2_status_t AXIS2_CALL
@@ -119,202 +110,168 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_free(
- void *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- if(storage_impl->instance)
+ if(storage_mgr->instance)
{
- sandesha2_storage_mgr_free(storage_impl->instance, env);
- storage_impl->instance = NULL;
+ sandesha2_storage_mgr_free(storage_mgr->instance, env);
+ storage_mgr->instance = NULL;
}
- if(storage_impl->create_seq_mgr)
+ if(storage_mgr->create_seq_mgr)
{
- SANDESHA2_CREATE_SEQ_MGR_FREE(storage_impl->create_seq_mgr, env);
- storage_impl->create_seq_mgr = NULL;
+ SANDESHA2_CREATE_SEQ_MGR_FREE(storage_mgr->create_seq_mgr, env);
+ storage_mgr->create_seq_mgr = NULL;
}
- if(storage_impl->next_msg_mgr)
+ if(storage_mgr->next_msg_mgr)
{
- SANDESHA2_NEXT_MSG_MGR_FREE(storage_impl->next_msg_mgr, env);
- storage_impl->next_msg_mgr = NULL;
+ SANDESHA2_NEXT_MSG_MGR_FREE(storage_mgr->next_msg_mgr, env);
+ storage_mgr->next_msg_mgr = NULL;
}
- if(storage_impl->sender_mgr)
+ if(storage_mgr->sender_mgr)
{
- SANDESHA2_SENDER_MGR_FREE(storage_impl->sender_mgr, env);
- storage_impl->sender_mgr = NULL;
+ SANDESHA2_SENDER_MGR_FREE(storage_mgr->sender_mgr, env);
+ storage_mgr->sender_mgr = NULL;
}
- if(storage_impl->seq_property_mgr)
+ if(storage_mgr->seq_property_mgr)
{
- SANDESHA2_SEQ_PROPERTY_MGR_FREE(storage_impl->seq_property_mgr, env);
- storage_impl->seq_property_mgr = NULL;
+ SANDESHA2_SEQ_PROPERTY_MGR_FREE(storage_mgr->seq_property_mgr, env);
+ storage_mgr->seq_property_mgr = NULL;
}
- if(storage_impl->invoker_mgr)
+ if(storage_mgr->invoker_mgr)
{
- SANDESHA2_INVOKER_MGR_FREE(storage_impl->invoker_mgr, env);
- storage_impl->invoker_mgr = NULL;
+ sandesha2_invoker_mgr_free(storage_mgr->invoker_mgr, env);
+ storage_mgr->invoker_mgr = NULL;
}
- if(storage_impl->SANDESHA2_MSG_MAP_KEY)
+ if(storage_mgr->SANDESHA2_MSG_MAP_KEY)
{
- AXIS2_FREE(env->allocator, storage_impl->SANDESHA2_MSG_MAP_KEY);
- storage_impl->SANDESHA2_MSG_MAP_KEY = NULL;
+ AXIS2_FREE(env->allocator, storage_mgr->SANDESHA2_MSG_MAP_KEY);
+ storage_mgr->SANDESHA2_MSG_MAP_KEY = NULL;
}
- if(storage_impl)
+ if(storage_mgr)
{
- AXIS2_FREE(env->allocator, storage_impl);
- storage_impl = NULL;
+ AXIS2_FREE(env->allocator, storage_mgr);
+ storage_mgr = NULL;
}
return AXIS2_SUCCESS;
}
sandesha2_transaction_t *AXIS2_CALL
sandesha2_storage_mgr_get_transaction(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
return sandesha2_transaction_create(env);
}
sandesha2_create_seq_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_create_seq_mgr(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- return storage_impl->create_seq_mgr;
+ return storage_mgr->create_seq_mgr;
}
sandesha2_next_msg_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_next_msg_mgr(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- return storage_impl->next_msg_mgr;
+ return storage_mgr->next_msg_mgr;
}
sandesha2_sender_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_retrans_mgr(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- return storage_impl->sender_mgr;
+ return storage_mgr->sender_mgr;
}
sandesha2_seq_property_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_seq_property_mgr(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- return storage_impl->seq_property_mgr;
+ return storage_mgr->seq_property_mgr;
}
sandesha2_invoker_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_storage_map_mgr(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- return storage_impl->invoker_mgr;
+ return storage_mgr->invoker_mgr;
}
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_set_ctx(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
-
- storage_impl->conf_ctx = conf_ctx;
+ storage_mgr->conf_ctx = conf_ctx;
return AXIS2_SUCCESS;
}
axis2_conf_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_get_ctx(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
-
- return storage_impl->conf_ctx;
+ return storage_mgr->conf_ctx;
}
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_init(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- sandesha2_storage_mgr_set_ctx(storage, env, conf_ctx);
+ sandesha2_storage_mgr_set_ctx(storage_mgr, env, conf_ctx);
return AXIS2_SUCCESS;
}
axis2_msg_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_msg_ctx(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_char_t *key,
axis2_conf_ctx_t *conf_ctx)
{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_hash_t *storage_map = NULL;
axis2_property_t *property = NULL;
axis2_ctx_t *ctx = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
+ conf_ctx = sandesha2_storage_mgr_get_ctx(storage_mgr, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
+ storage_mgr->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!storage_map)
return NULL;
@@ -324,24 +281,22 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_store_msg_ctx(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_char_t *key,
axis2_msg_ctx_t *msg_ctx)
{
- 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;
axis2_ctx_t *ctx = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
+ conf_ctx = sandesha2_storage_mgr_get_ctx(storage_mgr, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
+ storage_mgr->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
property = axis2_property_create(env);
@@ -353,7 +308,7 @@
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_map);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
- AXIS2_CTX_SET_PROPERTY(ctx, env, storage_impl->SANDESHA2_MSG_MAP_KEY,
+ AXIS2_CTX_SET_PROPERTY(ctx, env, storage_mgr->SANDESHA2_MSG_MAP_KEY,
property, AXIS2_FALSE);
}
if(!key)
@@ -367,12 +322,11 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_update_msg_ctx(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_char_t *key,
axis2_msg_ctx_t *msg_ctx)
{
- 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;
@@ -380,12 +334,11 @@
void *old_entry = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
+ conf_ctx = sandesha2_storage_mgr_get_ctx(storage_mgr, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
+ storage_mgr->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
@@ -406,16 +359,15 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return sandesha2_storage_mgr_store_msg_ctx(storage, env, key, msg_ctx);
+ return sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, msg_ctx);
}
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_remove_msg_ctx(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_char_t *key)
{
- 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;
@@ -423,12 +375,11 @@
void *entry = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
+ conf_ctx = sandesha2_storage_mgr_get_ctx(storage_mgr, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
+ storage_mgr->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
@@ -445,7 +396,6 @@
entry = axis2_hash_get(storage_map, key, AXIS2_HASH_KEY_STRING);
if(entry)
{
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_FALSE);*/
axis2_hash_set(storage_map, key, AXIS2_HASH_KEY_STRING, NULL);
}
return AXIS2_SUCCESS;
@@ -453,7 +403,7 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_init_storage(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_module_desc_t *module_desc)
{
@@ -462,7 +412,7 @@
axiom_soap_envelope_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_soap_envelope(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axis2_char_t *key)
{
@@ -472,7 +422,7 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_store_soap_envelope(
- sandesha2_storage_mgr_t *storage,
+ sandesha2_storage_mgr_t *storage_mgr,
const axis2_env_t *env,
axiom_soap_envelope_t *soap_env,
axis2_char_t *key)
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Thu Nov 9 01:50:04 2006
@@ -210,7 +210,7 @@
ack_int_bean = sandesha2_utils_get_property_bean_from_op(env,
AXIS2_MSG_CTX_GET_OP(ref_msg, env));
- ack_interval = SANDESHA2_PROPERTY_BEAN_GET_ACK_INTERVAL(ack_int_bean,
+ ack_interval = sandesha2_property_bean_get_ack_interval(ack_int_bean,
env);
time_to_send = sandesha2_utils_get_current_time_in_millis(env) +
ack_interval;
Modified: webservices/sandesha/trunk/c/src/util/fault_data.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_data.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_data.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_data.c Thu Nov 9 01:50:04 2006
@@ -22,11 +22,9 @@
* @brief Fault Data struct impl
* Sandesha2 Fault Data
*/
-typedef struct sandesha2_fault_data_impl sandesha2_fault_data_impl_t;
-struct sandesha2_fault_data_impl
+struct sandesha2_fault_data_t
{
- sandesha2_fault_data_t data;
int type;
axis2_char_t *code;
axis2_char_t *sub_code;
@@ -35,31 +33,29 @@
axiom_node_t *detail;
};
-#define SANDESHA2_INTF_TO_IMPL(data) \
- ((sandesha2_fault_data_impl_t *)(data))
-
AXIS2_EXTERN sandesha2_fault_data_t* AXIS2_CALL
-sandesha2_fault_data_create(const axis2_env_t *env)
+sandesha2_fault_data_create(
+ const axis2_env_t *env)
{
- sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+ sandesha2_fault_data_t *fault_data = NULL;
AXIS2_ENV_CHECK(env, NULL);
- fault_data_impl = (sandesha2_fault_data_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_fault_data_impl_t));
+ fault_data = (sandesha2_fault_data_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(sandesha2_fault_data_t));
- if(NULL == fault_data_impl)
+ if(!fault_data)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- fault_data_impl->type = -1;
- fault_data_impl->code = NULL;
- fault_data_impl->sub_code = NULL;
- fault_data_impl->reason = NULL;
- fault_data_impl->seq_id = NULL;
- fault_data_impl->detail = NULL;
+ fault_data->type = -1;
+ fault_data->code = NULL;
+ fault_data->sub_code = NULL;
+ fault_data->reason = NULL;
+ fault_data->seq_id = NULL;
+ fault_data->detail = NULL;
- return &(fault_data_impl->data);
+ return fault_data;
}
@@ -68,38 +64,35 @@
sandesha2_fault_data_t *data,
const axis2_env_t *env)
{
- sandesha2_fault_data_impl_t *fault_data_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
- fault_data_impl->type = -1;
- if(NULL != fault_data_impl->code)
+ data->type = -1;
+ if(data->code)
{
- AXIS2_FREE(env->allocator, fault_data_impl->code);
- fault_data_impl->code = NULL;
+ AXIS2_FREE(env->allocator, data->code);
+ data->code = NULL;
}
- if(NULL != fault_data_impl->sub_code)
+ if(data->sub_code)
{
- AXIS2_FREE(env->allocator, fault_data_impl->sub_code);
- fault_data_impl->sub_code = NULL;
+ AXIS2_FREE(env->allocator, data->sub_code);
+ data->sub_code = NULL;
}
- if(NULL != fault_data_impl->reason)
+ if(data->reason)
{
- AXIS2_FREE(env->allocator, fault_data_impl->reason);
- fault_data_impl->reason = NULL;
+ AXIS2_FREE(env->allocator, data->reason);
+ data->reason = NULL;
}
- if(NULL != fault_data_impl->seq_id)
+ if(data->seq_id)
{
- AXIS2_FREE(env->allocator, fault_data_impl->seq_id);
- fault_data_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, data->seq_id);
+ data->seq_id = NULL;
}
/* Not sure we have to free this.
* TODO consider in memory cleaning stage
*/
- fault_data_impl->detail = NULL;
+ data->detail = NULL;
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(data));
+ AXIS2_FREE(env->allocator, data);
return AXIS2_SUCCESS;
}
@@ -109,7 +102,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(data)->detail;
+ return data->detail;
}
axis2_status_t AXIS2_CALL
@@ -121,7 +114,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, detail, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(data)->detail = detail;
+ data->detail = detail;
return AXIS2_SUCCESS;
}
@@ -131,7 +124,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(data)->reason;
+ return data->reason;
}
axis2_status_t AXIS2_CALL
@@ -140,18 +133,15 @@
const axis2_env_t *env,
axis2_char_t *reason)
{
- sandesha2_fault_data_impl_t *fault_data_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, reason, AXIS2_FAILURE);
- fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
- if(NULL != fault_data_impl->reason)
+ if(data->reason)
{
- AXIS2_FREE(env->allocator, fault_data_impl->reason);
- fault_data_impl->reason = NULL;
+ AXIS2_FREE(env->allocator, data->reason);
+ data->reason = NULL;
}
- fault_data_impl->reason = AXIS2_STRDUP(reason, env);
+ data->reason = AXIS2_STRDUP(reason, env);
return AXIS2_SUCCESS;
}
@@ -161,7 +151,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(data)->sub_code;
+ return data->sub_code;
}
axis2_status_t AXIS2_CALL
@@ -170,18 +160,15 @@
const axis2_env_t *env,
axis2_char_t *sub_code)
{
- sandesha2_fault_data_impl_t *fault_data_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, sub_code, AXIS2_FAILURE);
- fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
- if(NULL != fault_data_impl->sub_code)
+ if(data->sub_code)
{
- AXIS2_FREE(env->allocator, fault_data_impl->sub_code);
- fault_data_impl->sub_code = NULL;
+ AXIS2_FREE(env->allocator, data->sub_code);
+ data->sub_code = NULL;
}
- fault_data_impl->sub_code = AXIS2_STRDUP(sub_code, env);
+ data->sub_code = AXIS2_STRDUP(sub_code, env);
return AXIS2_SUCCESS;
}
@@ -191,7 +178,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(data)->code;
+ return data->code;
}
axis2_status_t AXIS2_CALL
@@ -200,18 +187,15 @@
const axis2_env_t *env,
axis2_char_t *code)
{
- sandesha2_fault_data_impl_t *fault_data_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, code, AXIS2_FAILURE);
- fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
- if(NULL != fault_data_impl->code)
+ if(data->code)
{
- AXIS2_FREE(env->allocator, fault_data_impl->code);
- fault_data_impl->code = NULL;
+ AXIS2_FREE(env->allocator, data->code);
+ data->code = NULL;
}
- fault_data_impl->code = AXIS2_STRDUP(code, env);
+ data->code = AXIS2_STRDUP(code, env);
return AXIS2_SUCCESS;
}
@@ -221,7 +205,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, -1);
- return SANDESHA2_INTF_TO_IMPL(data)->type;
+ return data->type;
}
axis2_status_t AXIS2_CALL
@@ -231,7 +215,7 @@
int type)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(data)->type = type;
+ data->type = type;
return AXIS2_SUCCESS;
}
@@ -241,7 +225,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(data)->seq_id;
+ return data->seq_id;
}
axis2_status_t AXIS2_CALL
@@ -250,18 +234,16 @@
const axis2_env_t *env,
axis2_char_t *seq_id)
{
- sandesha2_fault_data_impl_t *fault_data_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
- if(NULL != fault_data_impl->seq_id)
+ if(data->seq_id)
{
- AXIS2_FREE(env->allocator, fault_data_impl->seq_id);
- fault_data_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, data->seq_id);
+ data->seq_id = NULL;
}
- fault_data_impl->seq_id = AXIS2_STRDUP(seq_id, env);
+ data->seq_id = AXIS2_STRDUP(seq_id, env);
return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Thu Nov 9 01:50:04 2006
@@ -30,55 +30,8 @@
#include <stdio.h>
#include <string.h>
-
-/**
- * @brief Fault Manager struct impl
- * Sandesha2 Fault Manager
- */
-typedef struct sandesha2_fault_mgr_impl sandesha2_fault_mgr_impl_t;
-
-struct sandesha2_fault_mgr_impl
-{
- sandesha2_fault_mgr_t mgr;
-};
-
-#define SANDESHA2_INTF_TO_IMPL(mgr) \
- ((sandesha2_fault_mgr_impl_t *)(mgr))
-
-AXIS2_EXTERN sandesha2_fault_mgr_t* AXIS2_CALL
-sandesha2_fault_mgr_create(
- const axis2_env_t *env)
-{
- sandesha2_fault_mgr_impl_t *fault_mgr_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- fault_mgr_impl = (sandesha2_fault_mgr_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_fault_mgr_impl_t));
-
- if(!fault_mgr_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- return &(fault_mgr_impl->mgr);
-}
-
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_mgr_free(
- sandesha2_fault_mgr_t *mgr,
- const axis2_env_t *env)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(mgr));
- return AXIS2_SUCCESS;
-}
-
sandesha2_msg_ctx_t* AXIS2_CALL
sandesha2_fault_mgr_check_for_create_seq_refused (
- sandesha2_fault_mgr_t *fault_mgr,
const axis2_env_t *env,
axis2_msg_ctx_t *create_seq_msg,
sandesha2_storage_mgr_t *storage_man)
@@ -117,7 +70,7 @@
sandesha2_fault_data_set_sub_code(fault_data, env,
SANDESHA2_SOAP_FAULT_SUBCODE_CREATE_SEQ_REFUSED);
sandesha2_fault_data_set_reason(fault_data, env, "");
- return sandesha2_fault_mgr_get_fault(fault_mgr, env, rm_msg_ctx,
+ return sandesha2_fault_mgr_get_fault(env, rm_msg_ctx,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx,
env), storage_man);
}
@@ -126,7 +79,6 @@
sandesha2_msg_ctx_t* AXIS2_CALL
sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
- sandesha2_fault_mgr_t *fault_mgr,
const axis2_env_t *env,
sandesha2_msg_ctx_t *app_rm_msg,
sandesha2_storage_mgr_t *storage_man)
@@ -147,7 +99,7 @@
app_rm_msg, env, SANDESHA2_MSG_PART_SEQ);
msg_num = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(sandesha2_seq_get_msg_num(
sequence, env), env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(sequence, env), env);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
@@ -184,7 +136,7 @@
sandesha2_fault_data_set_sub_code(fault_data, env,
SANDESHA2_SOAP_FAULT_SUBCODE_LAST_MESSAGE_NO_EXCEEDED);
sandesha2_fault_data_set_reason(fault_data, env, reason);
- return sandesha2_fault_mgr_get_fault(fault_mgr, env, app_rm_msg,
+ return sandesha2_fault_mgr_get_fault(env, app_rm_msg,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(app_rm_msg,
env), storage_man);
}
@@ -193,7 +145,6 @@
sandesha2_msg_ctx_t* AXIS2_CALL
sandesha2_fault_mgr_check_for_msg_num_rollover(
- sandesha2_fault_mgr_t *fault_mgr,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
sandesha2_storage_mgr_t *storage_man)
@@ -206,8 +157,7 @@
}
sandesha2_msg_ctx_t* AXIS2_CALL
-sandesha2_fault_mgr_check_for_unknown_seq
- (sandesha2_fault_mgr_t *fault_mgr,
+sandesha2_fault_mgr_check_for_unknown_seq(
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *seq_id,
@@ -234,7 +184,7 @@
axis2_array_list_t *list = NULL;
AXIS2_LOG_INFO(env->log, "[sandesha2] came10 .........");
find_bean = sandesha2_create_seq_bean_create(env);
- SANDESHA2_CREATE_SEQ_BEAN_SET_SEQ_ID(find_bean, env, seq_id);
+ sandesha2_create_seq_bean_set_seq_id(find_bean, env, seq_id);
list = SANDESHA2_CREATE_SEQ_MGR_FIND(create_seq_mgr, env,
find_bean);
if(list)
@@ -303,7 +253,7 @@
sandesha2_fault_data_set_detail(fault_data, env, detail_node);
sandesha2_fault_data_set_reason(fault_data, env, "A sequence with the"
" given sequenceID has NOT been established");
- return sandesha2_fault_mgr_get_fault(fault_mgr, env, rm_msg_ctx,
+ return sandesha2_fault_mgr_get_fault(env, rm_msg_ctx,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx,
env), storage_man);
}
@@ -312,7 +262,6 @@
sandesha2_msg_ctx_t* AXIS2_CALL
sandesha2_fault_mgr_check_for_invalid_ack(
- sandesha2_fault_mgr_t *fault_mgr,
const axis2_env_t *env,
sandesha2_msg_ctx_t *ack_rm_msg,
sandesha2_storage_mgr_t *storage_man)
@@ -380,7 +329,7 @@
qname, dummy_node, &detail_node);
sandesha2_fault_data_set_detail(fault_data, env, detail_node);
sandesha2_fault_data_set_reason(fault_data, env, reason);
- return sandesha2_fault_mgr_get_fault(fault_mgr, env, ack_rm_msg,
+ return sandesha2_fault_mgr_get_fault(env, ack_rm_msg,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(ack_rm_msg,
env), storage_man);
}
@@ -389,7 +338,6 @@
sandesha2_msg_ctx_t* AXIS2_CALL
sandesha2_fault_mgr_check_for_seq_closed(
- sandesha2_fault_mgr_t *fault_mgr,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *seq_id,
@@ -430,7 +378,7 @@
AXIOM_SOAP12_FAULT_CODE_SENDER);
sandesha2_fault_data_set_reason(fault_data, env, reason);
- return sandesha2_fault_mgr_get_fault(fault_mgr, env, rm_msg_ctx,
+ return sandesha2_fault_mgr_get_fault(env, rm_msg_ctx,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx,
env), storage_man);
}
@@ -439,7 +387,6 @@
sandesha2_msg_ctx_t* AXIS2_CALL
sandesha2_fault_mgr_get_fault(
- sandesha2_fault_mgr_t *fault_mgr,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
sandesha2_fault_data_t *fault_data,
@@ -493,7 +440,7 @@
create_seq = (sandesha2_create_seq_t *)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
epr = SANDESHA2_ADDRESS_GET_EPR(SANDESHA2_ACKS_TO_GET_ADDRESS(
- SANDESHA2_CREATE_SEQ_GET_ACKS_TO(create_seq, env),
+ sandesha2_create_seq_get_acks_to(create_seq, env),
env), env);
acks_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
}
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Thu Nov 9 01:50:04 2006
@@ -197,9 +197,9 @@
offer_part = sandesha2_seq_offer_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, offered_seq);
+ sandesha2_identifier_set_identifier(identifier, env, offered_seq);
SANDESHA2_SEQ_OFFER_SET_IDENTIFIER(offer_part, env, identifier);
- SANDESHA2_CREATE_SEQ_SET_SEQ_OFFER(create_seq_part, env, offer_part);
+ sandesha2_create_seq_set_seq_offer(create_seq_part, env, offer_part);
}
}
reply_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
@@ -236,7 +236,7 @@
temp_address = sandesha2_address_create(env, addressing_ns_value, acks_to_epr);
temp_acks_to = sandesha2_acks_to_create(env, temp_address, rm_ns_value,
addressing_ns_value);
- SANDESHA2_CREATE_SEQ_SET_ACKS_TO(create_seq_part, env, temp_acks_to);
+ sandesha2_create_seq_set_acks_to(create_seq_part, env, temp_acks_to);
SANDESHA2_MSG_CTX_SET_MSG_PART(create_seq_rm_msg, env,
SANDESHA2_MSG_PART_CREATE_SEQ, (sandesha2_iom_rm_part_t *)
create_seq_part);
@@ -307,16 +307,16 @@
response = sandesha2_create_seq_res_create(env, rm_ns_value,
addressing_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, new_seq_id);
- SANDESHA2_CREATE_SEQ_RES_SET_IDENTIFIER(response, env, identifier);
- offer = SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(cs, env);
+ sandesha2_identifier_set_identifier(identifier, env, new_seq_id);
+ sandesha2_create_seq_res_set_identifier(response, env, identifier);
+ offer = sandesha2_create_seq_get_seq_offer(cs, env);
if(offer)
{
axis2_char_t *out_seq_id = NULL;
sandesha2_identifier_t *temp_identifier = NULL;
temp_identifier = SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(offer, env);
- out_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(temp_identifier, env);
+ out_seq_id = sandesha2_identifier_get_identifier(temp_identifier, env);
if(out_seq_id && 0 != AXIS2_STRCMP("", out_seq_id))
{
sandesha2_accept_t *accept = NULL;
@@ -331,7 +331,7 @@
SANDESHA2_ADDRESS_SET_EPR(address, env, acks_to_epr);
SANDESHA2_ACKS_TO_SET_ADDRESS(acks_to, env, address);
sandesha2_accept_set_acks_to(accept, env, acks_to);
- SANDESHA2_CREATE_SEQ_RES_SET_ACCEPT(response, env, accept);
+ sandesha2_create_seq_res_set_accept(response, env, accept);
}
}
temp_envelope = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(create_seq_msg, env);
@@ -403,12 +403,12 @@
cs = (sandesha2_close_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
close_seq_msg, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
temp_identifier = sandesha2_close_seq_get_identifier(cs, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(temp_identifier, env);
+ seq_id = sandesha2_identifier_get_identifier(temp_identifier, env);
ns = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(close_seq_msg, env);
SANDESHA2_MSG_CTX_SET_RM_NS_VAL(close_seq_response, env, ns);
response = (sandesha2_iom_rm_part_t *) sandesha2_close_seq_res_create(env, ns);
identifier = sandesha2_identifier_create(env, ns);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
+ sandesha2_identifier_set_identifier(identifier, env, seq_id);
SANDESHA2_CLOSE_SEQ_RES_SET_IDENTIFIER((sandesha2_close_seq_res_t *) response, env, identifier);
temp_envelope = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(close_seq_msg, env);
soap_version = sandesha2_utils_get_soap_version(env, temp_envelope);
@@ -557,7 +557,7 @@
terminate_seq = sandesha2_terminate_seq_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
+ sandesha2_identifier_set_identifier(identifier, env, seq_id);
sandesha2_terminate_seq_set_identifier(terminate_seq, env, identifier);
SANDESHA2_MSG_CTX_SET_MSG_PART(terminate_rm_msg, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ,
@@ -588,7 +588,7 @@
res_rm_msg = sandesha2_msg_ctx_create(env, out_msg);
terminate_seq = (sandesha2_terminate_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
ref_rm_msg, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
rm_ns_val = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(ref_rm_msg, env);
@@ -596,7 +596,7 @@
terminate_seq_res = sandesha2_terminate_seq_res_create(env, rm_ns_val);
identifier = sandesha2_identifier_create(env, rm_ns_val);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
+ sandesha2_identifier_set_identifier(identifier, env, seq_id);
sandesha2_terminate_seq_res_set_identifier(terminate_seq_res, env,
identifier);
soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
@@ -846,7 +846,7 @@
rm_ns_value = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_version);
seq_ack = sandesha2_seq_ack_create(env, rm_ns_value);
id = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(id, env, seq_id);
+ sandesha2_identifier_set_identifier(id, env, seq_id);
sandesha2_seq_ack_set_identifier(seq_ack, env, id);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, seq_id,
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Thu Nov 9 01:50:04 2006
@@ -297,8 +297,8 @@
sandesha2_identifier_t *idf = NULL;
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ_RESPONSE);
- idf = SANDESHA2_CREATE_SEQ_RES_GET_IDENTIFIER(create_seq_res, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ idf = sandesha2_create_seq_res_get_identifier(create_seq_res, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(terminate_seq)
{
@@ -306,7 +306,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_TERMINATE_SEQ);
idf = sandesha2_terminate_seq_get_identifier(terminate_seq, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(terminate_seq_res)
{
@@ -314,7 +314,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_TERMINATE_SEQ_RESPONSE);
idf = sandesha2_terminate_seq_res_get_identifier(terminate_seq_res, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(seq)
{
@@ -322,7 +322,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_APPLICATION);
idf = sandesha2_seq_get_identifier(seq, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(seq_ack)
{
@@ -330,7 +330,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_ACK);
idf = sandesha2_seq_ack_get_identifier(seq_ack, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(ack_request)
{
@@ -338,7 +338,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_ACK_REQUEST);
idf = SANDESHA2_ACK_REQUESTED_GET_IDENTIFIER(ack_request, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(close_seq)
{
@@ -346,7 +346,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_CLOSE_SEQ);
idf = sandesha2_close_seq_get_identifier(close_seq, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else if(close_seq_res)
{
@@ -354,7 +354,7 @@
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_CLOSE_SEQ_RESPONSE);
idf = sandesha2_close_res_seq_get_identifier(close_seq_res, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
+ seq_id = sandesha2_identifier_get_identifier(idf, env);
}
else
{
Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Thu Nov 9 01:50:04 2006
@@ -87,7 +87,7 @@
env) + 1);
sandesha2_msg_retrans_adjuster_adjust_next_retrans_time(env, retrans_bean,
property_bean);
- max_attempts = SANDESHA2_PROPERTY_BEAN_GET_MAX_RETRANS_COUNT(property_bean,
+ max_attempts = sandesha2_property_bean_get_max_retrans_count(property_bean,
env);
if(max_attempts > 0 && SANDESHA2_SENDER_BEAN_GET_SENT_COUNT(retrans_bean,
@@ -125,10 +125,10 @@
AXIS2_PARAM_CHECK(env->error, property_bean, NULL);
count = SANDESHA2_SENDER_BEAN_GET_SENT_COUNT(retrans_bean, env);
- base_interval = SANDESHA2_PROPERTY_BEAN_GET_RETRANS_INTERVAL(property_bean,
+ base_interval = sandesha2_property_bean_get_retrans_interval(property_bean,
env);
new_interval = base_interval;
- if(AXIS2_TRUE == SANDESHA2_PROPERTY_BEAN_IS_EXP_BACKOFF(property_bean, env))
+ if(AXIS2_TRUE == sandesha2_property_bean_is_exp_backoff(property_bean, env))
{
new_interval = sandesha2_msg_retrans_adjuster_next_exp_backoff_diff(env,
count, base_interval);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org