You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by na...@apache.org on 2007/03/13 07:29:30 UTC
svn commit: r517561 [2/2] - in /webservices/sandesha/trunk/c:
samples/RMSampleService/ src/client/ src/core/ src/handlers/
src/msgprocessors/ src/polling/ src/storage/inmemory/
src/storage/permanent/ src/transport/ src/util/ src/workers/ src/wsrm/
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Mon Mar 12 23:29:29 2007
@@ -62,7 +62,7 @@
AXIS2_PARAM_CHECK(env->error, storage_mgr, NULL);
ref_msg = sandesha2_msg_ctx_get_msg_ctx(ref_rm_msg, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(ref_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,
env);
acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
@@ -81,7 +81,7 @@
ack_op = axis2_op_create(env);
axis2_op_set_msg_exchange_pattern(ack_op, env, AXIS2_MEP_URI_OUT_ONLY);
- ref_op = AXIS2_MSG_CTX_GET_OP(ref_msg, env);
+ ref_op = axis2_msg_ctx_get_op(ref_msg, env);
if(ref_op)
{
axis2_array_list_t *out_flow = NULL;
@@ -112,12 +112,12 @@
ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
sandesha2_msg_ctx_set_rm_ns_val(ack_rm_msg, env,
sandesha2_msg_ctx_get_rm_ns_val(ref_rm_msg, env));
- AXIS2_MSG_CTX_SET_WSA_MESSAGE_ID(ack_msg_ctx, env, axis2_uuid_gen(env));
+ axis2_msg_ctx_set_wsa_message_id(ack_msg_ctx, env, axis2_uuid_gen(env));
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
- AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(ref_msg, env)));
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(ack_msg_ctx, env, soap_env);
- AXIS2_MSG_CTX_SET_TO(ack_msg_ctx, env, acks_to);
+ axis2_msg_ctx_get_soap_envelope(ref_msg, env)));
+ axis2_msg_ctx_set_soap_envelope(ack_msg_ctx, env, soap_env);
+ axis2_msg_ctx_set_to(ack_msg_ctx, env, acks_to);
/* Adding the sequence acknowledgement part */
sandesha2_msg_creator_add_ack_msg(env, ack_rm_msg, seq_id, storage_mgr);
axis2_msg_ctx_set_property(ack_msg_ctx, env, AXIS2_TRANSPORT_IN, NULL,
@@ -127,7 +127,7 @@
storage_mgr);
if(addr_ns_uri)
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION,
+ property = axis2_msg_ctx_get_property(ack_msg_ctx, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
if(property)
{
@@ -145,14 +145,14 @@
{
axis2_op_ctx_t *op_ctx = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(ref_msg, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(ref_msg, env);
if(!op_ctx)
{
axis2_op_t *op = axis2_op_create(env);
axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_IN_OUT);
op_ctx = axis2_op_ctx_create(env, op, NULL);
- AXIS2_MSG_CTX_SET_OP(ref_msg, env, op);
- AXIS2_MSG_CTX_SET_OP_CTX(ref_msg, env, op_ctx);
+ axis2_msg_ctx_set_op(ref_msg, env, op);
+ axis2_msg_ctx_set_op_ctx(ref_msg, env, op_ctx);
}
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
@@ -183,7 +183,7 @@
ack_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(ack_bean, env, key);
sandesha2_sender_bean_set_msg_id(ack_bean, env,
- (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
+ (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(
ack_msg_ctx, env));
sandesha2_sender_bean_set_resend(ack_bean, env, AXIS2_FALSE);
sandesha2_sender_bean_set_seq_id(ack_bean, env, seq_id);
@@ -198,7 +198,7 @@
/* Avoid retrieving property bean from operation until it is availbale */
/*ack_int_bean = sandesha2_utils_get_property_bean_from_op(env,
- AXIS2_MSG_CTX_GET_OP(ref_msg, env));*/
+ axis2_msg_ctx_get_op(ref_msg, env));*/
ack_int_bean = sandesha2_utils_get_property_bean(env,
axis2_conf_ctx_get_conf(conf_ctx, env));
ack_interval = sandesha2_property_bean_get_ack_interval(ack_int_bean,
@@ -230,7 +230,7 @@
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,
+ orig_trans_out = axis2_msg_ctx_get_transport_out_desc(ack_msg_ctx,
env);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, axis2_transport_out_desc_free_void_arg, orig_trans_out);
@@ -249,7 +249,7 @@
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
trans_out = sandesha2_utils_get_transport_out(env);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(ack_msg_ctx, env, trans_out);
+ axis2_msg_ctx_set_transport_out_desc(ack_msg_ctx, env, trans_out);
ret_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
sandesha2_utils_start_sender_for_seq(env, conf_ctx, seq_id);
@@ -403,7 +403,7 @@
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(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);
@@ -439,7 +439,7 @@
msg_ctx1 = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
msg_ctx_ref_key, conf_ctx);
to = (axis2_char_t*)axis2_endpoint_ref_get_address(
- AXIS2_MSG_CTX_GET_TO(msg_ctx1, env), env);
+ axis2_msg_ctx_get_to(msg_ctx1, env), env);
if(0 == AXIS2_STRCMP(to, to_str))
continue;
/*axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((const sandesha2_sender_bean_t *)sender_bean, env);*/
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Mon Mar 12 23:29:29 2007
@@ -417,24 +417,24 @@
/* Setting context hierachy - be caereful about freeing
*/
- AXIS2_MSG_CTX_SET_SVC_GRP(fault_msg_ctx, env, AXIS2_MSG_CTX_GET_SVC_GRP(
+ axis2_msg_ctx_set_svc_grp(fault_msg_ctx, env, axis2_msg_ctx_get_svc_grp(
ref_msg, env));
- AXIS2_MSG_CTX_SET_SVC(fault_msg_ctx, env, AXIS2_MSG_CTX_GET_SVC(ref_msg,
+ axis2_msg_ctx_set_svc_grp(fault_msg_ctx, env, axis2_msg_ctx_get_svc(ref_msg,
env));
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(fault_msg_ctx, env,
- AXIS2_MSG_CTX_GET_SVC_GRP_CTX(ref_msg, env));
- AXIS2_MSG_CTX_SET_SVC_CTX(fault_msg_ctx, env, AXIS2_MSG_CTX_GET_SVC_CTX(
+ axis2_msg_ctx_set_svc_grp_ctx(fault_msg_ctx, env,
+ axis2_msg_ctx_get_svc_grp_ctx(ref_msg, env));
+ axis2_msg_ctx_set_svc_ctx(fault_msg_ctx, env, axis2_msg_ctx_get_svc_ctx(
ref_msg, env));
grp_ctx_id = (axis2_string_t *) axis2_msg_ctx_get_svc_grp_ctx_id(ref_msg,
env);
axis2_msg_ctx_set_svc_grp_ctx_id(fault_msg_ctx, env, grp_ctx_id);
- AXIS2_MSG_CTX_SET_SVC_CTX_ID(fault_msg_ctx, env,
- AXIS2_MSG_CTX_GET_SVC_CTX_ID(ref_msg, env));
+ axis2_msg_ctx_set_svc_ctx_id(fault_msg_ctx, env,
+ axis2_msg_ctx_get_svc_ctx_id(ref_msg, env));
op = axis2_op_create(env);
axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_ONLY);
op_ctx = axis2_op_ctx_create(env, op, NULL);
- AXIS2_MSG_CTX_SET_OP(fault_msg_ctx, env, op);
- AXIS2_MSG_CTX_SET_OP_CTX(fault_msg_ctx, env, op_ctx);
+ axis2_msg_ctx_set_op(fault_msg_ctx, env, op);
+ axis2_msg_ctx_set_op_ctx(fault_msg_ctx, env, op_ctx);
if(SANDESHA2_MSG_TYPE_CREATE_SEQ == sandesha2_msg_ctx_get_msg_type(rm_msg_ctx,
env))
@@ -466,7 +466,7 @@
}
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
if(NULL!= acks_to_str && 0 != AXIS2_STRCMP(acks_to_str, anon_uri))
- AXIS2_MSG_CTX_SET_TO(fault_msg_ctx, env, axis2_endpoint_ref_create(env,
+ axis2_msg_ctx_set_to(fault_msg_ctx, env, axis2_endpoint_ref_create(env,
acks_to_str));
soap_ver = sandesha2_utils_get_soap_version(env,
sandesha2_msg_ctx_get_soap_envelope(rm_msg_ctx, env));
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Mon Mar 12 23:29:29 2007
@@ -117,7 +117,7 @@
AXIS2_FAILURE);
return NULL;
}
- ctx = AXIS2_MSG_CTX_GET_CONF_CTX(application_msg_ctx, env);
+ ctx = axis2_msg_ctx_get_conf_ctx(application_msg_ctx, env);
if(!ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
@@ -135,14 +135,14 @@
application_rm_msg, create_seq_op);
sandesha2_msg_creator_init_creation(env, application_msg_ctx,
create_seq_msg_ctx);
- create_seq_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(create_seq_msg_ctx, env);
+ create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg_ctx, env);
create_seq_msg_id = axis2_uuid_gen(env);
- AXIS2_MSG_CTX_SET_MESSAGE_ID(create_seq_msg_ctx, env, create_seq_msg_id);
+ axis2_msg_ctx_set_message_id(create_seq_msg_ctx, env, create_seq_msg_id);
axis2_allocator_switch_to_global_pool(env->allocator);
axis2_conf_ctx_register_op_ctx(ctx, env, create_seq_msg_id, create_seq_op_ctx);
axis2_allocator_switch_to_local_pool(env->allocator);
- app_msg_op_desc = AXIS2_MSG_CTX_GET_OP(application_msg_ctx, env);
- create_seq_op = AXIS2_MSG_CTX_GET_OP(create_seq_msg_ctx, env);
+ app_msg_op_desc = axis2_msg_ctx_get_op(application_msg_ctx, env);
+ create_seq_op = axis2_msg_ctx_get_op(create_seq_msg_ctx, env);
if(app_msg_op_desc)
{
axis2_array_list_t *outflow = NULL;
@@ -168,7 +168,7 @@
axis2_op_set_in_flow(create_seq_op, env, new_inflow);
}
axis2_msg_ctx_set_op(create_seq_msg_ctx, env, create_seq_op);
- property = AXIS2_MSG_CTX_GET_PROPERTY(application_msg_ctx, env,
+ property = axis2_msg_ctx_get_property(application_msg_ctx, env,
AXIS2_TARGET_EPR, AXIS2_FALSE);
if(property)
{
@@ -188,12 +188,12 @@
if (to_epr)
{
- AXIS2_MSG_CTX_SET_TO(create_seq_msg_ctx, env, to_epr);
+ axis2_msg_ctx_set_to(create_seq_msg_ctx, env, to_epr);
to_epr = NULL;
}
temp_reply_to = sandesha2_msg_ctx_get_reply_to(application_rm_msg, env);
- AXIS2_MSG_CTX_SET_REPLY_TO(create_seq_msg_ctx, env, temp_reply_to);
+ axis2_msg_ctx_set_reply_to(create_seq_msg_ctx, env, temp_reply_to);
create_seq_rm_msg = sandesha2_msg_ctx_create(env, create_seq_msg_ctx);
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr);
if(!rm_version)
@@ -208,15 +208,15 @@
create_seq_part = sandesha2_create_seq_create(env, addressing_ns_value,
rm_ns_value);
/* Adding sequence offer - if present */
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(application_msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(application_msg_ctx, env);
if(op_ctx)
{
axis2_char_t *offered_seq = NULL;
axis2_property_t *property = NULL;
axis2_ctx_t *ctx = NULL;
- ctx = AXIS2_MSG_CTX_GET_BASE(application_msg_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ ctx = axis2_msg_ctx_get_base(application_msg_ctx, env);
+ property = axis2_ctx_get_property(ctx, env,
SANDESHA2_CLIENT_OFFERED_SEQ_ID, AXIS2_FALSE);
if(property)
offered_seq = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -330,7 +330,7 @@
int soap_version = -1;
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(temp_msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(temp_msg_ctx, env);
msg_part = (sandesha2_iom_rm_element_t *) sandesha2_msg_ctx_get_msg_part(
create_seq_msg, env, SANDESHA2_MSG_PART_CREATE_SEQ);
cs = (sandesha2_create_seq_t *) msg_part;
@@ -390,8 +390,8 @@
rm_version);*/
soap_action = axis2_string_create(env, temp_action);
axis2_msg_ctx_set_soap_action(out_msg, env, soap_action);
- ctx = AXIS2_MSG_CTX_GET_BASE(out_msg, env);
- prop = AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
+ ctx = axis2_msg_ctx_get_base(out_msg, env);
+ prop = axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
if(prop)
{
AXIS2_PROPERTY_SET_VALUE(prop, env, addressing_ns_value);
@@ -399,11 +399,11 @@
else
{
prop = axis2_property_create_with_args(env, 0, 0, 0, addressing_ns_value);
- AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, prop, AXIS2_FALSE);
+ axis2_ctx_set_property(ctx, env, AXIS2_WSA_VERSION, prop, AXIS2_FALSE);
}
new_msg_id = axis2_uuid_gen(env);
- AXIS2_MSG_CTX_SET_MESSAGE_ID(out_msg, env, new_msg_id);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(out_msg, env, envelope);
+ axis2_msg_ctx_set_message_id(out_msg, env, new_msg_id);
+ axis2_msg_ctx_set_soap_envelope(out_msg, env, envelope);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
sandesha2_msg_creator_init_creation(env, temp_msg_ctx,out_msg);
create_seq_response = sandesha2_msg_init_init_msg(env, out_msg);
@@ -412,7 +412,7 @@
response);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
sandesha2_msg_creator_finalize_creation(env, temp_msg_ctx, out_msg);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(temp_msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(temp_msg_ctx, env, AXIS2_TRUE);
return create_seq_response;
}
@@ -448,7 +448,7 @@
close_seq_response = sandesha2_msg_ctx_create(env, out_msg);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(close_seq_msg, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(temp_msg_ctx, env);
+ 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);
@@ -480,7 +480,7 @@
sandesha2_msg_creator_init_creation(env, temp_msg_ctx,out_msg);
sandesha2_msg_ctx_add_soap_envelope(close_seq_response, env);
sandesha2_msg_creator_finalize_creation(env, temp_msg_ctx, out_msg);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(temp_msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(temp_msg_ctx, env, AXIS2_TRUE);
return close_seq_response;
}
@@ -519,7 +519,7 @@
sandesha2_identifier_t *identifier = NULL;
ref_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(ref_rm_msg, env);
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(ref_msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_keep_alive(ref_msg_ctx, env, AXIS2_TRUE);
if(!ref_msg_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
@@ -532,7 +532,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(ref_msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(ref_msg_ctx, env);
if(!conf_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
@@ -540,16 +540,16 @@
}
terminate_seq_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env,
ref_rm_msg, terminate_seq_op);
- terminate_seq_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(terminate_seq_msg_ctx, env);
- terminate_seq_msg_id = (axis2_char_t*)AXIS2_MSG_CTX_GET_MSG_ID(
+ terminate_seq_op_ctx = axis2_msg_ctx_get_op_ctx(terminate_seq_msg_ctx, env);
+ terminate_seq_msg_id = (axis2_char_t*)axis2_msg_ctx_get_msg_id(
terminate_seq_msg_ctx, env);
axis2_allocator_switch_to_global_pool(env->allocator);
if(terminate_seq_msg_id)
axis2_conf_ctx_register_op_ctx(conf_ctx, env, terminate_seq_msg_id,
terminate_seq_op_ctx);
axis2_allocator_switch_to_local_pool(env->allocator);
- ref_msg_op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
- terminate_seq_op = AXIS2_MSG_CTX_GET_OP(terminate_seq_msg_ctx, env);
+ ref_msg_op = axis2_msg_ctx_get_op(ref_msg_ctx, env);
+ terminate_seq_op = axis2_msg_ctx_get_op(terminate_seq_msg_ctx, env);
if(ref_msg_op)
{
axis2_array_list_t *outflow = NULL;
@@ -587,7 +587,7 @@
if(!is_seq_res_reqd)
{
- AXIS2_MSG_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
+ axis2_msg_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);
@@ -597,8 +597,8 @@
return NULL;
}
temp_msg_id = axis2_uuid_gen(env);
- AXIS2_MSG_CTX_SET_MESSAGE_ID(terminate_seq_msg_ctx, env, temp_msg_id);
- /*ref_msg_op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
+ axis2_msg_ctx_set_message_id(terminate_seq_msg_ctx, env, temp_msg_id);
+ /*ref_msg_op = axis2_msg_ctx_get_op(ref_msg_ctx, env);
if(ref_msg_op)
{
axis2_array_list_t *outphases = NULL;
@@ -625,7 +625,7 @@
(sandesha2_iom_rm_part_t*)terminate_seq);
sandesha2_msg_creator_finalize_creation(env, ref_msg_ctx,
terminate_seq_msg_ctx);
- AXIS2_MSG_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
+ axis2_msg_ctx_set_property(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
NULL, AXIS2_FALSE);
return terminate_rm_msg;
}
@@ -684,7 +684,7 @@
sandesha2_msg_ctx_add_soap_envelope(ref_rm_msg, env);
sandesha2_msg_creator_finalize_creation(env, sandesha2_msg_ctx_get_msg_ctx(
ref_rm_msg, env), out_msg);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(sandesha2_msg_ctx_get_msg_ctx(ref_rm_msg, env),
+ axis2_msg_ctx_set_server_side(sandesha2_msg_ctx_get_msg_ctx(ref_rm_msg, env),
env, AXIS2_TRUE);
return res_rm_msg;
}
@@ -703,10 +703,10 @@
axis2_ctx_t *related_ctx = NULL;
axis2_ctx_t *new_ctx = NULL;
- temp_bool = AXIS2_MSG_CTX_GET_SERVER_SIDE(related_msg, env);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(new_msg, env, temp_bool);
+ temp_bool = axis2_msg_ctx_get_server_side(related_msg, env);
+ axis2_msg_ctx_set_server_side(new_msg, env, temp_bool);
/* Adding all parameters from old message to the new one */
- old_op = AXIS2_MSG_CTX_GET_OP(related_msg, env);
+ old_op = axis2_msg_ctx_get_op(related_msg, env);
if(old_op)
{
axis2_array_list_t *op_params = NULL;
@@ -717,7 +717,7 @@
axis2_op_t *new_op = NULL;
int i = 0, size = 0;
- new_op = AXIS2_MSG_CTX_GET_OP(new_msg, env);
+ new_op = axis2_msg_ctx_get_op(new_msg, env);
size = axis2_array_list_size(op_params, env);
for(i = 0; i < size; i++)
{
@@ -744,13 +744,13 @@
axis2_ctx_t *ctx = NULL;
ctx = AXIS2_OP_CTX_GET_BASE(old_op_ctx, env);
- old_op_ctx_props = AXIS2_CTX_GET_ALL_PROPERTIES(ctx, env);
+ old_op_ctx_props = axis2_ctx_get_all_properties(ctx, env);
if(old_op_ctx_props)
{
axis2_op_ctx_t *new_op_ctx = NULL;
axis2_hash_index_t *hi = NULL;
- new_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(new_msg, env);
+ new_op_ctx = axis2_msg_ctx_get_op_ctx(new_msg, env);
for (hi = axis2_hash_first (old_op_ctx_props, env); hi; hi =
axis2_hash_next (env, hi))
{
@@ -768,7 +768,7 @@
if(prop)
new_prop = AXIS2_PROPERTY_CLONE(prop, env);
if(new_prop)
- AXIS2_CTX_SET_PROPERTY(ctx, env, key, new_prop, AXIS2_FALSE);
+ axis2_ctx_set_property(ctx, env, key, new_prop, AXIS2_FALSE);
}
}
}
@@ -778,8 +778,8 @@
axis2_hash_t *old_msg_ctx_props = NULL;
axis2_ctx_t *ctx = NULL;
- ctx = AXIS2_MSG_CTX_GET_BASE(related_msg, env);
- old_msg_ctx_props = AXIS2_CTX_GET_ALL_PROPERTIES(ctx, env);
+ ctx = axis2_msg_ctx_get_base(related_msg, env);
+ old_msg_ctx_props = axis2_ctx_get_all_properties(ctx, env);
if(old_msg_ctx_props)
{
axis2_hash_index_t *i = NULL;
@@ -797,11 +797,11 @@
axis2_hash_this (i, (const void **)&k, NULL, &v);
key = (axis2_char_t *) k;
prop = (axis2_property_t *) v;
- ctx = AXIS2_MSG_CTX_GET_BASE(new_msg, env);
+ ctx = axis2_msg_ctx_get_base(new_msg, env);
if(prop)
new_prop = AXIS2_PROPERTY_CLONE(prop, env);
if(new_prop)
- AXIS2_CTX_SET_PROPERTY(ctx, env, key, new_prop, AXIS2_FALSE);
+ axis2_ctx_set_property(ctx, env, key, new_prop, AXIS2_FALSE);
}
}
}*/
@@ -809,10 +809,10 @@
if(related_msg && new_msg)
{
- related_ctx = AXIS2_MSG_CTX_GET_BASE(related_msg, env);
- related_msg_props = AXIS2_CTX_GET_ALL_PROPERTIES(related_ctx, env);
- new_ctx = AXIS2_MSG_CTX_GET_BASE(new_msg, env);
- new_msg_props = AXIS2_CTX_GET_ALL_PROPERTIES(new_ctx, env);
+ related_ctx = axis2_msg_ctx_get_base(related_msg, env);
+ related_msg_props = axis2_ctx_get_all_properties(related_ctx, env);
+ new_ctx = axis2_msg_ctx_get_base(new_msg, env);
+ new_msg_props = axis2_ctx_get_all_properties(new_ctx, env);
/*if(!new_msg_props)
{
new_msg_props = axis2_hash_make(env);
@@ -852,8 +852,8 @@
axis2_svc_t *related_svc = NULL;
axis2_svc_t *new_svc = NULL;
- related_svc = AXIS2_MSG_CTX_GET_SVC(related_msg, env);
- new_svc = AXIS2_MSG_CTX_GET_SVC(new_msg, env);
+ related_svc = axis2_msg_ctx_get_svc(related_msg, env);
+ new_svc = axis2_msg_ctx_get_svc(new_msg, env);
if(related_svc && new_svc && related_svc != new_svc)
{
axis2_param_t *ref_policy_param = NULL;
@@ -915,7 +915,7 @@
return AXIS2_FAILURE;
}
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(app_msg, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
rm_version = sandesha2_utils_get_rm_version(env, seq_id, storage_mgr);
if(!rm_version)
{
@@ -1024,8 +1024,8 @@
*/
if(ref_msg_ctx)
{
- axis2_op_t *op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
- axis2_op_t *make_conn_op = AXIS2_MSG_CTX_GET_OP(make_conn_msg_ctx, env);
+ axis2_op_t *op = axis2_msg_ctx_get_op(ref_msg_ctx, env);
+ axis2_op_t *make_conn_op = axis2_msg_ctx_get_op(make_conn_msg_ctx, env);
axis2_array_list_t *out_flow = axis2_op_get_out_flow(op, env);
axis2_array_list_t *in_flow = axis2_op_get_in_flow(op, env);
int size = axis2_array_list_size(out_flow, env);
@@ -1089,17 +1089,17 @@
axis2_endpoint_ref_t *reply_to = NULL;
axis2_char_t *address = NULL;
/* Setting the addressing properties */
- to = AXIS2_MSG_CTX_GET_TO(ref_msg_ctx, env);
+ to = axis2_msg_ctx_get_to(ref_msg_ctx, env);
address = (axis2_char_t *) axis2_endpoint_ref_get_address(
(const axis2_endpoint_ref_t *) to, env);
to = axis2_endpoint_ref_create(env, address);
- AXIS2_MSG_CTX_SET_TO(make_conn_msg_ctx, env, to);
+ axis2_msg_ctx_set_to(make_conn_msg_ctx, env, to);
reply_to = axis2_endpoint_ref_create(env, AXIS2_WSA_ANONYMOUS_URL);
- AXIS2_MSG_CTX_SET_REPLY_TO(make_conn_msg_ctx, env, reply_to);
+ axis2_msg_ctx_set_reply_to(make_conn_msg_ctx, env, reply_to);
wsa_action = sandesha2_spec_specific_consts_get_make_connection_action(
env, rm_version);
axis2_msg_ctx_set_wsa_action(make_conn_msg_ctx, env, wsa_action);
- AXIS2_MSG_CTX_SET_MESSAGE_ID(make_conn_msg_ctx, env, axis2_uuid_gen(env));
+ axis2_msg_ctx_set_message_id(make_conn_msg_ctx, env, axis2_uuid_gen(env));
sandesha2_msg_ctx_set_msg_part(make_conn_rm_msg_ctx, env,
SANDESHA2_MSG_PART_MAKE_CONNECTION,
(sandesha2_iom_rm_part_t *) make_conn);
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Mon Mar 12 23:29:29 2007
@@ -132,12 +132,12 @@
* Assuming the default addressing version.
*/
if(msg_ctx)
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
- prop = AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
+ prop = axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
if(prop)
addressing_ns = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(prop, env);
- if(!addressing_ns && !AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ if(!addressing_ns && !axis2_msg_ctx_get_server_side(msg_ctx, env))
{
addressing_ns = AXIS2_STRDUP(AXIS2_WSA_NAMESPACE, env);
}
@@ -145,8 +145,8 @@
rm_elements = sandesha2_rm_elements_create(env, addressing_ns);
if(!rm_elements)
return AXIS2_FAILURE;
- envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
- action = (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
+ envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ action = (axis2_char_t*)axis2_msg_ctx_get_wsa_action(msg_ctx, env);
sandesha2_rm_elements_from_soap_envelope(rm_elements, env, envelope, action);
create_seq = sandesha2_rm_elements_get_create_seq(rm_elements, env);
if(create_seq)
@@ -292,8 +292,8 @@
int temp_flow = -1;
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(temp_msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ 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);
create_seq = (sandesha2_create_seq_t *) sandesha2_msg_ctx_get_msg_part(
@@ -421,7 +421,7 @@
{
sandesha2_msg_ctx_set_msg_type(rm_msg_ctx, env, SANDESHA2_MSG_TYPE_UNKNOWN);
}
- temp_flow = AXIS2_MSG_CTX_GET_FLOW(temp_msg_ctx, env);
+ temp_flow = axis2_msg_ctx_get_flow(temp_msg_ctx, env);
if(temp_flow == AXIS2_IN_FLOW)
{
prop_key = AXIS2_STRDUP(seq_id, env);
@@ -471,7 +471,7 @@
{
axis2_op_t *op = NULL;
- op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
if(!op)
{
axis2_svc_t *svc = NULL;
@@ -485,7 +485,7 @@
AXIS2_FAILURE);
return;
}
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, tmp_qname);
if(!op)
{
@@ -496,14 +496,14 @@
op = axis2_op_create_with_qname(env, tmp_qname);
axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
info = AXIS2_CONF_GET_PHASES_INFO(conf, env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
status = AXIS2_SVC_ADD_OP(svc, env, op);
if(AXIS2_SUCCESS == status)
{
- status = AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
+ status = axis2_msg_ctx_set_op(msg_ctx, env, op);
if(AXIS2_SUCCESS != status)
{
axis2_op_free(op, env);
@@ -517,7 +517,7 @@
}
}
AXIS2_QNAME_FREE(tmp_qname, env);
- AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
+ axis2_msg_ctx_set_op(msg_ctx, env, op);
}
}
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Mon Mar 12 23:29:29 2007
@@ -87,7 +87,7 @@
/* Avoid retrieving property bean from operation until it is availbale */
/*property_bean = sandesha2_utils_get_property_bean_from_op(env,
- AXIS2_MSG_CTX_GET_OP(msg_ctx, env));*/
+ axis2_msg_ctx_get_op(msg_ctx, env));*/
property_bean = sandesha2_utils_get_property_bean(env,
axis2_conf_ctx_get_conf(conf_ctx, env));
sent_count = sandesha2_sender_bean_get_sent_count(retrans_bean, env) + 1;
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Mon Mar 12 23:29:29 2007
@@ -361,7 +361,7 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- property = AXIS2_CTX_GET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_INVOKER, AXIS2_FALSE);
if(property)
invoker = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -370,7 +370,7 @@
invoker = sandesha2_in_order_invoker_create(env);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, sandesha2_in_order_invoker_free_void_arg, invoker);
- AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_INVOKER, property, AXIS2_FALSE);
}
sandesha2_in_order_invoker_run_for_seq(invoker, env, conf_ctx, seq_id);
@@ -389,7 +389,7 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- property = AXIS2_CTX_GET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_SENDER, AXIS2_FALSE);
if(property)
sender = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -399,7 +399,7 @@
sender = sandesha2_sender_create(env);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, sandesha2_sender_free_void_arg, sender);
- AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_SENDER, property, AXIS2_FALSE);
}
sandesha2_sender_run_for_seq(sender, env, conf_ctx, seq_id);
@@ -417,7 +417,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
- property = AXIS2_CTX_GET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_POLLING_MGR, AXIS2_FALSE);
if(property)
polling_mgr = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -430,7 +430,7 @@
polling_mgr = sandesha2_polling_mgr_create(env);
property = axis2_property_create_with_args(env, 3, AXIS2_FALSE,
sandesha2_polling_mgr_free_void_arg, polling_mgr);
- AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_POLLING_MGR, property, AXIS2_FALSE);
}
sandesha2_polling_mgr_start(polling_mgr, env, conf_ctx);
@@ -459,7 +459,7 @@
transport_sender = sandesha2_transport_sender_create(env);
out_desc = axis2_transport_out_desc_create(env, AXIS2_TRANSPORT_ENUM_HTTP);
- AXIS2_TRANSPORT_OUT_DESC_SET_SENDER(out_desc, env, transport_sender);
+ axis2_transport_out_desc_set_sender(out_desc, env, transport_sender);
return out_desc;
}
@@ -468,12 +468,12 @@
axis2_conf_ctx_t *conf_ctx)
{
axis2_property_t *property = NULL;
- axis2_ctx_t *ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env);
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR,
+ property = axis2_ctx_get_property(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR,
AXIS2_FALSE);
if(property && AXIS2_PROPERTY_GET_VALUE(property, env))
@@ -490,7 +490,7 @@
sandesha2_inmemory_storage_mgr_create(env, conf_ctx);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, sandesha2_storage_mgr_free_void_arg, storage_mgr);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR,
property, AXIS2_FALSE);
return storage_mgr;
}
@@ -503,14 +503,14 @@
axis2_conf_ctx_t *conf_ctx)
{
axis2_property_t *property = NULL;
- axis2_ctx_t *ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env);
/*axis2_array_list_t *storage_mgr_list = axis2_array_list_create(env, 0);*/
sandesha2_storage_mgr_t *storage_mgr = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
+ property = axis2_ctx_get_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
AXIS2_FALSE);
if(property)
storage_mgr = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -518,7 +518,7 @@
storage_mgr = sandesha2_permanent_storage_mgr_create(env, conf_ctx);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, 0, storage_mgr);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
property, AXIS2_FALSE);
/*if(property)
storage_mgr_list = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -527,7 +527,7 @@
axis2_array_list_add(storage_mgr_list, env, storage_mgr);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, 0, storage_mgr_list);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
property, AXIS2_FALSE);*/
return storage_mgr;
}
@@ -633,32 +633,32 @@
AXIS2_PARAM_CHECK(env->error, op, NULL);
ref_msg = sandesha2_msg_ctx_get_msg_ctx(ref_rm_msg, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(ref_msg, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(ref_msg, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- out_desc = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(ref_msg, env);
- in_desc = AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(ref_msg, env);
+ out_desc = axis2_msg_ctx_get_transport_out_desc(ref_msg, env);
+ in_desc = axis2_msg_ctx_get_transport_in_desc(ref_msg, env);
new_msg = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
options = axis2_options_create(env);
- AXIS2_MSG_CTX_SET_OPTIONS(new_msg, env, options);
- svc_grp = AXIS2_MSG_CTX_GET_SVC_GRP(ref_msg, env);
+ axis2_msg_ctx_set_options(new_msg, env, options);
+ svc_grp = axis2_msg_ctx_get_svc_grp(ref_msg, env);
if(svc_grp)
{
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
- AXIS2_MSG_CTX_SET_SVC_GRP(new_msg, env, svc_grp);
- svc_grp_ctx = AXIS2_MSG_CTX_GET_SVC_GRP_CTX(ref_msg, env);
+ axis2_msg_ctx_set_svc_grp(new_msg, env, svc_grp);
+ svc_grp_ctx = axis2_msg_ctx_get_svc_grp_ctx(ref_msg, env);
if(svc_grp_ctx)
{
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(new_msg, env, svc_grp_ctx);
+ axis2_msg_ctx_set_svc_grp_ctx(new_msg, env, svc_grp_ctx);
}
else
{
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
svc_grp_ctx = axis2_svc_grp_ctx_create(env,
- AXIS2_MSG_CTX_GET_SVC_GRP(ref_msg, env), conf_ctx);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(new_msg, env, svc_grp_ctx);
+ axis2_msg_ctx_get_svc_grp(ref_msg, env), conf_ctx);
+ axis2_msg_ctx_set_svc_grp_ctx(new_msg, env, svc_grp_ctx);
}
}
else
@@ -668,26 +668,26 @@
svc_grp = axis2_svc_grp_create_with_conf(env, conf);
svc_grp_ctx = axis2_svc_grp_ctx_create(env, svc_grp, conf_ctx);
- AXIS2_MSG_CTX_SET_SVC_GRP(new_msg, env, svc_grp);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(new_msg, env, svc_grp_ctx);
+ axis2_msg_ctx_set_svc_grp(new_msg, env, svc_grp);
+ axis2_msg_ctx_set_svc_grp_ctx(new_msg, env, svc_grp_ctx);
}
- if(AXIS2_MSG_CTX_GET_SVC(ref_msg, env))
+ if(axis2_msg_ctx_get_svc(ref_msg, env))
{
- AXIS2_MSG_CTX_SET_SVC(new_msg, env, AXIS2_MSG_CTX_GET_SVC(ref_msg, env));
- if(AXIS2_MSG_CTX_GET_SVC_CTX(ref_msg, env))
+ axis2_msg_ctx_set_svc_grp(new_msg, env, axis2_msg_ctx_get_svc(ref_msg, env));
+ if(axis2_msg_ctx_get_svc_ctx(ref_msg, env))
{
- AXIS2_MSG_CTX_SET_SVC_CTX(new_msg, env,
- AXIS2_MSG_CTX_GET_SVC_CTX(ref_msg, env));
- AXIS2_MSG_CTX_SET_SVC_CTX_ID(new_msg, env,
- AXIS2_MSG_CTX_GET_SVC_CTX_ID(ref_msg, env));
+ axis2_msg_ctx_set_svc_ctx(new_msg, env,
+ axis2_msg_ctx_get_svc_ctx(ref_msg, env));
+ axis2_msg_ctx_set_svc_ctx_id(new_msg, env,
+ axis2_msg_ctx_get_svc_ctx_id(ref_msg, env));
}
else
{
axis2_svc_ctx_t *svc_ctx = NULL;
svc_ctx = axis2_svc_ctx_create(env,
- AXIS2_MSG_CTX_GET_SVC(ref_msg, env),
- AXIS2_MSG_CTX_GET_SVC_GRP_CTX(new_msg, env));
- AXIS2_MSG_CTX_SET_SVC_CTX(new_msg, env, svc_ctx);
+ axis2_msg_ctx_get_svc(ref_msg, env),
+ axis2_msg_ctx_get_svc_grp_ctx(new_msg, env));
+ axis2_msg_ctx_set_svc_ctx(new_msg, env, svc_ctx);
}
}
else
@@ -701,15 +701,15 @@
svc_qname = axis2_qname_create(env, "AnonymousRMService", NULL, NULL);
axis_svc = axis2_svc_create_with_qname(env, svc_qname);
- svc_grp = AXIS2_MSG_CTX_GET_SVC_GRP(new_msg, env);
- AXIS2_SVC_SET_PARENT(axis_svc, env, AXIS2_MSG_CTX_GET_SVC_GRP(new_msg,
+ svc_grp = axis2_msg_ctx_get_svc_grp(new_msg, env);
+ AXIS2_SVC_SET_PARENT(axis_svc, env, axis2_msg_ctx_get_svc_grp(new_msg,
env));
AXIS2_SVC_GRP_ADD_SVC(svc_grp, env, axis_svc);
- svc_grp_ctx = AXIS2_MSG_CTX_GET_SVC_GRP_CTX(new_msg, env);
+ svc_grp_ctx = axis2_msg_ctx_get_svc_grp_ctx(new_msg, env);
svc_ctx = axis2_svc_ctx_create(env, axis_svc, svc_grp_ctx);
}
- AXIS2_MSG_CTX_SET_OP(new_msg, env, op);
- svc = AXIS2_MSG_CTX_GET_SVC(new_msg, env);
+ axis2_msg_ctx_set_op(new_msg, env, op);
+ svc = axis2_msg_ctx_get_svc(new_msg, env);
if(svc && op)
{
@@ -718,33 +718,33 @@
}
axis2_allocator_switch_to_global_pool(env->allocator);
- op_ctx = axis2_op_ctx_create(env, op, AXIS2_MSG_CTX_GET_SVC_CTX(new_msg,
+ op_ctx = axis2_op_ctx_create(env, op, axis2_msg_ctx_get_svc_ctx(new_msg,
env));
axis2_allocator_switch_to_local_pool(env->allocator);
- AXIS2_MSG_CTX_SET_OP_CTX(new_msg, env, op_ctx);
+ axis2_msg_ctx_set_op_ctx(new_msg, env, op_ctx);
AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, new_msg);
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
- AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(ref_msg, env)));
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg, env, soap_env);
+ axis2_msg_ctx_get_soap_envelope(ref_msg, env)));
+ axis2_msg_ctx_set_soap_envelope(new_msg, env, soap_env);
transport_to = axis2_msg_ctx_get_transport_url(ref_msg, env);
if(transport_to)
{
axis2_msg_ctx_set_transport_url(new_msg, env, transport_to);
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_WSA_VERSION,
+ property = axis2_msg_ctx_get_property(ref_msg, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
if(!property)
{
axis2_msg_ctx_t *req_msg = NULL;
- axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(ref_msg, env);
+ axis2_op_ctx_t *op_ctx = axis2_msg_ctx_get_op_ctx(ref_msg, env);
req_msg = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg)
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg, env,
+ property = axis2_msg_ctx_get_property(req_msg, env,
AXIS2_WSA_VERSION, AXIS2_FALSE);
if(property)
addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -755,42 +755,42 @@
addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
}
property = axis2_property_create_with_args(env, 0, 0, 0, addr_ver);
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_WSA_VERSION, property,
+ axis2_msg_ctx_set_property(new_msg, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
- /*property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_TRANSPORT_OUT,
+ /*property = axis2_msg_ctx_get_property(ref_msg, env, AXIS2_TRANSPORT_OUT,
AXIS2_FALSE);
if(property)
{
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_TRANSPORT_OUT,
+ axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_OUT,
AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
}*/
out_stream = axis2_msg_ctx_get_transport_out_stream(ref_msg,
env);
axis2_msg_ctx_set_transport_out_stream(new_msg, env, out_stream);
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env,
+ property = axis2_msg_ctx_get_property(ref_msg, env,
AXIS2_TRANSPORT_IN, AXIS2_FALSE);
if(property)
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_TRANSPORT_IN,
+ axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_IN,
AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env,
+ property = axis2_msg_ctx_get_property(ref_msg, env,
AXIS2_HTTP_OUT_TRANSPORT_INFO, AXIS2_FALSE);
if(property)
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
+ axis2_msg_ctx_set_property(new_msg, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
axis2_msg_ctx_set_http_out_transport_info(new_msg, env,
axis2_msg_ctx_get_http_out_transport_info(ref_msg, env));
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env,
+ property = axis2_msg_ctx_get_property(ref_msg, env,
AXIS2_TRANSPORT_HEADERS, AXIS2_FALSE);
if(property)
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_TRANSPORT_HEADERS,
+ axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_HEADERS,
AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_EXECUTION_CHAIN(new_msg, env,
- AXIS2_MSG_CTX_GET_EXECUTION_CHAIN(ref_msg, env));
- paused_phase_name = (axis2_char_t*)AXIS2_MSG_CTX_GET_PAUSED_PHASE_NAME(
+ axis2_msg_ctx_set_execution_chain(new_msg, env,
+ axis2_msg_ctx_get_execution_chain(ref_msg, env));
+ paused_phase_name = (axis2_char_t*)axis2_msg_ctx_get_paused_phase_name(
ref_msg, env);
- AXIS2_MSG_CTX_SET_PAUSED_PHASE_NAME(new_msg, env, paused_phase_name);
+ axis2_msg_ctx_set_paused_phase_name(new_msg, env, paused_phase_name);
return new_msg;
}
@@ -847,7 +847,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
- action = (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
+ action = (axis2_char_t*)axis2_msg_ctx_get_wsa_action(msg_ctx, env);
if(!action)
return AXIS2_FALSE;
@@ -877,8 +877,8 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
- action = (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
- soap_env = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ action = (axis2_char_t*)axis2_msg_ctx_get_wsa_action(msg_ctx, env);
+ soap_env = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if(!soap_env)
{
@@ -1030,7 +1030,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
- property = AXIS2_CTX_GET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
+ property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_POLLING_MGR, AXIS2_FALSE);
if(property)
polling_mgr = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -1227,33 +1227,33 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
if(msg_ctx)
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
sandesha2_msg_ctx_set_msg_type(rm_msg_ctx, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ);
/* Message will be stored in the sandesha2_transport_sender */
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, storage_key);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
- transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
property = axis2_property_create_with_args(env, 3, 0,
axis2_transport_out_desc_free_void_arg, transport_out);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_SET_SEND_TO_TRUE,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
sandesha2_transport_out = sandesha2_utils_get_transport_out(env);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, sandesha2_transport_out);
+ axis2_msg_ctx_set_transport_out_desc(msg_ctx, env, sandesha2_transport_out);
/*Sending the message once through the sandesha2_transport_sender */
engine = axis2_engine_create(env, conf_ctx);
- if(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
+ if(axis2_msg_ctx_is_paused(msg_ctx, env))
{
- AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(msg_ctx, env,
- AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(msg_ctx, env) + 1);
+ axis2_msg_ctx_set_current_handler_index(msg_ctx, env,
+ axis2_msg_ctx_get_current_handler_index(msg_ctx, env) + 1);
AXIS2_ENGINE_RESUME_SEND(engine, env, msg_ctx);
}
else
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Mon Mar 12 23:29:29 2007
@@ -116,7 +116,7 @@
return NULL;
}
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(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_mgr, env);
received_msg_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES, "");
@@ -158,7 +158,7 @@
sandesha2_next_msg_mgr_insert(next_msg_mgr, env, next_msg_bean);
/* Message to invoke. This will apply for only in-order invocations */
- if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env) ||
+ if(!axis2_msg_ctx_get_server_side(msg_ctx, env) ||
!sandesha2_utils_is_anon_uri(env, reply_to_addr))
sandesha2_utils_start_sender_for_seq(env, conf_ctx, seq_id);
/* Setting the RM Spec version for this sequence */
@@ -263,7 +263,7 @@
/* Avoid retrieving property bean from operation until it is availbale */
/*property_bean = sandesha2_utils_get_property_bean_from_op(env,
- AXIS2_MSG_CTX_GET_OP(sandesha2_msg_ctx_get_msg_ctx(
+ axis2_msg_ctx_get_op(sandesha2_msg_ctx_get_msg_ctx(
rm_msg_ctx, env), env));*/
conf_ctx = sandesha2_storage_mgr_get_ctx(storage_mgr, env);
property_bean = sandesha2_utils_get_property_bean(env,
@@ -347,10 +347,10 @@
AXIS2_PARAM_CHECK(env->error, spec_version, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(first_app_msg, env);
+ 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);
- property = AXIS2_MSG_CTX_GET_PROPERTY(first_app_msg, env, AXIS2_WSA_VERSION,
+ property = axis2_msg_ctx_get_property(first_app_msg, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
if(property)
addr_ns_val = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -358,12 +358,12 @@
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_msg_ctx_t *req_msg_ctx = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(first_app_msg, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(first_app_msg, env);
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg_ctx)
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg_ctx, env,
+ property = axis2_msg_ctx_get_property(req_msg_ctx, env,
AXIS2_WSA_VERSION, AXIS2_FALSE);
if(property)
addr_ns_val = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -379,8 +379,8 @@
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, addr_ns_bean);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_val);
- to_epr = AXIS2_MSG_CTX_GET_TO(first_app_msg, env);
- property = AXIS2_MSG_CTX_GET_PROPERTY(first_app_msg, env,
+ to_epr = axis2_msg_ctx_get_to(first_app_msg, env);
+ property = axis2_msg_ctx_get_property(first_app_msg, env,
SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
if(property)
acks_to_str = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -398,12 +398,12 @@
env));
}
- if(AXIS2_MSG_CTX_GET_SERVER_SIDE(first_app_msg, env))
+ if(axis2_msg_ctx_get_server_side(first_app_msg, env))
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_msg_ctx_t *req_msg_ctx = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(first_app_msg, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(first_app_msg, env);
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_IN);
if(!req_msg_ctx)
@@ -412,9 +412,9 @@
" the request message from the operation context");
return AXIS2_FAILURE;
}
- reply_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);
+ reply_to_epr = axis2_msg_ctx_get_to(req_msg_ctx, env);
/*ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ property = axis2_ctx_get_property(ctx, env,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, AXIS2_FALSE);
reply_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);*/
if(reply_to_epr)
@@ -431,7 +431,7 @@
}
else
{
- reply_to_epr = AXIS2_MSG_CTX_GET_REPLY_TO(first_app_msg, env);
+ reply_to_epr = axis2_msg_ctx_get_reply_to(first_app_msg, env);
/* Set replyTo bean */
if(reply_to_epr)
{
@@ -448,10 +448,10 @@
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env,
int_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
acks_to_str);
- if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(first_app_msg, env) &&
+ if(!axis2_msg_ctx_get_server_side(first_app_msg, env) &&
0 != AXIS2_STRCMP(acks_to_str, anon_uri))
{
- ctx = AXIS2_MSG_CTX_GET_BASE(first_app_msg, env);
+ ctx = axis2_msg_ctx_get_base(first_app_msg, env);
/* TODO currently axis2 doesn't expose the *options* at msg ctx level.
* Once it is finished change to get from there
*/
@@ -492,11 +492,11 @@
spec_version);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_version_bean);
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id, storage_mgr);
- epr = AXIS2_MSG_CTX_GET_TO(first_app_msg, env);
+ epr = axis2_msg_ctx_get_to(first_app_msg, env);
if(epr)
addr = (axis2_char_t*)axis2_endpoint_ref_get_address(
epr, env);
- if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(first_app_msg, env) ||
+ if(!axis2_msg_ctx_get_server_side(first_app_msg, env) ||
!sandesha2_utils_is_anon_uri(env, addr))
sandesha2_utils_start_sender_for_seq(env, conf_ctx, int_seq_id);
sandesha2_seq_mgr_update_client_side_listener_if_needed(env, first_app_msg,
@@ -521,17 +521,17 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, addr_anon_uri, AXIS2_FAILURE);
- if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ if(!axis2_msg_ctx_get_server_side(msg_ctx, env))
return AXIS2_SUCCESS;
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
/* TODO currently axis2 doesn't expose the *options* at msg ctx level.
* Once it is finished change to get from there
*/
/* options = AXIS2_CTX_GET_OPTIONS(ctx, env);
transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(options, env);*/
transport_in_protocol = AXIS2_TRANSPORT_HTTP;
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, SANDESHA2_CLIENT_ACKS_TO,
+ property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_ACKS_TO,
AXIS2_FALSE);
if(property)
acks_to = AXIS2_PROPERTY_GET_VALUE(property, env);
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Mon Mar 12 23:29:29 2007
@@ -92,7 +92,7 @@
axis2_allocator_switch_to_local_pool(env->allocator);
}
- prop_bean = sandesha2_utils_get_property_bean(env, AXIS2_CONF_CTX_GET_CONF(
+ prop_bean = sandesha2_utils_get_property_bean(env, axis2_conf_ctx_get_conf(
conf_ctx, env));
in_order_invoke = sandesha2_property_bean_is_in_order(prop_bean, env);
if(!in_order_invoke)
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Mon Mar 12 23:29:29 2007
@@ -224,13 +224,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION, NULL,
+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_WSA_VERSION, NULL,
AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, NULL);
- AXIS2_MSG_CTX_SET_TO(msg_ctx, env, NULL);
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, NULL);
+ axis2_msg_ctx_set_message_id(msg_ctx, env, NULL);
+ axis2_msg_ctx_set_to(msg_ctx, env, NULL);
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env, NULL);
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_REINJECTED_MESSAGE,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_REINJECTED_MESSAGE,
property, AXIS2_FALSE);
return AXIS2_SUCCESS;
}
@@ -269,7 +269,7 @@
return NULL;
storage_mgr = sandesha2_utils_get_storage_mgr(env,
invoker->conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(invoker->conf_ctx, env));
+ axis2_conf_ctx_get_conf(invoker->conf_ctx, env));
next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(
storage_mgr, env);
storage_map_mgr = sandesha2_storage_mgr_get_storage_map_mgr
@@ -364,10 +364,10 @@
sandesha2_transaction_commit(transaction, env);
property = axis2_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_to_invoke, env,
+ axis2_msg_ctx_set_property(msg_to_invoke, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_to_invoke, env,
+ property = axis2_msg_ctx_get_property(msg_to_invoke, env,
SANDESHA2_POST_FAILURE_MESSAGE, AXIS2_FALSE);
if(property)
post_failure_str = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -384,7 +384,7 @@
else
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_MSG_CTX_SET_PAUSED(msg_to_invoke, env, AXIS2_FALSE);
+ axis2_msg_ctx_set_paused(msg_to_invoke, env, AXIS2_FALSE);
status = AXIS2_ENGINE_RESUME_RECEIVE(engine, env, msg_to_invoke);
if(!status)
return NULL;
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Mon Mar 12 23:29:29 2007
@@ -255,7 +255,7 @@
AXIS2_LOG_INFO(env->log, "Start:sandesha2_sender_worker_func");
storage_mgr = sandesha2_utils_get_storage_mgr(env, sender->conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(sender->conf_ctx, env));
+ axis2_conf_ctx_get_conf(sender->conf_ctx, env));
while(sender->run_sender)
{
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Mon Mar 12 23:29:29 2007
@@ -274,7 +274,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env,
sender_worker->conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(sender_worker->conf_ctx, env));
+ axis2_conf_ctx_get_conf(sender_worker->conf_ctx, env));
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
sender_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
sender_worker_bean = sandesha2_sender_mgr_retrieve(sender_mgr, env, msg_id);
@@ -356,7 +356,7 @@
/* Avoid retrieving property bean from operation until it is availbale */
/*prop_bean = sandesha2_utils_get_property_bean_from_op(env,
- AXIS2_MSG_CTX_GET_OP(msg_ctx, env));*/
+ axis2_msg_ctx_get_op(msg_ctx, env));*/
prop_bean = sandesha2_utils_get_property_bean(env,
axis2_conf_ctx_get_conf(sender_worker->conf_ctx, env));
if(prop_bean)
@@ -418,8 +418,8 @@
}
if(!transport_out)
- transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
- transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
+ transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
if(transport_sender)
{
sandesha2_transaction_commit(transaction, env);
@@ -504,7 +504,7 @@
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
@@ -583,14 +583,14 @@
if(!property)
return AXIS2_SUCCESS;
- res_msg_ctx = axis2_msg_ctx_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx,
- env), AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(
- msg_ctx, env), AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx,
+ res_msg_ctx = axis2_msg_ctx_create(env, axis2_msg_ctx_get_conf_ctx(msg_ctx,
+ env), axis2_msg_ctx_get_transport_in_desc(
+ msg_ctx, env), axis2_msg_ctx_get_transport_out_desc(msg_ctx,
env));
/* Setting the message as serverSide will let it go through the
* Message Receiver (may be callback MR).
*/
- AXIS2_MSG_CTX_SET_SERVER_SIDE(res_msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(res_msg_ctx, env, AXIS2_TRUE);
property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TRANSPORT_IN,
AXIS2_FALSE);
if(property)
@@ -599,34 +599,34 @@
axis2_msg_ctx_set_property(res_msg_ctx, env, AXIS2_TRANSPORT_IN,
temp_prop, AXIS2_FALSE);
}
- AXIS2_MSG_CTX_SET_SVC_CTX(res_msg_ctx, env, AXIS2_MSG_CTX_GET_SVC_CTX(
+ axis2_msg_ctx_set_svc_ctx(res_msg_ctx, env, axis2_msg_ctx_get_svc_ctx(
msg_ctx, env));
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(res_msg_ctx, env,
- AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env));
- req_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ axis2_msg_ctx_set_svc_grp_ctx(res_msg_ctx, env,
+ axis2_msg_ctx_get_svc_grp_ctx(msg_ctx, env));
+ req_op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if(req_op_ctx)
{
axis2_ctx_t *ctx = NULL;
ctx = AXIS2_OP_CTX_GET_BASE(req_op_ctx, env);
- if(AXIS2_CTX_GET_PROPERTY(ctx, env, MTOM_RECIVED_CONTENT_TYPE,
+ if(axis2_ctx_get_property(ctx, env, MTOM_RECIVED_CONTENT_TYPE,
AXIS2_FALSE))
{
axis2_msg_ctx_set_property(res_msg_ctx, env,
- MTOM_RECIVED_CONTENT_TYPE, AXIS2_CTX_GET_PROPERTY(ctx, env,
+ MTOM_RECIVED_CONTENT_TYPE, axis2_ctx_get_property(ctx, env,
MTOM_RECIVED_CONTENT_TYPE, AXIS2_FALSE), AXIS2_FALSE);
}
- if(AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_HTTP_CHAR_SET_ENCODING,
+ if(axis2_ctx_get_property(ctx, env, AXIS2_HTTP_CHAR_SET_ENCODING,
AXIS2_FALSE))
{
axis2_msg_ctx_set_property(res_msg_ctx, env,
- AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_CTX_GET_PROPERTY(ctx, env,
+ AXIS2_HTTP_CHAR_SET_ENCODING, axis2_ctx_get_property(ctx, env,
AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_FALSE), AXIS2_FALSE);
}
}
- AXIS2_MSG_CTX_SET_DOING_REST(res_msg_ctx, env, AXIS2_MSG_CTX_GET_DOING_REST(
+ axis2_msg_ctx_set_doing_rest(res_msg_ctx, env, axis2_msg_ctx_get_doing_rest(
msg_ctx, env));
- soap_ns_uri = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) ?
+ soap_ns_uri = axis2_msg_ctx_get_is_soap_11(msg_ctx, env) ?
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI:
AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
@@ -645,9 +645,9 @@
if(res_envelope)
{
axis2_engine_t *engine = NULL;
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(res_msg_ctx, env, res_envelope);
+ axis2_msg_ctx_set_soap_envelope(res_msg_ctx, env, res_envelope);
- engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx,
+ engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(msg_ctx,
env));
if(AXIS2_TRUE == sandesha2_sender_worker_is_fault_envelope(env,
res_envelope))
Modified: webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_pending.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Mon Mar 12 23:29:29 2007
@@ -217,7 +217,7 @@
SANDESHA2_ERROR_PENDING_HEADER_MUST_HAVE_ATTRIBUTE_PENDING,
AXIS2_FAILURE);
}
- value = AXIOM_ATTRIBUTE_GET_VALUE(pending_attr, env);
+ value = axiom_attribute_get_value(pending_attr, env);
if(0 == AXIS2_STRCMP(value, AXIS2_VALUE_TRUE))
pending = AXIS2_TRUE;
if(0 == AXIS2_STRCMP(value, AXIS2_VALUE_FALSE))
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org