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/07/11 14:42:27 UTC
svn commit: r420822 [3/4] - in /webservices/sandesha/trunk/c: include/
include/sandesha2/ src/client/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/transport/ src/util/ src/workers/ src/wsrm/
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Jul 11 05:42:25 2006
@@ -16,16 +16,16 @@
#include <sandesha2/sandesha2_app_msg_processor.h>
#include <sandesha2/sandesha2_seq_ack.h>
-#include <sandesha2/sandesha2_sequence.h>
+#include <sandesha2/sandesha2_seq.h>
#include <sandesha2/sandesha2_ack_requested.h>
#include <sandesha2/sandesha2_last_msg.h>
#include <sandesha2/sandesha2_identifier.h>
-#include <sandesha2/sandesha2_invoker_bean_manager.h>
-#include <sandesha2/sandesha2_next_msg_bean_manager.h>
-#include <sandesha2/sandesha2_seq_property_bean_manager.h>
+#include <sandesha2/sandesha2_invoker_bean_mgr.h>
+#include <sandesha2/sandesha2_next_msg_bean_mgr.h>
+#include <sandesha2/sandesha2_seq_property_bean_mgr.h>
#include <sandesha2/sandesha2_seq_property_bean.h>
-#include <sandesha2/sandesha2_storage_manager.h>
-#include <sandesha2/sandesha2_fault_manager.h>
+#include <sandesha2/sandesha2_storage_mgr.h>
+#include <sandesha2/sandesha2_fault_mgr.h>
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_utils.h>
#include <axis2_string.h>
@@ -70,7 +70,7 @@
const axis2_env_t *env,
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *msg_str,
- sandesha2_storage_manager_t *manager);
+ sandesha2_storage_mgr_t *mgr);
axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_add_create_seq_msg(
@@ -79,7 +79,7 @@
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *internal_seq_id,
axis2_char_t *acks_to,
- sandesha2_storage_manager_t *manager);
+ sandesha2_storage_mgr_t *mgr);
axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_response_msg(
@@ -89,14 +89,14 @@
axis2_char_t *internal_seq_id,
long msg_num,
axis2_char_t *storage_key,
- sandesha2_storage_manager_t *manager);
+ sandesha2_storage_mgr_t *mgr);
long AXIS2_CALL
sandesha2_app_msg_processor_get_prev_msg_no(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
- sandesha2_storage_manager_t *manager);
+ sandesha2_storage_mgr_t *mgr);
axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_set_next_msg_no(
@@ -104,7 +104,7 @@
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
long msg_num,
- sandesha2_storage_manager_t *manager);
+ sandesha2_storage_mgr_t *mgr);
axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_free (sandesha2_msg_processor_t *element,
@@ -180,10 +180,10 @@
axis2_ctx_t *ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_property_t *property = NULL;
- sandesha2_storage_manager_t *storage_man = NULL;
+ sandesha2_storage_mgr_t *storage_man = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
- sandesha2_fault_manager_t *fault_man = NULL;
- sandesha2_sequence_t *sequence = NULL;
+ sandesha2_fault_mgr_t *fault_man = NULL;
+ sandesha2_seq_t *seq = NULL;
axis2_char_t *str_seq_id = NULL;
sandesha2_seq_property_bean_t *msgs_bean = NULL;
long msg_no = 0;
@@ -191,12 +191,12 @@
axis2_char_t *str_key = NULL;
axis2_char_t *msgs_str = "";
axis2_char_t msg_num_str[32];
- sandesha2_invoker_bean_manager_t *storage_map_mgr = NULL;
- sandesha2_next_msg_bean_manager_t *next_bean_mgr = NULL;
+ sandesha2_invoker_bean_mgr_t *storage_map_mgr = NULL;
+ sandesha2_next_msg_bean_mgr_t *next_bean_mgr = NULL;
sandesha2_next_msg_bean_t *next_msg_bean = NULL;
axis2_bool_t in_order_invoke = AXIS2_FALSE;
sandesha2_invoker_bean_t *invoker_bean = NULL;
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
axis2_char_t *highest_in_msg_no_str = NULL;
axis2_char_t *highest_in_msg_key_str = NULL;
@@ -257,10 +257,10 @@
}
}
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx1, env);
- storage_man = sandesha2_utils_get_storage_manager(env, conf_ctx,
+ storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- fault_man = sandesh2_fault_manager_create(env);
- fault_ctx = SANDESHA2_FAULT_MANAGER_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(
+ fault_man = sandesh2_fault_mgr_create(env);
+ fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(
fault_man, env, msg_ctx, storage_man);
if(NULL != fault_ctx)
{
@@ -275,14 +275,14 @@
AXIS2_MSG_CTX_PAUSE(msg_ctx1, env);
return AXIS2_SUCCESS;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
storage_man, env);
- sequence = SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx, env,
- SANDESHA2_MSG_PART_SEQUENCE);
- SANDESHA2_SEQUNCE_SET_MUST_UNDERSTAND(sequence, env, AXIS2_FALSE);
+ seq = SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx, env,
+ SANDESHA2_MSG_PART_SEQ);
+ SANDESHA2_SEQUNCE_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
str_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQUENCE_GET_IDENTIFIER(sequence, env), env);
- fault_ctx = SANDESHA2_FAULT_MANAGER_CHECK_FOR_UNKNOWN_SEQ(fault_man, env,
+ SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+ fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_man, env,
msg_ctx, str_seq_id, storage_man);
if(NULL != fault_ctx)
{
@@ -297,9 +297,9 @@
AXIS2_MSG_CTX_PAUSE(msg_ctx1, env);
return AXIS2_SUCCESS;
}
- SANDESHA2_SEQUENCE_SET_MUST_UNDERSTAND(sequence, env, AXIS2_FALSE);
+ SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(msg_ctx, env);
- fault_ctx = SANDESHA2_FAULT_MANAGER_CHECK_FOR_SEQ_CLOSED(fault_man, env,
+ fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_man, env,
msg_ctx, str_seq_id, storage_man);
if(NULL != fault_ctx)
{
@@ -314,13 +314,13 @@
AXIS2_MSG_CTX_PAUSE(msg_ctx1, env);
return AXIS2_SUCCESS;
}
- sandesha2_seq_manager_update_last_activated_time(env, str_seq_id,
+ sandesha2_seq_mgr_update_last_activated_time(env, str_seq_id,
storage_man);
- msgs_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr, env,
+ msgs_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
str_seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
- msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(SANDESHA2_SEQUENCE_GET_MSG_NUM(
- sequence, env), env);
+ msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(SANDESHA2_SEQ_GET_MSG_NUM(
+ seq, env), env);
if(0 == msg_no)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
@@ -354,22 +354,22 @@
highest_msg_key_bean = sandesha2_seq_property_bean_create_with_data(env,
str_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY,
highest_in_msg_key_str);
- SANDESHA2_STORAGE_MANAGER_REMOVE_MSG_CTX(storage_man, env,
+ SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env,
highest_in_msg_key_str);
- SANDESHA2_STORAGE_MANAGER_store_MSG_CTX(storage_man, env,
+ SANDESHA2_STORAGE_MGR_store_MSG_CTX(storage_man, env,
highest_in_msg_key_str, msg_ctx1);
if(NULL != highest_in_msg_no_str)
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
highest_msg_no_bean);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
highest_msg_key_bean);
}
else
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
highest_msg_no_bean);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
highest_msg_key_bean);
}
}
@@ -397,11 +397,11 @@
msgs_str = AXIS2_STRDUP(msg_num_str, env);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
- SANDESHA2_SEQ_PROPERY_MANAGER_UPDATE(seq_prop_mgr, env, msgs_bean);
+ SANDESHA2_SEQ_PROPERY_MGR_UPDATE(seq_prop_mgr, env, msgs_bean);
- next_bean_mgr = SANDESHA2_STORAGE_MANAGER_GET_NEXT_BEAN_MANAGER(storage_man,
+ next_bean_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_BEAN_MGR(storage_man,
env);
- next_msg_bean = SANDESHA2_NEXT_MSG_BEAN_MANAGER_RETRIEVE(next_bean_mgr, env,
+ next_msg_bean = SANDESHA2_NEXT_MSG_BEAN_MGR_RETRIEVE(next_bean_mgr, env,
str_seq_id);
if(NULL != next_msg_bean)
{
@@ -409,7 +409,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- storage_map_mgr = SANDESHA2_STORAGE_MANAGER_GET_STORAGE_MAP_BEAN_MANAGER(
+ storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_BEAN_MGR(
storage_man, env);
in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(
sandesha2_utils_get_property_bean(env,
@@ -419,9 +419,9 @@
sandesha2_seq_property_bean_t *incoming_seq_list_bean = NULL;
axis2_array_list_t *incoming_seq_list = NULL;
- incoming_seq_list_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(
- seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQUENCES,
- SANDESHA2_SEQ_PROP_INCOMING_SEQUENCE_LIST);
+ incoming_seq_list_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
+ seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQS,
+ SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
if(NULL == incoming_seq_list_bean)
{
/**
@@ -430,18 +430,18 @@
*/
incoming_seq_list_bean = sandesha2_seq_property_bean_create(env);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(incoming_seq_list_bean, env,
- SANDESHA2_SEQ_PROP_ALL_SEQUENCES);
+ SANDESHA2_SEQ_PROP_ALL_SEQS);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(incoming_seq_list_bean, env,
- SANDESHA2_SEQ_PROP_INCOMING_SEQUENCE_LIST);
+ SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(incoming_seq_list_bean,
env, "[]");
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
incoming_seq_list_bean);
}
incoming_seq_list = sandesha2_utils_get_array_list_from_string(env,
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
incoming_seq_list_bean, env));
- /* Adding current sequence to the incoming sequence List */
+ /* Adding current seq to the incoming seq List */
if(AXIS2_FALSE == sandesha2_utils_array_list_contains(env,
incoming_seq_list, str_seq_id))
{
@@ -453,15 +453,15 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(incoming_seq_list_bean,
env, str_seq_list);
AXIS2_FREE(env->allocator, str_seq_list);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
incoming_seq_list_bean);
}
/* save the message */
- SANDESHA2_STORAGE_MANAGER_STORE_MSG_CTX(storage_man, env, str_key,
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, str_key,
msg_ctx1);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
msg_no, str_seq_id, AXIS2_FALSE);
- SANDESHA2_STORAGE_MAP_MANAGER_INSERT(storage_map_mgr, env, invoker_bean);
+ SANDESHA2_STORAGE_MAP_MGR_INSERT(storage_map_mgr, env, invoker_bean);
/* To avoid performing application processing more than once. */
SANDESHA2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE,
@@ -484,8 +484,8 @@
{
axis2_msg_ctx_t *msg_ctx1 = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
- sandesha2_storage_manager_t *storage_man = NULL;
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
+ sandesha2_storage_mgr_t *storage_man = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
axis2_bool_t *is_svr_side = AXIS2_FALSE;
axis2_char_t *internal_seq_id = NULL;
axis2_char_t *storage_key = NULL;
@@ -510,9 +510,9 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx1, env);
/* TODO setting up fault callback */
- storage_man = sandesha2_utils_get_storage_manager(env, conf_ctx,
+ storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
storage_man, env);
is_svr_side = AXIS2_MSG_CTX_IS_SERVER_SIDE(msg_ctx1, env);
@@ -534,16 +534,16 @@
{
axis2_msg_ctx_t *req_msg_ctx = NULL;
sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
- sandesha2_sequence_t *req_sequence = NULL;
+ sandesha2_seq_t *req_seq = NULL;
long request_msg_no = NULL;
axis2_char_t *req_last_msg_num_str = NULL;
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx1, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
req_rm_msg_ctx = sandesha2_msg_initilizer_initilize_msg(env, req_msg_ctx);
- req_sequence = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQUENCE);
- if(NULL == req_sequence)
+ req_seq = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx, env,
+ SANDESHA2_MSG_PART_SEQ);
+ if(NULL == req_seq)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST,
@@ -551,14 +551,14 @@
return AXIS2_FAILURE;
}
incoming_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQUENCE_GET_IDENTIFIER(sequence, env), env);
+ SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
if(NULL == incoming_seq_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL");
return AXIS2_FAILURE;
}
request_msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(
- SANDESHA2_SEQUENCE_GET_MSG_NUM(sequence, env), env);
+ SANDESHA2_SEQ_GET_MSG_NUM(seq, env), env);
internal_seq_id = sandesha2_utils_get_outgoing_internal_seq_id(env,
incoming_seq_id);
req_last_msg_num_str = sandesha2_utils_get_seq_property(env,
@@ -579,7 +579,7 @@
to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
- SANDESHA2_CLIENT_CONST_SEQUENCE_KEY, AXIS2_FALSE);
+ SANDESHA2_CLIENT_CONST_SEQ_KEY, AXIS2_FALSE);
if(NULL != property)
seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
@@ -636,7 +636,7 @@
internal_seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_NUMBER,
msg_number_str);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
res_highest_msg_bean);
if(AXIS2_TRUE == last_msg)
{
@@ -651,9 +651,9 @@
env, internal_seq_id,
SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO,
msg_number_str);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
res_highest_msg_key_bean);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
res_last_msg_key_bean);
}
if(AXIS2_TRUE == is_svr_side)
@@ -662,7 +662,7 @@
sandesha2_seq_property_bean_t *incoming_to_bean = NULL;
incoming_seq_id = sandesha2_utils_get_incoming_seq_id(env,
internal_seq_id);
- incoming_to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(
+ incoming_to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(NULL != incoming_to_bean)
@@ -681,7 +681,7 @@
{
axis2_msg_ctx_t *req_msg_ctx = NULL;
sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL
- sandesha2_sequence_t *sequence = NULL;
+ sandesha2_seq_t *seq = NULL;
axis2_char_t *req_seq_id = NULL;
sandesha2_seq_property_bean_t *spec_ver_bean = NULL;
@@ -694,11 +694,11 @@
return AXIS2_FAILURE;
}
req_rm_msg_ctx = sandesha2_msg_initilizer_initilize_msg(env, req_msg_ctx);
- sequence = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQUENCE);
+ seq = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx, env,
+ SANDESHA2_MSG_PART_SEQ);
req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQUNCE_GET_IDENTIFIER(sequence, env), env);
- spec_ver_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr,
+ SANDESHA2_SEQUNCE_GET_IDENTIFIER(seq, env), env);
+ spec_ver_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(NULL == spec_ver_bean)
{
@@ -721,7 +721,7 @@
{
if(NULL == out_seq_bean)
send_create_seq = AXIS2_TRUE;
- sandesha2_seq_manager_setup_new_client_seq(env, msg_ctx1,
+ sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx1,
internal_seq_id, spec_ver, storage_man);
}
if(AXIS2_TRUE == send_create_seq)
@@ -730,9 +730,9 @@
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
- res_create_seq_added = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(
+ res_create_seq_added = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_CREATE_SEQUENCE_SENT);
+ SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
@@ -742,9 +742,9 @@
res_create_seq_added = sandesha2_seq_property_bean_create_with_data(
env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_CREATE_SEQUENCE_SENT,
+ SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT,
SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
res_create_seq_added);
if(NULL != AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx1, env))
{
@@ -779,7 +779,7 @@
incoming_seq_id = sandesha2_utils_get_incoming_seq_id(env,
internal_seq_id);
- reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(
+ reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
if(NULL != reply_to_epr_bean)
@@ -897,9 +897,9 @@
const axis2_env_t *env,
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *msg_str,
- sandesha2_storage_manager_t *manager)
+ sandesha2_storage_mgr_t *mgr)
{
- sandesha2_sequence_t *sequence = NULL;
+ sandesha2_seq_t *seq = NULL;
axis2_char_t *seq_id = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_ack_requested_t *ack_requested = NULL;
@@ -908,12 +908,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_str, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- sequence = SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx, env,
- SANDESHA2_MSG_PART_SEQUENCE);
+ seq = SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx, env,
+ SANDESHA2_MSG_PART_SEQ);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQUENCE_GET_IDENTIFIER(sequence, env), env);
+ SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx,
env), env);
if(NULL == conf_ctx)
@@ -929,8 +929,8 @@
AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(msg_ctx, env);
}
- ack_rm_msg = sandesha2_ack_manager_generate_ack_msg(env, msg_ctx, seq_id,
- manager);
+ ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, msg_ctx, seq_id,
+ mgr);
engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_SUCCESS != AXIS2_ENGINE_SEND(engine, env,
SANDESHA2_MSG_CTX_GET_MSG_CTX(ack_rm_msg, env)))
@@ -948,14 +948,14 @@
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *internal_seq_id,
axis2_char_t *acks_to,
- sandesha2_storage_manager_t *manager)
+ sandesha2_storage_mgr_t *mgr)
{
axis2_msg_ctx_t *msg_ctx1 = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
- sandesha2_create_seq_bean_manager_t *create_seq_man = NULL;
- sandesha2_sender_bean_manager_t *retransmitter_man = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_create_seq_bean_mgr_t *create_seq_man = NULL;
+ sandesha2_sender_bean_mgr_t *retransmitter_man = NULL;
sandesha2_seq_offer_t *seq_offer = NULL;
axis2_msg_ctx_t *create_seq_msg = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
@@ -974,22 +974,22 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, acks_to, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
msg_ctx1 = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
create_seq_rm_msg = sandesha2_msg_creator_create_create_seq_msg(env,
- msg_ctx, internal_seq_id, acks_to, manager);
+ msg_ctx, internal_seq_id, acks_to, mgr);
SANDESHA2_MSG_CTX_SET_FLOW(create_seq_rm_msg, env,
SANDESHA2_MSG_CTX_OUT_FLOW);
create_seq_part = SANDESHA2_MSG_CTX_GET_MSG_PART(create_seq_rm_msg, env,
SANDESHA2_MSG_PART_CREATE_SEQ);
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
- manager, env);
- create_seq_man = SANDESHA2_STORAGE_MANAGER_GET_CREATE_SEQ_BEAN_MANAGER(
- manager, env);
- retransmitter_man = SANDESHA2_STORAGE_MANAGER_GET_RETRANSMITTER_BEAN_MANAGER
- (manager, env);
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ mgr, env);
+ create_seq_man = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_BEAN_MGR(
+ mgr, env);
+ retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANSMITTER_BEAN_MGR
+ (mgr, env);
seq_offer = SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq_part, env);
if(NULL != seq_offer)
{
@@ -997,14 +997,14 @@
sandesha2_sequece_property_bean_t *offer_seq_bean = NULL;
seq_offer_id = SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env);
- offer_seq_bean = sandesha2_sequence_property_bean_create(env);
- SANDESHA2_SEQUENCE_PROPERTY_BEAN_SET_NAME(offer_seq_bean, env,
- SANDESHA2_SEQ_PROP_OFFERED_SEQUENCE);
- SANDESHA2_SEQUENCE_PROPERTY_BEAN_SET_SEQUENCE_ID(offer_seq_bean, env,
+ offer_seq_bean = sandesha2_seq_property_bean_create(env);
+ SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(offer_seq_bean, env,
+ SANDESHA2_SEQ_PROP_OFFERED_SEQ);
+ SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(offer_seq_bean, env,
internal_seq_id);
- SANDESHA2_SEQUENCE_PROPERTY_BEAN_SET_VALUE(offer_seq_bean, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(offer_seq_bean, env,
seq_offer_id);
- SANDESHA2_SEQUNCE_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQUNCE_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
offer_seq_bean);
}
create_seq_msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(create_seq_rm_msg, env);
@@ -1013,7 +1013,7 @@
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
internal_seq_id, AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
create_seq_msg, env), NULL);
- SANDESHA2_CREATE_SEQ_BEAN_MANAGER_INSERT(create_seq_man, env,
+ SANDESHA2_CREATE_SEQ_BEAN_MGR_INSERT(create_seq_man, env,
create_seq_bean);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
@@ -1046,9 +1046,9 @@
AXIS2_FALSE);
SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(create_seq_entry, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ);
- SANDESHA2_SENDER_BEAN_MANAGER_INSERT(retransmitter_man, env,
+ SANDESHA2_SENDER_BEAN_MGR_INSERT(retransmitter_man, env,
create_seq_entry);
- SANDESHA2_STORAGE_MANAGER_STORE_MSG_CTX(manager, env, create_seq_msg);
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, create_seq_msg);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(str_key, env));
@@ -1085,11 +1085,11 @@
axis2_char_t *internal_seq_id,
long msg_num,
axis2_char_t *storage_key,
- sandesha2_storage_manager_t *manager)
+ sandesha2_storage_mgr_t *mgr)
{
axis2_msg_ctx_t *msg = NULL;
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
- sandesha2_sender_bean_manager_t *retransmitter_man = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_sender_bean_mgr_t *retransmitter_man = NULL;
sandesha2_seq_property_bean_t *to_bean = NULL;
sandesha2_seq_property_bean_t *reply_to_bean = NULL;
sandesha2_seq_property_bean_t *out_seq_bean = NULL;
@@ -1097,8 +1097,8 @@
axis2_endpoint_ref_t *reply_to_epr = NULL;
axis2_char_t *new_to_str = NULL;
sandesha2_msg_ctx_t *req_rm_msg = NULL;
- sandesha2_sequence_t *sequence = NULL;
- sandesha2_sequence_t *req_sequence = NULL;
+ sandesha2_seq_t *seq = NULL;
+ sandesha2_seq_t *req_seq = NULL;
axis2_char_t *rm_version = NULL;
axis2_char_t *rm_ns_val = NULL;
sandesha2_msg_number_t *msg_number = NULL;
@@ -1115,20 +1115,20 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_key, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
- manager, env);
- retransmitter_man = SANDESHA2_STORAGE_MANAGER_GET_RETRANS_BEAN_MANAGER
- (manager, env);
- to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr, env,
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ mgr, env);
+ retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANS_BEAN_MGR
+ (mgr, env);
+ to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
- reply_to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr, env,
+ reply_to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
- out_seq_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr, env,
- internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQUENCE_ID);
+ out_seq_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
+ internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(NULL != to_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] To is NULL");
@@ -1161,7 +1161,7 @@
if(NULL != reply_to_epr)
SANDESHA2_MSG_CTX_SET_REPLY_TO(msg_ctx, env, reply_to_epr);
- rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, manager);
+ rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, mgr);
if(NULL == rm_version)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to fine RM spec version");
@@ -1169,25 +1169,25 @@
}
rm_ns_val = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_version);
- sequence = sandesha2_sequence_create(env, rm_ns_val);
+ seq = sandesha2_seq_create(env, rm_ns_val);
msg_number = sandesha2_msg_number_create(env, rm_ns_val);
SANDESHA2_MSG_NUMBER_SET_MSG_NUM(msg_number, env, msg_num);
- SANDESHA2_SEQUENCE_SET_MSG_NUM(sequence, env, msg_num);
+ SANDESHA2_SEQ_SET_MSG_NUM(seq, env, msg_num);
if(AXIS2_TRUE == AXIS2_MSG_CTX_IS_SERVER_SIDE(msg, env))
{
req_rm_msg = sandesha2_msg_initilizer_initilize_msg(env, req_msg);
- req_sequence = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg, env,
- SANDESHA2_MSG_PART_SEQUENCE);
- if(NULL == sequence)
+ req_seq = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg, env,
+ SANDESHA2_MSG_PART_SEQ);
+ if(NULL == seq)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence not found");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_SEQUENCE,
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_SEQ,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- if(NULL != SANDESHA2_SEQUENCE_GET_LAST_MSG(sequence, env))
- SANDESHA2_SEQUENCE_SET_LAST_MSG(sequence, env,
+ if(NULL != SANDESHA2_SEQ_GET_LAST_MSG(seq, env))
+ SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
}
else
@@ -1210,12 +1210,12 @@
{
axis2_char_t *spec_ver = NULL;
spec_ver = sandesha2_utils_get_rm_version(env,
- internal_seq_id, manager);
+ internal_seq_id, mgr);
if(AXIS2_TRUE ==
sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, spec_ver))
{
- SANDESHA2_SEQUENCE_SET_LAST_MSG(sequence, env,
+ SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
}
}
@@ -1224,15 +1224,15 @@
}
if(NULL == out_seq_bean || NULL == SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
out_seq_bean, env))
- str_identifier = SANDESHA2_TEMP_SEQUENCE_ID;
+ str_identifier = SANDESHA2_TEMP_SEQ_ID;
else
str_identifier = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(out_seq_bean, env);
identifier = sandesha2_identifier_create(env, rm_ns_val);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, str_identifier);
- SANDESHA2_SEQUENCE_SET_IDENTIFIER(sequence, env, identifier);
- SANDESHA2_MSG_CTX_SET_MSG_PART(msg_ctx, env, SANDESHA2_MSG_PART_SEQUENCE,
- sequence);
+ SANDESHA2_SEQ_SET_IDENTIFIER(seq, env, identifier);
+ SANDESHA2_MSG_CTX_SET_MSG_PART(msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
+ seq);
/* TODO add_ack_requested */
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(msg_ctx, env);
app_msg_entry = sandesha2_sender_bean_create(env);
@@ -1260,8 +1260,8 @@
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
SANDESHA2_MSG_CTX_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
- SANDESHA2_STORAGE_MANAGER_STORE_MSG_CTX(manager, env, storage_key, msg);
- SANDESHA2_SENDER_BEAN_MANAGER_INSERT(retransmitter_man, env, app_msg_entry);
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, msg);
+ SANDESHA2_SENDER_BEAN_MGR_INSERT(retransmitter_man, env, app_msg_entry);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -1300,19 +1300,19 @@
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
- sandesha2_storage_manager_t *manager)
+ sandesha2_storage_mgr_t *mgr)
{
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
long next_msg_no = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
- manager, env);
- next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr,
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ mgr, env);
+ next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
env, internal_seq_id,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
@@ -1335,16 +1335,16 @@
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
long msg_num,
- sandesha2_storage_manager_t *manager)
+ sandesha2_storage_mgr_t *mgr)
{
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
axis2_bool_t update = AXIS2_TRUE;
axis2_char_t str_long[32];
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
if(msg_num <= 0)
{
@@ -1352,9 +1352,9 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
- manager, env);
- next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr,
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ mgr, env);
+ next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
env, internal_seq_id,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
if(NULL == next_msg_no_bean)
@@ -1370,12 +1370,12 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(next_msg_no_bean, env, str_long);
if(AXIS2_TRUE == update)
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
next_msg_no_bean);
}
else
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
next_msg_no_bean);
}
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c Tue Jul 11 05:42:25 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <sandesha2/sandesha2_create_seq_bean.h>
+#include <sandesha2_create_seq_bean.h>
#include <axis2_env.h>
#include <axis2_utils.h>
#include <axis2_utils_defines.h>
@@ -28,13 +28,13 @@
{
sandesha2_create_seq_bean_t o_bean;
- /* a unique identifier that can be used to identify the messages of a certain sequence */
+ /* a unique identifier that can be used to identify the messages of a certain seq */
axis2_char_t *internal_seq_id;
- /* This is the message ID of the create sequence message. */
+ /* This is the message ID of the create seq message. */
axis2_char_t *create_seq_msg_id;
- /* This is the actual Sequence ID of the sequence.*/
+ /* This is the actual Sequence ID of the seq.*/
axis2_char_t *seq_id;
};
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?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c Tue Jul 11 05:42:25 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <sandesha2/sandesha2_invoker_bean.h>
+#include <sandesha2_invoker_bean.h>
#include <string.h>
/* create_seq_bean struct */
@@ -30,7 +30,7 @@
/* The message number of the message. */
long msg_no;
- /* The sequence ID of the sequence the message belong to. */
+ /* The seq ID of the seq the message belong to. */
axis2_char_t *seq_id;
/* Weather the message has been invoked by the invoker.*/
Modified: webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c Tue Jul 11 05:42:25 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <sandesha2/sandesha2_next_msg_bean.h>
+#include <sandesha2_next_msg_bean.h>
#include <string.h>
/* invoker_bean struct */
@@ -23,7 +23,7 @@
struct sandesha2_next_msg_bean_impl
{
sandesha2_next_msg_bean_t o_bean;
- axis2_char_t *sequence_id;
+ axis2_char_t *seq_id;
long msg_no;
};
@@ -37,11 +37,11 @@
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
- sandesha2_next_msg_bean_get_sequence_id(sandesha2_next_msg_bean_t *next_msg_bean,
+ sandesha2_next_msg_bean_get_seq_id(sandesha2_next_msg_bean_t *next_msg_bean,
const axis2_env_t *env);
void AXIS2_CALL
- sandesha2_next_msg_bean_set_sequence_id(sandesha2_next_msg_bean_t *next_msg_bean,
+ sandesha2_next_msg_bean_set_seq_id(sandesha2_next_msg_bean_t *next_msg_bean,
const axis2_env_t *env, axis2_char_t *seq_id);
long AXIS2_CALL
@@ -71,7 +71,7 @@
}
/* init the properties. */
- bean->sequence_id = NULL;
+ bean->seq_id = NULL;
bean->msg_no = -1;
bean->o_bean.ops = NULL;
@@ -85,8 +85,8 @@
}
bean->o_bean.ops->free = sandesha2_next_msg_bean_free;
- bean->o_bean.ops->get_sequence_id = sandesha2_next_msg_bean_get_sequence_id;
- bean->o_bean.ops->set_sequence_id = sandesha2_next_msg_bean_set_sequence_id;
+ bean->o_bean.ops->get_seq_id = sandesha2_next_msg_bean_get_seq_id;
+ bean->o_bean.ops->set_seq_id = sandesha2_next_msg_bean_set_seq_id;
bean->o_bean.ops->set_next_msg_no_to_process = sandesha2_next_msg_bean_set_next_msg_no_to_process;
return &(bean->o_bean);
@@ -110,7 +110,7 @@
}
/* init the properties. */
- bean->sequence_id = (axis2_char_t*)AXIS2_STRDUP(env, seq_id);
+ bean->seq_id = (axis2_char_t*)AXIS2_STRDUP(env, seq_id);
bean->msg_no = msg_no;
bean->o_bean.ops = NULL;
@@ -124,8 +124,8 @@
}
bean->o_bean.ops->free = sandesha2_next_msg_bean_free;
- bean->o_bean.ops->get_sequence_id = sandesha2_next_msg_bean_get_sequence_id;
- bean->o_bean.ops->set_sequence_id = sandesha2_next_msg_bean_set_sequence_id;
+ bean->o_bean.ops->get_seq_id = sandesha2_next_msg_bean_get_seq_id;
+ bean->o_bean.ops->set_seq_id = sandesha2_next_msg_bean_set_seq_id;
bean->o_bean.ops->set_next_msg_no_to_process = sandesha2_next_msg_bean_set_next_msg_no_to_process;
return &(bean->o_bean);
@@ -138,10 +138,10 @@
sandesha2_next_msg_bean_impl_t *bean_impl = NULL;
bean_impl = AXIS2_INTF_TO_IMPL(next_msg);
- if(bean_impl->sequence_id)
+ if(bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->sequence_id);
- bean_impl->sequence_id= NULL;
+ AXIS2_FREE(env->allocator, bean_impl->seq_id);
+ bean_impl->seq_id= NULL;
}
return AXIS2_SUCCESS;
@@ -149,30 +149,30 @@
axis2_char_t* AXIS2_CALL
-sandesha2_next_msg_bean_get_sequence_id(sandesha2_next_msg_bean_t *next_msg_bean,
+sandesha2_next_msg_bean_get_seq_id(sandesha2_next_msg_bean_t *next_msg_bean,
const axis2_env_t *env)
{
sandesha2_next_msg_bean_impl_t *bean_impl = NULL;
bean_impl = AXIS2_INTF_TO_IMPL(next_msg_bean);
- return bean_impl->sequence_id;
+ return bean_impl->seq_id;
}
void AXIS2_CALL
-sandesha2_next_msg_bean_set_sequence_id(sandesha2_next_msg_bean_t *next_msg_bean,
+sandesha2_next_msg_bean_set_seq_id(sandesha2_next_msg_bean_t *next_msg_bean,
const axis2_env_t *env, axis2_char_t *seq_id)
{
sandesha2_next_msg_bean_impl_t *bean_impl = NULL;
bean_impl = AXIS2_INTF_TO_IMPL(next_msg_bean);
- if(bean_impl->sequence_id)
+ if(bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->sequence_id);
- bean_impl->sequence_id = NULL;
+ AXIS2_FREE(env->allocator, bean_impl->seq_id);
+ bean_impl->seq_id = NULL;
}
- bean_impl->sequence_id = (axis2_char_t*) AXIS2_STRDUP(env, seq_id);
+ bean_impl->seq_id = (axis2_char_t*) AXIS2_STRDUP(env, seq_id);
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c Tue Jul 11 05:42:25 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <sandesha2/sandesha2_sender_bean.h>
+#include <sandesha2_sender_bean.h>
#include <string.h>
/*sender_bean struct */
@@ -33,7 +33,7 @@
axis2_bool_t resend;
long time_to_send;
int msg_type;
- axis2_char_t *sequence_id;
+ axis2_char_t *seq_id;
};
@@ -125,13 +125,13 @@
int msg_type);
axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_sequence_id(sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_seq_id(sandesha2_sender_bean_t *sender,
const axis2_env_t *env);
void AXIS2_CALL
- sandesha2_sender_bean_set_sequence_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_seq_id (sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
- axis2_char_t *sequence_id);
+ axis2_char_t *seq_id);
AXIS2_EXTERN sandesha2_sender_bean_t* AXIS2_CALL
@@ -159,7 +159,7 @@
bean_impl->resend = AXIS2_FALSE;
bean_impl->time_to_send = -1;
bean_impl->msg_type = -1;
- bean_impl->sequence_id = NULL;
+ bean_impl->seq_id = NULL;
bean_impl->o_bean.ops = NULL;
bean_impl->o_bean.ops = (sandesha2_sender_bean_ops_t*) AXIS2_MALLOC(env->allocator,
@@ -192,8 +192,8 @@
bean_impl->o_bean.ops->set_time_to_send = sandesha2_sender_bean_set_time_to_send;
bean_impl->o_bean.ops->get_msg_type = sandesha2_sender_bean_get_msg_type;
bean_impl->o_bean.ops->set_msg_type = sandesha2_sender_bean_set_msg_type;
- bean_impl->o_bean.ops->get_sequence_id = sandesha2_sender_bean_get_sequence_id;
- bean_impl->o_bean.ops->set_sequence_id = sandesha2_sender_bean_set_sequence_id;
+ bean_impl->o_bean.ops->get_seq_id = sandesha2_sender_bean_get_seq_id;
+ bean_impl->o_bean.ops->set_seq_id = sandesha2_sender_bean_set_seq_id;
return &(bean_impl->o_bean);
}
@@ -231,7 +231,7 @@
bean_impl->resend = AXIS2_FALSE;
bean_impl->time_to_send = time_to_send;
bean_impl->msg_type = -1;
- bean_impl->sequence_id = NULL;
+ bean_impl->seq_id = NULL;
bean_impl->o_bean.ops = NULL;
bean_impl->o_bean.ops = (sandesha2_sender_bean_ops_t*) AXIS2_MALLOC(env->allocator,
@@ -264,8 +264,8 @@
bean_impl->o_bean.ops->set_time_to_send = sandesha2_sender_bean_set_time_to_send;
bean_impl->o_bean.ops->get_msg_type = sandesha2_sender_bean_get_msg_type;
bean_impl->o_bean.ops->set_msg_type = sandesha2_sender_bean_set_msg_type;
- bean_impl->o_bean.ops->get_sequence_id = sandesha2_sender_bean_get_sequence_id;
- bean_impl->o_bean.ops->set_sequence_id = sandesha2_sender_bean_set_sequence_id;
+ bean_impl->o_bean.ops->get_seq_id = sandesha2_sender_bean_get_seq_id;
+ bean_impl->o_bean.ops->set_seq_id = sandesha2_sender_bean_set_seq_id;
return &(bean_impl->o_bean);
}
@@ -296,10 +296,10 @@
bean_impl->internal_seq_id = NULL;
}
- if(bean_impl->sequence_id)
+ if(bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->sequence_id);
- bean_impl->sequence_id = NULL;
+ AXIS2_FREE(env->allocator, bean_impl->seq_id);
+ bean_impl->seq_id = NULL;
}
return AXIS2_SUCCESS;
@@ -523,31 +523,31 @@
}
axis2_char_t* AXIS2_CALL
- sandesha2_sender_bean_get_sequence_id(sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_get_seq_id(sandesha2_sender_bean_t *sender,
const axis2_env_t *env)
{
sandesha2_sender_bean_impl_t *bean_impl = NULL;
bean_impl = AXIS2_INTF_TO_IMPL(sender);
- return bean_impl->sequence_id;
+ return bean_impl->seq_id;
}
void AXIS2_CALL
- sandesha2_sender_bean_set_sequence_id (sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_set_seq_id (sandesha2_sender_bean_t *sender,
const axis2_env_t *env,
- axis2_char_t *sequence_id)
+ axis2_char_t *seq_id)
{
sandesha2_sender_bean_impl_t *bean_impl = NULL;
bean_impl = AXIS2_INTF_TO_IMPL(sender);
- if(bean_impl->sequence_id)
+ if(bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->sequence_id);
- bean_impl->sequence_id = NULL;
+ AXIS2_FREE(env->allocator, bean_impl->seq_id);
+ bean_impl->seq_id = NULL;
}
- bean_impl->sequence_id = (axis2_char_t *)AXIS2_STRDUP(env, sequence_id);
+ bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(env, seq_id);
}
Added: webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c?rev=420822&view=auto
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (added)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Tue Jul 11 05:42:25 2006
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <sandesha2_seq_property_bean.h>
+#include <string.h>
+
+/*seq_property_bean struct */
+typedef struct sandesha2_seq_property_bean_impl sandesha2_seq_property_bean_impl_t;
+
+struct sandesha2_seq_property_bean_impl
+{
+ sandesha2_seq_property_bean_t o_bean;
+ axis2_char_t *seq_id;
+ axis2_char_t *name;
+ axis2_char_t *value;
+};
+
+#define AXIS2_INTF_TO_IMPL(prop_bean) ((sandesha2_seq_property_bean_impl_t*)prop_bean)
+
+
+/************* FUNCTION prototypes ***************/
+axis2_status_t AXIS2_CALL
+ sandesha2_seq_property_bean_free (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env);
+
+axis2_char_t *AXIS2_CALL
+ sandesha2_seq_property_bean_get_name (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+ sandesha2_seq_property_bean_set_name (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *name);
+
+axis2_char_t *AXIS2_CALL
+ sandesha2_seq_property_bean_get_seq_id (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+ sandesha2_seq_property_bean_set_seq_id (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id);
+
+axis2_char_t* AXIS2_CALL
+ sandesha2_seq_property_bean_get_value (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+ sandesha2_seq_property_bean_set_value (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *value);
+
+
+AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
+ sandesha2_seq_property_bean_create(const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ AXIS2_ENV_CHECK(env, NULL);
+
+ bean_impl = (sandesha2_seq_property_bean_impl_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_bean_impl_t));
+
+ if(!bean_impl)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ /* initialize properties */
+ bean_impl->seq_id = NULL;
+ bean_impl->name = NULL;
+ bean_impl->value = NULL;
+
+ bean_impl->o_bean.ops = NULL;
+ bean_impl->o_bean.ops = (sandesha2_seq_property_bean_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_bean_ops_t));
+
+ if(!bean_impl->o_bean.ops)
+ {
+ AXIS2_FREE(env->allocator, bean_impl);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+
+ return NULL;
+ }
+
+ bean_impl->o_bean.ops->free = sandesha2_seq_property_bean_free;
+ bean_impl->o_bean.ops->get_name = sandesha2_seq_property_bean_get_name;
+ bean_impl->o_bean.ops->set_name = sandesha2_seq_property_bean_set_name;
+ bean_impl->o_bean.ops->get_seq_id = sandesha2_seq_property_bean_get_seq_id;
+ bean_impl->o_bean.ops->set_seq_id = sandesha2_seq_property_bean_set_seq_id;
+ bean_impl->o_bean.ops->get_value = sandesha2_seq_property_bean_get_value;
+ bean_impl->o_bean.ops->set_value = sandesha2_seq_property_bean_set_value;
+
+ return &(bean_impl->o_bean);
+}
+
+AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
+ sandesha2_seq_property_bean_create_with_data(const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ axis2_char_t *prop_name,
+ axis2_char_t *value)
+
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ AXIS2_ENV_CHECK(env, NULL);
+
+ bean_impl = (sandesha2_seq_property_bean_impl_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_bean_impl_t));
+
+ if(!bean_impl)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ /* initialize properties */
+ bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(env, seq_id);
+ bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(env, prop_name);
+ bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(env, value);
+
+ bean_impl->o_bean.ops = NULL;
+ bean_impl->o_bean.ops = (sandesha2_seq_property_bean_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_property_bean_ops_t));
+
+ if(!bean_impl->o_bean.ops)
+ {
+ AXIS2_FREE(env->allocator, bean_impl);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+
+ return NULL;
+ }
+
+ bean_impl->o_bean.ops->free = sandesha2_seq_property_bean_free;
+ bean_impl->o_bean.ops->get_name = sandesha2_seq_property_bean_get_name;
+ bean_impl->o_bean.ops->set_name = sandesha2_seq_property_bean_set_name;
+ bean_impl->o_bean.ops->get_seq_id = sandesha2_seq_property_bean_get_seq_id;
+ bean_impl->o_bean.ops->set_seq_id = sandesha2_seq_property_bean_set_seq_id;
+ bean_impl->o_bean.ops->get_value = sandesha2_seq_property_bean_get_value;
+ bean_impl->o_bean.ops->set_value = sandesha2_seq_property_bean_set_value;
+
+ return &(bean_impl->o_bean);
+}
+
+
+axis2_status_t AXIS2_CALL
+ sandesha2_seq_property_bean_free (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ if(bean_impl->seq_id)
+ {
+ AXIS2_FREE(env->allocator, bean_impl->seq_id);
+ bean_impl->seq_id = NULL;
+ }
+
+ if(bean_impl->name)
+ {
+ AXIS2_FREE(env->allocator, bean_impl->name);
+ bean_impl->name = NULL;
+ }
+
+ if(bean_impl->value)
+ {
+ AXIS2_FREE(env->allocator, bean_impl->value);
+ bean_impl->value = NULL;
+ }
+ return AXIS2_SUCCESS;
+}
+
+axis2_char_t *AXIS2_CALL
+ sandesha2_seq_property_bean_get_name (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ return bean_impl->name;
+}
+
+void AXIS2_CALL
+ sandesha2_seq_property_bean_set_name (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *name)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ if(bean_impl->name)
+ {
+ AXIS2_FREE(env->allocator, bean_impl->name);
+ bean_impl->name = NULL;
+ }
+
+ bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(env, name);
+}
+
+axis2_char_t *AXIS2_CALL
+ sandesha2_seq_property_bean_get_seq_id (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ return bean_impl->seq_id;
+}
+
+
+void AXIS2_CALL
+ sandesha2_seq_property_bean_set_seq_id (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ if(bean_impl->seq_id)
+ {
+ AXIS2_FREE(env->allocator, bean_impl->seq_id);
+ bean_impl->seq_id = NULL;
+ }
+
+ bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(env, seq_id);
+}
+
+axis2_char_t* AXIS2_CALL
+ sandesha2_seq_property_bean_get_value (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ return bean_impl->value;
+}
+
+
+void AXIS2_CALL
+ sandesha2_seq_property_bean_set_value (struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *value)
+{
+ sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
+ bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
+
+ if(bean_impl->value)
+ {
+ AXIS2_FREE(env->allocator, bean_impl->value);
+ bean_impl->value = NULL;
+ }
+
+ bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(env, value);
+
+}
+
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am Tue Jul 11 05:42:25 2006
@@ -1,12 +1,12 @@
noinst_LTLIBRARIES = libsandesha2_inmemory.la
libsandesha2_inmemory_la_SOURCES = \
- in_memory_create_seq_mgr.c \
- in_memory_invoker_mgr.c \
- in_memory_sender_mgr.c \
- in_memory_next_msg_mgr.c \
- in_memory_seq_property_mgr.c \
- in_memory_transaction.c
+ create_seq_mgr.c \
+ invoker_mgr.c \
+ sender_mgr.c \
+ next_msg_mgr.c \
+ seq_property_mgr.c \
+ transaction.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
Copied: webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c (from r420809, webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c?p2=webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c&p1=webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c&r1=420809&r2=420822&rev=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c Tue Jul 11 05:42:25 2006
@@ -208,7 +208,7 @@
axis2_thread_mutex_lock(next_msg_impl->mutex);
- seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQUENCE_ID(bean, env);
+ seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(bean, env);
if(!seq_id)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_KEY_IS_NULL, AXIS2_FAILURE);
@@ -277,7 +277,7 @@
next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
axis2_thread_mutex_lock(next_msg_impl->mutex);
- seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQUENCE_ID(bean, env);
+ seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(bean, env);
if(!seq_id)
{
axis2_thread_mutex_unlock(next_msg_impl->mutex);
@@ -330,8 +330,8 @@
{
equal = AXIS2_FALSE;
}
- seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQUENCE_ID(bean, env);
- temp_seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQUENCE_ID(temp, env);
+ seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(bean, env);
+ temp_seq_id = SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(temp, env);
if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
Copied: webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c (from r420809, 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/seq_property_mgr.c?p2=webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c&p1=webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c&r1=420809&r2=420822&rev=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c Tue Jul 11 05:42:25 2006
@@ -50,7 +50,7 @@
sandesha2_seq_property_mgr_insert(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
- sandesha2_sequence_property_bean_t *bean);
+ sandesha2_seq_property_bean_t *bean);
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_remove(
@@ -59,7 +59,7 @@
axis2_char_t *seq_id,
axis2_char_t *name);
-sandesha2_sequence_property_bean_t *AXIS2_CALL
+sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
@@ -70,19 +70,19 @@
sandesha2_seq_property_mgr_update(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
- sandesha2_sequence_property_bean_t *bean);
+ sandesha2_seq_property_bean_t *bean);
axis2_array_list_t *AXIS2_CALL
sandesha2_seq_property_mgr_find(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
- sandesha2_sequence_property_bean_t *bean);
+ sandesha2_seq_property_bean_t *bean);
-sandesha2_sequence_property_bean_t *AXIS2_CALL
+sandesha2_seq_property_bean_t *AXIS2_CALL
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_seq_property_bean_t *bean);
axis2_array_list_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve_all(
@@ -93,13 +93,13 @@
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_seq_property_bean_t *bean);
static axis2_char_t *
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_seq_property_bean_t *bean);
AXIS2_EXTERN sandesha2_seq_property_mgr_t * AXIS2_CALL
sandesha2_seq_property_mgr_create(
@@ -129,7 +129,7 @@
}
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- SANDESHA2_BEAN_MAP_SEQUENCE_PROPERTY, AXIS2_FALSE);
+ SANDESHA2_BEAN_MAP_SEQ_PROPERTY, AXIS2_FALSE);
seq_property_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!seq_property_impl->table)
{
@@ -144,7 +144,7 @@
}
AXIS2_PROPERTY_SET_VALUE(property, env, seq_property_impl->table);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, seq_property_impl->seq_property.ops->free);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_SEQUENCE_PROPERTY,
+ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_SEQ_PROPERTY,
property, AXIS2_FALSE);
}
seq_property_impl->seq_property.ops->free = sandesha2_seq_property_mgr_free;
@@ -213,7 +213,7 @@
sandesha2_seq_property_mgr_insert(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
- sandesha2_sequence_property_bean_t *bean)
+ sandesha2_seq_property_bean_t *bean)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *seq_id = NULL;
@@ -226,13 +226,13 @@
axis2_thread_mutex_lock(seq_property_impl->mutex);
- seq_id = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_SEQUENCE_ID(bean, env);
+ seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
if(!seq_id)
{
axis2_thread_mutex_unlock(seq_property_impl->mutex);
return AXIS2_FALSE;
}
- name = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_NAME(bean, env);
+ name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(bean, env);
if(!name)
{
axis2_thread_mutex_unlock(seq_property_impl->mutex);
@@ -254,7 +254,7 @@
axis2_char_t *name)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
- sandesha2_sequence_property_bean_t *bean = NULL;
+ sandesha2_seq_property_bean_t *bean = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -275,7 +275,7 @@
}
-sandesha2_sequence_property_bean_t *AXIS2_CALL
+sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
@@ -283,7 +283,7 @@
axis2_char_t *name)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
- sandesha2_sequence_property_bean_t *bean = NULL;
+ sandesha2_seq_property_bean_t *bean = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -294,7 +294,7 @@
axis2_thread_mutex_lock(seq_property_impl->mutex);
key = axis2_strcat(env, seq_id, ":", name, NULL);
- bean = (sandesha2_sequence_property_bean_t *) axis2_hash_get(seq_property_impl->table,
+ bean = (sandesha2_seq_property_bean_t *) axis2_hash_get(seq_property_impl->table,
key, AXIS2_HASH_KEY_STRING);
axis2_thread_mutex_unlock(seq_property_impl->mutex);
@@ -305,11 +305,11 @@
sandesha2_seq_property_mgr_update(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
- sandesha2_sequence_property_bean_t *bean)
+ sandesha2_seq_property_bean_t *bean)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *id = NULL;
- sandesha2_sequence_property_bean_t *bean_l = NULL;
+ sandesha2_seq_property_bean_t *bean_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
@@ -340,7 +340,7 @@
sandesha2_seq_property_mgr_find(
sandesha2_seq_property_mgr_t *seq_property,
const axis2_env_t *env,
- sandesha2_sequence_property_bean_t *bean)
+ sandesha2_seq_property_bean_t *bean)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_array_list_t *beans = NULL;
@@ -365,7 +365,7 @@
for (i = axis2_hash_first (seq_property_impl->table, env); i;
i = axis2_hash_next (env, i))
{
- sandesha2_sequence_property_bean_t *temp = NULL;
+ sandesha2_seq_property_bean_t *temp = NULL;
void *v = NULL;
axis2_bool_t equal = AXIS2_TRUE;
axis2_char_t *seq_id = NULL;
@@ -376,21 +376,21 @@
axis2_char_t *temp_value = NULL;
axis2_hash_this (i, NULL, NULL, &v);
- temp = (sandesha2_sequence_property_bean_t *) v;
- seq_id = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_SEQUENCE_ID(bean, env);
- temp_seq_id = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_SEQUENCE_ID(temp, env);
+ temp = (sandesha2_seq_property_bean_t *) v;
+ seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
+ temp_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(temp, env);
if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
- name = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_NAME(bean, env);
- temp_name = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_NAME(temp, env);
+ name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(bean, env);
+ temp_name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(temp, env);
if(name && temp_name && 0 != AXIS2_STRCMP(name, temp_name))
{
equal = AXIS2_FALSE;
}
- value = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_VALUE(bean, env);
- temp_value = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_VALUE(temp,
+ value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(bean, env);
+ temp_value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(temp,
env);
if(value && temp_value && 0 != AXIS2_STRCMP(value, temp_value))
{
@@ -407,16 +407,16 @@
return beans;
}
-sandesha2_sequence_property_bean_t *AXIS2_CALL
+sandesha2_seq_property_bean_t *AXIS2_CALL
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_seq_property_bean_t *bean)
{
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;
+ sandesha2_seq_property_bean_t *ret = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
@@ -462,11 +462,11 @@
for (i = axis2_hash_first (seq_property_impl->table, env); i;
i = axis2_hash_next (env, i))
{
- sandesha2_sequence_property_bean_t *bean = NULL;
+ sandesha2_seq_property_bean_t *bean = NULL;
void *v = NULL;
axis2_hash_this (i, NULL, NULL, &v);
- bean = (sandesha2_sequence_property_bean_t *) v;
+ bean = (sandesha2_seq_property_bean_t *) v;
AXIS2_ARRAY_LIST_ADD(seq_property_impl->values, env, bean);
}
@@ -479,11 +479,11 @@
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_seq_property_bean_t *bean)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *id = NULL;
- sandesha2_sequence_property_bean_t *bean_l = NULL;
+ sandesha2_seq_property_bean_t *bean_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
@@ -513,7 +513,7 @@
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_seq_property_bean_t *bean)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_char_t *seq_id = NULL;
@@ -524,8 +524,8 @@
seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
axis2_thread_mutex_lock(seq_property_impl->mutex);
- seq_id = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_SEQUENCE_ID(bean, env);
- name = SANDESHA2_SEQUENCE_PROPERTY_BEAN_GET_NAME(bean, env);
+ seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
+ name = SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(bean, env);
id = axis2_strcat(env, seq_id, ":", name, NULL);
axis2_thread_mutex_unlock(seq_property_impl->mutex);
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Tue Jul 11 05:42:25 2006
@@ -15,7 +15,7 @@
*/
#include <sandesha2/sandesha2_transport_sender.h>
#include <sandesha2/sandesha2_constants.h>
-#include <sandesha2/sandesha2_storage_manager.h>
+#include <sandesha2/sandesha2_storage_mgr.h>
#include <sandesha2/sandesha2_utils.h>
#include <axis2_conf.h>
#include <axis2_string.h>
@@ -155,7 +155,7 @@
axis2_char_t *key = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- sandesha2_storage_manager_t *storage_man = NULL;
+ sandesha2_storage_mgr_t *storage_man = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -177,7 +177,7 @@
key = AXIS2_PROPERTY_GET_VALUE(property, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- storage_man = sandesha2_utils_get_storage_manager(env, conf_ctx, conf);
+ storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -185,6 +185,6 @@
env));
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
- SANDESHA2_STORAGE_MANAGER_UPDATE_MSG_CTX(storage_man, env, key, msg_ctx);
+ SANDESHA2_STORAGE_MGR_UPDATE_MSG_CTX(storage_man, env, key, msg_ctx);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/util/utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/utils.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/utils.c Tue Jul 11 05:42:25 2006
@@ -20,7 +20,7 @@
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_in_order_invoker.h>
#include <sandesha2/sandesha2_transport_sender.h>
-#include <sandesha2/sandesha2_seq_property_bean_manager.h>
+#include <sandesha2/sandesha2_seq_property_bean_mgr.h>
#include <sandesha2/sandesha2_error.h>
#include <axis2_string.h>
#include <axis2_conf.h>
@@ -66,7 +66,7 @@
}
AXIS2_EXTERN long AXIS2_CALL
-sandesha2_util_get_current_time_in_millis(
+sandesha2_utils_get_current_time_in_millis(
const axis2_env_t *env)
{
struct timeb *tp = AXIS2_MALLOC(env->allocator, sizeof(struct timeb));
@@ -82,26 +82,26 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_get_rm_version(const axis2_env_t *env,
axis2_char_t *key,
- sandesha2_storage_manager_t *storage_man)
+ sandesha2_storage_mgr_t *storage_man)
{
- sandesha2_seq_property_bean_manager_t *seq_prop_man = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_man = NULL;
sandesha2_seq_property_bean_t *rm_version_bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
- seq_prop_man = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
+ seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
storage_man, env);
- rm_version_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_man,
+ rm_version_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_man,
env, key, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(NULL == rm_version_bean)
return NULL;
return SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(rm_version_bean, env);
}
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_utils_get_storage_manager(const axis2_env_t *env,
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_utils_get_storage_mgr(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_conf_t *conf)
{
@@ -113,18 +113,18 @@
AXIS2_PARAM_CHECK(env->error, conf, NULL);
parameter = AXIS2_CONF_GET_PARAM(conf, env,
- SANDESHA2_STORAGE_MANAGER_PARAMETER);
+ SANDESHA2_STORAGE_MGR_PARAMETER);
if(NULL == parameter)
- parameter = axis2_param_create(env, SANDESHA2_STORAGE_MANAGER_PARAMETER,
- SANDESHA2_DEFAULT_STORAGE_MANAGER);
+ parameter = axis2_param_create(env, SANDESHA2_STORAGE_MGR_PARAMETER,
+ SANDESHA2_DEFAULT_STORAGE_MGR);
value = AXIS2_PARAM_GET_VALUE(parameter, env);
- if(0 == AXIS2_STRCMP(value, SANDESHA2_INMEMORY_STORAGE_MANAGER))
- return sandesha2_utils_get_inmemory_storage_manager(env, conf_ctx);
- else if (0 == AXIS2_STRCMP(value, SANDESHA2_PERMANENT_STORAGE_MANAGER))
- return sandesha2_utils_get_permanent_storage_manager(env, conf_ctx);
+ if(0 == AXIS2_STRCMP(value, SANDESHA2_INMEMORY_STORAGE_MGR))
+ return sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
+ else if (0 == AXIS2_STRCMP(value, SANDESHA2_PERMANENT_STORAGE_MGR))
+ return sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
else
{
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_STORAGE_MANAGER,
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_STORAGE_MGR,
AXIS2_FAILURE);
return NULL;
}
@@ -135,9 +135,9 @@
sandesha2_utils_get_seq_property(const axis2_env_t *env,
axis2_char_t *id,
axis2_char_t *name,
- sandesha2_storage_manager_t *storage_man)
+ sandesha2_storage_mgr_t *storage_man)
{
- sandesha2_seq_property_bean_manager_t *seq_prop_man = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_man = NULL;
sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -145,9 +145,9 @@
AXIS2_PARAM_CHECK(env->error, name, NULL);
AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
- seq_prop_man = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
+ seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
storage_man, env);
- seq_prop_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_man,
+ seq_prop_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_man,
env, id, name);
if(NULL == seq_prop_bean)
return NULL;
@@ -282,7 +282,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, seq_id, NULL);
- return axis2_strcat(env, SANDESHA2_INTERNAL_SEQUENCE_PREFIX, ":",
+ return axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":",
seq_id, NULL);
}
@@ -302,8 +302,8 @@
return out_desc;
}
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_utils_get_inmemory_storage_manager(const axis2_env_t *env,
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_utils_get_inmemory_storage_mgr(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
axis2_property_t *property = NULL;
@@ -312,29 +312,29 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
property = AXIS2_CTX_GET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
- env, SANDESHA2_INMEMORY_STORAGE_MANAGER, AXIS2_FALSE);
+ env, SANDESHA2_INMEMORY_STORAGE_MGR, AXIS2_FALSE);
if(NULL != property && NULL != AXIS2_PROPERTY_GET_VALUE(property, env))
- return (sandesha2_storage_manager_t*)AXIS2_PROPERTY_GET_VALUE(property,
+ return (sandesha2_storage_mgr_t*)AXIS2_PROPERTY_GET_VALUE(property,
env);
else
{
- /* TODO we need to class load the proper storage manager */
- sandesha2_storage_manager_t *storage_man =
- sandesha2_storage_manager_create(env, conf_ctx);
+ /* TODO we need to class load the proper storage mgr */
+ sandesha2_storage_mgr_t *storage_man =
+ sandesha2_storage_mgr_create(env, conf_ctx);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_man);
AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
- env, SANDESHA2_INMEMORY_STORAGE_MANAGER, property,
+ env, SANDESHA2_INMEMORY_STORAGE_MGR, property,
AXIS2_FALSE);
return storage_man;
}
return NULL;
}
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_utils_get_permanent_storage_manager(const axis2_env_t *env,
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_utils_get_permanent_storage_mgr(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
AXIS2_ENV_CHECK(env, NULL);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org