Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 19620 invoked from network); 12 Mar 2007 19:05:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Mar 2007 19:05:13 -0000 Received: (qmail 83834 invoked by uid 500); 12 Mar 2007 19:05:20 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 83694 invoked by uid 500); 12 Mar 2007 19:05:19 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 83502 invoked by uid 500); 12 Mar 2007 19:05:18 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 83458 invoked by uid 99); 12 Mar 2007 19:05:17 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2007 12:05:17 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2007 12:05:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 46FDE1A983A; Mon, 12 Mar 2007 12:04:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517336 [1/2] - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/context/ modules/core/description/ modules/core/engine/ modules/core/receivers/ modules/core/transport/http/common/ modules/core/transport/http/sen... Date: Mon, 12 Mar 2007 19:04:44 -0000 To: axis2-cvs@ws.apache.org From: dinesh@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070312190446.46FDE1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dinesh Date: Mon Mar 12 12:04:41 2007 New Revision: 517336 URL: http://svn.apache.org/viewvc?view=rev&rev=517336 Log: msg_ctx.c , macros removed Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h webservices/axis2/trunk/c/modules/core/clientapi/async_result.c webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c webservices/axis2/trunk/c/modules/core/clientapi/op_client.c webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c webservices/axis2/trunk/c/modules/core/context/conf_ctx.c webservices/axis2/trunk/c/modules/core/context/msg_ctx.c webservices/axis2/trunk/c/modules/core/description/op.c webservices/axis2/trunk/c/modules/core/engine/addr_disp.c webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c webservices/axis2/trunk/c/modules/core/engine/disp.c webservices/axis2/trunk/c/modules/core/engine/disp_checker.c webservices/axis2/trunk/c/modules/core/engine/engine.c webservices/axis2/trunk/c/modules/core/engine/phase.c webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c webservices/axis2/trunk/c/modules/core/util/core_utils.c webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c webservices/axis2/trunk/c/rampart/src/util/username_token.c webservices/axis2/trunk/c/samples/server/sg_math/add.c webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c webservices/axis2/trunk/c/savan/src/util/savan_util.c webservices/axis2/trunk/c/test/core/engine/test_engine.c Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original) +++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Mon Mar 12 12:04:41 2007 @@ -914,7 +914,7 @@ * @return SOAP action string */ AXIS2_EXTERN axis2_string_t *AXIS2_CALL - axis2_msg_ctx_get_soap_action(const axis2_msg_ctx_t *msg_ctx, + axis2_msg_ctx_get_soap_action(const axis2_msg_ctx_t *msg_ctx, const axis2_env_t *env); /** @@ -1110,7 +1110,7 @@ * a cloned copy */ AXIS2_EXTERN struct axis2_svc_grp *AXIS2_CALL - axis2_msg_ctx_get_svc_grp(const axis2_msg_ctx_t *msg_ctx, + axis2_msg_ctx_get_svc_grp(const axis2_msg_ctx_t *msg_ctx, const axis2_env_t *env); /** @@ -1422,388 +1422,6 @@ const axis2_env_t *env, axis2_char_t *str); -/** Gets base context struct. */ -#define AXIS2_MSG_CTX_GET_BASE(msg_ctx, env) \ - axis2_msg_ctx_get_base(msg_ctx, env) - -/** Gets parent operation context. */ -#define AXIS2_MSG_CTX_GET_PARENT(msg_ctx, env) \ - axis2_msg_ctx_get_parent(msg_ctx, env) - -/** Sets parent operation context. */ -#define AXIS2_MSG_CTX_SET_PARENT(msg_ctx, env, parent) \ - axis2_msg_ctx_get_parent(msg_ctx, env, parent) - -/** Frees message context. */ -#define AXIS2_MSG_CTX_FREE(msg_ctx, env) \ - axis2_msg_ctx_free(msg_ctx, env) - -/** Initializes message context. */ -#define AXIS2_MSG_CTX_INIT(msg_ctx, env, conf) \ - axis2_msg_ctx_init(msg_ctx, env, conf) - -/** Gets WS-Addressing fault to address. */ -#define AXIS2_MSG_CTX_GET_FAULT_TO(msg_ctx, env) \ - axis2_msg_ctx_get_fault_to(msg_ctx, env) - -/** Gets WS-Addressing from address. */ -#define AXIS2_MSG_CTX_GET_FROM(msg_ctx, env) \ - axis2_msg_ctx_get_from(msg_ctx, env) - -/** Gets in fault flow. */ -#define AXIS2_MSG_CTX_GET_IN_FAULT_FLOW(msg_ctx, env) \ - axis2_msg_ctx_get_in_fault_flow(msg_ctx, env) - -/** Gets SOAP envelope. */ -#define AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env) \ - axis2_msg_ctx_get_soap_envelope(msg_ctx, env) - -#define AXIS2_MSG_CTX_GET_RESPONSE_SOAP_ENVELOPE(msg_ctx, env) \ - axis2_msg_ctx_get_response_soap_envelope(msg_ctx, env) - -/** Gets fault SOAP envelope. */ -#define AXIS2_MSG_CTX_GET_FAULT_SOAP_ENVELOPE(msg_ctx, env) \ - axis2_msg_ctx_get_fault_soap_envelope(msg_ctx, env) - -/** Gets message ID. */ -#define AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env) \ - axis2_msg_ctx_get_msg_id(msg_ctx, env) - -/** Sets message ID. */ -#define AXIS2_MSG_CTX_SET_MSG_ID(msg_ctx, env, msg_id) \ - axis2_msg_ctx_set_msg_id(msg_ctx, env, msg_id) - -/** Gats bool value indicating if to process SOAP fault or not. */ -#define AXIS2_MSG_CTX_GET_PROCESS_FAULT(msg_ctx, env) \ - axis2_msg_ctx_get_process_fault(msg_ctx, env) - -/** Gets WS-Addressing relates to information. */ -#define AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env) \ - axis2_msg_ctx_get_relates_to(msg_ctx, env) - -/** Gets WS-Addressing reply to address. */ -#define AXIS2_MSG_CTX_GET_REPLY_TO(msg_ctx, env) \ - axis2_msg_ctx_get_reply_to(msg_ctx, env) - -/** Gets bool value indicating whether the invocation is happening on server - side or client side. */ -#define AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env) \ - axis2_msg_ctx_get_server_side(msg_ctx, env) - -/** Gets WS-Addressing to address. */ -#define AXIS2_MSG_CTX_GET_TO(msg_ctx, env) \ - axis2_msg_ctx_get_to(msg_ctx, env) - -/** Sets WS-Addressing fault to address. */ -#define AXIS2_MSG_CTX_SET_FAULT_TO(msg_ctx, env, reference) \ - axis2_msg_ctx_set_fault_to(msg_ctx, env, reference) - -/** Sets WS-Addressing from address. */ -#define AXIS2_MSG_CTX_SET_FROM(msg_ctx, env, reference) \ - axis2_msg_ctx_set_from(msg_ctx, env, reference) - -/** Sets in fault flow. */ -#define AXIS2_MSG_CTX_SET_IN_FAULT_FLOW(msg_ctx, env, in_fault_flow) \ - axis2_msg_ctx_get_in_fault_flow(msg_ctx, env, in_fault_flow) - -/** Sets SOAP envelope. */ -#define AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope) \ - axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope) - -#define AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE(msg_ctx, env, soap_envelope) \ - axis2_msg_ctx_set_response_soap_envelope(msg_ctx, env, soap_envelope) - - -/** Sats fault SOAP envelope. */ -#define AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, soap_envelope) \ - axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, soap_envelope) - -/** Sets the message ID. */ -#define AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, message_id) \ - axis2_msg_ctx_set_message_id(msg_ctx, env, message_id) - -/** Sets bool value indicating whether to process SOAP fault. */ -#define AXIS2_MSG_CTX_SET_PROCESS_FAULT(msg_ctx, env, process_fault) \ - axis2_msg_ctx_set_process_fault(msg_ctx, env, process_fault) - -/** Sets WS-Addressing relates to information. */ -#define AXIS2_MSG_CTX_SET_RELATES_TO(msg_ctx, env, reference) \ - axis2_msg_ctx_set_relates_to(msg_ctx, env, reference) - -/** Sets WS-Addressing reply to address. */ -#define AXIS2_MSG_CTX_SET_REPLY_TO(msg_ctx, env, reference) \ - axis2_msg_ctx_set_reply_to(msg_ctx, env, reference) - -/** Sets bool value indicating whether the invocation is happening on server - side or client side. */ -#define AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, server_side) \ - axis2_msg_ctx_set_server_side(msg_ctx, env, server_side) - -/** Sets WS-Addressing to address. */ -#define AXIS2_MSG_CTX_SET_TO(msg_ctx, env, reference) \ - axis2_msg_ctx_set_to(msg_ctx, env, reference) - -/** Sets WS-Addressing action. */ -#define AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, action_uri) \ - axis2_msg_ctx_set_wsa_action(msg_ctx, env, action_uri) - -/** Gets WS-Addressing action. */ -#define AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env) \ - axis2_msg_ctx_get_wsa_action(msg_ctx, env) - -/** Sets WS-Addressing message ID. */ -#define AXIS2_MSG_CTX_SET_WSA_MESSAGE_ID(msg_ctx, env, message_id) \ - axis2_msg_ctx_set_wsa_message_id(msg_ctx, env, message_id) - -/** Gets WS-Addressing message ID. */ -#define AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(msg_ctx, env) \ - axis2_msg_ctx_get_wsa_message_id(msg_ctx, env) - -/** Gets WS-Addressing message information headers. */ -#define AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env) \ - axis2_msg_ctx_get_msg_info_headers(msg_ctx, env) - -/** Gets bool value indicating the paused status of invocation. */ -#define AXIS2_MSG_CTX_GET_PAUSED(msg_ctx, env) \ - axis2_msg_ctx_get_paused(msg_ctx, env) - -/** Sets bool value indicating the paused status of invocation. */ -#define AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, paused) \ - axis2_msg_ctx_set_paused(msg_ctx, env, paused) - -/** Gets bool value indicating the keep alive status of invocation. */ -#define AXIS2_MSG_CTX_IS_KEEP_ALIVE(msg_ctx, env) \ - axis2_msg_ctx_is_keep_alive(msg_ctx, env) - -/** Sets bool value indicating the keep alive status of invocation. */ -#define AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, keep_alive) \ - axis2_msg_ctx_set_keep_alive(msg_ctx, env, keep_alive) - -/** Gets transport in description. */ -#define AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(msg_ctx, env) \ - axis2_msg_ctx_get_transport_in_desc(msg_ctx, env) - -/** Gets transport out description. */ -#define AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env) \ - axis2_msg_ctx_get_transport_out_desc(msg_ctx, env) - -/** Sets transport in description. */ -#define AXIS2_MSG_CTX_SET_TRANSPORT_IN_DESC(msg_ctx, env, transport_in_desc) \ - axis2_msg_ctx_set_transport_in_desc(msg_ctx, env, transport_in_desc) - -/** Sets transport out description. */ -#define 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) - -/** Gets operation context. */ -#define AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env) \ - axis2_msg_ctx_get_op_ctx(msg_ctx, env) - -/** Sets operation context. */ -#define AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx) \ - axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx) - -/** Gets bool value indicating output written status. */ -#define AXIS2_MSG_CTX_GET_OUTPUT_WRITTEN(msg_ctx, env) \ - axis2_msg_ctx_get_output_written(msg_ctx, env) - -/** Sets bool value indicating output written status. */ -#define AXIS2_MSG_CTX_SET_OUTPUT_WRITTEN(msg_ctx, env, output_written) \ - axis2_msg_ctx_set_output_written(msg_ctx, env, output_written) - -/** Gets service context ID. */ -#define AXIS2_MSG_CTX_GET_SVC_CTX_ID(msg_ctx, env) \ - axis2_msg_ctx_get_svc_ctx_id(msg_ctx, env) - -/** Sets service context ID. */ -#define AXIS2_MSG_CTX_SET_SVC_CTX_ID(msg_ctx, env, svc_ctx_id) \ - axis2_msg_ctx_set_svc_ctx_id(msg_ctx, env, svc_ctx_id) - -/** Gets configuration context. */ -#define AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env) \ - axis2_msg_ctx_get_conf_ctx(msg_ctx, env) - -/** Sets configuration context. */ -#define AXIS2_MSG_CTX_SET_CONF_CTX(msg_ctx, env, conf_ctx) \ - axis2_msg_ctx_set_conf_ctx(msg_ctx, env, conf_ctx) - -/** Gets service context. */ -#define AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env) \ - axis2_msg_ctx_get_svc_ctx(msg_ctx, env) - -/** Sets service context. */ -#define AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx) \ - axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx) - -/** Sets WS-Addressing message information headers. */ -#define AXIS2_MSG_CTX_SET_MSG_INFO_HEADERS(msg_ctx, env, msg_info_headers) \ - axis2_msg_ctx_set_msg_info_headers(msg_ctx, env, msg_info_headers) - -/** Gets parameter with the given key. */ -#define AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, key) \ - axis2_msg_ctx_get_parameter(msg_ctx, env, key) - -/** Gets module parameter corresponding to given key, module name and handler - description. */ -#define AXIS2_MSG_CTX_GET_MODULE_PARAMETER(msg_ctx, env, key, module_name, handler_desc) \ - axis2_msg_ctx_get_module_parameter(msg_ctx, env, key, module_name, handler_desc) - -/** Gets property with given key. */ -#define AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, key, persistent) \ - axis2_msg_ctx_get_property(msg_ctx, env, key, persistent) - -/** Sets property with given key. */ -#define AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, key, value, persistent) \ - axis2_msg_ctx_set_property(msg_ctx, env, key, value, persistent) - -/** Gets name of the handler at which invocation was paused. */ -#define AXIS2_MSG_CTX_GET_PAUSED_HANDLER_NAME(msg_ctx, env) \ - axis2_msg_ctx_get_paused_handler_name(msg_ctx, env) - -/** Gets name of the phase at which invocation was paused. */ -#define AXIS2_MSG_CTX_GET_PAUSED_PHASE_NAME(msg_ctx, env) \ - axis2_msg_ctx_get_paused_phase_name(msg_ctx, env) - -/** Sets name of the phase at which invocation was paused. */ -#define AXIS2_MSG_CTX_SET_PAUSED_PHASE_NAME(msg_ctx, env, paused_phase_name) \ - axis2_msg_ctx_set_paused_phase_name(msg_ctx, env, paused_phase_name) - -/** Gets SOAP action. */ -#define AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env) \ - axis2_msg_ctx_get_soap_action(msg_ctx, env) - -/** Sets SOAP action. */ -#define AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, soap_action) \ - axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action) - -/** Gets bool value indicating whether MTOM is enabled. */ -#define AXIS2_MSG_CTX_GET_DOING_MTOM(msg_ctx, env) \ - axis2_msg_ctx_get_doing_mtom(msg_ctx, env) - -/** Sets bool value indicating whether MTOM is enabled. */ -#define AXIS2_MSG_CTX_SET_DOING_MTOM(msg_ctx, env, doing_mtom) \ - axis2_msg_ctx_set_doing_mtom(msg_ctx, env, doing_mtom) - -/** Gets bool value indicating whether REST is enabled. */ -#define AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env) \ - axis2_msg_ctx_get_doing_rest(msg_ctx, env) - -/** Sets bool value indicating whether REST is enabled. */ -#define AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx, env, doing_rest) \ - axis2_msg_ctx_set_doing_rest(msg_ctx, env, doing_rest) - -/** Sets bool value indicating whether REST should be done with HTTP POST. */ -#define AXIS2_MSG_CTX_SET_DO_REST_THROUGH_POST(msg_ctx, env, do_rest_through_post) \ - axis2_msg_ctx_set_do_rest_through_post(msg_ctx, env, do_rest_through_post) - -/** Gets bool value indicating the SOAP version in use. */ -#define AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) \ - axis2_msg_ctx_get_is_soap_11(msg_ctx, env) - -/** Sets bool value indicating the SOAP version in use. */ -#define AXIS2_MSG_CTX_SET_IS_SOAP_11(msg_ctx, env, is_soap11) \ - axis2_msg_ctx_set_is_soap_11(msg_ctx, env, is_soap11) - -/** Gets service group context. */ -#define AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env) \ - axis2_msg_ctx_get_svc_grp_ctx(msg_ctx, env) - -/** Sets service group context. */ -#define 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) - -/** Gets operation to be invoked. */ -#define AXIS2_MSG_CTX_GET_OP(msg_ctx, env) \ - axis2_msg_ctx_get_op(msg_ctx, env) - -/** Sets operation to be invoked. */ -#define AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op) \ - axis2_msg_ctx_set_op(msg_ctx, env, op) - -/** Gets service to be invoked. */ -#define AXIS2_MSG_CTX_GET_SVC(msg_ctx, env) \ - axis2_msg_ctx_get_svc(msg_ctx, env) - -/** Sets service to be invoked. */ -#define AXIS2_MSG_CTX_SET_SVC(msg_ctx, env, svc) \ - axis2_msg_ctx_set_svc(msg_ctx, env, svc) - -/** Gets service group. */ -#define AXIS2_MSG_CTX_GET_SVC_GRP(msg_ctx, env) \ - axis2_msg_ctx_get_svc_grp(msg_ctx, env) - -/** Sets service group. */ -#define AXIS2_MSG_CTX_SET_SVC_GRP(msg_ctx, env, svc_grp) \ - axis2_msg_ctx_set_svc_grp(msg_ctx, env, svc_grp) - -/** Gets service group context ID. */ -#define AXIS2_MSG_CTX_GET_SVC_GRP_CTX_ID(msg_ctx, env) \ - axis2_msg_ctx_get_svc_grp_ctx_id(msg_ctx, env) - -/** Sets the service group context ID. */ -#define AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id) \ - axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id) - -/** Gets bool value indicating whether invocation is paused. */ -#define AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env) \ - axis2_msg_ctx_is_paused(msg_ctx, env) - -/** Finds service. */ -#define AXIS2_MSG_CTX_FIND_SVC(msg_ctx, env) \ - axis2_msg_ctx_find_svc(msg_ctx, env) - -/** Finds operation. */ -#define AXIS2_MSG_CTX_FIND_OP(msg_ctx, env, svc) \ - axis2_msg_ctx_find_op(msg_ctx, env, svc) - -/** Gets options.*/ -#define AXIS2_MSG_CTX_GET_OPTIONS(msg_ctx, env) \ - axis2_msg_ctx_get_options(msg_ctx, env) -/** Sets options. */ -#define AXIS2_MSG_CTX_SET_OPTIONS(msg_ctx, env, options) \ - axis2_msg_ctx_set_options(msg_ctx, env, options) - -/** Sets flow. */ -#define AXIS2_MSG_CTX_SET_FLOW(msg_ctx, env, flow) \ - axis2_msg_ctx_set_flow(msg_ctx, env, flow) - -/** Gets flow. */ -#define AXIS2_MSG_CTX_GET_FLOW(msg_ctx, env) \ - axis2_msg_ctx_get_flow(msg_ctx, env) - -/** Sets execution chain. */ -#define AXIS2_MSG_CTX_SET_EXECUTION_CHAIN(msg_ctx, env, chain) \ - axis2_msg_ctx_set_execution_chain(msg_ctx, env, chain) - -/** Gets execution chain. */ -#define AXIS2_MSG_CTX_GET_EXECUTION_CHAIN(msg_ctx, env) \ - axis2_msg_ctx_get_execution_chain(msg_ctx, env) - -/** Sets current handler index. */ -#define AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(msg_ctx, env, index) \ - axis2_msg_ctx_set_current_handler_index(msg_ctx, env, index) - -/** Gets current handler index. */ -#define AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(msg_ctx, env) \ - axis2_msg_ctx_get_current_handler_index(msg_ctx, env) - -/** Gets paused handler index. */ -#define AXIS2_MSG_CTX_GET_PAUSED_HANDLER_INDEX(msg_ctx, env) \ - axis2_msg_ctx_get_paused_handler_index(msg_ctx, env) - -/** Sets current phase index. */ -#define AXIS2_MSG_CTX_SET_CURRENT_PHASE_INDEX(msg_ctx, env, index) \ - axis2_msg_ctx_set_current_phase_index(msg_ctx, env, index) - -/** Gets current phase index. */ -#define AXIS2_MSG_CTX_GET_CURRENT_PHASE_INDEX(msg_ctx, env) \ - axis2_msg_ctx_get_current_phase_index(msg_ctx, env) - -/** Gets paused phase index. */ -#define AXIS2_MSG_CTX_GET_PAUSED_PHASE_INDEX(msg_ctx, env) \ - axis2_msg_ctx_get_paused_phase_index(msg_ctx, env) - -/** @} */ #ifdef __cplusplus } #endif Modified: webservices/axis2/trunk/c/modules/core/clientapi/async_result.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/async_result.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/async_result.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/async_result.c Mon Mar 12 12:04:41 2007 @@ -107,7 +107,7 @@ if (async_result_impl->result) { - return AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(async_result_impl->result, env); + return axis2_msg_ctx_get_soap_envelope(async_result_impl->result, env); } return NULL; @@ -142,7 +142,7 @@ /* We have a shallow copy here, so it is not appropriate to free it here. if (async_result_impl->result) { - AXIS2_MSG_CTX_FREE(async_result_impl->result, env); + axis2_msg_ctx_free(async_result_impl->result, env); async_result_impl->result = NULL; }*/ Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Mon Mar 12 12:04:41 2007 @@ -228,7 +228,7 @@ callback_recv_impl = AXIS2_INTF_TO_IMPL(msg_recv->derived); - msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env); + msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env); if (msg_info_headers) { relates_to = axis2_msg_info_headers_get_relates_to(msg_info_headers, env); @@ -246,7 +246,7 @@ { AXIS2_CALLBACK_INVOKE_ON_COMPLETE(callback, env, result); AXIS2_CALLBACK_SET_COMPLETE(callback, env, AXIS2_TRUE); - AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, NULL); + axis2_msg_ctx_set_soap_envelope(msg_ctx, env, NULL); } AXIS2_ASYNC_RESULT_FREE(result, env); Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 12 12:04:41 2007 @@ -250,12 +250,12 @@ if (mep_client_impl->wsa_action) { - AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, mep_client_impl->wsa_action); + axis2_msg_ctx_set_wsa_action(msg_ctx, env, mep_client_impl->wsa_action); } if (mep_client_impl->soap_action) { - AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, mep_client_impl->soap_action); + axis2_msg_ctx_set_soap_action(msg_ctx, env, mep_client_impl->soap_action); } return AXIS2_SUCCESS; @@ -634,7 +634,7 @@ AXIS2_ENV_CHECK(env, NULL); - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); engine = axis2_engine_create(env, conf_ctx); if (!engine) return NULL; @@ -660,7 +660,7 @@ if (status != AXIS2_SUCCESS) return NULL; - op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + op = axis2_msg_ctx_get_op(msg_ctx, env); if (op) { /* handle one way case */ @@ -674,36 +674,36 @@ /* create the response */ response = axis2_msg_ctx_create(env, conf_ctx, - AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(msg_ctx, env), - AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env)); + axis2_msg_ctx_get_transport_in_desc(msg_ctx, env), + axis2_msg_ctx_get_transport_out_desc(msg_ctx, env)); if (!response) return NULL; - property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,AXIS2_TRANSPORT_IN, AXIS2_FALSE); + property = axis2_msg_ctx_get_property(msg_ctx, env,AXIS2_TRANSPORT_IN, AXIS2_FALSE); if (property) { - AXIS2_MSG_CTX_SET_PROPERTY(response, env, AXIS2_TRANSPORT_IN, property, + axis2_msg_ctx_set_property(response, env, AXIS2_TRANSPORT_IN, property, AXIS2_FALSE); property = NULL; } if (op) { - axis2_op_register_op_ctx(op, env, response, AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env)); + axis2_op_register_op_ctx(op, env, response, axis2_msg_ctx_get_op_ctx(msg_ctx, env)); } - AXIS2_MSG_CTX_SET_SERVER_SIDE(response, env, AXIS2_FALSE); - AXIS2_MSG_CTX_SET_CONF_CTX(response, env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env)); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX(response, env, AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env)); + axis2_msg_ctx_set_server_side(response, env, AXIS2_FALSE); + axis2_msg_ctx_set_conf_ctx(response, env, axis2_msg_ctx_get_conf_ctx(msg_ctx, env)); + axis2_msg_ctx_set_svc_grp_ctx(response, env, axis2_msg_ctx_get_svc_grp_ctx(msg_ctx, env)); /* If request is REST we assume the response is REST, so set the variable*/ - AXIS2_MSG_CTX_SET_DOING_REST(response, env, AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env)); + axis2_msg_ctx_set_doing_rest(response, env, axis2_msg_ctx_get_doing_rest(msg_ctx, env)); /* set response envelope */ if (engine) { AXIS2_ENGINE_FREE(engine, env); engine = NULL; } - response_envelope = AXIS2_MSG_CTX_GET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env); + response_envelope = axis2_msg_ctx_get_response_soap_envelope (msg_ctx, env); if(response_envelope) { axis2_msg_ctx_set_soap_envelope(response, env, response_envelope); @@ -763,7 +763,7 @@ AXIS2_ENGINE_FREE(engine, env); engine = NULL; } - AXIS2_MSG_CTX_FREE(response, env); + axis2_msg_ctx_free(response, env); return NULL; } } @@ -771,7 +771,7 @@ /* property is NULL, and we set null for AXIS2_TRANSPORT_IN in msg_ctx to avoid double free of this property */ - AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, property, + axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, property, AXIS2_FALSE); if (engine) @@ -799,32 +799,32 @@ /* create the response */ response = axis2_msg_ctx_create(env, conf_ctx, - AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(msg_ctx, env), - AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env)); + axis2_msg_ctx_get_transport_in_desc(msg_ctx, env), + axis2_msg_ctx_get_transport_out_desc(msg_ctx, env)); if (!response) return NULL; - property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, AXIS2_FALSE); + property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TRANSPORT_IN, AXIS2_FALSE); if (property) { - AXIS2_MSG_CTX_SET_PROPERTY(response, env, AXIS2_TRANSPORT_IN, property, + axis2_msg_ctx_set_property(response, env, AXIS2_TRANSPORT_IN, property, AXIS2_FALSE); property = NULL; } - op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + op = axis2_msg_ctx_get_op(msg_ctx, env); if (op) { - axis2_op_register_op_ctx(op, env, response, AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env)); + axis2_op_register_op_ctx(op, env, response, axis2_msg_ctx_get_op_ctx(msg_ctx, env)); } - AXIS2_MSG_CTX_SET_SERVER_SIDE(response, env, AXIS2_FALSE); - AXIS2_MSG_CTX_SET_CONF_CTX(response, env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env)); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX(response, env, AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env)); + axis2_msg_ctx_set_server_side(response, env, AXIS2_FALSE); + axis2_msg_ctx_set_conf_ctx(response, env, axis2_msg_ctx_get_conf_ctx(msg_ctx, env)); + axis2_msg_ctx_set_svc_grp_ctx(response, env, axis2_msg_ctx_get_svc_grp_ctx(msg_ctx, env)); /* If request is REST we assume the response is REST, so set the variable*/ - AXIS2_MSG_CTX_SET_DOING_REST(response, env, AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env)); + axis2_msg_ctx_set_doing_rest(response, env, axis2_msg_ctx_get_doing_rest(msg_ctx, env)); - response_envelope = AXIS2_MSG_CTX_GET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env); + response_envelope = axis2_msg_ctx_get_response_soap_envelope (msg_ctx, env); if (response_envelope) { axis2_msg_ctx_set_soap_envelope(response, env, response_envelope); @@ -858,7 +858,7 @@ /* property is NULL, and we set null for AXIS2_TRANSPORT_IN in msg_ctx to avoid double free of this property */ - AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, property, + axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, property, AXIS2_FALSE); if (engine) Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 12 12:04:41 2007 @@ -280,10 +280,10 @@ { /* may be this is the second invocation using the same service clinet, so reset */ - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); + axis2_msg_ctx_free(out_msg_ctx, env); out_msg_ctx = NULL; msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT] = NULL; - AXIS2_MSG_CTX_FREE(in_msg_ctx, env); + axis2_msg_ctx_free(in_msg_ctx, env); in_msg_ctx = NULL; msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN] = NULL; AXIS2_OP_CTX_SET_IS_COMPLETE(op_client_impl->op_ctx, env, AXIS2_FALSE); @@ -303,9 +303,9 @@ { axis2_property_t *dump_property; axis2_char_t *dump_value = NULL; - if (!AXIS2_MSG_CTX_GET_DOING_REST(out_msg_ctx, env)) + if (! axis2_msg_ctx_get_doing_rest(out_msg_ctx, env)) { - dump_property = AXIS2_MSG_CTX_GET_PROPERTY(out_msg_ctx, env, + dump_property = axis2_msg_ctx_get_property(out_msg_ctx, env, AXIS2_DUMP_INPUT_MSG_TRUE, AXIS2_FALSE); if (dump_property) @@ -315,7 +315,7 @@ if(AXIS2_STRCMP(dump_value, AXIS2_VALUE_TRUE)) { - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); + axis2_msg_ctx_free(out_msg_ctx, env); out_msg_ctx = NULL; msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT] = NULL; } @@ -438,7 +438,7 @@ return AXIS2_FAILURE; } - AXIS2_MSG_CTX_SET_OPTIONS(msg_ctx, env, op_client_impl->options); + axis2_msg_ctx_set_options(msg_ctx, env, op_client_impl->options); /** if the transport to use for sending is not specified, try to find it @@ -457,7 +457,7 @@ if(!to_epr) to_epr = AXIS2_OPTIONS_GET_TO(op_client_impl->options, env); if (!to_epr) - to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env); + to_epr = axis2_msg_ctx_get_to(msg_ctx, env); transport_out = AXIS2_MEP_CLIENT_INFER_TRANSPORT(op_client_impl->base, env, to_epr); } @@ -466,8 +466,8 @@ return AXIS2_FAILURE; } - if (!(AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env))) - AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, transport_out); + if (!( axis2_msg_ctx_get_transport_out_desc(msg_ctx, env))) + axis2_msg_ctx_set_transport_out_desc(msg_ctx, env, transport_out); transport_in = AXIS2_OPTIONS_GET_TRANSPORT_IN(op_client_impl->options, env); @@ -485,9 +485,9 @@ } } - if (!(AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(msg_ctx, env))) + if (!( axis2_msg_ctx_get_transport_in_desc(msg_ctx, env))) { - AXIS2_MSG_CTX_SET_TRANSPORT_IN_DESC(msg_ctx, env, transport_in); + axis2_msg_ctx_set_transport_in_desc(msg_ctx, env, transport_in); } op = AXIS2_OP_CTX_GET_OP(op_client_impl->op_ctx, env); @@ -499,7 +499,7 @@ return AXIS2_FAILURE; msg_id = (axis2_char_t*)axis2_uuid_gen(env); - AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, msg_id); + axis2_msg_ctx_set_message_id(msg_ctx, env, msg_id); if (msg_id) { AXIS2_FREE(env->allocator, msg_id); @@ -511,12 +511,12 @@ axis2_engine_t *engine = NULL; AXIS2_CALLBACK_RECV_ADD_CALLBACK(op_client_impl->callback_recv, env, - AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env), + axis2_msg_ctx_get_msg_id(msg_ctx, env), op_client_impl->callback); /* TODO: set up reply to */ - AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, axis2_op_find_op_ctx(op, env, + axis2_msg_ctx_set_op_ctx(msg_ctx, env, axis2_op_find_op_ctx(op, env, msg_ctx, op_client_impl->svc_ctx)); - AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, op_client_impl->svc_ctx); + axis2_msg_ctx_set_svc_ctx(msg_ctx, env, op_client_impl->svc_ctx); /* send the message */ engine = axis2_engine_create(env, conf_ctx); @@ -531,10 +531,10 @@ { axis2_msg_ctx_t *response_mc = NULL; - AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, op_client_impl->svc_ctx); - AXIS2_MSG_CTX_SET_CONF_CTX(msg_ctx, env, + axis2_msg_ctx_set_svc_ctx(msg_ctx, env, op_client_impl->svc_ctx); + axis2_msg_ctx_set_conf_ctx(msg_ctx, env, AXIS2_SVC_CTX_GET_CONF_CTX(op_client_impl->svc_ctx, env)); - AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_client_impl->op_ctx); + axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_client_impl->op_ctx); /*Send the SOAP Message and receive a response */ response_mc = axis2_mep_client_two_way_send(env, msg_ctx); @@ -636,7 +636,7 @@ op_client_impl = AXIS2_INTF_TO_IMPL(op_client); - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(mc, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(mc, env); if (!conf_ctx) return AXIS2_FAILURE; @@ -749,8 +749,8 @@ op_ctx = axis2_op_ctx_create(th_env, args_list->op, args_list->op_client_impl->svc_ctx); if (!op_ctx) return NULL; - AXIS2_MSG_CTX_SET_OP_CTX(args_list->msg_ctx, th_env, op_ctx); - AXIS2_MSG_CTX_SET_SVC_CTX(args_list->msg_ctx, th_env, args_list->op_client_impl->svc_ctx); + axis2_msg_ctx_set_op_ctx(args_list->msg_ctx, th_env, op_ctx); + axis2_msg_ctx_set_svc_ctx(args_list->msg_ctx, th_env, args_list->op_client_impl->svc_ctx); /* send the request and wait for response */ response = axis2_mep_client_two_way_send(th_env, args_list->msg_ctx); Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 12 12:04:41 2007 @@ -832,7 +832,7 @@ axis2_mep_client_receive(env, msg_ctx); if (res_msg_ctx) { - soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(res_msg_ctx, env); + soap_envelope = axis2_msg_ctx_get_soap_envelope(res_msg_ctx, env); if (soap_envelope) { soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); @@ -863,7 +863,7 @@ msg_ctx = axis2_msg_ctx_create(env, AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL); AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client_impl->op_client, env, msg_ctx); - AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope); + axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope); /* end of hack to get rid of memory leak */ /* process the result of the invocation */ @@ -900,7 +900,7 @@ res_msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CLIENT_GET_MSG_CTX( svc_client_impl->op_client, env, AXIS2_WSDL_MESSAGE_LABEL_IN); if (res_msg_ctx) - soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(res_msg_ctx, env); + soap_envelope = axis2_msg_ctx_get_soap_envelope(res_msg_ctx, env); else AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client_impl->op_client, env, res_msg_ctx); /* set in msg_ctx to be NULL to reset */ @@ -1464,7 +1464,7 @@ } } - AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, envelope); + axis2_msg_ctx_set_soap_envelope(msg_ctx, env, envelope); return AXIS2_TRUE; } Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original) +++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 12 12:04:41 2007 @@ -459,7 +459,7 @@ AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL); - svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env); + svc = axis2_msg_ctx_get_svc(msg_ctx, env); if (!svc) { AXIS2_ERROR_SET(env->error, @@ -492,7 +492,7 @@ if (!svc_grp_ctx_id) { svc_grp_ctx_id = (axis2_char_t*)axis2_string_get_buffer( - AXIS2_MSG_CTX_GET_SVC_GRP_CTX_ID(msg_ctx, env), env); + axis2_msg_ctx_get_svc_grp_ctx_id(msg_ctx, env), env); } /* by this time service group context id must have a value, @@ -521,7 +521,7 @@ { axis2_string_t *svc_grp_ctx_id_str = axis2_string_create_assume_ownership(env, &svc_grp_ctx_id); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id_str); + axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str); axis2_string_free(svc_grp_ctx_id_str, env); } } @@ -543,7 +543,7 @@ /* when you come here operation context MUST already been assigned to the message context */ - 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_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_MSG_CTX, AXIS2_FAILURE); @@ -551,7 +551,7 @@ } AXIS2_OP_CTX_SET_PARENT(op_ctx, env, svc_ctx); - AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX(msg_ctx, env, svc_grp_ctx); + axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx); + axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx); return svc_grp_ctx; } Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original) +++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 12 12:04:41 2007 @@ -1454,7 +1454,7 @@ } axis2_string_t *AXIS2_CALL -axis2_msg_ctx_get_soap_action( + axis2_msg_ctx_get_soap_action( const axis2_msg_ctx_t *msg_ctx, const axis2_env_t *env) { @@ -1663,7 +1663,7 @@ } axis2_svc_grp_t *AXIS2_CALL -axis2_msg_ctx_get_svc_grp( + axis2_msg_ctx_get_svc_grp( const axis2_msg_ctx_t *msg_ctx, const axis2_env_t *env) { @@ -1795,7 +1795,7 @@ axis2_ctx_set_non_persistent_map(msg_ctx->base, env, AXIS2_OPTIONS_GET_PROPERTIES(options, env)); - rest_val = (axis2_property_t *) AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, + rest_val = (axis2_property_t *) axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_ENABLE_REST, AXIS2_FALSE); if (rest_val) { @@ -1803,7 +1803,7 @@ if (value) { if (AXIS2_STRCMP(value, AXIS2_VALUE_TRUE) == 0) - AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx, env, AXIS2_TRUE); + axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE); } } Modified: webservices/axis2/trunk/c/modules/core/description/op.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/op.c (original) +++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar 12 12:04:41 2007 @@ -840,7 +840,7 @@ AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL); AXIS2_PARAM_CHECK(env->error, svc_ctx, NULL); - 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) { op_ctx = axis2_op_ctx_create(env, op, svc_ctx); @@ -855,7 +855,7 @@ axis2_conf_ctx_t *conf_ctx = NULL; const axis2_char_t *value = NULL; - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); value = axis2_relates_to_get_value(relates_to, env); op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, value); if (!op_ctx) @@ -889,13 +889,13 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL); - 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) { return op_ctx; } - 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) { return NULL; @@ -904,7 +904,7 @@ { axis2_conf_ctx_t *conf_ctx = NULL; axis2_char_t *value = NULL; - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, value); if (!op_ctx) @@ -933,12 +933,12 @@ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, op_ctx, AXIS2_FAILURE); - 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) { return AXIS2_FAILURE; } - msg_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env); + msg_id = axis2_msg_ctx_get_msg_id(msg_ctx, env); if (!msg_id) { return AXIS2_FAILURE; @@ -948,7 +948,7 @@ { return AXIS2_FAILURE; } - status = AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx); + status = axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx); if (AXIS2_FAILURE == status) { axis2_hash_t *op_ctx_map = NULL; Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 12 12:04:41 2007 @@ -94,7 +94,7 @@ AXIS2_ENV_CHECK(env, NULL); - endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env); + endpoint_ref = axis2_msg_ctx_get_to(msg_ctx, env); if (endpoint_ref) { @@ -123,7 +123,7 @@ { axis2_conf_ctx_t *conf_ctx = NULL; - 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_conf_t *conf = NULL; @@ -167,7 +167,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, svc, NULL); - action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env); + action = axis2_msg_ctx_get_wsa_action(msg_ctx, env); if (action) { @@ -196,7 +196,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - relates_to = AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env); + relates_to = axis2_msg_ctx_get_relates_to(msg_ctx, env); /** first check if we can dispatch using the relates_to */ if (relates_to) @@ -207,11 +207,11 @@ { axis2_conf_ctx_t *conf_ctx = NULL; - 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_op_ctx_t *op_ctx = NULL; - const axis2_char_t *msg_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env); + const axis2_char_t *msg_id = axis2_msg_ctx_get_msg_id(msg_ctx, env); op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, msg_id); if (op_ctx) { @@ -220,8 +220,8 @@ if (op) { axis2_svc_ctx_t *svc_ctx = NULL; - AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx); - AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op); + axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx); + axis2_msg_ctx_set_op(msg_ctx, env, op); axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx); svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); @@ -229,18 +229,18 @@ { axis2_svc_t *svc = NULL; axis2_svc_grp_ctx_t *svc_grp_ctx = NULL; - AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx); + axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx); svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env); if (svc) { - AXIS2_MSG_CTX_SET_SVC(msg_ctx, env, svc); + axis2_msg_ctx_set_svc(msg_ctx, env, svc); } svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env); if (svc_grp_ctx) { axis2_string_t *svc_grp_ctx_id_str = axis2_string_create(env, AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env)); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id_str); + axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str); axis2_string_free(svc_grp_ctx_id_str, env); } return AXIS2_SUCCESS; Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Mon Mar 12 12:04:41 2007 @@ -105,8 +105,8 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); - svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); + svc_ctx = axis2_msg_ctx_get_svc_ctx(msg_ctx, env); if (op_ctx && svc_ctx) { @@ -115,13 +115,13 @@ { axis2_string_t *svc_grp_ctx_id_str = axis2_string_create(env, AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env)); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id_str); + axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str); axis2_string_free(svc_grp_ctx_id_str, env); } return AXIS2_SUCCESS; } - op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + op = axis2_msg_ctx_get_op(msg_ctx, env); if (op) op_ctx = axis2_op_find_existing_op_ctx(op, env, msg_ctx); @@ -134,11 +134,11 @@ axis2_string_t *svc_grp_ctx_id_str = NULL; svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env); - AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX(msg_ctx, env, svc_grp_ctx); + axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx); + axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx); svc_grp_ctx_id_str = axis2_string_create(env, AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env)); - AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id_str); + axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str); axis2_string_free(svc_grp_ctx_id_str, env); } return AXIS2_SUCCESS; @@ -153,11 +153,11 @@ return AXIS2_FAILURE; } - AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx); + axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx); axis2_op_register_op_ctx(op, env, msg_ctx, op_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) { svc_grp_ctx = axis2_conf_ctx_fill_ctxs(conf_ctx, env, msg_ctx); Modified: webservices/axis2/trunk/c/modules/core/engine/disp.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/disp.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/disp.c Mon Mar 12 12:04:41 2007 @@ -217,25 +217,25 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - axis_service = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env); + axis_service = axis2_msg_ctx_get_svc(msg_ctx, env); if (!axis_service) { - axis_service = AXIS2_MSG_CTX_FIND_SVC(msg_ctx, env); + axis_service = axis2_msg_ctx_find_svc(msg_ctx, env); if (axis_service) { - AXIS2_MSG_CTX_SET_SVC(msg_ctx, env, axis_service); + axis2_msg_ctx_set_svc(msg_ctx, env, axis_service); /*TODO Set the Service Group Context to the message Context*/ } } - op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + op = axis2_msg_ctx_get_op(msg_ctx, env); if (!op) { - op = AXIS2_MSG_CTX_FIND_OP(msg_ctx, env, axis_service); + op = axis2_msg_ctx_find_op(msg_ctx, env, axis_service); if (op) { - AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op); + axis2_msg_ctx_set_op(msg_ctx, env, op); } } Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Mar 12 12:04:41 2007 @@ -231,62 +231,62 @@ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - if (!(AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))) /*if is client side, no point in proceeding*/ + if (!( axis2_msg_ctx_get_server_side(msg_ctx, env))) /*if is client side, no point in proceeding*/ return AXIS2_SUCCESS; - op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + op = axis2_msg_ctx_get_op(msg_ctx, env); if (!op) { - 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_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env); if (op) - AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op); + axis2_msg_ctx_set_op(msg_ctx, env, op); } } - svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env); + svc = axis2_msg_ctx_get_svc(msg_ctx, env); if (!svc) { - svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env); + svc_ctx = axis2_msg_ctx_get_svc_ctx(msg_ctx, env); if (svc_ctx) { axis2_svc_t *tsvc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env); if (tsvc) - AXIS2_MSG_CTX_SET_SVC(msg_ctx, env, tsvc); + axis2_msg_ctx_set_svc(msg_ctx, env, tsvc); } } - endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env); + endpoint_ref = axis2_msg_ctx_get_to(msg_ctx, env); if (endpoint_ref) address = axis2_endpoint_ref_get_address(endpoint_ref, env); - svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env); + svc = axis2_msg_ctx_get_svc(msg_ctx, env); if (!svc) { AXIS2_LOG_INFO(env->log, "Service Not found. Endpoint reference is : %s", (address) ? address : "NULL"); - if (AXIS2_MSG_CTX_GET_IS_SOAP_11 (msg_ctx, env)) + if ( axis2_msg_ctx_get_is_soap_11 (msg_ctx, env)) { soap_version = AXIOM_SOAP11; } soap_envelope = axiom_soap_envelope_create_default_soap_envelope (env, soap_version); soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); soap_fault = axiom_soap_fault_create_default_fault (env, soap_body, "Receiver", "Service Not Found", soap_version); - AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, soap_envelope); + axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, soap_envelope); return AXIS2_FAILURE; } - op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + op = axis2_msg_ctx_get_op(msg_ctx, env); if (!op) { AXIS2_LOG_INFO(env->log, "Operation Not found. Endpoint reference is : %s", (address) ? address : "NULL"); soap_envelope = axiom_soap_envelope_create_default_soap_envelope (env, soap_version); soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); soap_fault = axiom_soap_fault_create_default_fault (env, soap_body, "Receiver", "Operation Not Found", soap_version); - AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, soap_envelope); + axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, soap_envelope); return AXIS2_FAILURE; } return AXIS2_SUCCESS; Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/engine.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 12 12:04:41 2007 @@ -256,7 +256,7 @@ return status; /* find and invoke the phases */ - 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_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env); @@ -266,7 +266,7 @@ } } - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { /* message has paused, so rerun it from the position it stopped. The handler which paused the message will be the first one to resume @@ -278,7 +278,7 @@ return status; } - 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) { conf = axis2_conf_ctx_get_conf(conf_ctx, env); @@ -301,7 +301,7 @@ return status; } - 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) { conf = axis2_conf_ctx_get_conf(conf_ctx, env); @@ -316,11 +316,11 @@ } } - if (!(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))) + if (!( axis2_msg_ctx_is_paused(msg_ctx, env))) { /* write the message to wire */ axis2_transport_sender_t *transport_sender = NULL; - axis2_transport_out_desc_t *transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env); + axis2_transport_out_desc_t *transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env); if (transport_out) { @@ -364,31 +364,31 @@ engine_impl = AXIS2_INTF_TO_IMPL(engine); - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); conf = axis2_conf_ctx_get_conf(conf_ctx, env); pre_calculated_phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env); - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { /* the message has paused, so re-run them from the position they stopped. */ axis2_engine_resume_invocation_phases(engine, env, pre_calculated_phases, msg_ctx); - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { return AXIS2_SUCCESS; } axis2_engine_verify_ctx_built(engine, env, msg_ctx); /* resume op specific phases */ - 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) { op = AXIS2_OP_CTX_GET_OP(op_ctx, env); op_specific_phases = axis2_op_get_in_flow(op, env); axis2_engine_resume_invocation_phases(engine, env, op_specific_phases, msg_ctx); - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { return AXIS2_SUCCESS; } @@ -399,17 +399,17 @@ status = axis2_engine_invoke_phases(engine, env, pre_calculated_phases, msg_ctx); if (status != AXIS2_SUCCESS) { - if (AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env)) + if ( axis2_msg_ctx_get_server_side(msg_ctx, env)) return status; } - if (AXIS2_TRUE == AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if (AXIS2_TRUE == axis2_msg_ctx_is_paused(msg_ctx, env)) { return AXIS2_SUCCESS; } axis2_engine_verify_ctx_built(engine, env, msg_ctx); /* TODO : Remove me. I'm redundant */ - 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) { op = AXIS2_OP_CTX_GET_OP(op_ctx, env); @@ -420,14 +420,14 @@ return status; } - if (AXIS2_TRUE == AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if (AXIS2_TRUE == axis2_msg_ctx_is_paused(msg_ctx, env)) { return AXIS2_SUCCESS; } } } - if ((AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env)) && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))) + if (( axis2_msg_ctx_get_server_side(msg_ctx, env)) && !( axis2_msg_ctx_is_paused(msg_ctx, env))) { axis2_msg_recv_t *receiver = NULL; @@ -466,15 +466,15 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); - if (!(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))) + if (!( axis2_msg_ctx_is_paused(msg_ctx, env))) { /* send the SOAP Fault*/ axis2_conf_ctx_t *conf_ctx = NULL; axis2_transport_sender_t *transport_sender = NULL; axis2_transport_out_desc_t *transport_out = NULL; - 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_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env); @@ -488,7 +488,7 @@ } } - transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env); + transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env); if (transport_out) transport_sender = axis2_transport_out_desc_get_sender(transport_out, env); @@ -509,13 +509,13 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - 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) { /* if we do not have an op context that means this may be an incoming dual channel response. So try to dispatch the service */ - axis2_conf_ctx_t *conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + axis2_conf_ctx_t *conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); if (conf_ctx) { axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env); @@ -524,7 +524,7 @@ axis2_array_list_t *phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env); if (phases) { - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx); } @@ -538,13 +538,13 @@ } } - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); /* find and execute the fault in flow handlers */ if (op_ctx) { axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env); axis2_array_list_t *phases = axis2_op_get_fault_in_flow(op, env); - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx); } @@ -579,7 +579,7 @@ engine_impl = AXIS2_INTF_TO_IMPL(engine); - if (AXIS2_MSG_CTX_GET_PROCESS_FAULT(processing_context, env)) + if ( axis2_msg_ctx_get_process_fault(processing_context, env)) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PROCESSING_FAULT_ALREADY, AXIS2_FAILURE); @@ -587,12 +587,12 @@ } fault_ctx = axis2_msg_ctx_create(env, engine_impl->conf_ctx, - AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(processing_context, env), - AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(processing_context, env)); + axis2_msg_ctx_get_transport_in_desc(processing_context, env), + axis2_msg_ctx_get_transport_out_desc(processing_context, env)); - AXIS2_MSG_CTX_SET_PROCESS_FAULT(fault_ctx, env, AXIS2_TRUE); + axis2_msg_ctx_set_process_fault(fault_ctx, env, AXIS2_TRUE); - fault_to = AXIS2_MSG_CTX_GET_FAULT_TO(processing_context, env); + fault_to = axis2_msg_ctx_get_fault_to(processing_context, env); if (fault_to) { const axis2_char_t *address = axis2_endpoint_ref_get_address(fault_to, env); @@ -603,19 +603,19 @@ else if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL, address) == 0 || AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, address) == 0) { - reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(processing_context, env); + reply_to = axis2_msg_ctx_get_reply_to(processing_context, env); if (reply_to) { - AXIS2_MSG_CTX_SET_FAULT_TO(fault_ctx, env, reply_to); + axis2_msg_ctx_set_fault_to(fault_ctx, env, reply_to); } else { - AXIS2_MSG_CTX_SET_FAULT_TO(fault_ctx, env, fault_to); + axis2_msg_ctx_set_fault_to(fault_ctx, env, fault_to); } } else { - AXIS2_MSG_CTX_SET_FAULT_TO(fault_ctx, env, fault_to); + axis2_msg_ctx_set_fault_to(fault_ctx, env, fault_to); } } @@ -634,41 +634,41 @@ } /* set WSA action */ - msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(processing_context, env); + msg_info_headers = axis2_msg_ctx_get_msg_info_headers(processing_context, env); if (msg_info_headers) { wsa_action = axis2_msg_info_headers_get_action (msg_info_headers, env); if (wsa_action) { wsa_action = "http://www.w3.org/2005/08/addressing/fault"; - AXIS2_MSG_CTX_SET_WSA_ACTION(fault_ctx, env, wsa_action); + axis2_msg_ctx_set_wsa_action(fault_ctx, env, wsa_action); } } /* set relates to */ - msg_id = AXIS2_MSG_CTX_GET_MSG_ID(processing_context, env); + msg_id = axis2_msg_ctx_get_msg_id(processing_context, env); relates_to = axis2_relates_to_create(env, msg_id, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE); - AXIS2_MSG_CTX_SET_RELATES_TO(fault_ctx, env, relates_to); + axis2_msg_ctx_set_relates_to(fault_ctx, env, relates_to); /* set msg id */ msg_uuid = axis2_uuid_gen(env); - AXIS2_MSG_CTX_SET_MESSAGE_ID(fault_ctx, env, msg_uuid); + axis2_msg_ctx_set_message_id(fault_ctx, env, msg_uuid); if (msg_uuid) { AXIS2_FREE(env->allocator, msg_uuid); msg_uuid = NULL; } - AXIS2_MSG_CTX_SET_OP_CTX(fault_ctx, env, AXIS2_MSG_CTX_GET_OP_CTX(processing_context, env)); - AXIS2_MSG_CTX_SET_PROCESS_FAULT(fault_ctx, env, AXIS2_TRUE); - AXIS2_MSG_CTX_SET_SERVER_SIDE(fault_ctx, env, AXIS2_TRUE); + axis2_msg_ctx_set_op_ctx(fault_ctx, env, axis2_msg_ctx_get_op_ctx(processing_context, env)); + axis2_msg_ctx_set_process_fault(fault_ctx, env, AXIS2_TRUE); + axis2_msg_ctx_set_server_side(fault_ctx, env, AXIS2_TRUE); - envelope = AXIS2_MSG_CTX_GET_FAULT_SOAP_ENVELOPE(processing_context, env); + envelope = axis2_msg_ctx_get_fault_soap_envelope(processing_context, env); if (!envelope) { - if (AXIS2_MSG_CTX_GET_IS_SOAP_11(processing_context, env)) + if ( axis2_msg_ctx_get_is_soap_11(processing_context, env)) { envelope = axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP11); @@ -694,7 +694,7 @@ } } - AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(fault_ctx, env, envelope); + axis2_msg_ctx_set_soap_envelope(fault_ctx, env, envelope); axis2_msg_ctx_set_http_out_transport_info(fault_ctx, env, axis2_msg_ctx_get_http_out_transport_info(processing_context, env)); return fault_ctx; @@ -723,15 +723,15 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - if (!AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env)) + if (! axis2_msg_ctx_get_conf_ctx(msg_ctx, env)) { return AXIS2_FAILURE; } - if (!AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env)) + if (! axis2_msg_ctx_get_op_ctx(msg_ctx, env)) { return AXIS2_FAILURE; } - if (!AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env)) + if (! axis2_msg_ctx_get_svc_ctx(msg_ctx, env)) { return AXIS2_FAILURE; } @@ -756,7 +756,7 @@ if (phases) count = axis2_array_list_size(phases, env); - for (i = 0; (i < count && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))); i++) + for (i = 0; (i < count && !( axis2_msg_ctx_is_paused(msg_ctx, env))); i++) { axis2_phase_t *phase = (axis2_phase_t *) axis2_array_list_get(phases, env, i); @@ -789,16 +789,16 @@ AXIS2_PARAM_CHECK(env->error, phases, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_FALSE); + axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_FALSE); count = axis2_array_list_size(phases, env); - for (i = 0; i < count && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)); i++) + for (i = 0; i < count && !( axis2_msg_ctx_is_paused(msg_ctx, env)); i++) { axis2_phase_t *phase = (axis2_phase_t *) axis2_array_list_get(phases, env, i); const axis2_char_t *phase_name = AXIS2_PHASE_GET_NAME(phase, env); - const axis2_char_t *paused_phase_name = AXIS2_MSG_CTX_GET_PAUSED_PHASE_NAME( + const axis2_char_t *paused_phase_name = axis2_msg_ctx_get_paused_phase_name( msg_ctx, env); /* skip invoking handlers until we find the paused phase */ if (phase_name && paused_phase_name && 0 == AXIS2_STRCMP(phase_name, @@ -807,7 +807,7 @@ int paused_handler_i = -1; found_match = AXIS2_TRUE; - paused_handler_i = AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(msg_ctx, + paused_handler_i = axis2_msg_ctx_get_current_handler_index(msg_ctx, env); /* invoke the paused handler and rest of the handlers of the paused * phase */ @@ -868,7 +868,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - 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) return AXIS2_FAILURE; @@ -905,7 +905,7 @@ that role too have been dealt with. */ role = AXIOM_SOAP_HEADER_BLOCK_GET_ROLE(header_block, env); - if (AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) != AXIS2_TRUE) + if ( axis2_msg_ctx_get_is_soap_11(msg_ctx, env) != AXIS2_TRUE) { /* SOAP 1.2 */ if (!role || AXIS2_STRCMP(role, AXIOM_SOAP12_SOAP_ROLE_NEXT) != 0) @@ -915,8 +915,8 @@ "soapenv:MustUnderstand", "Header not understood", AXIOM_SOAP12, NULL, NULL); - AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, temp_env); - AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, + axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, temp_env); + axis2_msg_ctx_set_wsa_action(msg_ctx, env, "http://www.w3.org/2005/08/addressing/fault"); return AXIS2_FAILURE; } @@ -931,8 +931,8 @@ "soapenv:MustUnderstand", "Header not understood", AXIOM_SOAP11, NULL, NULL); - AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, temp_env); - AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, + axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, temp_env); + axis2_msg_ctx_set_wsa_action(msg_ctx, env, "http://www.w3.org/2005/08/addressing/fault"); return AXIS2_FAILURE; } @@ -957,14 +957,14 @@ axis2_array_list_t *phases = NULL; /* find and invoke the phases */ - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); conf = axis2_conf_ctx_get_conf(conf_ctx, env); phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env); axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx); /* invoking the message receiver */ - if (AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env) && !AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_get_server_side(msg_ctx, env) && ! axis2_msg_ctx_is_paused(msg_ctx, env)) { /* invoke the message receivers */ axis2_op_ctx_t *op_ctx = NULL; @@ -973,7 +973,7 @@ if (status != AXIS2_SUCCESS) return status; - 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_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env); @@ -1005,7 +1005,7 @@ axis2_status_t status = AXIS2_FAILURE; /* invoke the phases */ - 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_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env); @@ -1017,12 +1017,12 @@ axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx); /* invoking transport sender */ - if (!AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if (! axis2_msg_ctx_is_paused(msg_ctx, env)) { /* write the message to the wire */ axis2_transport_out_desc_t *transport_out = NULL; axis2_transport_sender_t *sender = NULL; - transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env); + transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env); if (transport_out) { sender = axis2_transport_out_desc_get_sender(transport_out, env); Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/phase.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/phase.c Mon Mar 12 12:04:41 2007 @@ -320,10 +320,10 @@ phase_impl = AXIS2_INTF_TO_IMPL(phase); - AXIS2_MSG_CTX_SET_PAUSED_PHASE_NAME(msg_ctx, env, phase_impl->name); + axis2_msg_ctx_set_paused_phase_name(msg_ctx, env, phase_impl->name); if (phase_impl->first_handler) { - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { return AXIS2_SUCCESS; } @@ -345,7 +345,7 @@ while (index < size) { - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { break; } @@ -365,7 +365,7 @@ /* index increment should be done after the invoke function. If the invocation failed this handler is taken care of and no need to revoke again */ index++; - AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(msg_ctx, env, index); + axis2_msg_ctx_set_current_handler_index(msg_ctx, env, index); } } } @@ -373,7 +373,7 @@ /* If phase last handler is there invoke it here*/ if (phase_impl->last_handler) { - if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) + if ( axis2_msg_ctx_is_paused(msg_ctx, env)) { return AXIS2_SUCCESS; } @@ -1143,7 +1143,7 @@ phase_impl = AXIS2_INTF_TO_IMPL(phase); - AXIS2_MSG_CTX_SET_PAUSED_PHASE_NAME(msg_ctx, env, phase_impl->name); + axis2_msg_ctx_set_paused_phase_name(msg_ctx, env, phase_impl->name); size = axis2_array_list_size(phase_impl->handlers, env); for (i = paused_handler_index; i < size; i++) @@ -1162,8 +1162,8 @@ } AXIS2_HANDLER_INVOKE(handler, env, msg_ctx); - index = AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(msg_ctx, env); - AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(msg_ctx, env, (index + 1)); + index = axis2_msg_ctx_get_current_handler_index(msg_ctx, env); + axis2_msg_ctx_set_current_handler_index(msg_ctx, env, (index + 1)); } } return status; Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Mon Mar 12 12:04:41 2007 @@ -89,7 +89,7 @@ AXIS2_ENV_CHECK(env, NULL); - endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env); + endpoint_ref = axis2_msg_ctx_get_to(msg_ctx, env); if (endpoint_ref) { @@ -110,7 +110,7 @@ { axis2_conf_ctx_t *conf_ctx = NULL; - 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_conf_t *conf = NULL; @@ -146,7 +146,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, svc, NULL); - endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env); + endpoint_ref = axis2_msg_ctx_get_to(msg_ctx, env); if (endpoint_ref) { Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Mon Mar 12 12:04:41 2007 @@ -101,7 +101,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, svc, NULL); - action = axis2_string_get_buffer(AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env), env); + action = axis2_string_get_buffer( axis2_msg_ctx_get_soap_action(msg_ctx, env), env); if (action) { Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Mon Mar 12 12:04:41 2007 @@ -91,7 +91,7 @@ axis2_svc_t *svc = NULL; AXIS2_ENV_CHECK(env, NULL); - 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) { axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); @@ -130,7 +130,7 @@ { axis2_conf_ctx_t *conf_ctx = NULL; - 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_conf_t *conf = NULL; @@ -173,7 +173,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, svc, NULL); - 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) { axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original) +++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 12 12:04:41 2007 @@ -202,7 +202,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env); if (NULL == svc) @@ -250,7 +250,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env); if (NULL == svc) @@ -312,7 +312,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env); if (NULL == svc) @@ -364,11 +364,11 @@ { return AXIS2_FAILURE; } - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(out_msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(out_msg_ctx, env); if (!op_ctx) { axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx); - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); + axis2_msg_ctx_free(out_msg_ctx, env); return AXIS2_FAILURE; } @@ -376,7 +376,7 @@ if (!status) { axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx); - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); + axis2_msg_ctx_free(out_msg_ctx, env); return status; } status = AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx); @@ -388,7 +388,7 @@ if (AXIS2_SUCCESS != status) { axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx); - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); + axis2_msg_ctx_free(out_msg_ctx, env); return status; } svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); @@ -396,12 +396,12 @@ engine = axis2_engine_create(env, conf_ctx); if (!engine) { - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); + axis2_msg_ctx_free(out_msg_ctx, env); return AXIS2_FAILURE; } - if (AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(out_msg_ctx, env)) + if ( axis2_msg_ctx_get_soap_envelope(out_msg_ctx, env)) { - axiom_soap_envelope_t *soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE( + axiom_soap_envelope_t *soap_envelope = axis2_msg_ctx_get_soap_envelope( out_msg_ctx, env); if (soap_envelope) { @@ -414,9 +414,9 @@ if (AXIOM_SOAP_BODY_HAS_FAULT(body, env)) { status = AXIS2_FAILURE; - AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, + axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, soap_envelope); - AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(out_msg_ctx, env, NULL); + axis2_msg_ctx_set_soap_envelope(out_msg_ctx, env, NULL); } else { @@ -428,14 +428,14 @@ } } AXIS2_ENGINE_FREE(engine, env); - if (!AXIS2_MSG_CTX_IS_PAUSED(out_msg_ctx, env) && - !AXIS2_MSG_CTX_IS_KEEP_ALIVE(out_msg_ctx, env)) + if (! axis2_msg_ctx_is_paused(out_msg_ctx, env) && + ! axis2_msg_ctx_is_keep_alive(out_msg_ctx, env)) { axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx); } /* this is freed in http worker by resetting the operation context holding this msg context - AXIS2_MSG_CTX_FREE(out_msg_ctx, env); */ + axis2_msg_ctx_free(out_msg_ctx, env); */ out_msg_ctx = NULL; return status; } @@ -468,17 +468,17 @@ { return AXIS2_FAILURE; } - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(new_msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(new_msg_ctx, env); if (!op_ctx) { - AXIS2_MSG_CTX_FREE(new_msg_ctx, env); + axis2_msg_ctx_free(new_msg_ctx, env); return AXIS2_FAILURE; } AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, new_msg_ctx); status = AXIS2_MSG_RECV_INVOKE_IN_OUT_BUSINESS_LOGIC_ASYNC(msg_recv, env, msg_ctx, new_msg_ctx, callback); /* end of code that run in a thread */ - conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); /* get thread pool from conf_ctx and execute the thread task */ /*messageCtx.getConfigurationContext().getThreadPool().execute(theadedTask);*/ return status; Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original) +++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Mar 12 12:04:41 2007 @@ -103,7 +103,7 @@ if (!svc_obj) { const axis2_char_t *svc_name = NULL; - axis2_svc_t *svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env); + axis2_svc_t *svc = axis2_msg_ctx_get_svc(msg_ctx, env); if (svc) { @@ -123,7 +123,7 @@ } else { - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); op_desc = AXIS2_OP_CTX_GET_OP(op_ctx, env); style = axis2_op_get_style(op_desc, env); @@ -132,7 +132,7 @@ axiom_soap_envelope_t *envelope = NULL; axiom_soap_body_t *body = NULL; - envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env); + envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env); body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env); om_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env); om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env); @@ -145,7 +145,7 @@ axiom_node_t *op_node = NULL; axiom_element_t *op_element = NULL; - envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env); + envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env); body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env); op_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env); op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env); @@ -257,13 +257,13 @@ } } - if (msg_ctx && AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env)) + if (msg_ctx && axis2_msg_ctx_get_is_soap_11(msg_ctx, env)) { soap_ns = AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI; /* default is 1.2 */ soap_version = AXIOM_SOAP11; } - if (AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(new_msg_ctx, env)) + if ( axis2_msg_ctx_get_soap_envelope(new_msg_ctx, env)) { /* service implementation has set the envelope, useful when setting a SOAP fault. @@ -335,11 +335,11 @@ if (body_content_node) { AXIOM_NODE_ADD_CHILD(out_node , env, body_content_node); - status = AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope); + status = axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope); } else if (soap_fault) { - AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope); + axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope); status = AXIS2_SUCCESS; } else Modified: webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?view=diff&rev=517336&r1=517335&r2=517336 ============================================================================== --- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original) +++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Mon Mar 12 12:04:41 2007 @@ -132,7 +132,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env); engine = axis2_engine_create(env, conf_ctx); @@ -158,7 +158,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE); - op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env); engine = axis2_engine_create(env, conf_ctx); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org