You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/12 20:04:44 UTC
svn commit: r517336 [2/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...
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Mon Mar 12 12:04:41 2007
@@ -239,7 +239,7 @@
(http_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
if (0 == AXIS2_STRCASECMP(http_version, AXIS2_HTTP_HEADER_PROTOCOL_11))
@@ -269,7 +269,7 @@
if (svc_grp_uuid)
{
axis2_string_t *svc_grp_uuid_str = axis2_string_create_assume_ownership(env, &svc_grp_uuid);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_uuid_str);
+ axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_uuid_str);
axis2_string_free(svc_grp_uuid_str, env);
}
@@ -379,7 +379,7 @@
}
}
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (axis2_op_ctx_get_response_written(op_ctx, env))
{
AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env, http_version,
@@ -400,9 +400,9 @@
url_external_form = NULL;
/* this is freed in the following block of logic, taking it from
operation context that holds it
- AXIS2_MSG_CTX_FREE(msg_ctx, env); */
+ axis2_msg_ctx_free(msg_ctx, env); */
/* Free message contextx */
- 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 *out_msg_ctx = NULL, *in_msg_ctx = NULL;
@@ -415,14 +415,14 @@
if (out_msg_ctx)
{
- 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;
}
if (in_msg_ctx)
{
- 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;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Mar 12 12:04:41 2007
@@ -279,7 +279,7 @@
AXIS2_PARAM_CHECK(env->error, str_url, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_action, AXIS2_FAILURE);
- if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
+ if (AXIS2_TRUE == axis2_msg_ctx_get_doing_rest(msg_ctx, env))
is_soap = AXIS2_FALSE;
else
is_soap = AXIS2_TRUE;
@@ -305,7 +305,7 @@
}
data_out = AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
- method = (axis2_property_t *)AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ method = (axis2_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD, AXIS2_FALSE);
if (method)
method_value = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE (method, env);
@@ -350,10 +350,10 @@
AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
axis2_http_client_free_void_arg);
AXIS2_PROPERTY_SET_VALUE(property, env, sender_impl->client);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_CLIENT,
+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT,
property, AXIS2_FALSE);*/
- doing_mtom = AXIS2_MSG_CTX_GET_DOING_MTOM(msg_ctx, env);
+ doing_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);
if (NULL == sender_impl->om_output)
{
@@ -375,7 +375,7 @@
if (is_soap)
{
- dump_property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ dump_property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_DUMP_INPUT_MSG_TRUE, AXIS2_FALSE);
if(dump_property)
{
@@ -435,7 +435,7 @@
axis2_http_sender_util_add_header (env, request, AXIS2_HTTP_HEADER_USER_AGENT, "Axis2/C");
- if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ if (AXIS2_TRUE == axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
if ('\"' != *soap_action)
{
@@ -483,7 +483,7 @@
{
content_type = (axis2_char_t *)AXIOM_OUTPUT_GET_CONTENT_TYPE(sender_impl->om_output,
env);
- if (AXIS2_TRUE != AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ if (AXIS2_TRUE != axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
/* handle SOAP action for SOAP 1.2 case */
if (axis2_strcmp(soap_action, ""))
@@ -498,7 +498,7 @@
}
}
}
- else if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ else if (AXIS2_TRUE == axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML;
@@ -531,7 +531,7 @@
}
else
{
- content_type_property = (axis2_property_t *)AXIS2_MSG_CTX_GET_PROPERTY(
+ content_type_property = (axis2_property_t *) axis2_msg_ctx_get_property(
msg_ctx, env,
AXIS2_USER_DEFINED_HTTP_HEADER_CONTENT_TYPE,
AXIS2_FALSE);
@@ -595,9 +595,9 @@
sender_impl->so_timeout);
/* TODO: Load from property
- * ssl_pp_property = AXIS2_MSG_CTX_GET_PROPERTY(AXIS2_SSL_PASSPHRASE);*/
+ * ssl_pp_property = axis2_msg_ctx_get_property(AXIS2_SSL_PASSPHRASE);*/
- ssl_pp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
+ ssl_pp_param = axis2_msg_ctx_get_parameter(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
if (ssl_pp_param)
{
@@ -635,7 +635,7 @@
axis2_char_t *tmp_header_val = NULL;
axis2_op_t *op = NULL;
- op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
if (op)
{
const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
@@ -745,7 +745,7 @@
/* property = axis2_property_create(env); */
/* AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); */
/* AXIS2_PROPERTY_SET_VALUE(property, env, transfer_encoding); */
-/* AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, */
+/* axis2_msg_ctx_set_property(msg_ctx, env, */
/* AXIS2_HTTP_HEADER_TRANSFER_ENCODING, */
/* property, */
/* AXIS2_FALSE); */
@@ -779,7 +779,7 @@
&& strstr(content_type, AXIS2_HTTP_HEADER_XOP_XML))
{
axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE(
- AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
+ axis2_msg_ctx_get_op_ctx(msg_ctx, env), env);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(content_type,
@@ -790,7 +790,7 @@
}
if (charset)
{
- axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
+ axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE( axis2_msg_ctx_get_op_ctx(
msg_ctx, env), env);
if (axis_ctx)
{
@@ -814,7 +814,7 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, content_length);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ axis2_msg_ctx_set_property(msg_ctx, env,
AXIS2_HTTP_HEADER_CONTENT_LENGTH, property,
AXIS2_FALSE);
}
@@ -844,7 +844,7 @@
}
axis2_http_sender_get_header_info(sender, env, msg_ctx, response);
- /*axis_ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env),
+ /*axis_ctx = AXIS2_OP_CTX_GET_BASE( axis2_msg_ctx_get_op_ctx(msg_ctx, env),
env);*/
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -852,7 +852,7 @@
AXIS2_PROPERTY_SET_VALUE(property, env, in_stream);
/*axis2_ctx_set_property(axis_ctx, env, AXIS2_TRANSPORT_IN, property,
AXIS2_FALSE);*/
- 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);
return AXIS2_SUCCESS;
}
@@ -870,7 +870,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- tmp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx,
+ tmp_param = axis2_msg_ctx_get_parameter(msg_ctx,
env, AXIS2_HTTP_SO_TIMEOUT);
if (tmp_param)
@@ -881,7 +881,7 @@
AXIS2_INTF_TO_IMPL(sender)->so_timeout = AXIS2_ATOI(so_str);
}
}
- tmp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env,
+ tmp_param = axis2_msg_ctx_get_parameter(msg_ctx, env,
AXIS2_HTTP_CONNECTION_TIMEOUT);
if (tmp_param)
{
@@ -927,7 +927,7 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
sender_impl = AXIS2_INTF_TO_IMPL(sender);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if (NULL == conf_ctx)
{
return AXIS2_FAILURE;
@@ -1019,7 +1019,7 @@
sender_impl = AXIS2_INTF_TO_IMPL(sender);
- server_cert_property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ server_cert_property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_SSL_SERVER_CERT, AXIS2_FALSE);
if(server_cert_property)
{
@@ -1028,7 +1028,7 @@
}
else
{
- server_cert_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env,
+ server_cert_param = axis2_msg_ctx_get_parameter(msg_ctx, env,
AXIS2_SSL_SERVER_CERT);
if(server_cert_param)
{
@@ -1062,7 +1062,7 @@
sender_impl = AXIS2_INTF_TO_IMPL(sender);
- key_file_property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ key_file_property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_SSL_KEY_FILE, AXIS2_FALSE);
if(key_file_property)
{
@@ -1071,7 +1071,7 @@
}
else
{
- key_file_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env,
+ key_file_param = axis2_msg_ctx_get_parameter(msg_ctx, env,
AXIS2_SSL_KEY_FILE);
if(key_file_param)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon Mar 12 12:04:41 2007
@@ -177,7 +177,7 @@
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,
AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
if (property)
{
@@ -192,7 +192,7 @@
if (!char_set_enc)
{
- axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ axis2_op_ctx_t *op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
{
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -219,9 +219,9 @@
do_mtom = axis2_http_transport_utils_do_write_mtom(env,
msg_ctx);
- AXIS2_MSG_CTX_SET_DOING_MTOM(msg_ctx, env, do_mtom);
- /*do_mtom = AXIS2_MSG_CTX_GET_DOING_MTOM(msg_ctx, env);*/
- /*AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx,
+ axis2_msg_ctx_set_doing_mtom(msg_ctx, env, do_mtom);
+ /*do_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);*/
+ /* axis2_msg_ctx_set_doing_rest(msg_ctx,
env, axis2_http_transport_utils_is_doing_rest(env,
msg_ctx));*/
@@ -232,7 +232,7 @@
}
else
{
- axis2_endpoint_ref_t *ctx_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
+ axis2_endpoint_ref_t *ctx_epr = axis2_msg_ctx_get_to(msg_ctx, env);
if (ctx_epr && 0 != AXIS2_STRCMP(
AXIS2_WSA_ANONYMOUS_URL_SUBMISSION,
axis2_endpoint_ref_get_address(ctx_epr, env)) &&
@@ -268,7 +268,7 @@
return AXIS2_FAILURE;
}
- AXIOM_OUTPUT_SET_SOAP11(om_output, env, AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env));
+ AXIOM_OUTPUT_SET_SOAP11(om_output, env, axis2_msg_ctx_get_is_soap_11(msg_ctx, env));
if (epr)
{
if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, axis2_endpoint_ref_get_address(epr, env)) == 0 ||
@@ -287,7 +287,7 @@
{
axis2_stream_t *out_stream = axis2_msg_ctx_get_transport_out_stream(msg_ctx, env);
- if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ if (AXIS2_TRUE == axis2_msg_ctx_get_server_side(msg_ctx, env))
{
axis2_http_out_transport_info_t *out_info = NULL;
axis2_bool_t is_soap11 = AXIS2_FALSE;
@@ -304,7 +304,7 @@
xml_writer = NULL;
return AXIS2_FAILURE;
}
- is_soap11 = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env);
+ is_soap11 = axis2_msg_ctx_get_is_soap_11(msg_ctx, env);
/* AXIOM_OUTPUT_SET_SOAP11(om_output, env, is_soap_11);
*/
AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CHAR_ENCODING(out_info, env,
@@ -326,7 +326,7 @@
* AXIS2_MSG_CTX_GET_IS_DOING_MTOM(msg_ctx, env);
*/
- if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
+ if (AXIS2_TRUE == axis2_msg_ctx_get_doing_rest(msg_ctx, env))
{
axiom_node_t *body_node = NULL;
axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(
@@ -392,7 +392,7 @@
AXIS2_STREAM_WRITE(out_stream, env, buffer, buffer_size);
/*AXIS2_FREE(env->allocator, buffer);*/
- 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);
}
}
@@ -557,7 +557,7 @@
url = axis2_endpoint_ref_get_address(epr, env);
- soap_action = axis2_string_get_buffer(AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env), env);
+ soap_action = axis2_string_get_buffer( axis2_msg_ctx_get_soap_action(msg_ctx, env), env);
if (NULL == soap_action)
{
@@ -595,7 +595,7 @@
AXIS2_HTTP_SENDER_FREE(sender, env);
sender = 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 */
@@ -610,12 +610,12 @@
}
else
{
- soap_ns_uri = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) ?
+ soap_ns_uri = axis2_msg_ctx_get_is_soap_11(msg_ctx, env) ?
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI : AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
response_envelope = axis2_http_transport_utils_create_soap_msg(env,
msg_ctx, soap_ns_uri);
if (response_envelope)
- AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env, response_envelope);
+ axis2_msg_ctx_set_response_soap_envelope (msg_ctx, env, response_envelope);
}
}
/* Free the client */
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Mon Mar 12 12:04:41 2007
@@ -93,7 +93,7 @@
headers = curl_slist_append (headers, "User-Agent:Axis2/C");
headers = curl_slist_append (headers, "Accept:");
headers = curl_slist_append (headers, "Expect:");
- if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
+ if (AXIS2_TRUE == axis2_msg_ctx_get_doing_rest(msg_ctx, env))
is_soap = AXIS2_FALSE;
else
is_soap = AXIS2_TRUE;
@@ -117,7 +117,7 @@
}
data_out = AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
- method = (axis2_property_t *)AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ method = (axis2_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD, AXIS2_FALSE);
if (method)
method_value = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE (method, env);
@@ -146,13 +146,13 @@
if (is_soap)
{
- doing_mtom = AXIS2_MSG_CTX_GET_DOING_MTOM(msg_ctx, env);
+ doing_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);
AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env,
doing_mtom);
AXIOM_SOAP_ENVELOPE_SERIALIZE(out, env, om_output,
AXIS2_FALSE);
- if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ if (AXIS2_TRUE == axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
if ('\"' != *soap_action)
{
@@ -177,7 +177,7 @@
&output_stream_size);
content_type = (axis2_char_t *)AXIOM_OUTPUT_GET_CONTENT_TYPE(om_output,
env);
- if (AXIS2_TRUE != AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ if (AXIS2_TRUE != axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
/* handle SOAP action for SOAP 1.2 case */
if (axis2_strcmp(soap_action, ""))
@@ -192,7 +192,7 @@
}
}
}
- else if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
+ else if (AXIS2_TRUE == axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML;
@@ -230,7 +230,7 @@
axis2_char_t *content_type_value = NULL;
AXIOM_NODE_SERIALIZE(data_out, env, om_output);
- content_type_property = (axis2_property_t *)AXIS2_MSG_CTX_GET_PROPERTY(
+ content_type_property = (axis2_property_t *) axis2_msg_ctx_get_property(
msg_ctx, env,
AXIS2_USER_DEFINED_HTTP_HEADER_CONTENT_TYPE,
AXIS2_FALSE);
@@ -301,7 +301,7 @@
AXIS2_PROPERTY_SET_SCOPE(trans_in_property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_FREE_FUNC(trans_in_property, env, axis2_stream_free_void_arg);
AXIS2_PROPERTY_SET_VALUE(trans_in_property, env, in_stream);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, trans_in_property,
+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, trans_in_property,
AXIS2_FALSE);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Mon Mar 12 12:04:41 2007
@@ -237,7 +237,7 @@
AXIS2_TRANSPORT_ENUM_HTTP);
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
@@ -245,7 +245,7 @@
if (ctx_uuid)
{
axis2_string_t *uuid_str = axis2_string_create_assume_ownership(env, &ctx_uuid);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, uuid_str);
+ axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, uuid_str);
axis2_string_free(uuid_str, env);
}
@@ -317,13 +317,13 @@
body_str_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
}
send_status = HTTP_INTERNAL_SERVER_ERROR;
- AXIS2_MSG_CTX_FREE(fault_ctx, env);
+ axis2_msg_ctx_free(fault_ctx, env);
}
}
// Nothing wrong has happen. So proceed with the request
if (-1 == send_status)
{
- axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ axis2_op_ctx_t *op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (axis2_op_ctx_get_response_written(op_ctx, env))
{
if (out_stream)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Mon Mar 12 12:04:41 2007
@@ -205,7 +205,7 @@
AXIS2_TRANSPORT_ENUM_HTTP);
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
@@ -216,7 +216,7 @@
if (ctx_uuid)
{
axis2_string_t *uuid_str = axis2_string_create_assume_ownership(env, &ctx_uuid);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, uuid_str);
+ axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, uuid_str);
axis2_string_free(uuid_str, env);
}
@@ -280,12 +280,12 @@
body_string_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
}
send_status = HTTP_INTERNAL_SERVER_ERROR;
- AXIS2_MSG_CTX_FREE(fault_ctx, env);
+ axis2_msg_ctx_free(fault_ctx, env);
}
}
if (-1 == send_status)
{
- axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ axis2_op_ctx_t *op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (axis2_op_ctx_get_response_written(op_ctx, env))
{
send_status = OK;
@@ -325,7 +325,7 @@
/*if (send_status != HTTP_INTERNAL_SERVER_ERROR)
{
- AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ axis2_msg_ctx_free(msg_ctx, env);
}*/
axis2_string_free(soap_action, env);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon Mar 12 12:04:41 2007
@@ -190,7 +190,7 @@
AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FAILURE);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
callback_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_callback_info_t));
/* Note: the memory created above is freed in xml reader free function
@@ -305,11 +305,11 @@
AXIS2_FREE(env->allocator, mime_boundary);
}
- AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, soap_action_header);
- AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,
+ axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action_header);
+ axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
request_uri));
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
char_set_str = axis2_http_transport_utils_get_charset_enc(env, content_type);
xml_reader = axiom_xml_reader_create_for_io(env,
@@ -400,7 +400,7 @@
if (do_rest)
{
/* REST support */
- axis2_param_t *rest_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env
+ axis2_param_t *rest_param = axis2_msg_ctx_get_parameter(msg_ctx, env
, AXIS2_ENABLE_REST);
if (rest_param && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
AXIS2_PARAM_GET_VALUE(rest_param, env)))
@@ -415,7 +415,7 @@
om_doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
AXIOM_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
- AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
}
}
@@ -449,7 +449,7 @@
*}
*/
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
engine = axis2_engine_create(env, conf_ctx);
@@ -470,13 +470,13 @@
{
status = AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx);
}
- if (NULL == AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env) &&
+ if (NULL == axis2_msg_ctx_get_soap_envelope(msg_ctx, env) &&
AXIS2_FALSE == is_soap11)
{
axiom_soap_envelope_t *def_envelope =
axiom_soap_envelope_create_default_soap_envelope(env,
AXIOM_SOAP12);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, def_envelope);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, def_envelope);
}
if (engine)
@@ -528,16 +528,16 @@
AXIS2_PARAM_CHECK(env->error, request_params, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,
+ axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
request_uri));
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
if (AXIS2_SUCCESS != axis2_http_transport_utils_dispatch_and_verify(env,
msg_ctx))
{
return AXIS2_FALSE;
}
- op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
/*if (op)
{
axis2_msg_t *msg = NULL;
@@ -552,8 +552,8 @@
}
else
{
- AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx, env, AXIS2_TRUE);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope);
+ axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx);
return AXIS2_TRUE;
@@ -599,11 +599,11 @@
return (axis2_msg_ctx_get_doing_mtom(msg_ctx, env));
- /*param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_ENABLE_MTOM);
+ /*param = axis2_msg_ctx_get_parameter(msg_ctx, env, AXIS2_ENABLE_MTOM);
if (param)
value = AXIS2_PARAM_GET_VALUE(param, env);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_ENABLE_MTOM, AXIS2_FALSE);
if (property)
value = (axis2_char_t *)AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -1030,7 +1030,7 @@
AXIS2_PARAM_CHECK(env->error, soap_ns_uri, NULL);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_TRANSPORT_IN, AXIS2_FALSE);
if (property)
{
@@ -1051,7 +1051,7 @@
callback_ctx->unread_len = -1;
callback_ctx->chunked_stream = NULL;
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_HEADER_CONTENT_LENGTH, AXIS2_FALSE);
if (property)
{
@@ -1085,7 +1085,7 @@
}
- 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_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -1115,7 +1115,7 @@
if (content_type)
{
axis2_char_t *mime_boundary = NULL;
- AXIS2_MSG_CTX_SET_DOING_MTOM(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_doing_mtom(msg_ctx, env, AXIS2_TRUE);
/* get mime boundry */
mime_boundary = axis2_http_transport_utils_get_value_from_content_type(env, content_type, AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
@@ -1154,7 +1154,7 @@
}
}
- if (AXIS2_TRUE != AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
+ if (AXIS2_TRUE != axis2_msg_ctx_get_doing_rest(msg_ctx, env))
{
axiom_xml_reader_t *xml_reader = NULL;
axiom_stax_builder_t *om_builder = NULL;
@@ -1326,7 +1326,7 @@
axiom_node_t *body_child_node = NULL;
body_child = axiom_element_create_with_qname(env, NULL,
- axis2_op_get_qname(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
+ axis2_op_get_qname( axis2_msg_ctx_get_op(msg_ctx, env),
env), &body_child_node);
AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
if (param_map)
@@ -1453,7 +1453,7 @@
}
body_child = axiom_element_create_with_qname(env, NULL,
- axis2_op_get_qname(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
+ axis2_op_get_qname( axis2_msg_ctx_get_op(msg_ctx, env),
env), &body_child_node);
AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
if (param_map)
@@ -1493,8 +1493,8 @@
handler = AXIS2_DISP_GET_BASE(req_uri_disp, env);
AXIS2_HANDLER_INVOKE(handler, env, msg_ctx);
- if (NULL == AXIS2_MSG_CTX_GET_SVC(msg_ctx, env) || NULL ==
- AXIS2_MSG_CTX_GET_OP(msg_ctx, env))
+ if (NULL == axis2_msg_ctx_get_svc(msg_ctx, env) || NULL ==
+ axis2_msg_ctx_get_op(msg_ctx, env))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_OR_OP_NOT_FOUND,
AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Mon Mar 12 12:04:41 2007
@@ -55,28 +55,28 @@
AXIS2_PARAM_CHECK(env->error, in_msg_ctx, NULL);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(in_msg_ctx, env);
- transport_in = AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(in_msg_ctx, env);
- transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(in_msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(in_msg_ctx, env);
+ transport_in = axis2_msg_ctx_get_transport_in_desc(in_msg_ctx, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(in_msg_ctx, env);
new_msg_ctx = axis2_msg_ctx_create(env, conf_ctx, transport_in, transport_out);
if (!new_msg_ctx)
{
return NULL;
}
- old_msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(in_msg_ctx, env);
+ old_msg_info_headers = axis2_msg_ctx_get_msg_info_headers(in_msg_ctx, env);
if (!old_msg_info_headers)
{
return NULL;
}
- msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(new_msg_ctx, env);
+ msg_info_headers = axis2_msg_ctx_get_msg_info_headers(new_msg_ctx, env);
if (!msg_info_headers)
{
/* if there is no msg info header in ew msg ctx, then create one */
msg_info_headers = axis2_msg_info_headers_create(env, NULL, NULL);
if (!msg_info_headers)
return NULL;
- AXIS2_MSG_CTX_SET_MSG_INFO_HEADERS(new_msg_ctx, env, msg_info_headers);
+ axis2_msg_ctx_set_msg_info_headers(new_msg_ctx, env, msg_info_headers);
}
msg_uuid = axis2_uuid_gen(env);
@@ -116,16 +116,16 @@
action = axis2_msg_info_headers_get_action(old_msg_info_headers, env);
axis2_msg_info_headers_set_action(msg_info_headers, env, action);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(in_msg_ctx, env);
- AXIS2_MSG_CTX_SET_OP_CTX(new_msg_ctx, env, op_ctx);
+ op_ctx = axis2_msg_ctx_get_op_ctx(in_msg_ctx, env);
+ axis2_msg_ctx_set_op_ctx(new_msg_ctx, env, op_ctx);
- svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(in_msg_ctx, env);
- AXIS2_MSG_CTX_SET_SVC_CTX(new_msg_ctx, env, svc_ctx);
+ svc_ctx = axis2_msg_ctx_get_svc_ctx(in_msg_ctx, env);
+ axis2_msg_ctx_set_svc_ctx(new_msg_ctx, env, svc_ctx);
- ctx = AXIS2_MSG_CTX_GET_BASE(in_msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(in_msg_ctx, env);
if (ctx)
{
- axis2_ctx_t *new_ctx = AXIS2_MSG_CTX_GET_BASE(new_msg_ctx, env);
+ axis2_ctx_t *new_ctx = axis2_msg_ctx_get_base(new_msg_ctx, env);
if (new_ctx)
{
axis2_ctx_set_non_persistent_map(new_ctx, env,
@@ -137,62 +137,62 @@
axis2_msg_ctx_set_transport_out_stream(new_msg_ctx, env, out_stream);
axis2_msg_ctx_set_http_out_transport_info(new_msg_ctx, env,
axis2_msg_ctx_get_http_out_transport_info(in_msg_ctx, env));
- /*property = AXIS2_MSG_CTX_GET_PROPERTY(in_msg_ctx, env,
+ /*property = axis2_msg_ctx_get_property(in_msg_ctx, env,
AXIS2_TRANSPORT_OUT, AXIS2_FALSE);
if (property)
{
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg_ctx, env, AXIS2_TRANSPORT_OUT, property,
+ axis2_msg_ctx_set_property(new_msg_ctx, env, AXIS2_TRANSPORT_OUT, property,
AXIS2_FALSE);
property = NULL;
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(in_msg_ctx, env,
+ property = axis2_msg_ctx_get_property(in_msg_ctx, env,
AXIS2_HTTP_OUT_TRANSPORT_INFO, AXIS2_FALSE);
if (property)
{
axis2_char_t *temp = AXIS2_PROPERTY_GET_VALUE(property, env);
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
+ axis2_msg_ctx_set_property(new_msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
property, AXIS2_FALSE);
property = NULL;
}*/
/* Setting the charater set encoding */
- /*property = AXIS2_MSG_CTX_GET_PROPERTY(in_msg_ctx, env,
+ /*property = axis2_msg_ctx_get_property(in_msg_ctx, env,
AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
if (property)
{
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg_ctx, env,
+ axis2_msg_ctx_set_property(new_msg_ctx, env,
AXIS2_CHARACTER_SET_ENCODING, property, AXIS2_FALSE);
property = NULL;
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(in_msg_ctx, env,
+ property = axis2_msg_ctx_get_property(in_msg_ctx, env,
AXIS2_WSA_VERSION, AXIS2_FALSE);
if (property)
{
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg_ctx, env,
+ axis2_msg_ctx_set_property(new_msg_ctx, env,
AXIS2_WSA_VERSION, property, AXIS2_FALSE);
property = NULL;
}*/
- doing_rest = AXIS2_MSG_CTX_GET_DOING_REST(in_msg_ctx, env);
- AXIS2_MSG_CTX_SET_DOING_REST(new_msg_ctx, env, doing_rest);
+ doing_rest = axis2_msg_ctx_get_doing_rest(in_msg_ctx, env);
+ axis2_msg_ctx_set_doing_rest(new_msg_ctx, env, doing_rest);
- doing_mtom = AXIS2_MSG_CTX_GET_DOING_MTOM(in_msg_ctx, env);
- AXIS2_MSG_CTX_SET_DOING_MTOM(new_msg_ctx, env, doing_mtom);
+ doing_mtom = axis2_msg_ctx_get_doing_mtom(in_msg_ctx, env);
+ axis2_msg_ctx_set_doing_mtom(new_msg_ctx, env, doing_mtom);
- server_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(in_msg_ctx, env);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(new_msg_ctx, env, server_side);
+ server_side = axis2_msg_ctx_get_server_side(in_msg_ctx, env);
+ axis2_msg_ctx_set_server_side(new_msg_ctx, env, server_side);
- svc_grp_ctx = AXIS2_MSG_CTX_GET_SVC_GRP_CTX(in_msg_ctx, env);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(new_msg_ctx, env, svc_grp_ctx);
-
- AXIS2_MSG_CTX_SET_IS_SOAP_11(new_msg_ctx, env,
- AXIS2_MSG_CTX_GET_IS_SOAP_11(in_msg_ctx, env));
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(new_msg_ctx, env,
- AXIS2_MSG_CTX_IS_KEEP_ALIVE(in_msg_ctx, env));
+ svc_grp_ctx = axis2_msg_ctx_get_svc_grp_ctx(in_msg_ctx, env);
+ axis2_msg_ctx_set_svc_grp_ctx(new_msg_ctx, env, svc_grp_ctx);
+
+ axis2_msg_ctx_set_is_soap_11(new_msg_ctx, env,
+ axis2_msg_ctx_get_is_soap_11(in_msg_ctx, env));
+ axis2_msg_ctx_set_keep_alive(new_msg_ctx, env,
+ axis2_msg_ctx_is_keep_alive(in_msg_ctx, env));
axis2_msg_ctx_set_charset_encoding(new_msg_ctx, env,
axis2_msg_ctx_get_charset_encoding(in_msg_ctx, env));
@@ -208,7 +208,7 @@
if (!out_msg_ctx)
return;
- msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(out_msg_ctx, env);
+ msg_info_headers = axis2_msg_ctx_get_msg_info_headers(out_msg_ctx, env);
if (msg_info_headers)
{
axis2_msg_info_headers_set_to(msg_info_headers, env, NULL);
@@ -217,20 +217,20 @@
axis2_msg_info_headers_set_reply_to(msg_info_headers, env, NULL);
}
- AXIS2_MSG_CTX_SET_OP_CTX(out_msg_ctx, env, NULL);
- AXIS2_MSG_CTX_SET_SVC_CTX(out_msg_ctx, env, NULL);
+ axis2_msg_ctx_set_op_ctx(out_msg_ctx, env, NULL);
+ axis2_msg_ctx_set_svc_ctx(out_msg_ctx, env, NULL);
axis2_msg_ctx_reset_transport_out_stream(out_msg_ctx, env);
axis2_msg_ctx_reset_http_out_transport_info(out_msg_ctx, env);
- /*AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env, AXIS2_TRANSPORT_OUT, NULL,
+ /* axis2_msg_ctx_set_property(out_msg_ctx, env, AXIS2_TRANSPORT_OUT, NULL,
AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
+ axis2_msg_ctx_set_property(out_msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
NULL, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
+ axis2_msg_ctx_set_property(out_msg_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
NULL, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env, AXIS2_WSA_VERSION, NULL,
+ axis2_msg_ctx_set_property(out_msg_ctx, env, AXIS2_WSA_VERSION, NULL,
AXIS2_FALSE);*/
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX(out_msg_ctx, env, NULL);
+ axis2_msg_ctx_set_svc_grp_ctx(out_msg_ctx, env, NULL);
return;
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Mon Mar 12 12:04:41 2007
@@ -129,7 +129,7 @@
AXIS2_LOG_INFO(env->log, "Starting addressing in handler .........");
- 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)
{
@@ -139,7 +139,7 @@
axis2_array_list_t *addr_headers = NULL;
axis2_ctx_t *ctx = NULL;
axis2_char_t *addr_ns_str = NULL;
- axis2_msg_info_headers_t *msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
+ axis2_msg_info_headers_t *msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
addr_headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
if (addr_headers)
@@ -162,7 +162,7 @@
&msg_info_headers,
addr_headers,
msg_ctx);
- axis2_addr_in_extract_ref_params(env, soap_header, AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env));
+ axis2_addr_in_extract_ref_params(env, soap_header, axis2_msg_ctx_get_msg_info_headers(msg_ctx, env));
}
else
@@ -220,7 +220,7 @@
axis2_conf_ctx_t * conf_ctx = NULL;
axis2_char_t *grp_id = AXIOM_ELEMENT_GET_TEXT(child_element, env,
child_node);
- 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 && grp_id)
{
axis2_string_t *svc_grp_ctx_id_str = axis2_string_create(env, grp_id);
@@ -230,7 +230,7 @@
/** TODO, set error */
return AXIS2_FAILURE;
}
- 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;
}
@@ -716,7 +716,7 @@
axiom_element_t * text_om_ele = NULL;
axiom_namespace_t *ns1 = 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;
}
@@ -737,8 +737,8 @@
"soapenv:Sender",
"A header representing a Message Addressing Property is not valid and the message cannot be processed",
soap_version, sub_codes, text_om_node);
- AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, envelope);
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env,
+ axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, envelope);
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env,
"http://www.w3.org/2005/08/addressing/fault");
return;
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Mon Mar 12 12:04:41 2007
@@ -126,7 +126,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- 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)
return AXIS2_SUCCESS; /* no addressing in use */
wsa_action = axis2_msg_info_headers_get_action (msg_info_headers, env);
@@ -156,11 +156,11 @@
addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;
}
}
- else if (AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env))
+ else if ( axis2_msg_ctx_get_op_ctx(msg_ctx, env))
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_msg_ctx_t *in_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)
{
in_msg_ctx =
@@ -199,8 +199,8 @@
}
addressing_namespace = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
- soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (!soap_envelope)
{
AXIOM_NAMESPACE_FREE(addressing_namespace, env);
@@ -328,7 +328,7 @@
/* add the service group id as a reference parameter */
svc_group_context_id = 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);
axis2_addr_out_handler_add_to_soap_header(env, epr,
AXIS2_WSA_REPLY_TO,
Modified: webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c Mon Mar 12 12:04:41 2007
@@ -74,7 +74,7 @@
AXIS2_LOG_INFO(env->log, "Starting logging in handler .........");
printf("\n\nStarting logging in handler .........\n\n");
- 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)
{
Modified: webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c Mon Mar 12 12:04:41 2007
@@ -74,7 +74,7 @@
AXIS2_LOG_INFO(env->log, "Starting logging out handler .........");
printf("\n\nStarting logging out handler .........\n\n");
- 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)
{
Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c Mon Mar 12 12:04:41 2007
@@ -94,7 +94,7 @@
serverside = axis2_msg_ctx_get_server_side(msg_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_INFO(env->log, "[rampart][rampart_in_handler] No SOAP envelope found. ERROR");
@@ -171,7 +171,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)
{
@@ -185,7 +185,7 @@
actions = rampart_actions_create(env);
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
param_in_flow_security = rampart_get_security_param(env, msg_ctx,
RAMPART_INFLOW_SECURITY);
Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c Mon Mar 12 12:04:41 2007
@@ -81,7 +81,7 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
serverside = axis2_msg_ctx_get_server_side(msg_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_INFO(env->log, "[rampart][rampart_out_handler] No SOAP envelope found. ERROR");
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Mon Mar 12 12:04:41 2007
@@ -148,7 +148,7 @@
{
/*parameter can be either RAMPART_OUTFLOW_SECURITY or RAMPART_INFLOW_SECURITY*/
axis2_param_t *param = NULL;
- param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, parameter);
+ param = axis2_msg_ctx_get_parameter(msg_ctx, env, parameter);
return param;
}
@@ -300,7 +300,7 @@
reason_text,
soap_version, sub_codes, text_om_node);
- AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, envelope);
+ axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, envelope);
/*free sub codes*/
return;
}
@@ -359,7 +359,7 @@
axis2_conf_t *conf = NULL;
struct axis2_conf_ctx *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_LOG_INFO(env->log, "[rampart][rhu] Conf context is NULL ");
@@ -388,7 +388,7 @@
*And If service is not there check whether the rampart is enabled by
a previous invocation of a handler.*/
- 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, "[rampart][rhu] Service is NULL.");
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c Mon Mar 12 12:04:41 2007
@@ -300,7 +300,7 @@
size = axis2_array_list_size(string_list, env);
}
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
for (i = 0; i < size; i++)
{
item = axis2_array_list_get(string_list, env, i);
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c Mon Mar 12 12:04:41 2007
@@ -991,7 +991,7 @@
if(status!=AXIS2_SUCCESS)
return status;
- if(AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ if( axis2_msg_ctx_get_server_side(msg_ctx, env))
{
status = rampart_shp_process_usernametoken(env,msg_ctx,rampart_context,sec_node);
if(status!=AXIS2_SUCCESS)
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c Mon Mar 12 12:04:41 2007
@@ -72,7 +72,7 @@
sec_processed_results_prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_VALUE(sec_processed_results_prop, env, sec_processed_results);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS, sec_processed_results_prop, AXIS2_FALSE);
+ axis2_msg_ctx_set_property(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS, sec_processed_results_prop, AXIS2_FALSE);
return AXIS2_SUCCESS;
}
@@ -84,7 +84,7 @@
axis2_property_t *sec_processed_results_prop = NULL;
axis2_hash_t *sec_processed_results = NULL;
- sec_processed_results_prop = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS, AXIS2_FALSE);
+ sec_processed_results_prop = axis2_msg_ctx_get_property(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS, AXIS2_FALSE);
if(!sec_processed_results_prop){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][spr] Cannot get %s from msg ctx ", RAMPART_SECURITY_PROCESSED_RESULTS);
return NULL;
Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Mon Mar 12 12:04:41 2007
@@ -487,7 +487,7 @@
/*Set the username to the SPR*/
rampart_set_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_USERNAME, username);
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ ctx = axis2_msg_ctx_get_base(msg_ctx, env);
/**
* NOTE: Here we will try two apraoches to get the UT validated
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Mon Mar 12 12:04:41 2007
@@ -125,7 +125,7 @@
text1 = axiom_text_create(env, node1, result_str, &node2);
/* Put the result into service group context */
- svc_grp_ctx = AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env);
+ svc_grp_ctx = axis2_msg_ctx_get_svc_grp_ctx(msg_ctx, env);
if (svc_grp_ctx)
{
axis2_ctx_t* ctx = NULL;
Modified: webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c Mon Mar 12 12:04:41 2007
@@ -141,8 +141,8 @@
data = AXIS2_MALLOC(env->allocator, sizeof(publisher_data_t));
data->env = (axis2_env_t*)env;
- data->svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
- data->conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ data->svc = axis2_msg_ctx_get_svc(msg_ctx, env);
+ data->conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
publisher_worker_func, (void*)data);
Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Mon Mar 12 12:04:41 2007
@@ -118,7 +118,7 @@
/* Set this subscriber inside a subscriber store maintained in the svc */
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if (!svc)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract "
@@ -364,7 +364,7 @@
/* Get soap envelop and extract relevant elements */
- envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (!envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the "
@@ -461,7 +461,7 @@
* Pass a copy because msg ctx free function frees all properties */
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_VALUE(property, env, (void*)AXIS2_STRDUP(id, env));
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SAVAN_KEY_SUB_ID, property,
+ axis2_msg_ctx_set_property(msg_ctx, env, SAVAN_KEY_SUB_ID, property,
AXIS2_FALSE);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c Mon Mar 12 12:04:41 2007
@@ -83,7 +83,7 @@
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if (svc)
svc_name = AXIS2_SVC_GET_NAME(svc, env);
@@ -136,7 +136,7 @@
if (from_client) /* send reply to client */
{
- axis2_op_t *op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ axis2_op_t *op = axis2_msg_ctx_get_op(msg_ctx, env);
axis2_msg_recv_t* msg_recv = savan_msg_recv_create(env);
axis2_op_set_msg_recv(op, env, msg_recv);
}
Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c Mon Mar 12 12:04:41 2007
@@ -91,7 +91,7 @@
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if (svc)
svc_name = AXIS2_SVC_GET_NAME(svc, env);
@@ -107,7 +107,7 @@
{
/* Treat unknown msgs as msgs for publishing */
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if (!svc)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan][out handler] "
@@ -150,7 +150,7 @@
val = NULL;
}
- 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/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Mon Mar 12 12:04:41 2007
@@ -127,7 +127,7 @@
" creation failed");
}*/
- /*AXIS2_SVC_SKELETON_SET_USER_DATA(svc_obj, env, (void*)AXIS2_MSG_CTX_GET_SVC(msg_ctx, env));*/
+ /*AXIS2_SVC_SKELETON_SET_USER_DATA(svc_obj, env, (void*) axis2_msg_ctx_get_svc(msg_ctx, env));*/
/* find the msg type and call the appropriate response function */
msg_type = savan_util_get_message_type(msg_ctx, env);
@@ -189,7 +189,7 @@
"handle sub request...");
/* set wsa action as SubscribeResponse. */
- info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(new_msg_ctx, env);
+ info_header = axis2_msg_ctx_get_msg_info_headers(new_msg_ctx, env);
axis2_msg_info_headers_set_action(info_header, env, SAVAN_ACTIONS_SUB_RESPONSE);
default_envelope = savan_msg_recv_build_soap_envelope(env, &body_node);
@@ -215,13 +215,13 @@
&submgr_node);
addr_elem = axiom_element_create(env, submgr_node, ELEM_NAME_ADDR, addr_ns,
&addr_node);
- old_info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
+ old_info_header = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
submgr_epr = axis2_msg_info_headers_get_to(old_info_header, env);
submgr_addr = axis2_endpoint_ref_get_address(submgr_epr, env);
AXIOM_ELEMENT_SET_TEXT(addr_elem, env, submgr_addr, addr_node);
/* Get subscriber id from the msg ctx */
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, SAVAN_KEY_SUB_ID, AXIS2_FALSE);
+ property = axis2_msg_ctx_get_property(msg_ctx, env, SAVAN_KEY_SUB_ID, AXIS2_FALSE);
id = (axis2_char_t*)AXIS2_PROPERTY_GET_VALUE(property, env);
/* Set sub id as a ref param */
@@ -239,7 +239,7 @@
AXIOM_ELEMENT_SET_TEXT(expires_elem, env, expires, expires_node);
AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope);
+ axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
}
@@ -278,7 +278,7 @@
}
/* Set wsa action as UnsubscribeResponse. */
- info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(new_msg_ctx, env);
+ info_header = axis2_msg_ctx_get_msg_info_headers(new_msg_ctx, env);
axis2_msg_info_headers_set_action(info_header, env, SAVAN_ACTIONS_UNSUB_RESPONSE);
default_envelope = savan_msg_recv_build_soap_envelope(env, &body_node);
@@ -299,7 +299,7 @@
&response_node);
AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope);
+ axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
}
@@ -346,7 +346,7 @@
}
/* Set wsa action as RenewResponse. */
- info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(new_msg_ctx, env);
+ info_header = axis2_msg_ctx_get_msg_info_headers(new_msg_ctx, env);
axis2_msg_info_headers_set_action(info_header, env, SAVAN_ACTIONS_RENEW_RESPONSE);
default_envelope = savan_msg_recv_build_soap_envelope(env, &body_node);
@@ -374,7 +374,7 @@
AXIOM_ELEMENT_SET_TEXT(expires_elem, env, expires, expires_node);
AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope);
+ axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
}
@@ -403,7 +403,7 @@
"handle get status request...");
/* set wsa action as GetStatusResponse. */
- info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(new_msg_ctx, env);
+ info_header = axis2_msg_ctx_get_msg_info_headers(new_msg_ctx, env);
axis2_msg_info_headers_set_action(info_header, env, SAVAN_ACTIONS_GET_STATUS_RESPONSE);
default_envelope = savan_msg_recv_build_soap_envelope(env, &body_node);
@@ -432,7 +432,7 @@
AXIOM_ELEMENT_SET_TEXT(expires_elem, env, expires, expires_node);
AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope);
+ axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Mon Mar 12 12:04:41 2007
@@ -230,7 +230,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan][subscribe] publish...");
path = AXIS2_GETENV("AXIS2C_HOME");
- 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);
/* Get anonymous service from conf. This will be null for the first time,
Modified: webservices/axis2/trunk/c/savan/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/util/savan_util.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Mon Mar 12 12:04:41 2007
@@ -30,7 +30,7 @@
const axis2_char_t *action = NULL;
axis2_msg_info_headers_t *info_header = NULL;
- info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
+ info_header = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
if (!info_header)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Cannot extract message "
@@ -90,7 +90,7 @@
/* Get soap envelop and extract the subscription id */
- envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (!envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the "
@@ -171,7 +171,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan][util] "
"get subscriber store...");
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if (!svc)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the "
Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=517336&r1=517335&r2=517336
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 12 12:04:41 2007
@@ -54,9 +54,9 @@
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
- AXIS2_MSG_CTX_SET_CONF_CTX(msg_ctx, env, conf_ctx);
- AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
- AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx);
+ axis2_msg_ctx_set_conf_ctx(msg_ctx, env, conf_ctx);
+ axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx);
+ axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
status = AXIS2_ENGINE_SEND(engine, env, msg_ctx);
@@ -68,7 +68,7 @@
printf("axis2_test_engine_send SUCCESS\n");
axis2_conf_ctx_free(conf_ctx, env);
- AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ axis2_msg_ctx_free(msg_ctx, env);
AXIS2_QNAME_FREE(qname, env);
AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
AXIS2_SVC_CTX_FREE(svc_ctx, env);
@@ -103,7 +103,7 @@
else
printf("axis2_test_engine_receive SUCCESS\n");
axis2_conf_ctx_free(conf_ctx, env);
- AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ axis2_msg_ctx_free(msg_ctx, env);
AXIS2_ENGINE_FREE(engine, env);
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org