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 [1/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/
Author: nandika
Date: Mon Mar 12 23:29:29 2007
New Revision: 517561
URL: http://svn.apache.org/viewvc?view=rev&rev=517561
Log:
compile errors fixed
Modified:
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c Mon Mar 12 23:29:29 2007
@@ -91,9 +91,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
- if( text && AXIOM_TEXT_GET_VALUE(text , env))
+ if( text && axiom_text_get_value(text , env))
{
- axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
+ axis2_char_t *text_str = axiom_text_get_value(text, env);
ret_node = build_echo_om(env, text_str);
}
}
@@ -193,9 +193,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
{
/*axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
- if( text && AXIOM_TEXT_GET_VALUE(text , env))
+ if( text && axiom_text_get_value(text , env))
{
- axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
+ axis2_char_t *text_str = axiom_text_get_value(text, env);
}*/
}
else
@@ -249,10 +249,10 @@
if (AXIOM_NODE_GET_NODE_TYPE(file_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(file_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
axiom_node_t *image_node = NULL;
- axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
+ axis2_char_t *text_str = axiom_text_get_value(text, env);
image_node = AXIOM_NODE_GET_NEXT_SIBLING(file_name_node, env);
if (image_node)
@@ -268,7 +268,7 @@
axiom_data_handler_t *data_handler = NULL;
axiom_text_t *bin_text = (axiom_text_t *)
AXIOM_NODE_GET_DATA_ELEMENT(binary_node, env);
- data_handler = AXIOM_TEXT_GET_DATA_HANDLER(bin_text, env);
+ data_handler = axiom_text_get_data_handler(bin_text, env);
if (data_handler)
{
AXIOM_DATA_HANDLER_SET_FILE_NAME(data_handler, env, text_str);
Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c Mon Mar 12 23:29:29 2007
@@ -104,7 +104,7 @@
axis2_qname_t *op_qname = NULL;
axis2_char_t *op_name = NULL;
- op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
if(op)
{
op_qname = (axis2_qname_t *)axis2_op_get_qname(op, env);
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Mon Mar 12 23:29:29 2007
@@ -247,11 +247,11 @@
sandesha2_seq_report_set_seq_direction(seq_report, env,
SANDESHA2_SEQ_DIRECTION_OUT);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_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_mgr = sandesha2_storage_mgr_get_create_seq_mgr(storage_mgr, env);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
if(client_report_transaction)
{
report_transaction = client_report_transaction;
@@ -416,12 +416,12 @@
axis2_property_t *property = NULL;
axis2_bool_t commit = AXIS2_TRUE;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_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);
sandesha2_report = sandesha2_report_create(env);
internal_seq_find_bean = sandesha2_seq_property_bean_create(env);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
if(client_report_transaction)
{
report_transaction = client_report_transaction;
@@ -1026,7 +1026,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_IN_ACTIVE_STATE, AXIS2_FAILURE);
return NULL;
}
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
@@ -1268,7 +1268,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_IN_ACTIVE_STATE, AXIS2_FAILURE);
return NULL;
}
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
@@ -1580,10 +1580,10 @@
AXIS2_PARAM_CHECK(env->error, seq_id, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_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);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
if(client_report_transaction)
{
report_transaction = client_report_transaction;
@@ -1700,7 +1700,7 @@
axis2_char_t *seq_id = NULL;
sandesha2_transaction_t *transaction = NULL;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
if(storage_mgr)
{
@@ -1930,7 +1930,7 @@
}
}
}
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, envelope);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, envelope);
return AXIS2_TRUE;
}
@@ -1974,9 +1974,9 @@
property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
client_seq_key = axis2_property_get_value(property, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
property = (axis2_property_t *) axis2_ctx_get_property(ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Mon Mar 12 23:29:29 2007
@@ -129,14 +129,14 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_IS_SOAP_11(rm_msg_ctx->msg_ctx, env))
+ if(AXIS2_FALSE == axis2_msg_ctx_get_is_soap_11(rm_msg_ctx->msg_ctx, env))
soap_ver = AXIOM_SOAP12;
- soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env);
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(rm_msg_ctx->msg_ctx, env);
if(NULL == soap_envelope)
{
soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
soap_ver);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env,
+ axis2_msg_ctx_set_soap_envelope(rm_msg_ctx->msg_ctx, env,
soap_envelope);
}
@@ -211,7 +211,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_MSG_CTX_GET_FROM(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_from(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -223,7 +223,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, from, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_TO(rm_msg_ctx->msg_ctx, env, from);;
+ return axis2_msg_ctx_set_to(rm_msg_ctx->msg_ctx, env, from);;
}
axis2_endpoint_ref_t *AXIS2_CALL
@@ -233,7 +233,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_MSG_CTX_GET_TO(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_to(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -245,7 +245,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, to, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_TO(rm_msg_ctx->msg_ctx, env, to);
+ return axis2_msg_ctx_set_to(rm_msg_ctx->msg_ctx, env, to);
}
axis2_endpoint_ref_t *AXIS2_CALL
@@ -255,7 +255,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_MSG_CTX_GET_REPLY_TO(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_reply_to(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -266,7 +266,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, reply_to, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_REPLY_TO(rm_msg_ctx->msg_ctx, env, reply_to);
+ return axis2_msg_ctx_set_reply_to(rm_msg_ctx->msg_ctx, env, reply_to);
}
axis2_endpoint_ref_t *AXIS2_CALL
@@ -276,7 +276,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_MSG_CTX_GET_FAULT_TO(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_fault_to(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -287,7 +287,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_to, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_FAULT_TO(rm_msg_ctx->msg_ctx, env, fault_to);
+ return axis2_msg_ctx_set_fault_to(rm_msg_ctx->msg_ctx, env, fault_to);
}
axis2_relates_to_t *AXIS2_CALL
@@ -297,7 +297,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_MSG_CTX_GET_RELATES_TO(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_relates_to(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -308,7 +308,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, relates_to, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_RELATES_TO(rm_msg_ctx->msg_ctx, env, relates_to);
+ return axis2_msg_ctx_set_relates_to(rm_msg_ctx->msg_ctx, env, relates_to);
}
axis2_char_t *AXIS2_CALL
@@ -318,7 +318,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
+ return (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(
rm_msg_ctx->msg_ctx, env);
}
@@ -331,7 +331,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_MESSAGE_ID(rm_msg_ctx->msg_ctx, env, msg_id);
+ return axis2_msg_ctx_set_message_id(rm_msg_ctx->msg_ctx, env, msg_id);
}
axiom_soap_envelope_t *AXIS2_CALL
@@ -341,7 +341,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_soap_envelope(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -353,7 +353,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env,
+ return axis2_msg_ctx_set_soap_envelope(rm_msg_ctx->msg_ctx, env,
soap_envelope);
}
@@ -364,7 +364,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(rm_msg_ctx->msg_ctx, env);
+ return (axis2_char_t*)axis2_msg_ctx_get_wsa_action(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -375,7 +375,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_WSA_ACTION(rm_msg_ctx->msg_ctx, env, action);
+ return axis2_msg_ctx_set_wsa_action(rm_msg_ctx->msg_ctx, env, action);
}
void *AXIS2_CALL
@@ -386,7 +386,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
- return AXIS2_MSG_CTX_GET_PROPERTY(rm_msg_ctx->msg_ctx, env, key,
+ return axis2_msg_ctx_get_property(rm_msg_ctx->msg_ctx, env, key,
AXIS2_FALSE);
}
@@ -400,7 +400,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FAILURE);
- return AXIS2_MSG_CTX_SET_PROPERTY(rm_msg_ctx->msg_ctx, env, key, val,
+ return axis2_msg_ctx_set_property(rm_msg_ctx->msg_ctx, env, key, val,
AXIS2_FALSE);
}
@@ -430,7 +430,7 @@
if(NULL == rm_msg_ctx->msg_ctx)
return AXIS2_FAILURE;
- return AXIS2_MSG_CTX_SET_PAUSED(rm_msg_ctx->msg_ctx, env, paused);
+ return axis2_msg_ctx_set_paused(rm_msg_ctx->msg_ctx, env, paused);
}
axis2_char_t *AXIS2_CALL
@@ -500,7 +500,7 @@
if(NULL == rm_msg_ctx->msg_ctx)
return -1;
- return AXIS2_MSG_CTX_GET_FLOW(rm_msg_ctx->msg_ctx, env);
+ return axis2_msg_ctx_get_flow(rm_msg_ctx->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -513,7 +513,7 @@
if(NULL == rm_msg_ctx->msg_ctx)
return AXIS2_FAILURE;
- return AXIS2_MSG_CTX_SET_FLOW(rm_msg_ctx->msg_ctx, env, flow);
+ return axis2_msg_ctx_set_flow(rm_msg_ctx->msg_ctx, env, flow);
}
axis2_char_t *AXIS2_CALL
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Mon Mar 12 23:29:29 2007
@@ -124,7 +124,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Not a global RM Message");
return AXIS2_SUCCESS;
}
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(!conf_ctx)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Configuration"
@@ -132,7 +132,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
if(!axis2_msg_ctx_get_server_side(msg_ctx, env))
{
axis2_ctx_t *conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
@@ -141,9 +141,9 @@
axis2_ctx_set_property(conf_ctx_base, env, SANDESHA2_IS_SVR_SIDE,
property, AXIS2_FALSE);
}
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if(!soap_envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]SOAP envelope "
@@ -204,14 +204,14 @@
rolled_back = AXIS2_TRUE;
}
- relates_to = AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env);
+ relates_to = axis2_msg_ctx_get_relates_to(msg_ctx, env);
if(relates_to)
{
const axis2_char_t *relates_to_val = NULL;
axis2_op_ctx_t *op_ctx = NULL;
relates_to_val = axis2_relates_to_get_value(relates_to, env);
- op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, relates_to_val);
+ op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, relates_to_val);
if(op_ctx)
{
axis2_msg_ctx_t *req_msg_ctx = NULL;
@@ -223,7 +223,7 @@
req_msg_ctx))
{
/* TODO we need to notify the listeners */
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
}
@@ -406,10 +406,10 @@
axis2_op_ctx_t *op_ctx1 = NULL;
relates_to_val = axis2_relates_to_get_value(relates_to, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(sandesha2_msg_ctx_get_msg_ctx(
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(sandesha2_msg_ctx_get_msg_ctx(
rm_msg_ctx, env), env);
- op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, relates_to_val);
- op_ctx1 = AXIS2_MSG_CTX_GET_OP_CTX(sandesha2_msg_ctx_get_msg_ctx(
+ op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, relates_to_val);
+ op_ctx1 = axis2_msg_ctx_get_op_ctx(sandesha2_msg_ctx_get_msg_ctx(
rm_msg_ctx, env), env);
if(!op_ctx && !op_ctx1)
{
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Mon Mar 12 23:29:29 2007
@@ -99,7 +99,7 @@
AXIS2_LOG_INFO(env->log, "[sandesha2] Starting in handler .........");
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(!conf_ctx)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
@@ -108,7 +108,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
temp_prop = axis2_ctx_get_property(ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
@@ -132,7 +132,7 @@
return AXIS2_SUCCESS; /* Reinjected Messages are not processed by
sandesha2 inflow handlers */
}
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
temp_prop = NULL;
temp_prop = axis2_ctx_get_property(ctx, env,
@@ -153,7 +153,7 @@
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if(!svc)
{
if(!within_transaction)
@@ -176,7 +176,7 @@
if(!AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
/* Message should not be sent in an exception situation */
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
if(!within_transaction)
{
axis2_property_t *prop = NULL;
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Mon Mar 12 23:29:29 2007
@@ -98,7 +98,7 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log, "[sandesha2] Starting out handler .........");
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(!conf_ctx)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Configuration Context is NULL");
@@ -161,7 +161,7 @@
temp_prop = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
temp_prop, AXIS2_FALSE);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
@@ -198,7 +198,7 @@
axis2_msg_ctx_t *req_msg_ctx = NULL;
axis2_op_ctx_t *op_ctx = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_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,
AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg_ctx) /* For the server side */
@@ -216,7 +216,7 @@
sandesha2_app_msg_processor_create(env); /* rm intended msg */
}
}
- else if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ else if(!axis2_msg_ctx_get_server_side(msg_ctx, env))
{
msg_processor = (sandesha2_msg_processor_t *)
sandesha2_app_msg_processor_create(env);
@@ -234,7 +234,7 @@
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
/* Message should not be sent in an exception situation */
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
/* Rolling back the transaction */
if(!within_transaction)
{
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -183,10 +183,10 @@
return 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);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
sandesha2_seq_ack_set_must_understand(seq_ack, env, AXIS2_FALSE);
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
@@ -214,7 +214,7 @@
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_msg_ctx, env));
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
}
fault_msg_ctx = sandesha2_fault_mgr_check_for_invalid_ack(env, rm_msg_ctx,
storage_mgr);
@@ -224,13 +224,13 @@
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_msg_ctx, env));
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
}
if(int_seq_id)
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id,
storage_mgr);
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_PROCSSED, property,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_ACK_PROCSSED, property,
AXIS2_FALSE);
input_bean = sandesha2_sender_bean_create(env);
@@ -345,7 +345,7 @@
}
}
}
- action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
+ action = axis2_msg_ctx_get_wsa_action(msg_ctx, env);
if(action && 0 == axis2_strcmp(action,
sandesha2_spec_specific_consts_get_ack_req_action(env,
sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env))))
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -179,9 +179,9 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_ack_requested_get_identifier(ack_requested, env), env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(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));
+ axis2_conf_ctx_get_conf(conf_ctx, 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, seq_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
@@ -220,19 +220,19 @@
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(rm_msg_ctx, env));
- AXIS2_MSG_CTX_SET_MESSAGE_ID(ack_msg_ctx, env, axis2_uuid_gen(env));
+ axis2_msg_ctx_set_message_id(ack_msg_ctx, env, axis2_uuid_gen(env));
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);
- AXIS2_MSG_CTX_SET_TO(ack_msg_ctx, env, acks_to);
- AXIS2_MSG_CTX_SET_REPLY_TO(ack_msg_ctx, env, AXIS2_MSG_CTX_GET_TO(msg_ctx,
+ axis2_msg_ctx_get_soap_envelope(msg_ctx, env)));
+ axis2_msg_ctx_set_soap_envelope(ack_msg_ctx, env, envelope);
+ axis2_msg_ctx_set_to(ack_msg_ctx, env, acks_to);
+ axis2_msg_ctx_set_reply_to(ack_msg_ctx, env, axis2_msg_ctx_get_to(msg_ctx,
env));
sandesha2_msg_creator_add_ack_msg(env, ack_rm_msg, seq_id, storage_mgr);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(ack_msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(ack_msg_ctx, env, AXIS2_TRUE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION,
+ property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
if(property)
wsa_version = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -240,7 +240,7 @@
property = axis2_property_create_with_args(env, 0, 0, 0, wsa_version);
if(property)
{
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
+ axis2_msg_ctx_set_property(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
property = NULL;
}
@@ -253,7 +253,7 @@
axis2_engine_t *engine = NULL;
axis2_op_ctx_t *op_ctx = NULL;
- if(!AXIS2_MSG_CTX_GET_OP(msg_ctx, env))
+ if(!axis2_msg_ctx_get_op(msg_ctx, env))
{
axis2_op_t *operation = NULL;
axis2_op_ctx_t *op_ctx = NULL;
@@ -262,15 +262,15 @@
axis2_op_set_msg_exchange_pattern(operation, env,
AXIS2_MEP_URI_IN_OUT);
op_ctx = axis2_op_ctx_create(env, operation, NULL);
- AXIS2_MSG_CTX_SET_OP(msg_ctx, env, operation);
- AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
+ axis2_msg_ctx_set_op(msg_ctx, env, operation);
+ axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx);
}
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_WRITTEN,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_ACK_WRITTEN,
property, AXIS2_FALSE);
engine = axis2_engine_create(env, conf_ctx);
@@ -302,7 +302,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_MSG_ID(ack_msg_ctx, env));
+ (axis2_char_t*)axis2_msg_ctx_get_msg_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);
sandesha2_sender_bean_set_send(ack_bean, env, AXIS2_TRUE);
@@ -310,12 +310,12 @@
property = axis2_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
+ axis2_msg_ctx_set_property(ack_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
/* 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(conf_ctx, env));
ack_interval = sandesha2_property_bean_get_ack_interval(prop_bean, env);
@@ -352,27 +352,27 @@
}
}
sandesha2_sender_bean_set_time_to_send(ack_bean, env, time_to_send);
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(ack_msg_ctx, env, AXIS2_TRUE);*/
+ /*axis2_msg_ctx_set_keep_alive(ack_msg_ctx, env, AXIS2_TRUE);*/
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx);
sandesha2_sender_mgr_insert(retrans_mgr, env, ack_bean);
- transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(ack_msg_ctx, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(ack_msg_ctx, env);
property = axis2_property_create_with_args(env, 0, 0,
axis2_transport_out_desc_free_void_arg, transport_out);
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
+ axis2_msg_ctx_set_property(ack_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
+ axis2_msg_ctx_set_property(ack_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0, key);
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
+ axis2_msg_ctx_set_property(ack_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(ack_msg_ctx, env,
+ axis2_msg_ctx_set_transport_out_desc(ack_msg_ctx, env,
sandesha2_utils_get_transport_out(env));
engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND(engine, env, ack_msg_ctx))
@@ -384,7 +384,7 @@
return AXIS2_FAILURE;
}
sandesha2_utils_start_sender_for_seq(env, conf_ctx, seq_id);
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
}
return AXIS2_SUCCESS;
}
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -243,13 +243,13 @@
return AXIS2_SUCCESS;
}
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op_ctx is %p", op_ctx);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op_ctx parent is %p", AXIS2_OP_CTX_GET_PARENT(op_ctx, env));
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
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));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
fault_ctx = sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
env, rm_msg_ctx, storage_mgr);
if(fault_ctx)
@@ -439,8 +439,8 @@
storage_mgr, env);
in_order_invoke = sandesha2_property_bean_is_in_order(
sandesha2_utils_get_property_bean(env,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env)), env);
- if(AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env) && in_order_invoke)
+ axis2_conf_ctx_get_conf(conf_ctx, env)), env);
+ if(axis2_msg_ctx_get_server_side(msg_ctx, env) && in_order_invoke)
{
sandesha2_seq_property_bean_t *incoming_seq_list_bean = NULL;
axis2_array_list_t *incoming_seq_list = NULL;
@@ -624,7 +624,7 @@
/*axis2_allocator_switch_to_global_pool(env->allocator);*/
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
/*axis2_allocator_switch_to_local_pool(env->allocator);*/
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
@@ -633,9 +633,9 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "seq_prop_mgr is NULL");
return AXIS2_FAILURE;
}
- is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env);
+ is_svr_side = axis2_msg_ctx_get_server_side(msg_ctx, env);
- to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
+ to_epr = axis2_msg_ctx_get_to(msg_ctx, env);
if((!to_epr || !axis2_endpoint_ref_get_address(to_epr, env)
|| 0 == AXIS2_STRLEN(axis2_endpoint_ref_get_address(
to_epr, env))) && !is_svr_side)
@@ -645,8 +645,8 @@
return AXIS2_FAILURE;
}
- if(!AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env))
- AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, axis2_uuid_gen(env));
+ if(!axis2_msg_ctx_get_msg_id(msg_ctx, env))
+ axis2_msg_ctx_set_message_id(msg_ctx, env, axis2_uuid_gen(env));
storage_key = axis2_uuid_gen(env);
if(is_svr_side)
@@ -894,7 +894,7 @@
AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
res_create_seq_added);
- if(AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
+ if(axis2_msg_ctx_get_svc_ctx(msg_ctx, env))
{
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
@@ -905,7 +905,7 @@
{
axis2_endpoint_ref_t *acks_to_epr = NULL;
- acks_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);
+ acks_to_epr = axis2_msg_ctx_get_to(req_msg_ctx, env);
acks_to = (axis2_char_t*)axis2_endpoint_ref_get_address(
acks_to_epr, env);
}
@@ -961,7 +961,7 @@
axis2_char_t *written = NULL;
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_ACK_WRITTEN,
+ property = axis2_ctx_get_property(ctx, env, SANDESHA2_ACK_WRITTEN,
AXIS2_FALSE);
if(property)
written = axis2_property_get_value(property, env);
@@ -978,11 +978,11 @@
if (to_epr)
to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
/* test code */
- /*if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, axis2_strcat(env, to_addr,
+ /*if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env))
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env, axis2_strcat(env, to_addr,
"/", op_name, NULL));*/
- if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, to_addr);
+ if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env))
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env, to_addr);
/*if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
axis2_msg_ctx_set_soap_action(msg_ctx, env, axis2_strcat(env, "\"",
to_addr, "/", op_name, "\"", NULL));*/
@@ -1155,14 +1155,14 @@
offer_seq_bean);
}
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);
+ axis2_msg_ctx_set_relates_to(create_seq_msg, env, NULL);
/* Set that the create sequence message is part of a transaction. */
property = axis2_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(create_seq_msg, env, SANDESHA2_WITHIN_TRANSACTION,
property, AXIS2_FALSE);
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
- internal_seq_id, (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
+ internal_seq_id, (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(
create_seq_msg, env), NULL);
create_seq_msg_store_key = axis2_uuid_gen(env);
sandesha2_create_seq_bean_set_create_seq_msg_store_key(create_seq_bean, env,
@@ -1177,11 +1177,11 @@
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
- if(!AXIS2_MSG_CTX_GET_REPLY_TO(create_seq_msg, env))
+ if(!axis2_msg_ctx_get_reply_to(create_seq_msg, env))
{
axis2_endpoint_ref_t *cs_epr = NULL;
cs_epr = axis2_endpoint_ref_create(env, anon_uri);
- AXIS2_MSG_CTX_SET_REPLY_TO(create_seq_msg, env, cs_epr);
+ axis2_msg_ctx_set_reply_to(create_seq_msg, env, cs_epr);
}
str_key = axis2_uuid_gen(env);
create_seq_entry = sandesha2_sender_bean_create(env);
@@ -1203,7 +1203,7 @@
property = axis2_property_create_with_args(env, 0, 0, 0, str_key);
axis2_msg_ctx_set_property(create_seq_msg, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
- orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(create_seq_msg, env);
+ orig_trans_out = axis2_msg_ctx_get_transport_out_desc(create_seq_msg, env);
property = axis2_property_create_with_args(env, 0, 0,
axis2_transport_out_desc_free_void_arg, orig_trans_out);
axis2_msg_ctx_set_property(create_seq_msg, env,
@@ -1212,7 +1212,7 @@
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(create_seq_msg, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(create_seq_msg, env, trans_out);
+ axis2_msg_ctx_set_transport_out_desc(create_seq_msg, env, trans_out);
engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(create_seq_msg,
env));
if(!AXIS2_ENGINE_RESUME_SEND(engine, env, create_seq_msg))
@@ -1295,7 +1295,7 @@
to_addr = axis2_endpoint_ref_get_address(to_epr, env);
}
- if(AXIS2_MSG_CTX_GET_SERVER_SIDE(app_msg_ctx, env))
+ if(axis2_msg_ctx_get_server_side(app_msg_ctx, env))
{
axis2_endpoint_ref_t *reply_to = NULL;
@@ -1303,7 +1303,7 @@
env, AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg)
{
- reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);
+ reply_to = axis2_msg_ctx_get_reply_to(req_msg, env);
}
if(reply_to)
new_to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(
@@ -1328,7 +1328,7 @@
SANDESHA2_MSG_NUMBER_SET_MSG_NUM(msg_number, env, msg_num);
sandesha2_seq_set_msg_num(seq, env, msg_number);
- if(AXIS2_MSG_CTX_GET_SERVER_SIDE(app_msg_ctx, env))
+ if(axis2_msg_ctx_get_server_side(app_msg_ctx, env))
{
sandesha2_msg_ctx_t *req_rm_msg = NULL;
@@ -1457,8 +1457,8 @@
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
- trs_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(
- AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env), env);
+ trs_sender = axis2_transport_out_desc_get_sender(
+ axis2_msg_ctx_get_transport_out_desc(app_msg_ctx, env), env);
if(trs_sender)
{
axis2_transport_out_desc_t *trans_out = NULL;
@@ -1467,16 +1467,16 @@
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
- trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env);
+ trans_out = axis2_msg_ctx_get_transport_out_desc(app_msg_ctx, env);
property = axis2_property_create_with_args(env, 0, 0,
axis2_transport_out_desc_free_void_arg, trans_out);
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(app_msg_ctx, env,
+ axis2_msg_ctx_set_transport_out_desc(app_msg_ctx, env,
sandesha2_utils_get_transport_out(env));
}
- AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(app_msg_ctx, env,
- AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(app_msg_ctx, env) + 1);
+ axis2_msg_ctx_set_current_handler_index(app_msg_ctx, env,
+ axis2_msg_ctx_get_current_handler_index(app_msg_ctx, env) + 1);
engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(app_msg_ctx,
env));
AXIS2_LOG_INFO(env->log,
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -155,10 +155,10 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, 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);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
close_seq = (sandesha2_close_seq_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
@@ -172,7 +172,7 @@
engine = axis2_engine_create(env, conf_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);
+ 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);
@@ -193,8 +193,8 @@
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);
+ 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,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -185,9 +185,9 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(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));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_create_seq_refused(
env, msg_ctx, storage_mgr);
@@ -198,7 +198,7 @@
engine = axis2_engine_create(env, conf_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);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
out_msg_ctx = axis2_core_utils_create_out_msg_ctx(env, msg_ctx);
@@ -311,7 +311,7 @@
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);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
sandesha2_seq_mgr_update_last_activated_time(env, new_seq_id,
storage_mgr);
@@ -331,7 +331,7 @@
storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if(0 == AXIS2_STRCMP(anon_uri, axis2_endpoint_ref_get_address(to_epr,
env)))
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
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=517561&r1=517560&r2=517561
==============================================================================
--- 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 Mon Mar 12 23:29:29 2007
@@ -187,10 +187,10 @@
"[sandesha2] Entry:sandesha2_create_seq_res_msg_processor_process_in_msg");
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);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
@@ -447,7 +447,7 @@
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);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -204,10 +204,10 @@
seq_id = sandesha2_identifier_get_identifier(identifier, env);
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);
if(conf_ctx)
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
if(storage_mgr)
sender_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
/* Selecting the set of sender beans that suit the given criteria */
@@ -281,7 +281,7 @@
/* Setting that the response gets written. This will be used by transports.*/
if(msg_ctx)
{
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
}
/*
@@ -372,7 +372,7 @@
seq_id = sandesha2_identifier_get_identifier(identifier, env);
}
- transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
+ transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, return_msg_ctx);
bean1 = sandesha2_sender_mgr_retrieve(sender_mgr, env, msg_id);
if(bean1)
@@ -416,11 +416,11 @@
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);
int_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,
- int_seq_id, AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env),
+ int_seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
storage_mgr);
}
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
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=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -208,9 +208,9 @@
"sequence id");
return AXIS2_FAILURE;
}
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(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));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,
rm_msg_ctx, seq_id, storage_mgr);
if(fault_ctx)
@@ -220,7 +220,7 @@
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);
+ 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);
@@ -400,7 +400,7 @@
axis2_msg_ctx_set_property(out_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
trans_out = sandesha2_utils_get_transport_out(env);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(out_msg_ctx, env, trans_out);
+ axis2_msg_ctx_set_transport_out_desc(out_msg_ctx, env, trans_out);
key = axis2_uuid_gen(env);
term_res_bean = sandesha2_sender_bean_create(env);
@@ -415,7 +415,7 @@
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
sandesha2_sender_bean_set_msg_id(term_res_bean, env,
- (axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(out_msg_ctx, env));
+ (axis2_char_t *) axis2_msg_ctx_get_msg_id(out_msg_ctx, env));
sandesha2_sender_bean_set_send(term_res_bean, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
@@ -428,15 +428,15 @@
/* end test code */
- engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env));
+ engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(msg_ctx, env));
AXIS2_ENGINE_SEND(engine, env, out_msg_ctx);
addr_ns_uri = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
- to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
+ to_epr = axis2_msg_ctx_get_to(msg_ctx, env);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if(0 == AXIS2_STRCMP(anon_uri, axis2_endpoint_ref_get_address(to_epr, env)))
{
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
@@ -482,14 +482,14 @@
"[sandesha2] sandesha2_terminate_msg_processor_process_out_msg .........");
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);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
to_address = (axis2_char_t*)axis2_endpoint_ref_get_address(
- AXIS2_MSG_CTX_GET_TO(msg_ctx, env), env);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
+ axis2_msg_ctx_get_to(msg_ctx, env), env);
+ property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
AXIS2_FALSE);
if(property)
seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -506,7 +506,7 @@
}
terminated = sandesha2_utils_get_seq_property(env, int_seq_id,
SANDESHA2_SEQ_PROP_TERMINATE_ADDED, storage_mgr);
- old_op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ old_op = axis2_msg_ctx_get_op(msg_ctx, env);
qname = axis2_qname_create(env, "temp", NULL, NULL);
@@ -517,7 +517,7 @@
axis2_allocator_switch_to_global_pool(env->allocator);
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_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(
rm_msg_ctx, env), op_ctx);
axis2_allocator_switch_to_local_pool(env->allocator);
@@ -536,7 +536,7 @@
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
property, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env, to_address));
+ axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env, to_address));
rm_version = sandesha2_utils_get_rm_version(env, int_seq_id, storage_mgr);
if(!rm_version)
{
@@ -544,7 +544,7 @@
" rm_version of the given message");
return AXIS2_FAILURE;
}
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env,
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env,
sandesha2_spec_specific_consts_get_terminate_seq_action(
env, rm_version));
temp_action = sandesha2_spec_specific_consts_get_terminate_seq_soap_action
@@ -571,7 +571,7 @@
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
sandesha2_sender_bean_set_msg_id(term_bean, env,
- (axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env));
+ (axis2_char_t *) axis2_msg_ctx_get_msg_id(msg_ctx, env));
sandesha2_sender_bean_set_send(term_bean, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
@@ -589,7 +589,7 @@
sandesha2_seq_property_bean_set_value(term_added, env, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_added);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, int_seq_id,
- AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env), storage_mgr);
+ axis2_msg_ctx_get_server_side(msg_ctx, env), storage_mgr);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_terminate_msg_processor_process_out_msg");
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Mon Mar 12 23:29:29 2007
@@ -151,9 +151,9 @@
"sequence id");
return AXIS2_FAILURE;
}
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
storage_mgr = (sandesha2_storage_mgr_t *) sandesha2_utils_get_storage_mgr(
- env, conf_ctx, AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ env, conf_ctx, axis2_conf_ctx_get_conf(conf_ctx, env));
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, seq_id,
AXIS2_FALSE, storage_mgr);
AXIS2_LOG_INFO(env->log,
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Mon Mar 12 23:29:29 2007
@@ -167,7 +167,7 @@
}
storage_mgr = sandesha2_utils_get_storage_mgr(env,
polling_mgr->conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(polling_mgr->conf_ctx, env));
+ axis2_conf_ctx_get_conf(polling_mgr->conf_ctx, env));
sandesha2_polling_mgr_set_poll(polling_mgr, env, AXIS2_TRUE);
sandesha2_polling_mgr_run(polling_mgr, env, storage_mgr);
axis2_thread_mutex_unlock(polling_mgr->mutex);
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c Mon Mar 12 23:29:29 2007
@@ -193,7 +193,7 @@
sandesha2_inmemory_bean_mgr_free(&(bean_mgr_impl->bean_mgr), env);
return NULL;
}
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, key, AXIS2_FALSE);
+ property = axis2_ctx_get_property(ctx, env, key, AXIS2_FALSE);
if(property)
{
bean_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(
@@ -212,7 +212,7 @@
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, bean_mgr_impl->table);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
- AXIS2_CTX_SET_PROPERTY(ctx, env, key, property, AXIS2_FALSE);
+ axis2_ctx_set_property(ctx, env, key, property, AXIS2_FALSE);
}
bean_mgr_impl->bean_mgr.ops = bean_mgr_ops;
return &(bean_mgr_impl->bean_mgr);
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c Mon Mar 12 23:29:29 2007
@@ -205,7 +205,7 @@
storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = AXIS2_STRDUP("Sandesha2MessageMap",
env);
storage_mgr_impl->conf_ctx = conf_ctx;
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
storage_mgr_impl->create_seq_mgr = sandesha2_inmemory_create_seq_mgr_create(
env, &(storage_mgr_impl->storage_mgr), ctx);
storage_mgr_impl->next_msg_mgr = sandesha2_inmemory_next_msg_mgr_create(
@@ -399,8 +399,8 @@
sandesha2_inmemory_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
conf_ctx = sandesha2_inmemory_storage_mgr_get_ctx(storage_mgr, env);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
+ property = axis2_ctx_get_property(ctx, env,
storage_mgr_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!storage_map)
@@ -424,8 +424,8 @@
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
conf_ctx = sandesha2_inmemory_storage_mgr_get_ctx(storage_mgr, env);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
+ property = axis2_ctx_get_property(ctx, env,
storage_mgr_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
@@ -438,14 +438,14 @@
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_map);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
- AXIS2_CTX_SET_PROPERTY(ctx, env, storage_mgr_impl->SANDESHA2_MSG_MAP_KEY,
+ axis2_ctx_set_property(ctx, env, storage_mgr_impl->SANDESHA2_MSG_MAP_KEY,
property, AXIS2_FALSE);
}
if(!key)
{
key = axis2_uuid_gen(env);
}
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_keep_alive(msg_ctx, env, AXIS2_TRUE);
axis2_hash_set(storage_map, key, AXIS2_HASH_KEY_STRING, msg_ctx);
return AXIS2_SUCCESS;
}
@@ -465,8 +465,8 @@
sandesha2_inmemory_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
conf_ctx = sandesha2_inmemory_storage_mgr_get_ctx(storage_mgr, env);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
+ property = axis2_ctx_get_property(ctx, env,
storage_mgr_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
@@ -505,8 +505,8 @@
sandesha2_inmemory_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
conf_ctx = sandesha2_inmemory_storage_mgr_get_ctx(storage_mgr, env);
- ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ ctx = axis2_conf_ctx_get_base(conf_ctx, env);
+ property = axis2_ctx_get_property(ctx, env,
storage_mgr_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Mon Mar 12 23:29:29 2007
@@ -278,7 +278,7 @@
axis2_allocator_switch_to_global_pool(env->allocator);
storage_mgr_impl->msg_ctx_map = axis2_hash_make(env);
axis2_allocator_switch_to_local_pool(env->allocator);
- conf = AXIS2_CONF_CTX_GET_CONF((const axis2_conf_ctx_t *) conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf((const axis2_conf_ctx_t *) conf_ctx, env);
storage_mgr_impl->bean_mgr = sandesha2_permanent_bean_mgr_create(env,
&(storage_mgr_impl->storage_mgr), conf_ctx, NULL);
storage_mgr_impl->create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(
@@ -553,7 +553,7 @@
axis2_hash_set(storage_mgr_impl->msg_ctx_map, key, AXIS2_HASH_KEY_STRING,
msg_ctx);
axis2_allocator_switch_to_local_pool(env->allocator);
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_keep_alive(msg_ctx, env, AXIS2_TRUE);
msg_store_bean = sandesha2_permanent_storage_mgr_get_msg_store_bean(
storage_mgr, env, msg_ctx);
sandesha2_msg_store_bean_set_stored_key(msg_store_bean, env, key);
@@ -652,7 +652,7 @@
axis2_op_ctx_t *op_ctx = NULL;
sandesha2_msg_store_bean_t *bean = NULL;
- envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (!envelope)
{
AXIS2_ERROR_SET(env->error,
@@ -675,22 +675,22 @@
xml_writer = NULL;
return AXIS2_FAILURE;
}
- AXIOM_OUTPUT_SET_SOAP11(om_output, env, AXIS2_MSG_CTX_GET_IS_SOAP_11(
+ AXIOM_OUTPUT_SET_SOAP11(om_output, env, axis2_msg_ctx_get_is_soap_11(
msg_ctx, env));
AXIOM_SOAP_ENVELOPE_SERIALIZE(envelope, env, om_output, AXIS2_FALSE);
soap_str = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
- if (AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ if (axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
soap_version = SANDESHA2_SOAP_VERSION_1_1;
else
soap_version = SANDESHA2_SOAP_VERSION_1_2;
bean = sandesha2_msg_store_bean_create(env);
- transport_out_desc = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
- svc_grp = AXIS2_MSG_CTX_GET_SVC_GRP(msg_ctx, env);
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
- op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ transport_out_desc = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
+ svc_grp = axis2_msg_ctx_get_svc_grp(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
if(transport_out_desc)
{
- AXIS2_TRANSPORT_ENUMS transport_out = AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(
+ AXIS2_TRANSPORT_ENUMS transport_out = axis2_transport_out_desc_get_enum(
transport_out_desc, env);
sandesha2_msg_store_bean_set_transport_out(bean, env, transport_out);
}
@@ -717,27 +717,27 @@
mep = (axis2_char_t *) axis2_op_get_msg_exchange_pattern(op, env);
sandesha2_msg_store_bean_set_op_mep(bean, env, mep);
}
- sandesha2_msg_store_bean_set_flow(bean, env, AXIS2_MSG_CTX_GET_FLOW(msg_ctx,
+ sandesha2_msg_store_bean_set_flow(bean, env, axis2_msg_ctx_get_flow(msg_ctx,
env));
sandesha2_msg_store_bean_set_svr_side(bean, env,
- AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env));
+ axis2_msg_ctx_get_server_side(msg_ctx, env));
sandesha2_msg_store_bean_set_soap_envelope_str(bean, env, soap_str);
sandesha2_msg_store_bean_set_soap_version(bean, env, soap_version);
sandesha2_msg_store_bean_set_msg_id(bean, env, (axis2_char_t *)
- AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env));
- to = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
+ axis2_msg_ctx_get_msg_id(msg_ctx, env));
+ to = axis2_msg_ctx_get_to(msg_ctx, env);
if(to)
{
address = (axis2_char_t *) axis2_endpoint_ref_get_address(to, env);
sandesha2_msg_store_bean_set_to_url(bean, env, address);
}
- reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(msg_ctx, env);
+ reply_to = axis2_msg_ctx_get_reply_to(msg_ctx, env);
if(reply_to)
{
address = (axis2_char_t *) axis2_endpoint_ref_get_address(reply_to, env);
sandesha2_msg_store_bean_set_reply_to(bean, env, address);
}
- /*property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL,
+ /*property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TRANSPORT_URL,
AXIS2_FALSE);
if(property)
@@ -760,7 +760,7 @@
prop_str);
/* setting the request message if this a response message.*/
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if(op_ctx)
{
axis2_msg_ctx_t *in_msg_ctx = NULL;
@@ -770,7 +770,7 @@
{
axis2_char_t *in_msg_store_key = NULL;
axis2_bool_t insert = AXIS2_FALSE;
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_IN_MESSAGE_STORAGE_KEY, AXIS2_FALSE);
if(property)
in_msg_store_key = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
@@ -860,36 +860,36 @@
AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
return NULL;
}
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope);
- AXIS2_MSG_CTX_SET_MSG_ID(msg_ctx, env, sandesha2_msg_store_bean_get_msg_id(
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
+ axis2_msg_ctx_set_msg_id(msg_ctx, env, sandesha2_msg_store_bean_get_msg_id(
msg_store_bean, env));
/* You cannot set the same message id to a new message context again. So generate
* a new message id and set it
* axis2_msg_ctx_set_msg_id(msg_ctx, env, axis2_uuid_gen(env));*/
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
transport_out = sandesha2_msg_store_bean_get_transport_out(msg_store_bean,
env);
transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, transport_out);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, transport_out_desc);
+ axis2_msg_ctx_set_transport_out_desc(msg_ctx, env, transport_out_desc);
svc_grp_name_str = sandesha2_msg_store_bean_get_svc_grp(msg_store_bean, env);
if(svc_grp_name_str)
{
svc_grp = AXIS2_CONF_GET_SVC_GRP(conf, env, svc_grp_name_str);
if(svc_grp)
- AXIS2_MSG_CTX_SET_SVC_GRP(msg_ctx, env, svc_grp);
+ axis2_msg_ctx_set_svc_grp(msg_ctx, env, svc_grp);
}
else
{
svc_grp = axis2_svc_grp_create_with_conf(env, conf);
- AXIS2_MSG_CTX_SET_SVC_GRP(msg_ctx, env, svc_grp);
+ axis2_msg_ctx_set_svc_grp(msg_ctx, env, svc_grp);
}
svc_name_str = sandesha2_msg_store_bean_get_svc(msg_store_bean, env);
if(svc_name_str)
{
svc = AXIS2_CONF_GET_SVC(conf, env, svc_name_str);
if(svc)
- AXIS2_MSG_CTX_SET_SVC(msg_ctx, env, svc);
+ axis2_msg_ctx_set_svc(msg_ctx, env, svc);
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Cannot build message "\
@@ -903,7 +903,7 @@
}
op_name_str = sandesha2_msg_store_bean_get_op(msg_store_bean, env);
op_mep_str = sandesha2_msg_store_bean_get_op_mep(msg_store_bean, env);
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if((op_name_str || op_mep_str) && svc)
{
axis2_op_t *op = NULL;
@@ -937,7 +937,7 @@
}
}
if(op)
- AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
+ axis2_msg_ctx_set_op(msg_ctx, env, op);
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Cant find a suitable "\
@@ -949,16 +949,16 @@
}
}
/* Setting contexts TODO is this necessary? */
- svc_grp = AXIS2_MSG_CTX_GET_SVC_GRP(msg_ctx, env);
+ svc_grp = axis2_msg_ctx_get_svc_grp(msg_ctx, env);
if(svc_grp)
{
axis2_svc_grp_ctx_t *svc_grp_ctx = axis2_svc_grp_ctx_create(env, svc_grp, conf_ctx);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(msg_ctx, env, svc_grp_ctx);
+ axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx);
}
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if(svc)
{
- axis2_svc_grp_ctx_t *svc_grp_ctx = AXIS2_MSG_CTX_GET_SVC_GRP_CTX(
+ axis2_svc_grp_ctx_t *svc_grp_ctx = axis2_msg_ctx_get_svc_grp_ctx(
msg_ctx, env);
axis2_svc_ctx_t *svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
if(svc_ctx)
@@ -968,34 +968,34 @@
}
}
- op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
if(op)
{
axis2_op_ctx_t *op_ctx = NULL;
- axis2_svc_ctx_t *svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env);
+ axis2_svc_ctx_t *svc_ctx = axis2_msg_ctx_get_svc_ctx(msg_ctx, env);
axis2_allocator_switch_to_global_pool(env->allocator);
op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
if(op_ctx)
{
axis2_char_t *msg_id = NULL;
AXIS2_OP_CTX_SET_PARENT(op_ctx, env, svc_ctx);
- AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
+ axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx);
/*AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx);*/
- msg_id = (axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
+ msg_id = (axis2_char_t *) axis2_msg_ctx_get_msg_id(msg_ctx, env);
/*axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, op_ctx);*/
}
axis2_allocator_switch_to_local_pool(env->allocator);
}
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env,
+ axis2_msg_ctx_set_server_side(msg_ctx, env,
sandesha2_msg_store_bean_is_svr_side(msg_store_bean, env));
- AXIS2_MSG_CTX_SET_FLOW(msg_ctx, env,
+ axis2_msg_ctx_set_flow(msg_ctx, env,
sandesha2_msg_store_bean_get_flow(msg_store_bean, env));
transport_to_str = sandesha2_msg_store_bean_get_transport_to(msg_store_bean,
env);
if(transport_to_str)
{
/*property = axis2_property_create_with_args(env, 0, 0, 0, transport_to_str);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL, property,
+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_URL, property,
AXIS2_FALSE);*/
axis2_msg_ctx_set_transport_url(msg_ctx, env, transport_to_str);
}
@@ -1003,15 +1003,15 @@
if(to_url_str)
{
endpoint_ref = axis2_endpoint_ref_create(env, to_url_str);
- AXIS2_MSG_CTX_SET_TO(msg_ctx, env, endpoint_ref);
+ axis2_msg_ctx_set_to(msg_ctx, env, endpoint_ref);
}
reply_to_str = sandesha2_msg_store_bean_get_reply_to(msg_store_bean, env);
if(reply_to_str)
{
endpoint_ref = axis2_endpoint_ref_create(env, reply_to_str);
- AXIS2_MSG_CTX_SET_REPLY_TO(msg_ctx, env, endpoint_ref);
+ axis2_msg_ctx_set_reply_to(msg_ctx, env, endpoint_ref);
}
- options = (axis2_options_t *) AXIS2_MSG_CTX_GET_OPTIONS(msg_ctx, env);
+ options = (axis2_options_t *) axis2_msg_ctx_get_options(msg_ctx, env);
if(options)
{
axis2_char_t *action = sandesha2_msg_store_bean_get_action(
@@ -1038,7 +1038,7 @@
axis2_hash_this(index, &k, NULL, &v);
key = (axis2_char_t *) k;
property = (axis2_property_t *) v;
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, key, property,
+ axis2_msg_ctx_set_property(msg_ctx, env, key, property,
AXIS2_FALSE);
}
}
@@ -1052,12 +1052,12 @@
{
axis2_char_t *prop_str = "";
axis2_property_t *property = NULL;
- axis2_options_t *options = (axis2_options_t *) AXIS2_MSG_CTX_GET_OPTIONS(
+ axis2_options_t *options = (axis2_options_t *) axis2_msg_ctx_get_options(
msg_ctx, env);
axis2_hash_t *properties = AXIS2_OPTIONS_GET_PROPERTIES(options, env);
axis2_hash_index_t *index = NULL;
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE);
if(property)
{
@@ -1065,7 +1065,7 @@
prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_WSA_VERSION, AXIS2_FALSE);
if(property)
{
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c Mon Mar 12 23:29:29 2007
@@ -120,7 +120,7 @@
conf_ctx = (axis2_conf_ctx_t *) sandesha2_storage_mgr_get_ctx(
storage_mgr, env);
if(conf_ctx)
- conf = AXIS2_CONF_CTX_GET_CONF((const axis2_conf_ctx_t *) conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf((const axis2_conf_ctx_t *) conf_ctx, env);
else
return NULL;
prop_bean = (sandesha2_property_bean_t *)sandesha2_utils_get_property_bean(
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?view=diff&rev=517561&r1=517560&r2=517561
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Mon Mar 12 23:29:29 2007
@@ -163,27 +163,27 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, AXIS2_FALSE);
if(NULL == property || NULL == AXIS2_PROPERTY_GET_VALUE(property, env))
return AXIS2_FAILURE;
out_desc = AXIS2_PROPERTY_GET_VALUE(property, env);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, out_desc);
+ axis2_msg_ctx_set_transport_out_desc(msg_ctx, env, out_desc);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, AXIS2_FALSE);
if(NULL == property || NULL == AXIS2_PROPERTY_GET_VALUE(property, env))
return AXIS2_FAILURE;
key = AXIS2_PROPERTY_GET_VALUE(property, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_storage_mgr_update_msg_ctx(storage_man, env, key, msg_ctx);
return AXIS2_SUCCESS;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org