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/10 10:51:10 UTC
svn commit: r473292 [3/6] - in /webservices/sandesha/trunk/c: include/
src/client/ src/core/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ 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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Fri Nov 10 01:51:08 2006
@@ -208,7 +208,7 @@
"[sandesha2] sandesha2_app_msg_processor_process_in_msg .........");
printf("sandesha2_app_msg_processor_process_in_msg\n");
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx,
+ seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
if(seq_ack)
{
@@ -217,23 +217,23 @@
SANDESHA2_MSG_PROCESSOR_PROCESS_IN_MSG(ack_proc, env, rm_msg_ctx);
}
- ack_requested = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ ack_requested = (sandesha2_ack_requested_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
if(ack_requested)
{
- SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env,
+ sandesha2_ack_requested_set_must_understand(ack_requested, env,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+ sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
}
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
if(!msg_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- property = SANDESHA2_MSG_CTX_GET_PROPERTY(rm_msg_ctx, env,
+ property = sandesha2_msg_ctx_get_property(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE);
if(property)
@@ -270,7 +270,7 @@
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
- SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
+ sandesha2_msg_ctx_get_msg_ctx(fault_ctx, env)))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_FAULT,
AXIS2_FAILURE);
@@ -281,7 +281,7 @@
}
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,
+ 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);
str_seq_id = sandesha2_identifier_get_identifier(
@@ -293,7 +293,7 @@
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
- SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
+ sandesha2_msg_ctx_get_msg_ctx(fault_ctx, env)))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_FAULT,
AXIS2_FAILURE);
@@ -303,14 +303,14 @@
return AXIS2_SUCCESS;
}
sandesha2_seq_set_must_understand(seq, env, AXIS2_FALSE);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+ sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
fault_ctx = sandesha2_fault_mgr_check_for_seq_closed(env, rm_msg_ctx,
str_seq_id, storage_mgr);
if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
- SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
+ sandesha2_msg_ctx_get_msg_ctx(fault_ctx, env)))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_FAULT,
AXIS2_FAILURE);
@@ -321,7 +321,7 @@
}
sandesha2_seq_mgr_update_last_activated_time(env, str_seq_id,
storage_mgr);
- msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ 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(
@@ -365,48 +365,48 @@
highest_in_msg_key_str, msg_ctx);
if(highest_in_msg_no_str)
{
- SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_update(seq_prop_mgr, env,
highest_msg_no_bean);
- SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_update(seq_prop_mgr, env,
highest_msg_key_bean);
}
else
{
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
highest_msg_no_bean);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
highest_msg_key_bean);
}
}
if(msgs_bean)
{
- msgs_str = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(msgs_bean, env);
+ msgs_str = sandesha2_seq_property_bean_get_value(msgs_bean, env);
}
else
{
msgs_bean = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(msgs_bean, env, str_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(msgs_bean, env,
+ sandesha2_seq_property_bean_set_seq_id(msgs_bean, env, str_seq_id);
+ sandesha2_seq_property_bean_set_name(msgs_bean, env,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
+ sandesha2_seq_property_bean_set_value(msgs_bean, env, msgs_str);
}
if(sandesha2_app_msg_processor_msg_num_is_in_list(env, msgs_str, msg_no) &&
0 == AXIS2_STRCMP(SANDESHA2_QOS_DEFAULT_INVOCATION_TYPE,
SANDESHA2_QOS_EXACTLY_ONCE))
{
- SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
}
if(msgs_str && 0 < AXIS2_STRLEN(msgs_str))
msgs_str = axis2_strcat(env, msgs_str, ",", msg_num_str, NULL);
else
msgs_str = AXIS2_STRDUP(msg_num_str, env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
- SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, msgs_bean);
+ 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,
env);
- next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_mgr, env,
+ next_msg_bean = sandesha2_next_msg_mgr_retrieve(next_mgr, env,
str_seq_id);
if(!next_msg_bean)
{
@@ -426,7 +426,7 @@
axis2_char_t *str_value = NULL;
axis2_property_t *property = NULL;
- incoming_seq_list_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
+ incoming_seq_list_bean = sandesha2_seq_property_mgr_retrieve(
seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
if(!incoming_seq_list_bean)
@@ -436,16 +436,16 @@
* here we don't have a list so [] should be passed
*/
incoming_seq_list_bean = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(incoming_seq_list_bean, env,
+ sandesha2_seq_property_bean_set_seq_id(incoming_seq_list_bean, env,
SANDESHA2_SEQ_PROP_ALL_SEQS);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(incoming_seq_list_bean, env,
+ sandesha2_seq_property_bean_set_name(incoming_seq_list_bean, env,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(incoming_seq_list_bean,
+ sandesha2_seq_property_bean_set_value(incoming_seq_list_bean,
env, "[]");
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
incoming_seq_list_bean);
}
- str_value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
+ str_value = sandesha2_seq_property_bean_get_value(
incoming_seq_list_bean, env);
incoming_seq_list = sandesha2_utils_get_array_list_from_string(env,
str_value);
@@ -464,10 +464,10 @@
str_seq_list = sandesha2_utils_array_list_to_string(env,
incoming_seq_list, SANDESHA2_ARRAY_LIST_STRING);
/* saving the property. */
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(incoming_seq_list_bean,
+ sandesha2_seq_property_bean_set_value(incoming_seq_list_bean,
env, str_seq_list);
AXIS2_FREE(env->allocator, str_seq_list);
- SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_update(seq_prop_mgr, env,
incoming_seq_list_bean);
}
/* save the message */
@@ -481,9 +481,9 @@
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
SANDESHA2_VALUE_TRUE, env));
/* To avoid performing application processing more than once. */
- SANDESHA2_MSG_CTX_SET_PROPERTY(rm_msg_ctx, env,
+ sandesha2_msg_ctx_set_property(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
- SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
/* Start the invoker if stopped */
sandesha2_utils_start_invoker_for_seq(env, conf_ctx, str_seq_id);
}
@@ -538,7 +538,7 @@
"[sandesha2] sandesha2_app_msg_processor_process_out_msg .........");
printf("sandesha2_app_msg_processor_process_out_msg\n");
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
@@ -574,7 +574,7 @@
sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
- req_seq = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
+ req_seq = (sandesha2_seq_t *) sandesha2_msg_ctx_get_msg_part(
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
if(!req_seq)
{
@@ -672,7 +672,7 @@
internal_seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_NUMBER,
msg_number_str);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
res_highest_msg_bean);
if(last_msg)
{
@@ -687,12 +687,12 @@
env, internal_seq_id,
SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO,
msg_number_str);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
res_highest_msg_key_bean);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
res_last_msg_key_bean);
}
- out_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(is_svr_side)
{
@@ -705,7 +705,7 @@
incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(env,
internal_seq_id);
- incoming_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
+ incoming_to_bean = sandesha2_seq_property_mgr_retrieve(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(incoming_to_bean)
@@ -713,7 +713,7 @@
axis2_char_t *incoming_to = NULL;
axis2_char_t *value = NULL;
- value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(incoming_to_bean, env);
+ value = sandesha2_seq_property_bean_get_value(incoming_to_bean, env);
incoming_to = AXIS2_STRDUP(value, env);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -723,12 +723,12 @@
}
req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
- seq = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
+ seq = (sandesha2_seq_t *) sandesha2_msg_ctx_get_msg_part(
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
req_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(seq, env), env);
- spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+ 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)
{
@@ -736,7 +736,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- spec_ver = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(spec_ver_bean, env);
+ spec_ver = sandesha2_seq_property_bean_get_value(spec_ver_bean, env);
}
else
{
@@ -760,7 +760,7 @@
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
- res_create_seq_added = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
+ res_create_seq_added = sandesha2_seq_property_mgr_retrieve(
seq_prop_mgr, env, internal_seq_id,
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
@@ -775,7 +775,7 @@
env, internal_seq_id,
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT,
SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
res_create_seq_added);
if(AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
{
@@ -802,14 +802,14 @@
incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(
env, internal_seq_id);
- reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
+ reply_to_epr_bean = sandesha2_seq_property_mgr_retrieve(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
if(reply_to_epr_bean)
{
axis2_endpoint_ref_t *acks_epr = NULL;
acks_epr = axis2_endpoint_ref_create(env,
- SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(reply_to_epr_bean,
+ sandesha2_seq_property_bean_get_value(reply_to_epr_bean,
env));
if(acks_epr)
acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
@@ -824,16 +824,16 @@
internal_seq_id, acks_to, storage_mgr);
}
}
- soap_env = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env);
+ soap_env = sandesha2_msg_ctx_get_soap_envelope(rm_msg_ctx, env);
if(!soap_env)
{
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
AXIOM_SOAP12);
- SANDESHA2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx, env, soap_env);
+ sandesha2_msg_ctx_set_soap_envelope(rm_msg_ctx, env, soap_env);
}
msg_id = axis2_uuid_gen(env);
- if(!SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env))
- SANDESHA2_MSG_CTX_SET_MSG_ID(rm_msg_ctx, env, msg_id);
+ if(!sandesha2_msg_ctx_get_msg_id(rm_msg_ctx, env))
+ sandesha2_msg_ctx_set_msg_id(rm_msg_ctx, env, msg_id);
if(is_svr_side)
{
@@ -931,29 +931,29 @@
AXIS2_PARAM_CHECK(env->error, msg_str, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
+ 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);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx,
+ conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx,
env), env);
if(!conf_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- ack_requested = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ ack_requested = (sandesha2_ack_requested_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
if(ack_requested)
{
- SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env,
+ sandesha2_ack_requested_set_must_understand(ack_requested, env,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+ sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
}
ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id,
mgr);
engine = axis2_engine_create(env, conf_ctx);
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(ack_rm_msg, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(ack_rm_msg, env);
if(AXIS2_SUCCESS != AXIS2_ENGINE_SEND(engine, env, msg_ctx))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_ACK, AXIS2_FAILURE);
@@ -996,13 +996,13 @@
AXIS2_PARAM_CHECK(env->error, acks_to, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
create_seq_rm_msg = sandesha2_msg_creator_create_create_seq_msg(env,
rm_msg_ctx, internal_seq_id, acks_to, mgr);
- SANDESHA2_MSG_CTX_SET_FLOW(create_seq_rm_msg, env,
+ sandesha2_msg_ctx_set_flow(create_seq_rm_msg, env,
SANDESHA2_MSG_CTX_OUT_FLOW);
- create_seq_part = (sandesha2_create_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ 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(
mgr, env);
@@ -1017,19 +1017,19 @@
sandesha2_seq_property_bean_t *offer_seq_bean = NULL;
seq_offer_id = sandesha2_identifier_get_identifier(
- SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env),
+ sandesha2_seq_offer_get_identifier(seq_offer, env),
env);
offer_seq_bean = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(offer_seq_bean, 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,
+ sandesha2_seq_property_bean_set_seq_id(offer_seq_bean, env,
internal_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(offer_seq_bean, env,
+ sandesha2_seq_property_bean_set_value(offer_seq_bean, env,
seq_offer_id);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
offer_seq_bean);
}
- create_seq_msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(create_seq_rm_msg, env);
+ create_seq_msg = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg, env);
AXIS2_MSG_CTX_SET_RELATES_TO(create_seq_msg, env, NULL);
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
@@ -1049,15 +1049,15 @@
}
str_key = axis2_uuid_gen(env);
create_seq_entry = sandesha2_sender_bean_create(env);
- SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(create_seq_entry, env,
+ sandesha2_sender_bean_set_msg_ctx_ref_key(create_seq_entry, env,
str_key);
millisecs = sandesha2_utils_get_current_time_in_millis(env);
- SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(create_seq_entry, env, millisecs);
- msg_id = SANDESHA2_MSG_CTX_GET_MSG_ID(create_seq_rm_msg, env);
- SANDESHA2_SENDER_BEAN_SET_MSG_ID(create_seq_entry, env, msg_id);
- SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(create_seq_entry, env,
+ sandesha2_sender_bean_set_time_to_send(create_seq_entry, env, millisecs);
+ msg_id = sandesha2_msg_ctx_get_msg_id(create_seq_rm_msg, env);
+ sandesha2_sender_bean_set_msg_id(create_seq_entry, env, msg_id);
+ sandesha2_sender_bean_set_internal_seq_id(create_seq_entry, env,
internal_seq_id);
- SANDESHA2_SENDER_BEAN_SET_SEND(create_seq_entry, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_send(create_seq_entry, env, AXIS2_TRUE);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_FALSE,
@@ -1065,9 +1065,9 @@
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property,
AXIS2_FALSE);
- SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(create_seq_entry, env,
+ sandesha2_sender_bean_set_msg_type(create_seq_entry, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ);
- SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env,
+ sandesha2_sender_mgr_insert(retransmitter_man, env,
create_seq_entry);
sandesha2_storage_mgr_store_msg_ctx(mgr, env, str_key, create_seq_msg);
property = axis2_property_create(env);
@@ -1139,17 +1139,17 @@
AXIS2_PARAM_CHECK(env->error, storage_key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- app_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ app_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
retransmitter_man = sandesha2_storage_mgr_get_retrans_mgr
(mgr, env);
- to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
- reply_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ reply_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
- out_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(NULL == to_bean)
{
@@ -1158,10 +1158,10 @@
return AXIS2_FAILURE;
}
to_epr = axis2_endpoint_ref_create(env,
- SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(to_bean, env));
+ sandesha2_seq_property_bean_get_value(to_bean, env));
if(NULL != reply_to_bean)
reply_to_epr = axis2_endpoint_ref_create(env,
- SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(reply_to_bean,
+ sandesha2_seq_property_bean_get_value(reply_to_bean,
env));
if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(app_msg_ctx, env))
@@ -1180,13 +1180,13 @@
reply_to, env);
}
if(NULL != new_to_str)
- SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, axis2_endpoint_ref_create(env,
+ sandesha2_msg_ctx_set_to(rm_msg_ctx, env, axis2_endpoint_ref_create(env,
new_to_str));
else
- SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, to_epr);
+ sandesha2_msg_ctx_set_to(rm_msg_ctx, env, to_epr);
if(NULL != reply_to_epr)
- SANDESHA2_MSG_CTX_SET_REPLY_TO(rm_msg_ctx, env, reply_to_epr);
+ sandesha2_msg_ctx_set_reply_to(rm_msg_ctx, env, reply_to_epr);
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, mgr);
if(NULL == rm_version)
@@ -1206,7 +1206,7 @@
sandesha2_msg_ctx_t *req_rm_msg = NULL;
req_rm_msg = sandesha2_msg_init_init_msg(env, req_msg);
- req_seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg,
+ req_seq = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(req_rm_msg,
env, SANDESHA2_MSG_PART_SEQ);
if(NULL == req_seq)
{
@@ -1253,37 +1253,37 @@
}
}
}
- if(NULL == out_seq_bean || NULL == SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
+ if(NULL == out_seq_bean || NULL == sandesha2_seq_property_bean_get_value(
out_seq_bean, env))
str_identifier = SANDESHA2_TEMP_SEQ_ID;
else
- str_identifier = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(out_seq_bean, env);
+ 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_seq_set_identifier(seq, env, identifier);
- SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
+ sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
(sandesha2_iom_rm_part_t*)seq);
/* TODO add_ack_requested */
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+ sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
app_msg_entry = sandesha2_sender_bean_create(env);
- SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(app_msg_entry, env,
+ sandesha2_sender_bean_set_msg_ctx_ref_key(app_msg_entry, env,
storage_key);
millisecs = sandesha2_utils_get_current_time_in_millis(env);
- SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(app_msg_entry, env, millisecs);
- msg_id = SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env);
- SANDESHA2_SENDER_BEAN_SET_MSG_ID(app_msg_entry, env, msg_id);
- SANDESHA2_SENDER_BEAN_SET_MSG_NO(app_msg_entry, env, msg_num);
- SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(app_msg_entry, env,
+ sandesha2_sender_bean_set_time_to_send(app_msg_entry, env, millisecs);
+ msg_id = sandesha2_msg_ctx_get_msg_id(rm_msg_ctx, env);
+ sandesha2_sender_bean_set_msg_id(app_msg_entry, env, msg_id);
+ sandesha2_sender_bean_set_msg_no(app_msg_entry, env, msg_num);
+ sandesha2_sender_bean_set_msg_type(app_msg_entry, env,
SANDESHA2_MSG_TYPE_APPLICATION);
- if(NULL == out_seq_bean || NULL == SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
+ if(NULL == out_seq_bean || NULL == sandesha2_seq_property_bean_get_value(
out_seq_bean, env))
{
- SANDESHA2_SENDER_BEAN_SET_SEND(app_msg_entry, env, AXIS2_FALSE);
+ sandesha2_sender_bean_set_send(app_msg_entry, env, AXIS2_FALSE);
}
else
{
- SANDESHA2_SENDER_BEAN_SET_SEND(app_msg_entry, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_send(app_msg_entry, env, AXIS2_TRUE);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
@@ -1291,9 +1291,9 @@
AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
- SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
+ 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_SENDER_MGR_INSERT(retransmitter_man, env, app_msg_entry);
+ sandesha2_sender_mgr_insert(retransmitter_man, env, app_msg_entry);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -1348,7 +1348,7 @@
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
- next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+ next_msg_no_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env, internal_seq_id,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
@@ -1356,7 +1356,7 @@
{
axis2_char_t *str_value = NULL;
- str_value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(next_msg_no_bean, env);
+ str_value = sandesha2_seq_property_bean_get_value(next_msg_no_bean, env);
if(NULL != str_value)
{
next_msg_no = atol(str_value);
@@ -1389,28 +1389,28 @@
}
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
mgr, env);
- next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+ next_msg_no_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env, internal_seq_id,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
if(NULL == next_msg_no_bean)
{
update = AXIS2_FALSE;
next_msg_no_bean = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(next_msg_no_bean, env,
+ sandesha2_seq_property_bean_set_seq_id(next_msg_no_bean, env,
internal_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(next_msg_no_bean, env,
+ sandesha2_seq_property_bean_set_name(next_msg_no_bean, env,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
}
sprintf(str_long, "%ld", msg_num);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(next_msg_no_bean, env, str_long);
+ sandesha2_seq_property_bean_set_value(next_msg_no_bean, env, str_long);
if(AXIS2_TRUE == update)
{
- SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_update(seq_prop_mgr, env,
next_msg_no_bean);
}
else
{
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
next_msg_no_bean);
}
return AXIS2_SUCCESS;
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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Fri Nov 10 01:51:08 2006
@@ -154,12 +154,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- close_seq = (sandesha2_close_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ close_seq = (sandesha2_close_seq_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
seq_id = sandesha2_identifier_get_identifier(
@@ -170,51 +170,51 @@
if(NULL != fault_rm_msg_ctx)
{
engine = axis2_engine_create(env, conf_ctx);
- AXIS2_ENGINE_SEND(engine, env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
+ AXIS2_ENGINE_SEND(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_rm_msg_ctx, env));
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);
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,
+ sandesha2_seq_property_bean_set_seq_id(close_seq_bean, env, seq_id);
+ sandesha2_seq_property_bean_set_name(close_seq_bean, env,
SANDESHA2_SEQ_PROP_SEQ_CLOSED);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(close_seq_bean, env,
+ sandesha2_seq_property_bean_set_value(close_seq_bean, env,
SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, close_seq_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, close_seq_bean);
ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id,
storage_mgr);
- ack_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(ack_rm_msg, env);
- rm_ns_val = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(ack_rm_msg, env);
- SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx, env);
- SANDESHA2_MSG_CTX_SET_RM_NS_VAL(ack_rm_msg, env, rm_ns_val);
+ ack_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(ack_rm_msg, env);
+ rm_ns_val = sandesha2_msg_ctx_get_rm_ns_val(ack_rm_msg, env);
+ sandesha2_msg_ctx_get_rm_ns_val(rm_msg_ctx, env);
+ sandesha2_msg_ctx_set_rm_ns_val(ack_rm_msg, env, rm_ns_val);
envelope = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env)));
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(ack_msg_ctx, env, envelope);
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(ack_rm_msg,
+ seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(ack_rm_msg,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
close_seq_res_msg = axis2_core_utils_create_out_msg_ctx(env, msg_ctx);
close_seq_res_rm_msg = sandesha2_msg_creator_create_close_seq_res_msg(env,
rm_msg_ctx, close_seq_res_msg, storage_mgr);
- SANDESHA2_MSG_CTX_SET_MSG_PART(close_seq_res_rm_msg, env,
+ sandesha2_msg_ctx_set_msg_part(close_seq_res_rm_msg, env,
SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
(sandesha2_iom_rm_part_t*)seq_ack);
- SANDESHA2_MSG_CTX_SET_FLOW(close_seq_res_rm_msg, env, AXIS2_OUT_FLOW);
+ sandesha2_msg_ctx_set_flow(close_seq_res_rm_msg, env, AXIS2_OUT_FLOW);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
env));
- SANDESHA2_MSG_CTX_SET_PROPERTY(close_seq_res_rm_msg, env,
+ sandesha2_msg_ctx_set_property(close_seq_res_rm_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(close_seq_res_msg, env, AXIS2_TRUE);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(close_seq_res_rm_msg, env);
+ sandesha2_msg_ctx_add_soap_envelope(close_seq_res_rm_msg, env);
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND(engine, env, close_seq_res_msg);
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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Fri Nov 10 01:51:08 2006
@@ -175,8 +175,8 @@
"[sandesha2] sandesha2_create_seq_msg_processor_process_in_msg .........");
printf("sandesha2_create_seq_msg_processor_process_in_msg\n");
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
- create_seq_part = (sandesha2_create_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
+ create_seq_part = (sandesha2_create_seq_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
if(NULL == create_seq_part)
{
@@ -197,7 +197,7 @@
axis2_engine_t *engine = NULL;
engine = axis2_engine_create(env, conf_ctx);
- AXIS2_ENGINE_SEND_FAULT(engine, env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
+ AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_rm_msg_ctx, env));
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
@@ -216,11 +216,11 @@
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
env));
/* For making sure that this won't be processed again */
- SANDESHA2_MSG_CTX_SET_PROPERTY(create_seq_res_msg, env,
+ sandesha2_msg_ctx_set_property(create_seq_res_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
create_seq_res_part = (sandesha2_create_seq_res_t*)
- SANDESHA2_MSG_CTX_GET_MSG_PART(create_seq_res_msg,
+ sandesha2_msg_ctx_get_msg_part(create_seq_res_msg,
env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part,
env);
@@ -242,7 +242,7 @@
return AXIS2_FAILURE;
}
offer_seq_id = sandesha2_identifier_get_identifier(
- SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env), env);
+ sandesha2_seq_offer_get_identifier(seq_offer, env), env);
offer_accepted = sandesha2_create_seq_msg_processor_offer_accepted(
env, offer_seq_id, rm_msg_ctx,
storage_mgr);
@@ -267,22 +267,22 @@
SANDESHA2_CREATE_SEQ_MGR_INSERT(create_seq_mgr, env, create_seq_bean);
out_seq_bean = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(out_seq_bean, env,
+ sandesha2_seq_property_bean_set_name(out_seq_bean, env,
SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(out_seq_bean, env,
+ sandesha2_seq_property_bean_set_seq_id(out_seq_bean, env,
offer_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(out_seq_bean, env,
+ sandesha2_seq_property_bean_set_value(out_seq_bean, env,
int_seq_id);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
out_seq_bean);
}
else
{
sandesha2_create_seq_res_set_accept(create_seq_res_part, env, NULL);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(create_seq_res_msg, env);
+ sandesha2_msg_ctx_add_soap_envelope(create_seq_res_msg, env);
}
}
- acks_to = SANDESHA2_ADDRESS_GET_EPR(SANDESHA2_ACKS_TO_GET_ADDRESS(
+ acks_to = SANDESHA2_ADDRESS_GET_EPR(sandesha2_acks_to_get_address(
sandesha2_create_seq_get_acks_to(create_seq_part, env),
env), env);
if(NULL == acks_to || NULL == AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to,
@@ -297,13 +297,13 @@
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env,
new_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
(axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env));
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, acks_to_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(out_msg_ctx, env, AXIS2_TRUE);
sandesha2_seq_mgr_update_last_activated_time(env, new_seq_id,
storage_mgr);
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND(engine, env, out_msg_ctx);
- to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
new_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
if(NULL == to_bean)
{
@@ -311,7 +311,7 @@
return AXIS2_FAILURE;
}
to_epr = axis2_endpoint_ref_create(env,
- SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(to_bean, env));
+ sandesha2_seq_property_bean_get_value(to_bean, env));
addr_ns_uri = sandesha2_utils_get_seq_property(env, new_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
storage_mgr);
@@ -328,7 +328,7 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_create_seq_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
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=473292&r1=473291&r2=473292
==============================================================================
--- 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 Fri Nov 10 01:51:08 2006
@@ -184,13 +184,13 @@
"[sandesha2] sandesha2_create_seq_res_msg_processor_process_in_msg .........");
printf("sandesha2_create_seq_res_msg_processor_process_in_msg\n");
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx,
+ seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
if(NULL != seq_ack)
{
@@ -198,7 +198,7 @@
ack_processor = sandesha2_ack_msg_processor_create(env);
SANDESHA2_MSG_PROCESSOR_PROCESS_IN_MSG(ack_processor, env, rm_msg_ctx);
}
- csr_part = (sandesha2_create_seq_res_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ csr_part = (sandesha2_create_seq_res_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
if(NULL == csr_part)
{
@@ -252,7 +252,7 @@
sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env, new_out_seq_id);
SANDESHA2_CREATE_SEQ_MGR_UPDATE(create_seq_mgr, env, create_seq_bean);
- create_seq_sender_bean = SANDESHA2_SENDER_MGR_RETRIEVE(retrans_mgr,
+ create_seq_sender_bean = sandesha2_sender_mgr_retrieve(retrans_mgr,
env, create_seq_msg_id);
if(NULL == create_seq_sender_bean)
{
@@ -260,11 +260,11 @@
" entry is not found");
return AXIS2_FAILURE;
}
- create_seq_storage_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
+ create_seq_storage_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
create_seq_sender_bean, 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);
+ sandesha2_sender_mgr_remove(retrans_mgr, env, create_seq_msg_id);
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,
@@ -273,8 +273,8 @@
int_seq_bean = sandesha2_seq_property_bean_create_with_data(env,
new_out_seq_id, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID,
int_seq_id);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, out_seq_bean);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, int_seq_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, out_seq_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, int_seq_bean);
accept = sandesha2_create_seq_res_get_accept(csr_part, env);
if(NULL != accept)
@@ -292,7 +292,7 @@
axis2_char_t *rm_spec_ver = NULL;
axis2_char_t *addr_ns_val = NULL;
- offerd_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
+ offerd_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
int_seq_id, SANDESHA2_SEQ_PROP_OFFERED_SEQ);
if(NULL == offerd_seq_bean)
{
@@ -300,56 +300,56 @@
" sequence entry. But an accept was received");
return AXIS2_FAILURE;
}
- offered_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(offerd_seq_bean,
+ offered_seq_id = sandesha2_seq_property_bean_get_value(offerd_seq_bean,
env);
- acks_to_epr = SANDESHA2_ADDRESS_GET_EPR(SANDESHA2_ACKS_TO_GET_ADDRESS(
+ acks_to_epr = SANDESHA2_ADDRESS_GET_EPR(sandesha2_acks_to_get_address(
sandesha2_accept_get_acks_to(accept, env), env), env);
acks_to_bean = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(acks_to_bean, env,
+ sandesha2_seq_property_bean_set_name(acks_to_bean, env,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(acks_to_bean, env,
+ sandesha2_seq_property_bean_set_seq_id(acks_to_bean, env,
offered_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(acks_to_bean, env,
+ sandesha2_seq_property_bean_set_value(acks_to_bean, env,
(axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
acks_to_epr, env));
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, acks_to_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
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);
+ 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,
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);
+ 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);
spec_ver_bean = sandesha2_seq_property_bean_create_with_data(env,
offered_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION,
rm_spec_ver);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, spec_ver_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_ver_bean);
rcvd_msg_bean = sandesha2_seq_property_bean_create_with_data(env,
offered_seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES, "");
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, rcvd_msg_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rcvd_msg_bean);
msgs_bean = sandesha2_seq_property_bean_create_with_data(env,
offered_seq_id,
SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES, "");
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, msgs_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, msgs_bean);
- addr_ns_val = SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx, env);
+ addr_ns_val = sandesha2_msg_ctx_get_addr_ns_val(rm_msg_ctx, env);
addr_ver_bean = sandesha2_seq_property_bean_create_with_data(env,
offered_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
addr_ns_val);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, addr_ver_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, addr_ver_bean);
}
target_bean = sandesha2_sender_bean_create(env);
- SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(target_bean, env, int_seq_id);
- SANDESHA2_SENDER_BEAN_SET_SEND(target_bean, env, AXIS2_FALSE);
- SANDESHA2_SENDER_BEAN_SET_RESEND(target_bean, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_internal_seq_id(target_bean, env, int_seq_id);
+ sandesha2_sender_bean_set_send(target_bean, env, AXIS2_FALSE);
+ sandesha2_sender_bean_set_resend(target_bean, env, AXIS2_TRUE);
- found_list = SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(retrans_mgr, env,
+ found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
target_bean);
if(found_list)
size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
@@ -366,7 +366,7 @@
sandesha2_ack_requested_t *ack_req_part = NULL;
tmp_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
- key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(tmp_bean, env);
+ key = sandesha2_sender_bean_get_msg_ctx_ref_key(tmp_bean, env);
app_msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
key, conf_ctx);
if(NULL == app_msg_ctx)
@@ -385,7 +385,7 @@
assumed_rm_ns = sandesha2_spec_specific_consts_get_rm_ns_val(env,
rm_ver);
app_rm_msg = sandesha2_msg_init_init_msg(env, app_msg_ctx);
- seq_part = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ seq_part = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(
app_rm_msg, env, SANDESHA2_MSG_PART_SEQ);
if(NULL == seq_part)
{
@@ -397,18 +397,18 @@
sandesha2_identifier_set_identifier(ident, env, new_out_seq_id);
sandesha2_seq_set_identifier(seq_part, env, ident);
- ack_req_part = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ ack_req_part = (sandesha2_ack_requested_t*)sandesha2_msg_ctx_get_msg_part(
app_rm_msg, env, SANDESHA2_MSG_PART_ACK_REQUEST);
if(NULL != ack_req_part)
{
sandesha2_identifier_t *ident1 = NULL;
ident1 = sandesha2_identifier_create(env, assumed_rm_ns);
sandesha2_identifier_set_identifier(ident1, env, new_out_seq_id);
- SANDESHA2_ACK_REQUESTED_SET_IDENTIFIER(ack_req_part, env, ident1);
+ sandesha2_ack_requested_set_identifier(ack_req_part, env, ident1);
}
- 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_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_seq_mgr_update_last_activated_time(env, int_seq_id, storage_mgr);
@@ -418,7 +418,7 @@
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_create_seq_res_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c Fri Nov 10 01:51:08 2006
@@ -50,7 +50,7 @@
{
int msg_type = -1;
- msg_type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
+ msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
switch(msg_type)
{
case SANDESHA2_MSG_TYPE_CREATE_SEQ:
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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Fri Nov 10 01:51:08 2006
@@ -178,9 +178,9 @@
"[sandesha2] sandesha2_terminate_msg_processor_process_in_msg .........");
printf("sandesha2_terminate_msg_processor_process_in_msg\n");
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
if(NULL != seq_ack)
@@ -189,7 +189,7 @@
ack_processor = sandesha2_ack_msg_processor_create(env);
SANDESHA2_MSG_PROCESSOR_PROCESS_IN_MSG(ack_processor, env, rm_msg_ctx);
}
- term_seq = (sandesha2_terminate_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ term_seq = (sandesha2_terminate_seq_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
if(NULL == term_seq)
{
@@ -217,21 +217,21 @@
axis2_engine_t *engine = NULL;
engine = axis2_engine_create(env, conf_ctx);
- AXIS2_ENGINE_SEND_FAULT(engine, env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
+ AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_ctx, env));
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);
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,
+ sandesha2_seq_property_bean_set_seq_id(term_rcvd_bean, env, seq_id);
+ sandesha2_seq_property_bean_set_name(term_rcvd_bean, env,
SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(term_rcvd_bean, env,
+ sandesha2_seq_property_bean_set_value(term_rcvd_bean, env,
SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, term_rcvd_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_rcvd_bean);
- spec_version = SANDESHA2_MSG_CTX_GET_RM_SPEC_VER(rm_msg_ctx, env);
+ spec_version = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_term_seq_res_reqd(env,
spec_version))
sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(env,
@@ -242,10 +242,10 @@
seq_id, storage_man);
transmit_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, transmit_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, transmit_bean);
sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_man);
- SANDESHA2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg");
printf("[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg\n");
@@ -307,7 +307,7 @@
last_in_msg_bean = sandesha2_seq_property_bean_create_with_data(env,
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);
+ 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_msg_key, conf_ctx);
if(highest_in_msg)
@@ -322,7 +322,7 @@
highest_out_rm_msg = sandesha2_msg_init_init_msg(env,
highest_out_msg);
seq_of_out_msg = (sandesha2_seq_t*)
- SANDESHA2_MSG_CTX_GET_MSG_PART(highest_out_rm_msg, env,
+ sandesha2_msg_ctx_get_msg_part(highest_out_rm_msg, env,
SANDESHA2_MSG_PART_SEQ);
if(NULL != seq_of_out_msg)
{
@@ -336,7 +336,7 @@
sandesha2_seq_property_bean_create_with_data(env,
res_side_int_seq_id, SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO,
long_str);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
highest_out_msg_bean);
add_res_side_term = AXIS2_TRUE;
}
@@ -382,20 +382,20 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_man, AXIS2_FAILURE);
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
out_msg_ctx = axis2_core_utils_create_out_msg_ctx(env, msg_ctx);
out_rm_msg = sandesha2_msg_creator_create_terminate_seq_res_msg(env,
rm_msg_ctx, out_msg_ctx, storage_man);
ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id,
storage_man);
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(ack_rm_msg,
+ seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(ack_rm_msg,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- SANDESHA2_MSG_CTX_SET_MSG_PART(out_rm_msg, env,
+ sandesha2_msg_ctx_set_msg_part(out_rm_msg, env,
SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
(sandesha2_iom_rm_part_t*)seq_ack);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(out_rm_msg, env);
- SANDESHA2_MSG_CTX_SET_FLOW(out_rm_msg, env, AXIS2_OUT_FLOW);
+ sandesha2_msg_ctx_add_soap_envelope(out_rm_msg, env);
+ sandesha2_msg_ctx_set_flow(out_rm_msg, env, AXIS2_OUT_FLOW);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -465,7 +465,7 @@
"[sandesha2] sandesha2_terminate_msg_processor_process_out_msg .........");
printf("sandesha2_terminate_msg_processor_process_out_msg\n");
- msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
@@ -499,7 +499,7 @@
AXIS2_OP_GET_IN_FLOW(old_op, env));
op_ctx = axis2_op_ctx_create(env, out_in_op, NULL);
AXIS2_OP_CTX_SET_PARENT(op_ctx, env, AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env));
- AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, SANDESHA2_MSG_CTX_GET_MSG_ID(
+ AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, sandesha2_msg_ctx_get_msg_id(
rm_msg_ctx, env), op_ctx);
if(NULL != terminated && 0 == AXIS2_STRCMP(terminated, SANDESHA2_VALUE_TRUE))
@@ -508,11 +508,11 @@
"added previously");
return AXIS2_SUCCESS;
}
- term_seq_part = (sandesha2_terminate_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ 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(
term_seq_part, env), env, out_seq_id);
- SANDESHA2_MSG_CTX_SET_FLOW(rm_msg_ctx, env, AXIS2_OUT_FLOW);
+ sandesha2_msg_ctx_set_flow(rm_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
@@ -546,21 +546,21 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
AXIS2_TRANSPORT_URL, property, AXIS2_FALSE);
}
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+ sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
key = axis2_uuid_gen(env);
term_bean = sandesha2_sender_bean_create(env);
- SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(term_bean, env, key);
+ sandesha2_sender_bean_set_msg_ctx_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);
/* TODO: refine the terminate delay */
- SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(term_bean, env,
+ sandesha2_sender_bean_set_time_to_send(term_bean, env,
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
- SANDESHA2_SENDER_BEAN_SET_MSG_ID(term_bean, env,
+ sandesha2_sender_bean_set_msg_id(term_bean, env,
(axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env));
- SANDESHA2_SENDER_BEAN_SET_SEND(term_bean, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_send(term_bean, env, AXIS2_TRUE);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -569,18 +569,18 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
- SANDESHA2_SENDER_BEAN_SET_RESEND(term_bean, env, AXIS2_FALSE);
+ sandesha2_sender_bean_set_resend(term_bean, env, AXIS2_FALSE);
retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_man, env);
- SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, term_bean);
+ sandesha2_sender_mgr_insert(retrans_mgr, env, term_bean);
term_added = sandesha2_seq_property_bean_create(env);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(term_added, env,
+ sandesha2_seq_property_bean_set_name(term_added, env,
SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(term_added, env, out_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(term_added, env, SANDESHA2_VALUE_TRUE);
+ sandesha2_seq_property_bean_set_seq_id(term_added, env, out_seq_id);
+ sandesha2_seq_property_bean_set_value(term_added, env, SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, term_added);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_added);
out_desc = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
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?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c Fri Nov 10 01:51:08 2006
@@ -20,51 +20,20 @@
#include <axis2_utils.h>
/* invoker_bean struct */
-typedef struct sandesha2_next_msg_bean_impl sandesha2_next_msg_bean_impl_t;
-
-struct sandesha2_next_msg_bean_impl
+struct sandesha2_next_msg_bean_t
{
- sandesha2_next_msg_bean_t o_bean;
axis2_char_t *seq_id;
long msg_no;
};
-#define AXIS2_INTF_TO_IMPL(next_msg) ((sandesha2_next_msg_bean_impl_t*)next_msg)
-
-
-/************* FUNCTION prototypes ***************/
-
-axis2_status_t AXIS2_CALL
- sandesha2_next_msg_bean_free (sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
- 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_seq_id(sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env, axis2_char_t *seq_id);
-
-long AXIS2_CALL
- sandesha2_next_msg_bean_get_next_msg_no_to_process(sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env);
-
-void AXIS2_CALL
- sandesha2_next_msg_bean_set_next_msg_no_to_process(sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env, long next_msg_no);
-
-
-
-
AXIS2_EXTERN sandesha2_next_msg_bean_t* AXIS2_CALL
sandesha2_next_msg_bean_create(const axis2_env_t *env)
{
- sandesha2_next_msg_bean_impl_t *bean = NULL;
+ sandesha2_next_msg_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean = (sandesha2_next_msg_bean_impl_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_next_msg_bean_impl_t));
+ bean = (sandesha2_next_msg_bean_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_next_msg_bean_t));
if(!bean)
{
@@ -76,35 +45,20 @@
bean->seq_id = NULL;
bean->msg_no = -1;
- bean->o_bean.ops = NULL;
- bean->o_bean.ops = (sandesha2_next_msg_bean_ops_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_next_msg_bean_ops_t));
-
- if(!bean->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean);
- return NULL;
- }
-
- bean->o_bean.ops->free = sandesha2_next_msg_bean_free;
- 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;
- bean->o_bean.ops->get_next_msg_no_to_process = sandesha2_next_msg_bean_get_next_msg_no_to_process;
-
- return &(bean->o_bean);
+ return bean;
}
AXIS2_EXTERN sandesha2_next_msg_bean_t* AXIS2_CALL
- sandesha2_next_msg_bean_create_with_data(const axis2_env_t *env,
- axis2_char_t *seq_id,
- long msg_no)
+sandesha2_next_msg_bean_create_with_data(
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ long msg_no)
{
- sandesha2_next_msg_bean_impl_t *bean = NULL;
+ sandesha2_next_msg_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean = (sandesha2_next_msg_bean_impl_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_next_msg_bean_impl_t));
+ bean = (sandesha2_next_msg_bean_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_next_msg_bean_t));
if(!bean)
{
@@ -116,88 +70,63 @@
bean->seq_id = (axis2_char_t*)AXIS2_STRDUP(seq_id, env);
bean->msg_no = msg_no;
- bean->o_bean.ops = NULL;
- bean->o_bean.ops = (sandesha2_next_msg_bean_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_next_msg_bean_ops_t));
-
- if(!bean->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean);
- return NULL;
- }
-
- bean->o_bean.ops->free = sandesha2_next_msg_bean_free;
- 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;
- bean->o_bean.ops->get_next_msg_no_to_process = sandesha2_next_msg_bean_get_next_msg_no_to_process;
-
- return &(bean->o_bean);
+ return bean;
}
axis2_status_t AXIS2_CALL
-sandesha2_next_msg_bean_free (sandesha2_next_msg_bean_t *next_msg,
- const axis2_env_t *env)
+sandesha2_next_msg_bean_free (
+ 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);
-
- if(bean_impl->seq_id)
+ if(next_msg_bean->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id= NULL;
+ AXIS2_FREE(env->allocator, next_msg_bean->seq_id);
+ next_msg_bean->seq_id= NULL;
}
return AXIS2_SUCCESS;
-
}
axis2_char_t* AXIS2_CALL
-sandesha2_next_msg_bean_get_seq_id(sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env)
+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->seq_id;
+ return next_msg_bean->seq_id;
}
void AXIS2_CALL
-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_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->seq_id)
+ if(next_msg_bean->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id = NULL;
+ AXIS2_FREE(env->allocator, next_msg_bean->seq_id);
+ next_msg_bean->seq_id = NULL;
}
- bean_impl->seq_id = (axis2_char_t*) AXIS2_STRDUP(seq_id, env);
+ next_msg_bean->seq_id = (axis2_char_t*) AXIS2_STRDUP(seq_id, env);
}
long AXIS2_CALL
-sandesha2_next_msg_bean_get_next_msg_no_to_process(sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env)
+sandesha2_next_msg_bean_get_next_msg_no_to_process(
+ 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->msg_no;
+ return next_msg_bean->msg_no;
}
void AXIS2_CALL
- sandesha2_next_msg_bean_set_next_msg_no_to_process(sandesha2_next_msg_bean_t *next_msg_bean,
- const axis2_env_t *env, long next_msg_no)
+sandesha2_next_msg_bean_set_next_msg_no_to_process(
+ sandesha2_next_msg_bean_t *next_msg_bean,
+ const axis2_env_t *env,
+ long next_msg_no)
{
- sandesha2_next_msg_bean_impl_t *bean_impl = NULL;
- bean_impl = AXIS2_INTF_TO_IMPL(next_msg_bean);
-
- bean_impl->msg_no = next_msg_no;
+ next_msg_bean->msg_no = next_msg_no;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org