You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/11/09 04:48:05 UTC
svn commit: r472762 [2/3] - in /webservices/sandesha/trunk/c: include/
src/client/ src/core/ src/handlers/ src/msgprocessors/
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?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -266,7 +266,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
fault_mgr = sandesha2_fault_mgr_create(env);
- fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(
+ fault_ctx = sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
fault_mgr, env, rm_msg_ctx, storage_mgr);
if(fault_ctx)
{
@@ -281,15 +281,15 @@
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
- SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
+ sandesha2_seq_set_must_understand(seq, env, AXIS2_FALSE);
str_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+ sandesha2_seq_get_identifier(seq, env), env);
AXIS2_LOG_INFO(env->log, "[sandesha2] str_seq_id :%s.........", str_seq_id);
- fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
+ fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
rm_msg_ctx, str_seq_id, storage_mgr);
if(fault_ctx)
{
@@ -304,9 +304,9 @@
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
- SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
+ sandesha2_seq_set_must_understand(seq, env, AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
- fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_mgr, env,
+ fault_ctx = sandesha2_fault_mgr_check_for_seq_closed(fault_mgr, env,
rm_msg_ctx, str_seq_id, storage_mgr);
if(fault_ctx)
{
@@ -326,7 +326,7 @@
msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
str_seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
- msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(SANDESHA2_SEQ_GET_MSG_NUM(
+ msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(sandesha2_seq_get_msg_num(
seq, env), env);
if(0 == msg_no)
{
@@ -361,9 +361,9 @@
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_MGR_REMOVE_MSG_CTX(storage_mgr, env,
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
highest_in_msg_key_str);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env,
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env,
highest_in_msg_key_str, msg_ctx);
if(highest_in_msg_no_str)
{
@@ -406,7 +406,7 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, msgs_bean);
- next_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr,
+ next_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_mgr,
env);
next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_mgr, env,
str_seq_id);
@@ -416,7 +416,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR(
+ storage_map_mgr = sandesha2_storage_mgr_get_storage_map_mgr(
storage_mgr, env);
in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(
sandesha2_utils_get_property_bean(env,
@@ -473,7 +473,7 @@
incoming_seq_list_bean);
}
/* save the message */
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, str_key,
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, str_key,
msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
msg_no, str_seq_id, AXIS2_FALSE);
@@ -549,7 +549,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env);
@@ -586,14 +586,14 @@
return AXIS2_FAILURE;
}
incoming_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(req_seq, env), env);
+ sandesha2_seq_get_identifier(req_seq, env), env);
if(!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_SEQ_GET_MSG_NUM(req_seq, env), env);
+ sandesha2_seq_get_msg_num(req_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,
@@ -729,7 +729,7 @@
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+ sandesha2_seq_get_identifier(seq, env), env);
spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(!spec_ver_bean)
@@ -878,12 +878,12 @@
"/", op_name, NULL));*/
if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, to_addr);
- printf("to_addr:%s#############################\n", to_addr);
/*if(!AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, axis2_strcat(env, "\"",
to_addr, "/", op_name, "\"", NULL));*/
if(!AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, to_addr);
+ /* end test code */
if(!dummy_msg)
sandesha2_app_msg_processor_process_response_msg(env, rm_msg_ctx,
@@ -936,7 +936,7 @@
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+ sandesha2_seq_get_identifier(seq, env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx,
env), env);
if(!conf_ctx)
@@ -1006,11 +1006,11 @@
create_seq_part = (sandesha2_create_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
create_seq_rm_msg, env, SANDESHA2_MSG_PART_CREATE_SEQ);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
- create_seq_man = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(
+ create_seq_man = sandesha2_storage_mgr_get_create_seq_mgr(
mgr, env);
- retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR
+ retransmitter_man = sandesha2_storage_mgr_get_retrans_mgr
(mgr, env);
seq_offer = SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq_part, env);
if(NULL != seq_offer)
@@ -1071,7 +1071,7 @@
SANDESHA2_MSG_TYPE_CREATE_SEQ);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env,
create_seq_entry);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, str_key, create_seq_msg);
+ sandesha2_storage_mgr_store_msg_ctx(mgr, env, str_key, 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));
@@ -1143,9 +1143,9 @@
app_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
- retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR
+ retransmitter_man = sandesha2_storage_mgr_get_retrans_mgr
(mgr, env);
to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
@@ -1201,7 +1201,7 @@
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_SEQ_SET_MSG_NUM(seq, env, msg_number);
+ sandesha2_seq_set_msg_num(seq, env, msg_number);
if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(app_msg_ctx, env))
{
@@ -1217,10 +1217,10 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- if(NULL != SANDESHA2_SEQ_GET_LAST_MSG(req_seq, env))
+ if(NULL != sandesha2_seq_get_last_msg(req_seq, env))
{
last_msg = AXIS2_TRUE;
- SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
+ sandesha2_seq_set_last_msg(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
}
}
@@ -1248,7 +1248,7 @@
sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, spec_ver))
{
- SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
+ sandesha2_seq_set_last_msg(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
}
}
@@ -1263,7 +1263,7 @@
identifier = sandesha2_identifier_create(env, rm_ns_val);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, str_identifier);
- SANDESHA2_SEQ_SET_IDENTIFIER(seq, env, identifier);
+ sandesha2_seq_set_identifier(seq, env, identifier);
SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
(sandesha2_iom_rm_part_t*)seq);
/* TODO add_ack_requested */
@@ -1294,7 +1294,7 @@
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, app_msg_ctx);
+ sandesha2_storage_mgr_store_msg_ctx(mgr, env, storage_key, app_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env, app_msg_entry);
property = axis2_property_create(env);
@@ -1348,7 +1348,7 @@
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, internal_seq_id,
@@ -1389,7 +1389,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, internal_seq_id,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -164,10 +164,10 @@
rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_CLOSE_SEQ_GET_IDENTIFIER(close_seq, env), env);
+ sandesha2_close_seq_get_identifier(close_seq, env), env);
fault_mgr = sandesha2_fault_mgr_create(env);
- fault_rm_msg_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
+ fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
rm_msg_ctx, seq_id, storage_mgr);
if(NULL != fault_rm_msg_ctx)
{
@@ -177,7 +177,7 @@
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
close_seq_bean = sandesha2_seq_property_bean_create(env);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(close_seq_bean, env, seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(close_seq_bean, env,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -192,7 +192,7 @@
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
fault_mgr = sandesha2_fault_mgr_create(env);
- fault_rm_msg_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_CREATE_SEQ_REFUSED(
+ fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_create_seq_refused(
fault_mgr, env, msg_ctx, storage_mgr);
if(NULL != fault_rm_msg_ctx)
{
@@ -205,7 +205,7 @@
return AXIS2_SUCCESS;
}
out_msg_ctx = axis2_core_utils_create_out_msg_ctx(env, msg_ctx);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr,
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
new_seq_id = sandesha2_seq_mgr_setup_new_seq(env, rm_msg_ctx,
storage_mgr);
@@ -264,7 +264,7 @@
int_seq_id);
SANDESHA2_CREATE_SEQ_BEAN_SET_CREATE_SEQ_MSG_ID(create_seq_bean, env,
axis2_uuid_gen(env));
- create_seq_mgr = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(
+ create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(
storage_mgr, env);
SANDESHA2_CREATE_SEQ_MGR_INSERT(create_seq_mgr, env, create_seq_bean);
@@ -370,7 +370,7 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FALSE);
- create_seq_mgr = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(storage_mgr, env);
+ create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(storage_mgr, env);
find_bean = sandesha2_create_seq_bean_create_with_data(env, NULL, NULL,
seq_id);
list = SANDESHA2_CREATE_SEQ_MGR_FIND(create_seq_mgr, env, find_bean);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -229,8 +229,8 @@
return AXIS2_FAILURE;
}
create_seq_msg_id = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env);
- create_seq_mgr = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(storage_mgr, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
+ create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(storage_mgr, env);
create_seq_bean = SANDESHA2_CREATE_SEQ_MGR_RETRIEVE(create_seq_mgr, env,
create_seq_msg_id);
if(NULL == create_seq_bean)
@@ -262,10 +262,10 @@
}
create_seq_storage_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
create_seq_sender_bean, env);
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env,
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
create_seq_storage_key);
SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env, create_seq_msg_id);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
out_seq_bean = sandesha2_seq_property_bean_create_with_data(env, int_seq_id,
SANDESHA2_SEQ_PROP_OUT_SEQ_ID, new_out_seq_id);
@@ -317,7 +317,7 @@
next_bean = sandesha2_next_msg_bean_create(env);
SANDESHA2_NEXT_MSG_BEAN_SET_SEQ_ID(next_bean, env, offered_seq_id);
SANDESHA2_NEXT_MSG_BEAN_SET_NEXT_MSG_NO_TO_PROCESS(next_bean, env, 1);
- next_bean_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr,
+ next_bean_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_mgr,
env);
SANDESHA2_NEXT_MSG_MGR_INSERT(next_bean_mgr, env, next_bean);
rm_spec_ver = SANDESHA2_MSG_CTX_GET_RM_SPEC_VER(rm_msg_ctx, env);
@@ -367,7 +367,7 @@
tmp_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(tmp_bean, env);
- app_msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env,
+ app_msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
key, conf_ctx);
if(NULL == app_msg_ctx)
{
@@ -395,7 +395,7 @@
}
ident = sandesha2_identifier_create(env, assumed_rm_ns);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(ident, env, new_out_seq_id);
- SANDESHA2_SEQ_SET_IDENTIFIER(seq_part, env, ident);
+ sandesha2_seq_set_identifier(seq_part, env, ident);
ack_req_part = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
app_rm_msg, env, SANDESHA2_MSG_PART_ACK_REQUEST);
@@ -409,7 +409,7 @@
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(app_rm_msg, env);
SANDESHA2_SENDER_BEAN_SET_SEND(tmp_bean, env, AXIS2_TRUE);
SANDESHA2_SENDER_MGR_UPDATE(retrans_mgr, env, tmp_bean);
- SANDESHA2_STORAGE_MGR_UPDATE_MSG_CTX(storage_mgr, env, key, app_msg_ctx);
+ sandesha2_storage_mgr_update_msg_ctx(storage_mgr, env, key, app_msg_ctx);
}
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id, storage_mgr);
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -201,7 +201,7 @@
return AXIS2_FAILURE;
}
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_TERMINATE_SEQ_GET_IDENTIFIER(term_seq, env), env);
+ sandesha2_terminate_seq_get_identifier(term_seq, env), env);
if(NULL == seq_id || 0 == AXIS2_STRLEN(seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid "
@@ -212,7 +212,7 @@
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
fault_mgr = sandesha2_fault_mgr_create(env);
- fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
+ fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
rm_msg_ctx, seq_id, storage_man);
if(fault_ctx)
{
@@ -224,7 +224,7 @@
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
term_rcvd_bean = sandesha2_seq_property_bean_create(env);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(term_rcvd_bean, env, seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(term_rcvd_bean, env,
@@ -279,7 +279,7 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
highest_msg_num_str = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER, storage_man);
@@ -310,7 +310,7 @@
seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_NO,
highest_msg_num_str);
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, last_in_msg_bean);
- highest_in_msg = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_man, env,
+ highest_in_msg = sandesha2_storage_mgr_retrieve_msg_ctx(storage_man, env,
highest_msg_key, conf_ctx);
if(highest_in_msg)
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(highest_in_msg, env);
@@ -332,7 +332,7 @@
sandesha2_seq_property_bean_t *highest_out_msg_bean = NULL;
highest_out_msg_num = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(
- SANDESHA2_SEQ_GET_MSG_NUM(seq_of_out_msg, env), env);
+ sandesha2_seq_get_msg_num(seq_of_out_msg, env), env);
sprintf(long_str, "%ld", highest_out_msg_num);
highest_out_msg_bean =
sandesha2_seq_property_bean_create_with_data(env,
@@ -472,7 +472,7 @@
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
to_address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
AXIS2_MSG_CTX_GET_TO(msg_ctx, env), env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
@@ -512,7 +512,7 @@
}
term_seq_part = (sandesha2_terminate_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(SANDESHA2_TERMINATE_SEQ_GET_IDENTIFIER(
+ SANDESHA2_IDENTIFIER_SET_IDENTIFIER(sandesha2_terminate_seq_get_identifier(
term_seq_part, env), env, out_seq_id);
SANDESHA2_MSG_CTX_SET_FLOW(rm_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create(env);
@@ -554,7 +554,7 @@
term_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(term_bean, env, key);
/*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, key, msg_ctx);
+ sandesha2_storage_mgr_store_msg_ctx(storage_man, env, key, msg_ctx);
/* TODO: refine the terminate delay */
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(term_bean, env,
@@ -573,7 +573,7 @@
SANDESHA2_SENDER_BEAN_SET_RESEND(term_bean, env, AXIS2_FALSE);
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_man, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_man, env);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, term_bean);
term_added = sandesha2_seq_property_bean_create(env);
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=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Wed Nov 8 19:48:04 2006
@@ -54,104 +54,6 @@
#define SANDESHA2_INTF_TO_IMPL(storage) ((sandesha2_storage_mgr_impl_t *) storage)
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_free(
- void *storage,
- const axis2_env_t *envv);
-
-sandesha2_transaction_t *AXIS2_CALL
-sandesha2_storage_mgr_get_transaction(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-sandesha2_create_seq_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_create_seq_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-sandesha2_next_msg_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_next_msg_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-sandesha2_sender_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_retransmitter_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-sandesha2_seq_property_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_seq_property_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-sandesha2_invoker_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_storage_map_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_set_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
-
-axis2_conf_ctx_t *AXIS2_CALL
-sandesha2_storage_mgr_get_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_init(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
-
-axis2_msg_ctx_t *AXIS2_CALL
-sandesha2_storage_mgr_retrieve_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_conf_ctx_t *conf_ctx);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_store_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_msg_ctx_t *msg_ctx);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_update_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_msg_ctx_t *msg_ctx);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_remove_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_init_storage(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_module_desc_t *module_desc);
-
-axiom_soap_envelope_t *AXIS2_CALL
-sandesha2_storage_mgr_retrieve_soap_envelope(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key);
-
-axis2_status_t AXIS2_CALL
-sandesha2_storage_mgr_store_soap_envelope(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axiom_soap_envelope_t *soap_env,
- axis2_char_t *key);
-
AXIS2_EXTERN sandesha2_storage_mgr_t * AXIS2_CALL
sandesha2_storage_mgr_create(
const axis2_env_t *env,
@@ -173,9 +75,6 @@
storage_impl->invoker_mgr = NULL;
storage_impl->conf_ctx = conf_ctx;
- storage_impl->storage.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_storage_mgr_ops_t));
-
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);
@@ -183,39 +82,6 @@
storage_impl->sender_mgr = sandesha2_sender_mgr_create(env, ctx);
storage_impl->invoker_mgr = sandesha2_invoker_mgr_create(env, ctx);
- storage_impl->storage.ops->free = sandesha2_storage_mgr_free;
- storage_impl->storage.ops->init = sandesha2_storage_mgr_init;
- storage_impl->storage.ops->set_ctx =
- sandesha2_storage_mgr_set_ctx;
- storage_impl->storage.ops->get_ctx =
- sandesha2_storage_mgr_get_ctx;
- storage_impl->storage.ops->init_storage =
- sandesha2_storage_mgr_init_storage;
- storage_impl->storage.ops->get_transaction =
- sandesha2_storage_mgr_get_transaction;
- storage_impl->storage.ops->get_create_seq_mgr =
- sandesha2_storage_mgr_get_create_seq_mgr;
- storage_impl->storage.ops->get_next_msg_mgr =
- sandesha2_storage_mgr_get_next_msg_mgr;
- storage_impl->storage.ops->get_retransmitter_mgr =
- sandesha2_storage_mgr_get_retransmitter_mgr;
- storage_impl->storage.ops->get_seq_property_mgr =
- sandesha2_storage_mgr_get_seq_property_mgr;
- storage_impl->storage.ops->get_storage_map_mgr =
- sandesha2_storage_mgr_get_storage_map_mgr;
- storage_impl->storage.ops->store_msg_ctx =
- sandesha2_storage_mgr_store_msg_ctx;
- storage_impl->storage.ops->update_msg_ctx =
- sandesha2_storage_mgr_update_msg_ctx;
- storage_impl->storage.ops->retrieve_msg_ctx =
- sandesha2_storage_mgr_retrieve_msg_ctx;
- storage_impl->storage.ops->remove_msg_ctx =
- sandesha2_storage_mgr_remove_msg_ctx;
- storage_impl->storage.ops->retrieve_soap_envelope =
- sandesha2_storage_mgr_retrieve_soap_envelope;
- storage_impl->storage.ops->store_soap_envelope =
- sandesha2_storage_mgr_store_soap_envelope;
-
return &(storage_impl->storage);
}
@@ -297,12 +163,6 @@
storage_impl->SANDESHA2_MSG_MAP_KEY = NULL;
}
- if((&(storage_impl->storage))->ops)
- {
- AXIS2_FREE(env->allocator, (&(storage_impl->storage))->ops);
- (&(storage_impl->storage))->ops = NULL;
- }
-
if(storage_impl)
{
AXIS2_FREE(env->allocator, storage_impl);
@@ -351,7 +211,7 @@
}
sandesha2_sender_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_retransmitter_mgr(
+sandesha2_storage_mgr_get_retrans_mgr(
sandesha2_storage_mgr_t *storage,
const axis2_env_t *env)
{
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?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Wed Nov 8 19:48:04 2006
@@ -188,7 +188,7 @@
env));
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
- SANDESHA2_STORAGE_MGR_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/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Nov 8 19:48:04 2006
@@ -60,7 +60,7 @@
ref_msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(ref_rm_msg, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(ref_msg, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr,
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
acks_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
@@ -188,7 +188,7 @@
axis2_transport_out_desc_t *trans_out = NULL;
sandesha2_msg_ctx_t *ret_rm_msg = NULL;
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
key = axis2_uuid_gen(env);
ack_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(ack_bean, env, key);
@@ -230,12 +230,12 @@
env);
SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_ID(old_ack_bean, env));
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env,
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
old_ack_bean, env));
}
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(ack_bean, env, time_to_send);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, key, ack_msg_ctx);
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, ack_bean);
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(ack_msg_ctx,
@@ -420,8 +420,8 @@
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
find_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(find_bean, env, SANDESHA2_MSG_TYPE_ACK);
@@ -450,7 +450,7 @@
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
sandesha2_iom_rm_part_t *seq_ack = NULL;
- msg_ctx1 = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env,
+ msg_ctx1 = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
sender_bean, env), conf_ctx);
to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
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=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_data.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_data.c Wed Nov 8 19:48:04 2006
@@ -38,80 +38,6 @@
#define SANDESHA2_INTF_TO_IMPL(data) \
((sandesha2_fault_data_impl_t *)(data))
-/***************************** Function headers *******************************/
-axiom_node_t *AXIS2_CALL
-sandesha2_fault_data_get_detail
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_detail
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axiom_node_t *detail);
-
-axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_reason
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_reason
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *reason);
-
-axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_sub_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_sub_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *sub_code);
-
-axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *code);
-
-int AXIS2_CALL
-sandesha2_fault_data_get_type
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_type
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- int type);
-
-axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_seq_id
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_seq_id
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_data_free
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
-/***************************** End of function headers ************************/
-
AXIS2_EXTERN sandesha2_fault_data_t* AXIS2_CALL
sandesha2_fault_data_create(const axis2_env_t *env)
{
@@ -133,37 +59,14 @@
fault_data_impl->seq_id = NULL;
fault_data_impl->detail = NULL;
- fault_data_impl->data.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_fault_data_ops_t));
- if(NULL == fault_data_impl->data.ops)
- {
- sandesha2_fault_data_free((sandesha2_fault_data_t*)fault_data_impl,
- env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- fault_data_impl->data.ops->get_detail = sandesha2_fault_data_get_detail;
- fault_data_impl->data.ops->set_detail = sandesha2_fault_data_set_detail;
- fault_data_impl->data.ops->get_reason = sandesha2_fault_data_get_reason;
- fault_data_impl->data.ops->set_reason = sandesha2_fault_data_set_reason;
- fault_data_impl->data.ops->get_sub_code = sandesha2_fault_data_get_sub_code;
- fault_data_impl->data.ops->set_sub_code = sandesha2_fault_data_set_sub_code;
- fault_data_impl->data.ops->get_code = sandesha2_fault_data_get_code;
- fault_data_impl->data.ops->set_code = sandesha2_fault_data_set_code;
- fault_data_impl->data.ops->get_type = sandesha2_fault_data_get_type;
- fault_data_impl->data.ops->set_type = sandesha2_fault_data_set_type;
- fault_data_impl->data.ops->get_seq_id = sandesha2_fault_data_get_seq_id;
- fault_data_impl->data.ops->set_seq_id = sandesha2_fault_data_set_seq_id;
- fault_data_impl->data.ops->free = sandesha2_fault_data_free;
-
return &(fault_data_impl->data);
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_free(sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_free(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
sandesha2_fault_data_impl_t *fault_data_impl = NULL;
@@ -196,29 +99,24 @@
*/
fault_data_impl->detail = NULL;
- if(NULL != data->ops)
- {
- AXIS2_FREE(env->allocator, data->ops);
- data->ops = NULL;
- }
AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(data));
return AXIS2_SUCCESS;
}
axiom_node_t *AXIS2_CALL
-sandesha2_fault_data_get_detail
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_get_detail(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return SANDESHA2_INTF_TO_IMPL(data)->detail;
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_detail
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axiom_node_t *detail)
+sandesha2_fault_data_set_detail(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axiom_node_t *detail)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, detail, AXIS2_FAILURE);
@@ -228,19 +126,19 @@
}
axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_reason
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_get_reason(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return SANDESHA2_INTF_TO_IMPL(data)->reason;
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_reason
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *reason)
+sandesha2_fault_data_set_reason(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *reason)
{
sandesha2_fault_data_impl_t *fault_data_impl = NULL;
@@ -258,19 +156,19 @@
}
axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_sub_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_get_sub_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return SANDESHA2_INTF_TO_IMPL(data)->sub_code;
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_sub_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *sub_code)
+sandesha2_fault_data_set_sub_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *sub_code)
{
sandesha2_fault_data_impl_t *fault_data_impl = NULL;
@@ -288,19 +186,19 @@
}
axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_get_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return SANDESHA2_INTF_TO_IMPL(data)->code;
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_code
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *code)
+sandesha2_fault_data_set_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *code)
{
sandesha2_fault_data_impl_t *fault_data_impl = NULL;
@@ -318,19 +216,19 @@
}
int AXIS2_CALL
-sandesha2_fault_data_get_type
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_get_type(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, -1);
return SANDESHA2_INTF_TO_IMPL(data)->type;
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_type
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- int type)
+sandesha2_fault_data_set_type(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ int type)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
SANDESHA2_INTF_TO_IMPL(data)->type = type;
@@ -338,19 +236,19 @@
}
axis2_char_t *AXIS2_CALL
-sandesha2_fault_data_get_seq_id
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env)
+sandesha2_fault_data_get_seq_id(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return SANDESHA2_INTF_TO_IMPL(data)->seq_id;
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_data_set_seq_id
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *seq_id)
+sandesha2_fault_data_set_seq_id(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id)
{
sandesha2_fault_data_impl_t *fault_data_impl = NULL;
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=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Nov 8 19:48:04 2006
@@ -45,68 +45,9 @@
#define SANDESHA2_INTF_TO_IMPL(mgr) \
((sandesha2_fault_mgr_impl_t *)(mgr))
-/***************************** Function headers *******************************/
-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);
-
-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);
-
-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);
-
-sandesha2_msg_ctx_t* AXIS2_CALL
-sandesha2_fault_mgr_check_for_unknown_seq
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
-
-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);
-
-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,
- sandesha2_storage_mgr_t *storage_man);
-
-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,
- axis2_char_t *addr_ns_uri,
- sandesha2_storage_mgr_t *storage_man);
-
-axis2_status_t AXIS2_CALL
-sandesha2_fault_mgr_free(sandesha2_fault_mgr_t *mgr,
- const axis2_env_t *env);
-
-/***************************** End of function headers ************************/
-
AXIS2_EXTERN sandesha2_fault_mgr_t* AXIS2_CALL
-sandesha2_fault_mgr_create(const axis2_env_t *env)
+sandesha2_fault_mgr_create(
+ const axis2_env_t *env)
{
sandesha2_fault_mgr_impl_t *fault_mgr_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -114,63 +55,33 @@
fault_mgr_impl = (sandesha2_fault_mgr_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(sandesha2_fault_mgr_impl_t));
- if(NULL == fault_mgr_impl)
+ if(!fault_mgr_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
- fault_mgr_impl->mgr.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_fault_mgr_ops_t));
- if(NULL == fault_mgr_impl->mgr.ops)
- {
- sandesha2_fault_mgr_free((sandesha2_fault_mgr_t*)fault_mgr_impl,
- env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- fault_mgr_impl->mgr.ops->check_for_create_seq_refused =
- sandesha2_fault_mgr_check_for_create_seq_refused;
- fault_mgr_impl->mgr.ops->check_for_last_msg_num_exceeded =
- sandesha2_fault_mgr_check_for_last_msg_num_exceeded;
- fault_mgr_impl->mgr.ops->check_for_msg_num_rollover =
- sandesha2_fault_mgr_check_for_msg_num_rollover;
- fault_mgr_impl->mgr.ops->check_for_unknown_seq =
- sandesha2_fault_mgr_check_for_unknown_seq;
- fault_mgr_impl->mgr.ops->check_for_invalid_ack =
- sandesha2_fault_mgr_check_for_invalid_ack;
- fault_mgr_impl->mgr.ops->check_for_seq_closed =
- sandesha2_fault_mgr_check_for_seq_closed;
- fault_mgr_impl->mgr.ops->get_fault =
- sandesha2_fault_mgr_get_fault;
- fault_mgr_impl->mgr.ops->free = sandesha2_fault_mgr_free;
return &(fault_mgr_impl->mgr);
}
axis2_status_t AXIS2_CALL
-sandesha2_fault_mgr_free(sandesha2_fault_mgr_t *mgr,
- const axis2_env_t *env)
+sandesha2_fault_mgr_free(
+ sandesha2_fault_mgr_t *mgr,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if(NULL != mgr->ops)
- {
- AXIS2_FREE(env->allocator, mgr->ops);
- mgr->ops = NULL;
- }
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)
+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)
{
sandesha2_msg_ctx_t *rm_msg_ctx = NULL;
sandesha2_create_seq_t *create_seq = NULL;
@@ -194,18 +105,18 @@
{
sandesha2_fault_data_t *fault_data = NULL;
fault_data = sandesha2_fault_data_create(env);
- SANDESHA2_FAULT_DATA_SET_TYPE(fault_data, env,
+ sandesha2_fault_data_set_type(fault_data, env,
SANDESHA2_SOAP_FAULT_TYPE_CREATE_SEQ_REFUSED);
if(SANDESHA2_SOAP_VERSION_1_1 == sandesha2_utils_get_soap_version(env,
SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env)))
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP11_FAULT_CODE_SENDER);
else
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP12_FAULT_CODE_SENDER);
- SANDESHA2_FAULT_DATA_SET_SUB_CODE(fault_data, env,
+ sandesha2_fault_data_set_sub_code(fault_data, env,
SANDESHA2_SOAP_FAULT_SUBCODE_CREATE_SEQ_REFUSED);
- SANDESHA2_FAULT_DATA_SET_REASON(fault_data, env, "");
+ sandesha2_fault_data_set_reason(fault_data, env, "");
return sandesha2_fault_mgr_get_fault(fault_mgr, env, rm_msg_ctx,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx,
env), storage_man);
@@ -214,11 +125,11 @@
}
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)
+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)
{
sandesha2_seq_t *sequence = NULL;
long msg_num = -1;
@@ -234,12 +145,12 @@
sequence = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
app_rm_msg, env, SANDESHA2_MSG_PART_SEQ);
- msg_num = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(SANDESHA2_SEQ_GET_MSG_NUM(
+ msg_num = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(sandesha2_seq_get_msg_num(
sequence, env), env);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(sequence, env), env);
+ sandesha2_seq_get_identifier(sequence, env), env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_man, env);
last_msg_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, seq_id, SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO);
@@ -257,22 +168,22 @@
msg_num, last_msg_no);
}
}
- if(AXIS2_TRUE == exceeded)
+ if(exceeded)
{
sandesha2_fault_data_t *fault_data = NULL;
fault_data = sandesha2_fault_data_create(env);
- SANDESHA2_FAULT_DATA_SET_TYPE(fault_data, env,
+ sandesha2_fault_data_set_type(fault_data, env,
SANDESHA2_SOAP_FAULT_TYPE_LAST_MESSAGE_NO_EXCEEDED);
if(SANDESHA2_SOAP_VERSION_1_1 == sandesha2_utils_get_soap_version(env,
SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(app_rm_msg, env)))
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP11_FAULT_CODE_SENDER);
else
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP12_FAULT_CODE_SENDER);
- SANDESHA2_FAULT_DATA_SET_SUB_CODE(fault_data, env,
+ 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);
+ sandesha2_fault_data_set_reason(fault_data, env, reason);
return sandesha2_fault_mgr_get_fault(fault_mgr, env, app_rm_msg,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(app_rm_msg,
env), storage_man);
@@ -281,11 +192,11 @@
}
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)
+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)
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, NULL);
@@ -311,7 +222,7 @@
AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
AXIS2_PARAM_CHECK(env->error, seq_id, NULL);
- create_seq_mgr = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(
+ create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(
storage_man, env);
type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
if(SANDESHA2_MSG_TYPE_ACK == type ||
@@ -340,7 +251,7 @@
axis2_array_list_t *list = NULL;
axis2_bool_t contains = AXIS2_FALSE;
- next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(
+ next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(
storage_man, env);
list = SANDESHA2_NEXT_MSG_MGR_RETRIEVE_ALL(next_msg_mgr, env);
if(list)
@@ -361,7 +272,7 @@
}
}
}
- if(AXIS2_TRUE == contains)
+ if(contains)
valid_seq = AXIS2_TRUE;
else
valid_seq = AXIS2_FALSE;
@@ -378,19 +289,19 @@
rm_ns_val = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx, env);
if(SANDESHA2_SOAP_VERSION_1_1 == sandesha2_utils_get_soap_version(env,
SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env)))
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP11_FAULT_CODE_SENDER);
else
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP12_FAULT_CODE_SENDER);
- SANDESHA2_FAULT_DATA_SET_SUB_CODE(fault_data, env,
+ sandesha2_fault_data_set_sub_code(fault_data, env,
SANDESHA2_SOAP_FAULT_SUBCODE_UNKNOWN_SEQ);
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_IDENTIFIER,
rm_ns_val, SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
detail_ele = axiom_element_create_with_qname(env, NULL, qname,
&detail_node);
- SANDESHA2_FAULT_DATA_SET_DETAIL(fault_data, env, detail_node);
- SANDESHA2_FAULT_DATA_SET_REASON(fault_data, env, "A sequence with the"
+ 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,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx,
@@ -400,11 +311,11 @@
}
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)
+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)
{
axis2_bool_t invalid_ack = AXIS2_FALSE;
axis2_char_t reason[256];
@@ -419,8 +330,8 @@
return NULL;
seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(ack_rm_msg,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- ack_range_list = SANDESHA2_SEQ_ACK_GET_ACK_RANGE_LIST(seq_ack, env);
- if(NULL != ack_range_list)
+ ack_range_list = sandesha2_seq_ack_get_ack_range_list(seq_ack, env);
+ if(ack_range_list)
{
int i = 0;
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(ack_range_list, env); i++)
@@ -439,7 +350,7 @@
}
}
}
- if(AXIS2_TRUE == invalid_ack)
+ if(invalid_ack)
{
sandesha2_fault_data_t *fault_data = NULL;
axis2_char_t *rm_ns_val = NULL;
@@ -453,12 +364,12 @@
rm_ns_val = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(ack_rm_msg, env);
if(SANDESHA2_SOAP_VERSION_1_1 == sandesha2_utils_get_soap_version(env,
SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(ack_rm_msg, env)))
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP11_FAULT_CODE_SENDER);
else
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP12_FAULT_CODE_SENDER);
- SANDESHA2_FAULT_DATA_SET_SUB_CODE(fault_data, env,
+ sandesha2_fault_data_set_sub_code(fault_data, env,
SANDESHA2_SOAP_FAULT_SUBCODE_INVALID_ACKNOWLEDGEMENT);
dummy_ele = axiom_element_create(env, NULL, "dummy_ele", NULL,
&dummy_node);
@@ -467,8 +378,8 @@
NULL, NULL);
detail_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(dummy_ele, env,
qname, dummy_node, &detail_node);
- SANDESHA2_FAULT_DATA_SET_DETAIL(fault_data, env, detail_node);
- SANDESHA2_FAULT_DATA_SET_REASON(fault_data, env, reason);
+ 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,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(ack_rm_msg,
env), storage_man);
@@ -477,12 +388,12 @@
}
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,
- sandesha2_storage_mgr_t *storage_man)
+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,
+ sandesha2_storage_mgr_t *storage_man)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *closed_bean = NULL;
@@ -494,31 +405,31 @@
AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
AXIS2_PARAM_CHECK(env->error, seq_id, NULL);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_man, env);
closed_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
seq_id, SANDESHA2_SEQ_PROP_SEQ_CLOSED);
- if(NULL != closed_bean && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
+ if(closed_bean && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(closed_bean, env)))
{
seq_closed = AXIS2_TRUE;
sprintf(reason, "The sequence with the id %s was closed previously."
" Cannot accept this message", seq_id);
}
- if(AXIS2_TRUE == seq_closed)
+ if(seq_closed)
{
sandesha2_fault_data_t *fault_data = NULL;
fault_data = sandesha2_fault_data_create(env);
if(SANDESHA2_SOAP_VERSION_1_1 == sandesha2_utils_get_soap_version(env,
SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env)))
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP11_FAULT_CODE_SENDER);
else
- SANDESHA2_FAULT_DATA_SET_CODE(fault_data, env,
+ sandesha2_fault_data_set_code(fault_data, env,
AXIOM_SOAP12_FAULT_CODE_SENDER);
- SANDESHA2_FAULT_DATA_SET_REASON(fault_data, env, reason);
+ sandesha2_fault_data_set_reason(fault_data, env, reason);
return sandesha2_fault_mgr_get_fault(fault_mgr, env, rm_msg_ctx,
fault_data, SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx,
env), storage_man);
@@ -527,13 +438,13 @@
}
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,
- axis2_char_t *addr_ns_uri,
- sandesha2_storage_mgr_t *storage_man)
+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,
+ axis2_char_t *addr_ns_uri,
+ sandesha2_storage_mgr_t *storage_man)
{
axis2_msg_ctx_t *fault_msg_ctx = NULL;
axis2_msg_ctx_t *ref_msg = NULL;
@@ -592,9 +503,9 @@
sandesha2_seq_property_bean_t *acks_to_bean = NULL;
axis2_char_t *seq_id = NULL;
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_man, env);
- seq_id = SANDESHA2_FAULT_DATA_GET_SEQ_ID(fault_data, env);
+ seq_id = sandesha2_fault_data_get_seq_id(fault_data, env);
acks_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
if(NULL != acks_to_bean)
@@ -615,3 +526,4 @@
fault_rm_msg = sandesha2_msg_init_init_msg(env, fault_msg_ctx);
return fault_rm_msg;
}
+
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=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Nov 8 19:48:04 2006
@@ -121,7 +121,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return NULL;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
/* Creating by copying common contents. (This will not see contexts except
* for conf_ctx)
*/
@@ -402,7 +402,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(temp_msg_ctx, env);
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);
+ temp_identifier = sandesha2_close_seq_get_identifier(cs, 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);
@@ -514,7 +514,7 @@
AXIS2_OP_SET_IN_FLOW(terminate_seq_op, env, inflow);
}
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr);
- if(rm_version == NULL)
+ if(!rm_version)
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_CANNOT_FIND_RM_VERSION_OF_GIVEN_MSG, AXIS2_FAILURE);
@@ -524,13 +524,13 @@
sandesha2_msg_creator_init_creation(env, ref_msg_ctx, terminate_seq_msg_ctx);
is_seq_res_reqd = sandesha2_spec_specific_consts_is_term_seq_res_reqd(env, rm_version);
- if(AXIS2_TRUE != is_seq_res_reqd)
+ if(!is_seq_res_reqd)
{
AXIS2_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
NULL, AXIS2_FALSE);
}
terminate_rm_msg = sandesha2_msg_init_init_msg(env, terminate_seq_msg_ctx);
- if(terminate_rm_msg == NULL)
+ if(!terminate_rm_msg)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX, AXIS2_FAILURE);
return NULL;
@@ -558,7 +558,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_TERMINATE_SEQ_SET_IDENTIFIER(terminate_seq, env, identifier);
+ sandesha2_terminate_seq_set_identifier(terminate_seq, env, identifier);
SANDESHA2_MSG_CTX_SET_MSG_PART(terminate_rm_msg, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ,
(sandesha2_iom_rm_part_t*)terminate_seq);
@@ -589,7 +589,7 @@
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(
- SANDESHA2_TERMINATE_SEQ_GET_IDENTIFIER(terminate_seq,
+ sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
rm_ns_val = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(ref_rm_msg, env);
SANDESHA2_MSG_CTX_SET_RM_NS_VAL(res_rm_msg, env, rm_ns_val);
@@ -597,7 +597,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_TERMINATE_SEQ_RES_SET_IDENTIFIER(terminate_seq_res, env,
+ sandesha2_terminate_seq_res_set_identifier(terminate_seq_res, env,
identifier);
soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
@@ -847,8 +847,8 @@
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_SEQ_ACK_SET_IDENTIFIER(seq_ack, env, id);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ 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,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
msg_no_list = (axis2_char_t *) SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
@@ -862,7 +862,7 @@
sandesha2_ack_range_t *ack_range = NULL;
ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
- SANDESHA2_SEQ_ACK_ADD_ACK_RANGE(seq_ack, env, ack_range);
+ sandesha2_seq_ack_add_ack_range(seq_ack, env, ack_range);
}
seq_closed_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, seq_id,
SANDESHA2_SEQ_PROP_SEQ_CLOSED);
@@ -880,7 +880,7 @@
sandesha2_ack_final_t *ack_final = NULL;
ack_final = sandesha2_ack_final_create(env,rm_ns_value);
- SANDESHA2_SEQ_ACK_SET_ACK_FINAL(seq_ack, env, ack_final);
+ sandesha2_seq_ack_set_ack_final(seq_ack, env, ack_final);
}
}
SANDESHA2_MSG_CTX_SET_MSG_PART(app_msg, env,
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=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Wed Nov 8 19:48:04 2006
@@ -262,7 +262,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(temp_msg_ctx, env);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
create_seq = (sandesha2_create_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
create_seq_res = (sandesha2_create_seq_res_t *)
@@ -305,7 +305,7 @@
sandesha2_identifier_t *idf = NULL;
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_TERMINATE_SEQ);
- idf = SANDESHA2_TERMINATE_SEQ_GET_IDENTIFIER(terminate_seq, env);
+ idf = sandesha2_terminate_seq_get_identifier(terminate_seq, env);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
}
else if(terminate_seq_res)
@@ -313,7 +313,7 @@
sandesha2_identifier_t *idf = NULL;
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);
+ idf = sandesha2_terminate_seq_res_get_identifier(terminate_seq_res, env);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
}
else if(seq)
@@ -321,7 +321,7 @@
sandesha2_identifier_t *idf = NULL;
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_APPLICATION);
- idf = SANDESHA2_SEQ_GET_IDENTIFIER(seq, env);
+ idf = sandesha2_seq_get_identifier(seq, env);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
}
else if(seq_ack)
@@ -329,7 +329,7 @@
sandesha2_identifier_t *idf = NULL;
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_ACK);
- idf = SANDESHA2_SEQ_ACK_GET_IDENTIFIER(seq_ack, env);
+ idf = sandesha2_seq_ack_get_identifier(seq_ack, env);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
}
else if(ack_request)
@@ -345,7 +345,7 @@
sandesha2_identifier_t *idf = NULL;
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_CLOSE_SEQ);
- idf = SANDESHA2_CLOSE_SEQ_GET_IDENTIFIER(close_seq, env);
+ idf = sandesha2_close_seq_get_identifier(close_seq, env);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(idf, env);
}
else if(close_seq_res)
@@ -353,7 +353,7 @@
sandesha2_identifier_t *idf = NULL;
SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_CLOSE_SEQ_RESPONSE);
- idf = SANDESHA2_CLOSE_SEQ_RES_GET_IDENTIFIER(close_seq_res, env);
+ idf = sandesha2_close_res_seq_get_identifier(close_seq_res, 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=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Wed Nov 8 19:48:04 2006
@@ -74,7 +74,7 @@
" present in the retransmittable message");
return AXIS2_FALSE;
}
- msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env,
+ msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
stored_key, conf_ctx);
rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
int_seq_id = SANDESHA2_SENDER_BEAN_GET_INTERNAL_SEQ_ID(retrans_bean, env);
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Nov 8 19:48:04 2006
@@ -126,7 +126,7 @@
AXIS2_PARAM_CHECK(env->error, key, NULL);
AXIS2_PARAM_CHECK(env->error, storage_mgr, NULL);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
if(seq_prop_mgr)
rm_version_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
@@ -183,7 +183,7 @@
AXIS2_PARAM_CHECK(env->error, name, NULL);
AXIS2_PARAM_CHECK(env->error, storage_mgr, NULL);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
seq_prop_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, incoming_seq_id, name);
@@ -884,7 +884,7 @@
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+ sandesha2_seq_get_identifier(seq, env), env);
}
else if(SANDESHA2_MSG_TYPE_ACK == msg_type)
{
@@ -892,7 +892,7 @@
seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_ACK_GET_IDENTIFIER(seq_ack, env), env);
+ sandesha2_seq_ack_get_identifier(seq_ack, env), env);
}
else if(SANDESHA2_MSG_TYPE_ACK_REQUEST == msg_type)
{
@@ -911,7 +911,7 @@
SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_CLOSE_SEQ);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_CLOSE_SEQ_GET_IDENTIFIER(close_seq,
+ sandesha2_close_seq_get_identifier(close_seq,
env), env);
}
else if(SANDESHA2_MSG_TYPE_CLOSE_SEQ_RESPONSE == msg_type)
@@ -921,7 +921,7 @@
SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE);
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_CLOSE_SEQ_RES_GET_IDENTIFIER(close_seq_res,
+ sandesha2_close_res_seq_get_identifier(close_seq_res,
env), env);
}
return seq_id;
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Nov 8 19:48:04 2006
@@ -112,7 +112,7 @@
}
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(create_seq_msg, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
received_msg_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES, "");
/* Setting the addressing version */
@@ -147,7 +147,7 @@
{
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, to_bean);
}
- next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr, env);
+ next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_mgr, env);
next_msg_bean = sandesha2_next_msg_bean_create_with_data(env, seq_id, 1);
/* 1 will be the next */
AXIS2_LOG_INFO(env->log, "[sandesha2] came1");
@@ -210,7 +210,7 @@
long current_time = -1;
axis2_char_t current_time_str[32];
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
last_activated_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
property_key, SANDESHA2_SEQ_PROP_LAST_ACTIVATED_TIME);
if(last_activated_bean == NULL)
@@ -283,7 +283,7 @@
AXIS2_PARAM_CHECK(env->error, property_key, -1);
AXIS2_PARAM_CHECK(env->error, storage_mgr, -1);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_prop_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
property_key, SANDESHA2_SEQ_PROP_LAST_ACTIVATED_TIME);
if(NULL != seq_prop_bean)
@@ -331,7 +331,7 @@
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(first_app_msg, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
property = AXIS2_MSG_CTX_GET_PROPERTY(first_app_msg, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/spec_specific_consts.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/spec_specific_consts.c (original)
+++ webservices/sandesha/trunk/c/src/util/spec_specific_consts.c Wed Nov 8 19:48:04 2006
@@ -300,8 +300,8 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_spec_specific_consts_is_term_seq_res_reqd(
- const axis2_env_t *env,
- axis2_char_t *spec_version)
+ const axis2_env_t *env,
+ axis2_char_t *spec_version)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, spec_version, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Nov 8 19:48:04 2006
@@ -95,7 +95,7 @@
sandesha2_terminate_mgr_rcv_side_clean_map = axis2_hash_make(env);
}
- invoker_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR(storage_man, env);
+ invoker_mgr = sandesha2_storage_mgr_get_storage_map_mgr(storage_man, env);
find_bean = sandesha2_invoker_bean_create(env);
SANDESHA2_INVOKER_BEAN_SET_SEQ_ID(find_bean, env, seq_id);
@@ -110,7 +110,7 @@
map_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
msg_store_key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(map_bean,
env);
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env, msg_store_key);
+ sandesha2_storage_mgr_remove_msg_ctx(storage_man, env, msg_store_key);
SANDESHA2_INVOKER_MGR_REMOVE(invoker_mgr, env,
SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(map_bean,
env));
@@ -149,7 +149,7 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_man, AXIS2_FAILURE);
- next_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_man, env);
+ next_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_man, env);
find_bean = sandesha2_next_msg_bean_create(env);
SANDESHA2_NEXT_MSG_BEAN_SET_SEQ_ID(find_bean, env, seq_id);
@@ -158,7 +158,7 @@
highest_in_msg_key = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, storage_man);
if(NULL != highest_in_msg_key)
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env,
+ sandesha2_storage_mgr_remove_msg_ctx(storage_man, env,
highest_in_msg_key);
sandesha2_terminate_mgr_remove_recv_side_propertis(env, conf_ctx, seq_id,
storage_man);
@@ -180,7 +180,7 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_man, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
all_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
@@ -230,7 +230,7 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_man, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
seq_term_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, seq_term_bean);
@@ -326,7 +326,7 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_man, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
seq_term_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT, SANDESHA2_VALUE_TRUE);
@@ -357,9 +357,9 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_man, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_man, env);
- create_seq_mgr = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_man, env);
+ create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(storage_man, env);
out_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_OUT_SEQ_ID, storage_man);
@@ -398,7 +398,7 @@
retrans_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
msg_store_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
retrans_bean, env);
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env, msg_store_key);
+ sandesha2_storage_mgr_remove_msg_ctx(storage_man, env, msg_store_key);
}
}
@@ -484,7 +484,7 @@
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_man, env);
terminated = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
out_seq_id, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
if(terminated && SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(terminated, env)
@@ -549,7 +549,7 @@
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(terminate_bean, env, key);
terminate_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(terminate_rm_msg, env);
/*AXIS2_MSG_CTX_SET_KEEP_ALIVE(terminate_msg_ctx, env, AXIS2_TRUE);*/
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, key, terminate_msg_ctx);
+ sandesha2_storage_mgr_store_msg_ctx(storage_man, env, key, terminate_msg_ctx);
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(terminate_bean, env,
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
@@ -565,7 +565,7 @@
SANDESHA2_QUALIFIED_FOR_SENDING, property);
SANDESHA2_SENDER_BEAN_SET_RESEND(terminate_bean, env, AXIS2_FALSE);
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_man, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_man, env);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, terminate_bean);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org