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/17 08:34:27 UTC
svn commit: r519255 [2/4] - in /webservices/axis2/trunk/c/modules:
core/addr/ core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/
core/transport/http/common/ core/transport/http/receiver/ co...
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Sat Mar 17 00:34:24 2007
@@ -89,7 +89,7 @@
{
return NULL;
}
- repos_listener->folder_name = AXIS2_STRDUP(folder_name, env);
+ repos_listener->folder_name = axis2_strdup(folder_name, env);
if (!repos_listener->folder_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -145,9 +145,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- temp_path = AXIS2_STRACAT(repos_listener->folder_name, AXIS2_PATH_SEP_STR,
+ temp_path = axis2_stracat(repos_listener->folder_name, AXIS2_PATH_SEP_STR,
env);
- module_path = AXIS2_STRACAT(temp_path, AXIS2_MODULE_PATH, env);
+ module_path = axis2_stracat(temp_path, AXIS2_MODULE_PATH, env);
AXIS2_FREE(env->allocator, temp_path);
status = axis2_repos_listener_search(repos_listener, env, module_path, AXIS2_MODULE);
AXIS2_FREE(env->allocator, module_path);
@@ -165,9 +165,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- temp_path = AXIS2_STRACAT(repos_listener->folder_name, AXIS2_PATH_SEP_STR,
+ temp_path = axis2_stracat(repos_listener->folder_name, AXIS2_PATH_SEP_STR,
env);
- svc_path = AXIS2_STRACAT(temp_path, AXIS2_SVC_PATH, env);
+ svc_path = axis2_stracat(temp_path, AXIS2_SVC_PATH, env);
AXIS2_FREE(env->allocator, temp_path);
status = axis2_repos_listener_search(repos_listener, env, svc_path, AXIS2_SVC);
AXIS2_FREE(env->allocator, svc_path);
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Sat Mar 17 00:34:24 2007
@@ -195,7 +195,7 @@
}
itr = axiom_element_get_children_with_qname(svc_element, env, qparamst,
svc_node);
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
qparamst = NULL;
parent = AXIS2_SVC_GET_PARENT(svc_builder->svc, env);
@@ -217,7 +217,7 @@
qdesc = axis2_qname_create(env, AXIS2_DESCRIPTION, NULL, NULL);
desc_element = axiom_element_get_first_child_with_qname(svc_element, env,
qdesc, svc_node, &desc_node);
- AXIS2_QNAME_FREE(qdesc, env) ;
+ axis2_qname_free(qdesc, env) ;
qdesc = NULL;
if( desc_element)
{
@@ -239,13 +239,13 @@
name_attr = axiom_element_get_attribute(svc_element, env, qattname);
svc_name = axiom_attribute_get_value(name_attr, env);
AXIS2_SVC_SET_NAME(svc_builder->svc, env, svc_name);
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
/* create dll_desc and set it in a parameter. then set that param in param
* container taken from svc
*/
dll_desc = axis2_dll_desc_create(env);
- impl_info_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
+ impl_info_param = axis2_param_container_get_param(
axis2_svc_get_param_container(svc_builder->svc, env),
env,
AXIS2_SERVICE_CLASS);
@@ -254,7 +254,7 @@
axis2_dll_desc_free(dll_desc, env);
return AXIS2_FAILURE;
}
- class_name = AXIS2_PARAM_GET_VALUE(impl_info_param, env);
+ class_name = axis2_param_get_value(impl_info_param, env);
svc_dll_name =
axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
@@ -278,7 +278,7 @@
dll_path = NULL;
axis2_dll_desc_set_type(dll_desc, env, AXIS2_SVC_DLL);
- status = AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ status = axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
axis2_dll_desc_free_void_arg);
if (AXIS2_SUCCESS != status)
@@ -291,7 +291,7 @@
qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
module_refs = axiom_element_get_children_with_qname(svc_element, env,
qmodulest, svc_node);
- AXIS2_QNAME_FREE(qmodulest, env) ;
+ axis2_qname_free(qmodulest, env) ;
qmodulest = NULL;
status = axis2_svc_builder_process_module_refs(svc_builder, env, module_refs);
if (AXIS2_SUCCESS != status)
@@ -303,7 +303,7 @@
qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
in_flow_element = axiom_element_get_first_child_with_qname(svc_element,
env, qinflowst, svc_node, &in_flow_node);
- AXIS2_QNAME_FREE(qinflowst, env) ;
+ axis2_qname_free(qinflowst, env) ;
qinflowst = NULL;
/*if (in_flow_element && in_flow_node)
{
@@ -322,7 +322,7 @@
qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
out_flow_element = axiom_element_get_first_child_with_qname(svc_element,
env, qoutflowst, svc_node, &out_flow_node);
- AXIS2_QNAME_FREE(qoutflowst, env) ;
+ axis2_qname_free(qoutflowst, env) ;
qoutflowst = NULL;
/*if (out_flow_element && NULL != out_flow_node)
{
@@ -341,7 +341,7 @@
qin_faultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
in_faultflow_element = axiom_element_get_first_child_with_qname(svc_element,
env, qin_faultflowst, svc_node, &in_faultflow_node);
- AXIS2_QNAME_FREE(qin_faultflowst, env) ;
+ axis2_qname_free(qin_faultflowst, env) ;
qin_faultflowst = NULL;
/*if (in_faultflow_element && in_faultflow_node)
@@ -362,7 +362,7 @@
qout_faultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
out_faultflow_element = axiom_element_get_first_child_with_qname(svc_element,
env, qoutflowst, svc_node, &out_faultflow_node);
- AXIS2_QNAME_FREE(qout_faultflowst, env) ;
+ axis2_qname_free(qout_faultflowst, env) ;
qout_faultflowst = NULL;
/*if (out_faultflow_element && NULL != out_faultflow_node)
{
@@ -384,7 +384,7 @@
qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
operation_itr = axiom_element_get_children_with_qname(svc_element, env,
qopst, svc_node);
- AXIS2_QNAME_FREE(qopst, env) ;
+ axis2_qname_free(qopst, env) ;
qopst = NULL;
ops = axis2_svc_builder_process_ops(svc_builder, env, operation_itr);
if (ops)
@@ -408,12 +408,12 @@
axis2_char_t *param_name = NULL;
param = axis2_array_list_get(params, env, j);
- param_name = AXIS2_PARAM_GET_NAME(param, env);
- if (0 == AXIS2_STRCMP(param_name, AXIS2_WSA_MAPPING))
+ param_name = axis2_param_get_name(param, env);
+ if (0 == axis2_strcmp(param_name, AXIS2_WSA_MAPPING))
{
axis2_char_t *key = NULL;
- key = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(param, env);
+ key = (axis2_char_t *) axis2_param_get_value(param, env);
AXIS2_SVC_ADD_MAPPING(svc_builder->svc, env, key, op_desc);
}
}
@@ -424,7 +424,7 @@
qmodule_config = axis2_qname_create(env, AXIS2_MODULECONFIG, NULL, NULL);
module_configs_itr = axiom_element_get_children_with_qname(svc_element,
env, qmodule_config, svc_node);
- AXIS2_QNAME_FREE(qmodule_config, env) ;
+ axis2_qname_free(qmodule_config, env) ;
status = axis2_svc_builder_process_svc_module_conf(svc_builder, env,
module_configs_itr, svc_builder->svc->param_container, svc_builder->svc);
*/
@@ -470,7 +470,7 @@
op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
op_name_att = axiom_element_get_attribute(op_element, env, qattname);
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
qattname = NULL;
if (NULL == op_name_att)
{
@@ -481,7 +481,7 @@
/* set the mep of the operation */
qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
- AXIS2_QNAME_FREE(qmep, env);
+ axis2_qname_free(qmep, env);
qmep = NULL;
if (op_mep_att)
{
@@ -529,13 +529,13 @@
AXIS2_OP_SET_WSDL_OP(op_desc, env, wsdl_op);
}
}*/
- AXIS2_QNAME_FREE(qopname, env);
+ axis2_qname_free(qopname, env);
qopname = NULL;
/* operation parameters */
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
params_itr = axiom_element_get_children_with_qname(op_element, env,
qparamst, op_node);
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
qparamst = NULL;
status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(svc_builder->desc_builder,
env, params_itr,
@@ -549,7 +549,7 @@
qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
recv_element = axiom_element_get_first_child_with_qname(op_element,
env, qmsgrecv, op_node, &recv_node);
- AXIS2_QNAME_FREE(qmsgrecv, env);
+ axis2_qname_free(qmsgrecv, env);
qmsgrecv = NULL;
if (recv_element && NULL != recv_node)
{
@@ -570,7 +570,7 @@
qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
module_itr = axiom_element_get_children_with_qname(op_element, env,
qmodulest, op_node);
- AXIS2_QNAME_FREE(qmodulest, env);
+ axis2_qname_free(qmodulest, env);
qmodulest = NULL;
status = AXIS2_DESC_BUILDER_PROCESS_OP_MODULE_REFS(svc_builder->
desc_builder, env, module_itr, op_desc);
@@ -617,7 +617,7 @@
qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
module_name_att = axiom_element_get_attribute(module_conf_element,
env, qattname);
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
qattname = NULL;
if (NULL == module_name_att)
{
@@ -653,7 +653,7 @@
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = axiom_element_get_attribute(module_ref_element,
env, qref);
- AXIS2_QNAME_FREE(qref, env);
+ axis2_qname_free(qref, env);
if (module_ref_att)
{
axis2_char_t *ref_name = NULL;
@@ -673,7 +673,7 @@
{
AXIS2_SVC_ADD_MODULE_QNAME(svc_builder->svc, env, qrefname);
}
- AXIS2_QNAME_FREE(qrefname, env);
+ axis2_qname_free(qrefname, env);
}
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Sat Mar 17 00:34:24 2007
@@ -119,7 +119,7 @@
if (qparamst)
{
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
qparamst = NULL;
}
@@ -135,7 +135,7 @@
if (qmodulest)
{
- AXIS2_QNAME_FREE(qmodulest, env);
+ axis2_qname_free(qmodulest, env);
qmodulest = NULL;
}
@@ -147,7 +147,7 @@
if (qsvc_element)
{
- AXIS2_QNAME_FREE(qsvc_element, env);
+ axis2_qname_free(qsvc_element, env);
qsvc_element = NULL;
}
@@ -167,7 +167,7 @@
if (qattname)
{
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
qattname = NULL;
}
@@ -195,7 +195,7 @@
qsvc_name = axis2_qname_create(env, svc_name, NULL, NULL);
axis_svc = axis2_svc_create_with_qname(env, qsvc_name);
- AXIS2_QNAME_FREE(qsvc_name, env);
+ axis2_qname_free(qsvc_name, env);
AXIS2_ARCH_FILE_DATA_ADD_SVC(file_data, env, axis_svc);
}
@@ -262,9 +262,9 @@
{
axis2_svc_grp_add_module_ref(svc_grp, env, qrefname);
}
- AXIS2_QNAME_FREE(qrefname, env);
+ axis2_qname_free(qrefname, env);
}
- AXIS2_QNAME_FREE(qref, env);
+ axis2_qname_free(qref, env);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Sat Mar 17 00:34:24 2007
@@ -53,7 +53,7 @@
ws_info->last_modified_date = 0;
ws_info->type = 0;
- ws_info->file_name = AXIS2_STRDUP(file_name, env);
+ ws_info->file_name = axis2_strdup(file_name, env);
if (!ws_info->file_name)
{
axis2_ws_info_free(ws_info, env);
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Sat Mar 17 00:34:24 2007
@@ -174,7 +174,7 @@
AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
temp_name = axis2_file_get_name(file, env);
- info_list_name = AXIS2_STRDUP(temp_name, env);
+ info_list_name = axis2_strdup(temp_name, env);
if (!info_list_name)
{
return AXIS2_FAILURE;
@@ -276,7 +276,7 @@
ws_info_list, env, i);
file_name_l = AXIS2_WS_INFO_GET_FILE_NAME(ws_info, env);
- if (0 == AXIS2_STRCMP(file_name_l, file_name))
+ if (0 == axis2_strcmp(file_name_l, file_name))
{
return ws_info;
}
@@ -353,7 +353,7 @@
axis2_char_t *file_name = NULL;
file_name = (axis2_char_t *) axis2_array_list_get(ws_info_list->
current_info_lists, env, j);
- if (0 == AXIS2_STRCMP(file_name, file_item_name))
+ if (0 == axis2_strcmp(file_name, file_item_name))
{
exist = AXIS2_TRUE;
break;
Modified: webservices/axis2/trunk/c/modules/core/description/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/client_utils.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/client_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/client_utils.c Sat Mar 17 00:34:24 2007
@@ -128,15 +128,15 @@
axis2_char_t *localname = NULL;
axis2_qname_t *temp_svc_qname = NULL;
- temp1 = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
+ temp1 = axis2_qname_get_localpart(svc_qname, env);
localname = axis2_strcat(env, "dii_", temp1, NULL);
- ns = AXIS2_QNAME_GET_URI(svc_qname, env);
- prefix = AXIS2_QNAME_GET_PREFIX(svc_qname, env);
+ ns = axis2_qname_get_uri(svc_qname, env);
+ prefix = axis2_qname_get_prefix(svc_qname, env);
temp_svc_qname = axis2_qname_create(env, localname, ns, prefix);
AXIS2_SVC_SET_NAME(axis2_svc, env, localname);
AXIS2_SVC_SET_QNAME(axis2_svc, env, temp_svc_qname);
AXIS2_FREE(env->allocator, localname);
- AXIS2_QNAME_FREE(temp_svc_qname, env);
+ axis2_qname_free(temp_svc_qname, env);
}
endpoints = WODEN_SVC_GET_ENDPOINTS(wsdl_svc, env);
if (endpoints)
@@ -155,7 +155,7 @@
endpoint_found = AXIS2_TRUE;
break;
}
- if (0 == AXIS2_STRCMP(ep_name, WODEN_NC_NAME_TO_STRING(ep_ncname, env)))
+ if (0 == axis2_strcmp(ep_name, WODEN_NC_NAME_TO_STRING(ep_ncname, env)))
{
endpoint_found = AXIS2_TRUE;
break;
@@ -170,7 +170,7 @@
soap_address = WODEN_ENDPOINT_GET_ADDRESS(endpoint, env);
if (soap_address)
{
- address = AXIS2_URI_TO_STRING(soap_address, env,
+ address = axis2_uri_to_string(soap_address, env,
AXIS2_URI_UNP_OMITUSERINFO);
endpoint_ref = axis2_endpoint_ref_create(env, address);
if (options)
@@ -232,11 +232,11 @@
direction = WODEN_INTERFACE_MSG_REF_GET_DIRECTION(interface_msg_ref,
env);
str_direction = WODEN_DIRECTION_TO_STRING(direction, env);
- if (0 == AXIS2_STRCMP(str_direction, "in"))
+ if (0 == axis2_strcmp(str_direction, "in"))
{
in = AXIS2_TRUE;
}
- if (0 == AXIS2_STRCMP(str_direction, "out"))
+ if (0 == axis2_strcmp(str_direction, "out"))
{
out = AXIS2_TRUE;
}
@@ -248,7 +248,7 @@
env);
if (mep_uri)
{
- mep_str = AXIS2_URI_TO_STRING(mep_uri, env,
+ mep_str = axis2_uri_to_string(mep_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
axis2_op_set_msg_exchange_pattern(axis2_op, env, mep_str);
}
@@ -292,7 +292,7 @@
svc_found = AXIS2_TRUE;
break;
}
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(svc_qname, env,
+ if (AXIS2_TRUE == axis2_qname_equals(svc_qname, env,
(axis2_qname_t *) wsdl_svc_qname))
{
svc_found = AXIS2_TRUE;
@@ -307,15 +307,15 @@
axis2_char_t *localname = NULL;
axis2_qname_t *temp_svc_qname = NULL;
- temp1 = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
+ temp1 = axis2_qname_get_localpart(svc_qname, env);
localname = axis2_strcat(env, "dii_", temp1, NULL);
- ns = AXIS2_QNAME_GET_URI(svc_qname, env);
- prefix = AXIS2_QNAME_GET_PREFIX(svc_qname, env);
+ ns = axis2_qname_get_uri(svc_qname, env);
+ prefix = axis2_qname_get_prefix(svc_qname, env);
temp_svc_qname = axis2_qname_create(env, localname, ns, prefix);
AXIS2_SVC_SET_NAME(axis2_svc, env, localname);
AXIS2_SVC_SET_QNAME(axis2_svc, env, temp_svc_qname);
AXIS2_FREE(env->allocator, localname);
- AXIS2_QNAME_FREE(temp_svc_qname, env);
+ axis2_qname_free(temp_svc_qname, env);
}
if(wsdl_svc)
{
@@ -337,7 +337,7 @@
endpoint_found = AXIS2_TRUE;
break;
}
- if (0 == AXIS2_STRCMP(ep_name, WODEN_NC_NAME_TO_STRING(ep_ncname, env)))
+ if (0 == axis2_strcmp(ep_name, WODEN_NC_NAME_TO_STRING(ep_ncname, env)))
{
endpoint_found = AXIS2_TRUE;
break;
@@ -369,7 +369,7 @@
ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
+ if (AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
void *soap_address = NULL;
@@ -386,7 +386,7 @@
if (soap_address_uri)
{
- address = AXIS2_URI_TO_STRING(soap_address_uri, env,
+ address = axis2_uri_to_string(soap_address_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
endpoint_ref = axis2_endpoint_ref_create(env, address);
if (options)
@@ -445,11 +445,11 @@
direction =
WODEN_WSDL10_INTERFACE_MSG_REF_GET_DIRECTION(interface_msg_ref, env);
str_direction = WODEN_DIRECTION_TO_STRING(direction, env);
- if (0 == AXIS2_STRCMP(str_direction, "in"))
+ if (0 == axis2_strcmp(str_direction, "in"))
{
in = AXIS2_TRUE;
}
- if (0 == AXIS2_STRCMP(str_direction, "out"))
+ if (0 == axis2_strcmp(str_direction, "out"))
{
out = AXIS2_TRUE;
}
@@ -461,7 +461,7 @@
env);
if (mep_uri)
{
- mep_str = AXIS2_URI_TO_STRING(mep_uri, env,
+ mep_str = axis2_uri_to_string(mep_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
axis2_op_set_msg_exchange_pattern(axis2_op, env, mep_str);
}
@@ -481,7 +481,7 @@
ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
+ if (AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
void *soap_binding_op = NULL;
axis2_uri_t *soap_action_uri = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/desc.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/desc.c Sat Mar 17 00:34:24 2007
@@ -92,7 +92,7 @@
if (desc->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(desc->param_container, env);
+ axis2_param_container_free(desc->param_container, env);
}
if (desc)
@@ -111,7 +111,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FALSE);
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(desc->param_container, env, param);
+ return axis2_param_container_add_param(desc->param_container, env, param);
}
AXIS2_EXTERN axis2_param_t *AXIS2_CALL
@@ -120,7 +120,7 @@
const axis2_char_t *param_name)
{
AXIS2_PARAM_CHECK(env->error, param_name, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAM(desc->param_container, env,
+ return axis2_param_container_get_param(desc->param_container, env,
param_name);
}
@@ -130,7 +130,7 @@
{
AXIS2_PARAM_CHECK(env->error, desc->param_container, AXIS2_FALSE);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(desc->param_container, env);
+ return axis2_param_container_get_params(desc->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -145,7 +145,7 @@
param_l = axis2_desc_get_param(desc, env, param_name);
- return (param_l && AXIS2_PARAM_IS_LOCKED(param_l, env));
+ return (param_l && axis2_param_is_locked(param_l, env));
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Sat Mar 17 00:34:24 2007
@@ -147,7 +147,7 @@
const axis2_env_t *env,
const axis2_char_t *name)
{
- return AXIS2_PARAM_CONTAINER_GET_PARAM(handler_desc->param_container, env, name);
+ return axis2_param_container_get_param(handler_desc->param_container, env, name);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -157,15 +157,15 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->parent, env,
- AXIS2_PARAM_GET_NAME(param, env)))
+ if (axis2_param_container_is_param_locked(handler_desc->parent, env,
+ axis2_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(handler_desc->param_container,
+ return axis2_param_container_add_param(handler_desc->param_container,
env, param);
}
@@ -173,7 +173,7 @@
axis2_handler_desc_get_all_params(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(handler_desc->param_container,
+ return axis2_param_container_get_params(handler_desc->param_container,
env);
}
@@ -185,13 +185,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
/* see if it is locked in parent */
- if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->parent, env,
+ if (axis2_param_container_is_param_locked(handler_desc->parent, env,
param_name))
{
return AXIS2_TRUE;
}
- return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->param_container,
+ return axis2_param_container_is_param_locked(handler_desc->param_container,
env, param_name);
}
@@ -244,7 +244,7 @@
if (class_name)
{
- handler_desc->class_name = AXIS2_STRDUP(class_name, env);
+ handler_desc->class_name = axis2_strdup(class_name, env);
if (!handler_desc->class_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -281,7 +281,7 @@
if (handler_desc->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(handler_desc-> param_container, env);
+ axis2_param_container_free(handler_desc-> param_container, env);
}
if (handler_desc->name)
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Sat Mar 17 00:34:24 2007
@@ -123,7 +123,7 @@
if (module_desc->params)
{
- AXIS2_PARAM_CONTAINER_FREE(module_desc->params, env);
+ axis2_param_container_free(module_desc->params, env);
}
if (module_desc->flow_container)
@@ -135,7 +135,7 @@
if (module_desc->qname)
{
- AXIS2_QNAME_FREE(module_desc->qname, env);
+ axis2_qname_free(module_desc->qname, env);
}
if (module_desc->ops)
@@ -269,10 +269,10 @@
if (module_desc->qname)
{
- AXIS2_QNAME_FREE(module_desc->qname, env);
+ axis2_qname_free(module_desc->qname, env);
}
- module_desc->qname = AXIS2_QNAME_CLONE((axis2_qname_t *)qname, env);
+ module_desc->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
return AXIS2_SUCCESS;
}
@@ -301,7 +301,7 @@
{
return AXIS2_FAILURE;
}
- op_name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)op_qname, env);
+ op_name = axis2_qname_to_string((axis2_qname_t *)op_qname, env);
axis2_hash_set(module_desc->ops, op_name, AXIS2_HASH_KEY_STRING, op);
return AXIS2_SUCCESS;
@@ -343,7 +343,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- param_name_l = AXIS2_PARAM_GET_NAME(param, env);
+ param_name_l = axis2_param_get_name(param, env);
if (NULL == param_name_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
@@ -359,7 +359,7 @@
}
else
{
- ret_status = AXIS2_PARAM_CONTAINER_ADD_PARAM(module_desc->params, env, param);
+ ret_status = axis2_param_container_add_param(module_desc->params, env, param);
}
return ret_status;
}
@@ -371,14 +371,14 @@
{
AXIS2_PARAM_CHECK(env->error, name, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAM(module_desc->params, env, name);
+ return axis2_param_container_get_param(module_desc->params, env, name);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
axis2_module_desc_get_all_params(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(module_desc->params, env);
+ return axis2_param_container_get_params(module_desc->params, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -409,7 +409,7 @@
{
param_l = axis2_module_desc_get_param(module_desc, env,
param_name);
- if (param_l && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param_l, env))
+ if (param_l && AXIS2_TRUE == axis2_param_is_locked(param_l, env))
ret_state = AXIS2_TRUE;
else
ret_state = AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Sat Mar 17 00:34:24 2007
@@ -92,7 +92,7 @@
if (msg->element_qname)
{
- AXIS2_QNAME_FREE(msg->element_qname, env);
+ axis2_qname_free(msg->element_qname, env);
}
if (msg->direction)
@@ -102,7 +102,7 @@
if (msg->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(msg->param_container, env);
+ axis2_param_container_free(msg->param_container, env);
}
msg->parent = NULL;
@@ -125,7 +125,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FALSE);
- param_name = AXIS2_PARAM_GET_NAME(param, env);
+ param_name = axis2_param_get_name(param, env);
if (AXIS2_TRUE == axis2_msg_is_param_locked(msg, env, param_name))
{
AXIS2_ERROR_SET(env->error,
@@ -134,7 +134,7 @@
}
else
{
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(msg->param_container, env,
+ return axis2_param_container_add_param(msg->param_container, env,
param);
}
@@ -148,7 +148,7 @@
{
AXIS2_PARAM_CHECK(env->error, param_name, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAM(msg->param_container, env, param_name);
+ return axis2_param_container_get_param(msg->param_container, env, param_name);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
@@ -157,7 +157,7 @@
{
AXIS2_PARAM_CHECK(env->error, msg->param_container, AXIS2_FALSE);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(msg->param_container, env);
+ return axis2_param_container_get_params(msg->param_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -210,7 +210,7 @@
{
param_l = axis2_msg_get_param(msg, env, param_name);
}
- return (param_l && AXIS2_PARAM_IS_LOCKED(param_l, env));
+ return (param_l && axis2_param_is_locked(param_l, env));
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -254,7 +254,7 @@
if (direction)
{
- msg->direction = AXIS2_STRDUP(direction, env);
+ msg->direction = axis2_strdup(direction, env);
if (!(msg->direction))
{
return AXIS2_FAILURE;
@@ -280,13 +280,13 @@
if (msg->element_qname)
{
- AXIS2_QNAME_FREE(msg->element_qname, env);
+ axis2_qname_free(msg->element_qname, env);
msg->element_qname = NULL;
}
if (element_qname)
{
- msg->element_qname = AXIS2_QNAME_CLONE((axis2_qname_t *)element_qname, env);
+ msg->element_qname = axis2_qname_clone((axis2_qname_t *)element_qname, env);
if (!(msg->element_qname))
{
return AXIS2_FAILURE;
@@ -318,7 +318,7 @@
if (name)
{
- msg->name = AXIS2_STRDUP(name, env);
+ msg->name = axis2_strdup(name, env);
if (!(msg->name))
{
return AXIS2_FAILURE;
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=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Sat Mar 17 00:34:24 2007
@@ -70,7 +70,7 @@
op->qname = NULL;
op->msg_exchange_pattern = NULL;
op->style = NULL;
- op->style = AXIS2_STRDUP(AXIS2_STYLE_DOC, env);
+ op->style = axis2_strdup(AXIS2_STYLE_DOC, env);
op->param_container = (axis2_param_container_t *)
axis2_param_container_create(env);
@@ -196,7 +196,7 @@
}
if (op->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(op->param_container, env);
+ axis2_param_container_free(op->param_container, env);
}
op->parent = NULL;
@@ -215,7 +215,7 @@
if (module_ref)
{
- AXIS2_QNAME_FREE(module_ref, env);
+ axis2_qname_free(module_ref, env);
}
}
axis2_array_list_free(op->module_qnames, env);
@@ -275,7 +275,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FALSE);
- param_name = AXIS2_PARAM_GET_NAME(param, env);
+ param_name = axis2_param_get_name(param, env);
if (AXIS2_TRUE == axis2_op_is_param_locked(op, env, param_name))
{
AXIS2_ERROR_SET(env->error,
@@ -284,7 +284,7 @@
}
else
{
- status = AXIS2_PARAM_CONTAINER_ADD_PARAM(op->param_container, env,
+ status = axis2_param_container_add_param(op->param_container, env,
param);
}
@@ -300,7 +300,7 @@
AXIS2_PARAM_CHECK(env->error, param_name, NULL);
- param = AXIS2_PARAM_CONTAINER_GET_PARAM(op->param_container, env, param_name);
+ param = axis2_param_container_get_param(op->param_container, env, param_name);
if (!param && op->parent)
{
param = AXIS2_SVC_GET_PARAM(op->parent, env, param_name);
@@ -312,7 +312,7 @@
axis2_op_get_all_params(const axis2_op_t *op,
const axis2_env_t *env)
{
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(op->param_container, env);
+ return axis2_param_container_get_params(op->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -338,7 +338,7 @@
return AXIS2_TRUE;
}
param = axis2_op_get_param(op, env, param_name);
- return (param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
+ return (param && AXIS2_TRUE == axis2_param_is_locked(param, env));
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -507,7 +507,7 @@
}
qname1 = axis2_module_desc_get_qname(module_desc, env);
qname2 = axis2_module_desc_get_qname(moduleref, env);
- if (AXIS2_QNAME_EQUALS(qname1, env, qname2))
+ if (axis2_qname_equals(qname1, env, qname2))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Module already engaged to operation");
@@ -576,7 +576,7 @@
(axis2_module_desc_t *) axis2_array_list_get(op->engaged_module_list, env, index);
module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
- if (AXIS2_QNAME_EQUALS(module_qname, env, module_qname_l))
+ if (axis2_qname_equals(module_qname, env, module_qname_l))
{
return AXIS2_SUCCESS;
}
@@ -606,42 +606,42 @@
temp = AXIS2_MEP_CONSTANT_INVALID;
- if (AXIS2_STRCMP(AXIS2_MEP_URI_IN_OUT,
+ if (axis2_strcmp(AXIS2_MEP_URI_IN_OUT,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_IN_OUT;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_IN_ONLY,
+ else if (axis2_strcmp(AXIS2_MEP_URI_IN_ONLY,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_IN_ONLY;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_IN_OPTIONAL_OUT,
+ else if (axis2_strcmp(AXIS2_MEP_URI_IN_OPTIONAL_OUT,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_IN_OPTIONAL_OUT;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_OUT_IN,
+ else if (axis2_strcmp(AXIS2_MEP_URI_OUT_IN,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_OUT_IN;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_OUT_ONLY,
+ else if (axis2_strcmp(AXIS2_MEP_URI_OUT_ONLY,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_OUT_ONLY;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_OUT_OPTIONAL_IN,
+ else if (axis2_strcmp(AXIS2_MEP_URI_OUT_OPTIONAL_IN,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_OUT_OPTIONAL_IN;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_ROBUST_IN_ONLY,
+ else if (axis2_strcmp(AXIS2_MEP_URI_ROBUST_IN_ONLY,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_ROBUST_IN_ONLY;
}
- else if (AXIS2_STRCMP(AXIS2_MEP_URI_ROBUST_OUT_ONLY,
+ else if (axis2_strcmp(AXIS2_MEP_URI_ROBUST_OUT_ONLY,
axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_ROBUST_OUT_ONLY;
@@ -814,7 +814,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
- module_qname_l = AXIS2_QNAME_CLONE((axis2_qname_t *)module_qname, env);
+ module_qname_l = axis2_qname_clone((axis2_qname_t *)module_qname, env);
return axis2_array_list_add(op->module_qnames, env, module_qname_l);
}
Modified: webservices/axis2/trunk/c/modules/core/description/phase_rule.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/phase_rule.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/phase_rule.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/phase_rule.c Sat Mar 17 00:34:24 2007
@@ -59,7 +59,7 @@
if (name)
{
- phase_rule->name = AXIS2_STRDUP(name, env);
+ phase_rule->name = axis2_strdup(name, env);
}
return phase_rule;
@@ -86,7 +86,7 @@
if (before)
{
- phase_rule->before = AXIS2_STRDUP(before, env);
+ phase_rule->before = axis2_strdup(before, env);
if (!phase_rule->before)
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
@@ -119,7 +119,7 @@
if (after)
{
- phase_rule->after = AXIS2_STRDUP(after, env);
+ phase_rule->after = axis2_strdup(after, env);
if (!phase_rule->after)
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
@@ -152,7 +152,7 @@
if (name)
{
- phase_rule->name = AXIS2_STRDUP(name, env);
+ phase_rule->name = axis2_strdup(name, env);
if (!phase_rule->name)
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Sat Mar 17 00:34:24 2007
@@ -197,21 +197,21 @@
AXIS2_FREE(env->allocator, svc->schema_target_ns_prefix);
svc->schema_target_ns_prefix = NULL;
}
- svc->schema_target_ns_prefix = AXIS2_STRDUP("ns", env);
+ svc->schema_target_ns_prefix = axis2_strdup("ns", env);
if (svc->target_ns)
{
AXIS2_FREE(env->allocator, svc->target_ns);
svc->target_ns = NULL;
}
- svc->target_ns = AXIS2_STRDUP("http://ws.apache.org/axis2", env);
+ svc->target_ns = axis2_strdup("http://ws.apache.org/axis2", env);
if (svc->target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc->target_ns_prefix);
svc->target_ns_prefix = NULL;
}
- svc->target_ns_prefix = AXIS2_STRDUP("tns", env);
+ svc->target_ns_prefix = axis2_strdup("tns", env);
svc->sc_calc_count = 0;
return svc;
@@ -253,7 +253,7 @@
if (svc->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(svc->param_container, env);
+ axis2_param_container_free(svc->param_container, env);
svc->param_container = NULL;
}
@@ -289,7 +289,7 @@
qname = axis2_array_list_get(svc->module_list, env, i);
if (qname)
{
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
qname = NULL;
}
}
@@ -451,7 +451,7 @@
}
qname = axis2_op_get_qname(op, env);
if (qname)
- key = AXIS2_QNAME_GET_LOCALPART(qname, env);
+ key = axis2_qname_get_localpart(qname, env);
if (key)
axis2_hash_set(svc->op_alias_map, key, AXIS2_HASH_KEY_STRING, op);
return AXIS2_SUCCESS;
@@ -469,7 +469,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, op_qname, NULL);
- key = AXIS2_QNAME_GET_LOCALPART(op_qname, env);
+ key = axis2_qname_get_localpart(op_qname, env);
op = axis2_hash_get(svc->op_alias_map, key, AXIS2_HASH_KEY_STRING);
if (NULL == op)
op = axis2_hash_get(svc->op_action_map, key, AXIS2_HASH_KEY_STRING);
@@ -565,7 +565,7 @@
if (AXIS2_TRUE == axis2_svc_is_param_locked(svc, env,
- AXIS2_PARAM_GET_NAME(param, env)))
+ axis2_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -573,7 +573,7 @@
}
else
{
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(svc->param_container, env, param);
+ return axis2_param_container_add_param(svc->param_container, env, param);
}
return AXIS2_FAILURE;
}
@@ -588,7 +588,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- param = AXIS2_PARAM_CONTAINER_GET_PARAM(svc->param_container, env, name);
+ param = axis2_param_container_get_param(svc->param_container, env, name);
if (param == NULL && svc->parent)
{
param = axis2_svc_grp_get_param(svc->parent, env, name);
@@ -603,7 +603,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(svc->param_container, env);
+ return axis2_param_container_get_params(svc->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -632,7 +632,7 @@
param = axis2_svc_get_param(svc, env, param_name);
if (param)
{
- ret = AXIS2_PARAM_IS_LOCKED(param, env);
+ ret = axis2_param_is_locked(param, env);
}
return ret;
}
@@ -662,7 +662,7 @@
env, AXIS2_MODULEREF_KEY);
if (property)
collection_module = (axis2_array_list_t *)
- AXIS2_PROPERTY_GET_VALUE(property, env);
+ axis2_property_get_value(property, env);
if (!collection_module)
{
return AXIS2_FAILURE;
@@ -895,7 +895,7 @@
svc->style = NULL;
}
- svc->style = AXIS2_STRDUP(style, env);
+ svc->style = axis2_strdup(style, env);
return AXIS2_SUCCESS;
}
@@ -921,7 +921,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FLOW_KEY);
if (property)
- return (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ return (axis2_flow_t *) axis2_property_get_value(property, env);
return NULL;
}
@@ -937,8 +937,8 @@
AXIS2_PARAM_CHECK(env->error, in_flow, AXIS2_FAILURE);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, in_flow);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_flow_free_void_arg);
+ axis2_property_set_value(property, env, in_flow);
+ axis2_property_set_free_func(property, env, axis2_flow_free_void_arg);
return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
wsdl_component, env, AXIS2_IN_FLOW_KEY, property);
}
@@ -956,7 +956,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FLOW_KEY);
if (property)
- return (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ return (axis2_flow_t *) axis2_property_get_value(property, env);
return NULL;
}
@@ -972,8 +972,8 @@
AXIS2_PARAM_CHECK(env->error, out_flow, AXIS2_FAILURE);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, out_flow);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_flow_free_void_arg);
+ axis2_property_set_value(property, env, out_flow);
+ axis2_property_set_free_func(property, env, axis2_flow_free_void_arg);
return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
wsdl_component, env, AXIS2_OUT_FLOW_KEY, property);
}
@@ -991,7 +991,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY);
if (property)
- return (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ return (axis2_flow_t *) axis2_property_get_value(property, env);
return NULL;
}
@@ -1007,8 +1007,8 @@
AXIS2_PARAM_CHECK(env->error, fault_flow, AXIS2_FAILURE);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, fault_flow);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_flow_free_void_arg);
+ axis2_property_set_value(property, env, fault_flow);
+ axis2_property_set_free_func(property, env, axis2_flow_free_void_arg);
return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY, property);
}
@@ -1025,7 +1025,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY);
if (property)
- return (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ return (axis2_flow_t *) axis2_property_get_value(property, env);
return NULL;
}
@@ -1041,8 +1041,8 @@
AXIS2_PARAM_CHECK(env->error, fault_flow, AXIS2_FAILURE);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, fault_flow);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_flow_free_void_arg);
+ axis2_property_set_value(property, env, fault_flow);
+ axis2_property_set_free_func(property, env, axis2_flow_free_void_arg);
return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY, property);
}
@@ -1061,7 +1061,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, soap_action, NULL);
- if (0 == AXIS2_STRCMP(soap_action, ""))
+ if (0 == axis2_strcmp(soap_action, ""))
return NULL;
endpoints = axis2_svc_get_all_endpoints(svc, env);
@@ -1140,7 +1140,7 @@
extensible_element, env);
if (axis2_qname_equals(type_2, env, type_1))
{
- if (0 == AXIS2_STRCMP(AXIS2_WSDL_SOAP_OP_GET_SOAP_ACTION(
+ if (0 == axis2_strcmp(AXIS2_WSDL_SOAP_OP_GET_SOAP_ACTION(
element, env), soap_action))
{
op = (axis2_op_t *)
@@ -1150,7 +1150,7 @@
}
}
- AXIS2_QNAME_FREE(type_2, env);
+ axis2_qname_free(type_2, env);
type_2 = NULL;
j++;
}
@@ -1160,7 +1160,7 @@
{
return op;
}
- AXIS2_QNAME_FREE(type_1, env);
+ axis2_qname_free(type_1, env);
type_1 = NULL;
return NULL;
} */
@@ -1174,7 +1174,7 @@
if (svc->qname)
{
- return AXIS2_QNAME_GET_LOCALPART(svc->qname, env);
+ return axis2_qname_get_localpart(svc->qname, env);
}
return NULL;
@@ -1194,7 +1194,7 @@
AXIS2_FREE(env->allocator, svc->axis_svc_name);
svc->axis_svc_name = NULL;
}
- svc->axis_svc_name = AXIS2_STRDUP(axis_svc_name, env);
+ svc->axis_svc_name = axis2_strdup(axis_svc_name, env);
if (!svc->axis_svc_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1242,7 +1242,7 @@
AXIS2_FREE(env->allocator, svc->filename);
svc->filename = NULL;
}
- svc->filename = (axis2_char_t *) AXIS2_STRDUP(filename, env);
+ svc->filename = (axis2_char_t *) axis2_strdup(filename, env);
if (!svc->filename)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1273,7 +1273,7 @@
AXIS2_FREE(env->allocator, svc->svc_desc);
svc->svc_desc = NULL;
}
- svc->svc_desc = (axis2_char_t *) AXIS2_STRDUP(svc_desc, env);
+ svc->svc_desc = (axis2_char_t *) axis2_strdup(svc_desc, env);
if (!svc->svc_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1337,7 +1337,7 @@
AXIS2_PARAM_CHECK(env->error, mapping_key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
- axis2_hash_set(svc->op_action_map, AXIS2_STRDUP(mapping_key, env),
+ axis2_hash_set(svc->op_action_map, axis2_strdup(mapping_key, env),
AXIS2_HASH_KEY_STRING, op_desc);
return AXIS2_SUCCESS;
}
@@ -1353,7 +1353,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
- qmodule_qname_l = AXIS2_QNAME_CLONE((axis2_qname_t *)module_qname, env);
+ qmodule_qname_l = axis2_qname_clone((axis2_qname_t *)module_qname, env);
return axis2_array_list_add(svc->module_list, env,
qmodule_qname_l);
}
@@ -1438,7 +1438,7 @@
AXIS2_FREE(env->allocator, svc->custom_schema_name_prefix);
svc->custom_schema_name_prefix = NULL;
}
- svc->custom_schema_name_prefix = AXIS2_STRDUP(prefix, env);
+ svc->custom_schema_name_prefix = axis2_strdup(prefix, env);
if (NULL == svc->custom_schema_name_prefix)
{
return AXIS2_FAILURE;
@@ -1469,7 +1469,7 @@
AXIS2_FREE(env->allocator, svc->custom_schema_name_suffix);
svc->custom_schema_name_suffix = NULL;
}
- svc->custom_schema_name_suffix = AXIS2_STRDUP(suffix, env);
+ svc->custom_schema_name_suffix = axis2_strdup(suffix, env);
if (NULL == svc->custom_schema_name_suffix)
{
return AXIS2_FAILURE;
@@ -1503,7 +1503,7 @@
buffer = XML_SCHEMA_SERIALIZE(schema, env);
if (buffer)
{
- AXIS2_STREAM_WRITE(out_stream, env, buffer, AXIS2_STRLEN(buffer));
+ AXIS2_STREAM_WRITE(out_stream, env, buffer, axis2_strlen(buffer));
}
AXIS2_FREE(env->allocator, buffer);
}
@@ -1628,7 +1628,7 @@
AXIS2_FREE(env->allocator, svc->schema_target_ns);
svc->schema_target_ns = NULL;
}
- svc->schema_target_ns = AXIS2_STRDUP(ns, env);
+ svc->schema_target_ns = axis2_strdup(ns, env);
return AXIS2_SUCCESS;
}
@@ -1655,7 +1655,7 @@
AXIS2_FREE(env->allocator, svc->schema_target_ns_prefix);
svc->schema_target_ns_prefix = NULL;
}
- svc->schema_target_ns_prefix = AXIS2_STRDUP(prefix, env);
+ svc->schema_target_ns_prefix = axis2_strdup(prefix, env);
return AXIS2_SUCCESS;
}*/
@@ -1682,7 +1682,7 @@
AXIS2_FREE(env->allocator, svc->target_ns);
svc->target_ns = NULL;
}
- svc->target_ns = AXIS2_STRDUP(ns, env);
+ svc->target_ns = axis2_strdup(ns, env);
return AXIS2_SUCCESS;
}
@@ -1709,7 +1709,7 @@
AXIS2_FREE(env->allocator, svc->target_ns_prefix);
svc->target_ns_prefix = NULL;
}
- svc->target_ns_prefix = AXIS2_STRDUP(prefix, env);
+ svc->target_ns_prefix = axis2_strdup(prefix, env);
return AXIS2_SUCCESS;
}
@@ -1810,7 +1810,7 @@
void *key = NULL;
axis2_hash_this(hi, (const void **)&key, NULL,
(void **)&value);
- if (0 == AXIS2_STRCMP((axis2_char_t *)value, ns))
+ if (0 == axis2_strcmp((axis2_char_t *)value, ns))
{
found = AXIS2_TRUE;
break;
@@ -1828,9 +1828,9 @@
axis2_char_t *tmp_val = NULL;
axis2_char_t *key = NULL;
- tmp_val = AXIS2_STRDUP(ns, env);
+ tmp_val = axis2_strdup(ns, env);
sprintf(str_count, "%d", svc->ns_count);
- key = AXIS2_STRACAT("ns", str_count, env);
+ key = axis2_stracat("ns", str_count, env);
axis2_hash_set(svc->ns_map, key, AXIS2_HASH_KEY_STRING, tmp_val);
svc->ns_count++;
}
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Sat Mar 17 00:34:24 2007
@@ -118,7 +118,7 @@
if (svc_grp->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(svc_grp->param_container,
+ axis2_param_container_free(svc_grp->param_container,
env);
}
@@ -160,7 +160,7 @@
if (svc_grp->svc_grp_name)
AXIS2_FREE(env->allocator, svc_grp->svc_grp_name);
- svc_grp->svc_grp_name = AXIS2_STRDUP(name, env);
+ svc_grp->svc_grp_name = axis2_strdup(name, env);
if (!svc_grp->svc_grp_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -199,7 +199,7 @@
return AXIS2_FAILURE;
}
svc_qname = AXIS2_SVC_GET_QNAME(svc, env);
- svc_name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)svc_qname, env);
+ svc_name = axis2_qname_to_string((axis2_qname_t *)svc_qname, env);
axis2_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, svc);
handler_resolver = axis2_phase_resolver_create_with_config_and_svc(env,
@@ -256,7 +256,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
- name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)qname, env);
+ name = axis2_qname_to_string((axis2_qname_t *)qname, env);
return (axis2_svc_t *) axis2_hash_get(svc_grp->svcs, name,
AXIS2_HASH_KEY_STRING);
}
@@ -283,7 +283,7 @@
svc = axis2_svc_grp_get_svc(svc_grp, env, svc_qname);
- svc_name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)svc_qname, env);
+ svc_name = axis2_qname_to_string((axis2_qname_t *)svc_qname, env);
axis2_hash_set(svc_grp->svcs, svc_name,
AXIS2_HASH_KEY_STRING, NULL);
@@ -300,7 +300,7 @@
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if (AXIS2_TRUE == axis2_svc_grp_is_param_locked(svc_grp, env,
- AXIS2_PARAM_GET_NAME(param, env)))
+ axis2_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -308,7 +308,7 @@
}
else
{
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(svc_grp->param_container, env, param);
+ return axis2_param_container_add_param(svc_grp->param_container, env, param);
}
return AXIS2_FAILURE;
@@ -324,7 +324,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- param = AXIS2_PARAM_CONTAINER_GET_PARAM(svc_grp->param_container, env, name);
+ param = axis2_param_container_get_param(svc_grp->param_container, env, name);
if (param == NULL && svc_grp->parent)
{
param = AXIS2_CONF_GET_PARAM(svc_grp->parent, env, name);
@@ -339,7 +339,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(svc_grp->param_container, env);
+ return axis2_param_container_get_params(svc_grp->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -367,7 +367,7 @@
ret = AXIS2_TRUE;
}
param = axis2_svc_grp_get_param(svc_grp, env, param_name);
- if (param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env))
+ if (param && AXIS2_TRUE == axis2_param_is_locked(param, env))
{
ret = AXIS2_TRUE;
}
@@ -441,9 +441,9 @@
for (i = 0; size; i++)
{
modu = axis2_array_list_get(svc_grp->module_qnames, env, i);
- modu_local = AXIS2_QNAME_GET_LOCALPART(modu, env);
- module_name_local = AXIS2_QNAME_GET_LOCALPART(module_name, env);
- if (0 == AXIS2_STRCMP(modu_local, module_name_local))
+ modu_local = axis2_qname_get_localpart(modu, env);
+ module_name_local = axis2_qname_get_localpart(module_name, env);
+ if (0 == axis2_strcmp(modu_local, module_name_local))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC_GRP, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Sat Mar 17 00:34:24 2007
@@ -84,7 +84,7 @@
if (transport_in->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(transport_in->param_container, env);
+ axis2_param_container_free(transport_in->param_container, env);
}
if (transport_in->in_flow)
@@ -274,7 +274,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(transport_in_desc->
+ return axis2_param_container_add_param(transport_in_desc->
param_container, env, param);
}
@@ -285,7 +285,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAM(transport_in_desc->param_container,
+ return axis2_param_container_get_param(transport_in_desc->param_container,
env, param_name);
}
@@ -298,7 +298,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
- return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(transport_in_desc->
+ return axis2_param_container_is_param_locked(transport_in_desc->
param_container, env, param_name);
}
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Sat Mar 17 00:34:24 2007
@@ -78,7 +78,7 @@
if (transport_out->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(transport_out->param_container, env);
+ axis2_param_container_free(transport_out->param_container, env);
}
if (transport_out->out_flow)
@@ -267,7 +267,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(transport_out_desc->
+ return axis2_param_container_add_param(transport_out_desc->
param_container, env, param);
}
@@ -278,7 +278,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAM(transport_out_desc->param_container,
+ return axis2_param_container_get_param(transport_out_desc->param_container,
env, param_name);
}
@@ -291,7 +291,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
- return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(transport_out_desc->
+ return axis2_param_container_is_param_locked(transport_out_desc->
param_container, env, param_name);
}
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=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Sat Mar 17 00:34:24 2007
@@ -107,8 +107,8 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Checking for service using WSA enpoint address : %s", address);
- if ((AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL, address) == 0) ||
- (AXIS2_STRCMP(AXIS2_WSA_NAMESPACE_SUBMISSION, address) == 0))
+ if ((axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL, address) == 0) ||
+ (axis2_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, address) == 0))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Endpoint address cannot be the same as WSA namespace : %s", address);
@@ -203,7 +203,7 @@
{
const axis2_char_t *relates_to_value = NULL;
relates_to_value = axis2_relates_to_get_value(relates_to, env);
- if (relates_to_value && AXIS2_STRCMP(relates_to_value, "") != 0)
+ if (relates_to_value && axis2_strcmp(relates_to_value, "") != 0)
{
axis2_conf_ctx_t *conf_ctx = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Sat Mar 17 00:34:24 2007
@@ -260,7 +260,7 @@
if (conf->param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(conf->param_container, env);
+ axis2_param_container_free(conf->param_container, env);
}
if (conf->svc_grps)
@@ -348,7 +348,7 @@
module_desc_qname = (axis2_qname_t *)
axis2_array_list_get(conf->engaged_modules, env, i);
if (module_desc_qname)
- AXIS2_QNAME_FREE(module_desc_qname, env);
+ axis2_qname_free(module_desc_qname, env);
}
axis2_array_list_free(conf->engaged_modules, env);
}
@@ -513,7 +513,7 @@
axis2_hash_this(index_i, NULL, NULL, &value);
desc = (axis2_svc_t *) value;
svc_qname = AXIS2_SVC_GET_QNAME(desc, env);
- svc_name = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
+ svc_name = axis2_qname_get_localpart(svc_qname, env);
svc_name2 = axis2_hash_get(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
@@ -536,7 +536,7 @@
axis2_hash_this(index_i, NULL, NULL, &value);
desc = (axis2_svc_t *) value;
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(desc, env), env);
+ svc_name = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(desc, env), env);
axis2_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
desc);
index_i = axis2_hash_next(env, index_i);
@@ -611,7 +611,7 @@
return AXIS2_FAILURE;
}
- svc_grp_name = AXIS2_QNAME_GET_LOCALPART(svc_grp_qname, env);
+ svc_grp_name = axis2_qname_get_localpart(svc_grp_qname, env);
if (!svc_grp_name)
{
return AXIS2_FAILURE;
@@ -675,7 +675,7 @@
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if (AXIS2_TRUE == axis2_conf_is_param_locked(conf, env,
- AXIS2_PARAM_GET_NAME(param, env)))
+ axis2_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -683,7 +683,7 @@
}
else
{
- status = AXIS2_PARAM_CONTAINER_ADD_PARAM(conf->param_container, env,
+ status = axis2_param_container_add_param(conf->param_container, env,
param);
}
return status;
@@ -705,7 +705,7 @@
return NULL;
}
- return AXIS2_PARAM_CONTAINER_GET_PARAM(conf->param_container, env,
+ return axis2_param_container_get_param(conf->param_container, env,
name);
}
@@ -716,7 +716,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(conf->param_container, env);
+ return axis2_param_container_get_params(conf->param_container, env);
}
@@ -732,7 +732,7 @@
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
param = axis2_conf_get_param(conf, env, param_name);
- return (param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
+ return (param && AXIS2_TRUE == axis2_param_is_locked(param, env));
}
AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
@@ -806,14 +806,14 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
- name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)qname, env);
+ name = axis2_qname_to_string((axis2_qname_t *)qname, env);
ret = (axis2_module_desc_t *) axis2_hash_get(conf->all_modules,
name, AXIS2_HASH_KEY_STRING);
if (ret)
{
return ret;
}
- module_name = AXIS2_QNAME_GET_LOCALPART(qname, env);
+ module_name = axis2_qname_get_localpart(qname, env);
if (NULL == module_name)
{
return NULL;
@@ -824,10 +824,10 @@
{
return NULL;
}
- name = AXIS2_QNAME_TO_STRING(mod_qname, env);
+ name = axis2_qname_to_string(mod_qname, env);
ret = (axis2_module_desc_t *) axis2_hash_get(conf->all_modules,
name, AXIS2_HASH_KEY_STRING);
- AXIS2_QNAME_FREE(mod_qname, env);
+ axis2_qname_free(mod_qname, env);
mod_qname = NULL;
return ret;
}
@@ -925,7 +925,7 @@
{
axis2_hash_this(index_j, NULL, NULL, &value2);
svc = (axis2_svc_t *) value2;
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(svc, env), env);
+ svc_name = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(svc, env), env);
axis2_hash_set(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING, svc);
@@ -951,7 +951,7 @@
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FALSE);
def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(conf, env,
- AXIS2_QNAME_GET_LOCALPART(module_name, env));
+ axis2_qname_get_localpart(module_name, env));
if (def_mod)
{
def_mod_qname = axis2_module_desc_get_qname(def_mod, env);
@@ -965,8 +965,8 @@
qname = (axis2_qname_t *) axis2_array_list_get(conf->
engaged_modules, env, i);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(module_name, env, qname) ||
- (def_mod_qname && AXIS2_TRUE == AXIS2_QNAME_EQUALS(
+ if (AXIS2_TRUE == axis2_qname_equals(module_name, env, qname) ||
+ (def_mod_qname && AXIS2_TRUE == axis2_qname_equals(
def_mod_qname, env, qname)))
{
return AXIS2_TRUE;
@@ -1128,7 +1128,7 @@
{
axis2_char_t *module_name = NULL;
- module_name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)module_qname, env);
+ module_name = axis2_qname_to_string((axis2_qname_t *)module_qname, env);
axis2_hash_set(conf->all_modules, module_name,
AXIS2_HASH_KEY_STRING, module);
}
@@ -1330,14 +1330,14 @@
{
return AXIS2_FAILURE;
}
- file_name = AXIS2_QNAME_GET_LOCALPART(module_ref, env);
+ file_name = axis2_qname_get_localpart(module_ref, env);
file = (axis2_file_t *) AXIS2_ARCH_READER_CREATE_MODULE_ARCH(
arch_reader, env, file_name) ;
repos_path = AXIS2_CONF_GET_REPO(conf, env);
- temp_path1 = AXIS2_STRACAT(repos_path, AXIS2_PATH_SEP_STR, env);
- temp_path2 = AXIS2_STRACAT(temp_path1, AXIS2_MODULE_FOLDER, env);
- temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
- path = AXIS2_STRACAT(temp_path3, file_name, env);
+ temp_path1 = axis2_stracat(repos_path, AXIS2_PATH_SEP_STR, env);
+ temp_path2 = axis2_stracat(temp_path1, AXIS2_MODULE_FOLDER, env);
+ temp_path3 = axis2_stracat(temp_path2, AXIS2_PATH_SEP_STR, env);
+ path = axis2_stracat(temp_path3, file_name, env);
AXIS2_FREE(env->allocator, temp_path1);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
@@ -1364,7 +1364,7 @@
qname = (axis2_qname_t *) axis2_array_list_get(conf->
engaged_modules, env, i);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(module_qname, env, qname))
+ if (AXIS2_TRUE == axis2_qname_equals(module_qname, env, qname))
{
to_be_engaged = AXIS2_FALSE;
}
@@ -1395,7 +1395,7 @@
return status;
}
module_qname = axis2_module_desc_get_qname(module_desc, env);
- module_qref_l = AXIS2_QNAME_CLONE((axis2_qname_t *)module_qname, env);
+ module_qref_l = axis2_qname_clone((axis2_qname_t *)module_qname, env);
status = axis2_array_list_add(conf->engaged_modules, env,
module_qref_l);
}
@@ -1427,7 +1427,7 @@
AXIS2_FREE(env->allocator, conf->axis2_repo);
conf->axis2_repo = NULL;
}
- conf->axis2_repo = AXIS2_STRDUP(repos_path, env);
+ conf->axis2_repo = axis2_strdup(repos_path, env);
return AXIS2_SUCCESS;
}
@@ -1480,13 +1480,13 @@
if (NULL == mod_ver)
{
- mod_name = AXIS2_STRDUP(module_name, env);
+ mod_name = axis2_strdup(module_name, env);
}
else
{
axis2_char_t *tmp_name = NULL;
- tmp_name = AXIS2_STRACAT(module_name, "-", env);
- mod_name = AXIS2_STRACAT(tmp_name, mod_ver, env);
+ tmp_name = axis2_stracat(module_name, "-", env);
+ mod_name = axis2_stracat(tmp_name, mod_ver, env);
AXIS2_FREE(env->allocator, tmp_name);
}
mod_qname = axis2_qname_create(env, mod_name, NULL, NULL);
@@ -1498,7 +1498,7 @@
return NULL;
}
ret_mod = (axis2_module_desc_t *)axis2_hash_get(all_modules,
- AXIS2_QNAME_TO_STRING(mod_qname, env),
+ axis2_qname_to_string(mod_qname, env),
AXIS2_HASH_KEY_STRING);
return ret_mod;
@@ -1526,7 +1526,7 @@
if (NULL == axis2_hash_get(name_to_ver_map, module_name,
AXIS2_HASH_KEY_STRING))
{
- axis2_char_t *new_entry = AXIS2_STRDUP(module_version, env);
+ axis2_char_t *new_entry = axis2_strdup(module_version, env);
if (NULL == new_entry)
{
return AXIS2_FAILURE;
@@ -1558,7 +1558,7 @@
return AXIS2_FAILURE;
}
status = AXIS2_CONF_ENGAGE_MODULE(conf, env, module_qname);
- AXIS2_QNAME_FREE(module_qname, env);
+ axis2_qname_free(module_qname, env);
return status;
}
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=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Sat Mar 17 00:34:24 2007
@@ -435,8 +435,8 @@
{
fault_to = NULL;
}
- else if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL, address) == 0 ||
- AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, address) == 0)
+ 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);
if (reply_to)
@@ -488,7 +488,7 @@
/* 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);
@@ -636,7 +636,7 @@
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,
+ if (phase_name && paused_phase_name && 0 == axis2_strcmp(phase_name,
paused_phase_name))
{
int paused_handler_i = -1;
@@ -683,7 +683,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_namespace, AXIS2_FAILURE);
- if (AXIS2_STRCMP(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_namespace))
+ if (axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_namespace))
return AXIOM_SOAP12_FAULT_CODE_RECEIVER;
else
return AXIOM_SOAP11_FAULT_CODE_RECEIVER;
@@ -743,7 +743,7 @@
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)
+ if (!role || axis2_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NEXT) != 0)
{
axiom_soap_envelope_t *temp_env =
axiom_soap_envelope_create_default_soap_fault_envelope(env,
@@ -759,7 +759,7 @@
else
{
/* SOAP 1.1 */
- if (!role || AXIS2_STRCMP(role, AXIOM_SOAP11_SOAP_ACTOR_NEXT) != 0)
+ if (!role || axis2_strcmp(role, AXIOM_SOAP11_SOAP_ACTOR_NEXT) != 0)
{
axiom_soap_envelope_t *temp_env =
axiom_soap_envelope_create_default_soap_fault_envelope(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=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Sat Mar 17 00:34:24 2007
@@ -83,7 +83,7 @@
if (phase_name)
{
- phase->name = AXIS2_STRDUP(phase_name, env);
+ phase->name = axis2_strdup(phase_name, env);
if (!(phase->name))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -258,7 +258,7 @@
if (before && after)
{
- if (AXIS2_STRCMP(before, after) == 0)
+ if (axis2_strcmp(before, after) == 0)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_BEFORE_AFTER_HANDLERS_SAME, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -453,7 +453,7 @@
if (!before)
return AXIS2_TRUE;
- if (AXIS2_STRCMP(first_handler_name, before) == 0)
+ if (axis2_strcmp(first_handler_name, before) == 0)
return AXIS2_FALSE;
else
return AXIS2_TRUE;
@@ -497,7 +497,7 @@
if (!after)
return AXIS2_TRUE;
- if (AXIS2_STRCMP(last_handler_name, after) == 0)
+ if (axis2_strcmp(last_handler_name, after) == 0)
return AXIS2_FALSE;
else
return AXIS2_TRUE;
@@ -557,7 +557,7 @@
return AXIS2_FAILURE;
}
- if (AXIS2_STRCMP(before, handler_name) == 0)
+ if (axis2_strcmp(before, handler_name) == 0)
{
/*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
@@ -585,7 +585,7 @@
return AXIS2_FAILURE;
}
- if (AXIS2_STRCMP(before, handler_name) == 0)
+ if (axis2_strcmp(before, handler_name) == 0)
{
return axis2_array_list_add_at(phase->handlers, env, i, handler);
}
@@ -648,7 +648,7 @@
return AXIS2_FAILURE;
}
- if (AXIS2_STRCMP(after, handler_name) == 0)
+ if (axis2_strcmp(after, handler_name) == 0)
{
return axis2_array_list_add_at(phase->handlers, env, 0, handler);
}
@@ -675,7 +675,7 @@
return AXIS2_FAILURE;
}
- if (AXIS2_STRCMP(after, handler_name) == 0)
+ if (axis2_strcmp(after, handler_name) == 0)
{
if (i == (size - 1))
{
@@ -778,8 +778,8 @@
if (before_handler_name && after_handler_name)
{
- if (AXIS2_STRCMP(before_handler_name, before_name) == 0 &&
- AXIS2_STRCMP(after_handler_name, after_name) == 0)
+ if (axis2_strcmp(before_handler_name, before_name) == 0 &&
+ axis2_strcmp(after_handler_name, after_name) == 0)
{
/*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
@@ -788,7 +788,7 @@
if (after_handler_name)
{
- if (AXIS2_STRCMP(after_handler_name, after_name) == 0)
+ if (axis2_strcmp(after_handler_name, after_name) == 0)
after = 0;
}
@@ -796,7 +796,7 @@
if (after_handler_name)
{
- if (AXIS2_STRCMP(before_handler_name, before_name) == 0)
+ if (axis2_strcmp(before_handler_name, before_name) == 0)
before = size;
}
@@ -819,9 +819,9 @@
return AXIS2_FAILURE;
}
- if (AXIS2_STRCMP(handler_name, after_name) == 0)
+ if (axis2_strcmp(handler_name, after_name) == 0)
after = i;
- if (AXIS2_STRCMP(handler_name, before_name) == 0)
+ if (axis2_strcmp(handler_name, before_name) == 0)
before = i;
}
@@ -998,7 +998,7 @@
add_handler = AXIS2_FALSE;
break;
}
- else if (0 == AXIS2_STRCMP(axis2_string_get_buffer(handler_name, env),
+ else if (0 == axis2_strcmp(axis2_string_get_buffer(handler_name, env),
axis2_string_get_buffer(obj_name, env)))
{
add_handler = AXIS2_FALSE;
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=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Sat Mar 17 00:34:24 2007
@@ -167,7 +167,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Checking for operation using target endpoint uri fragment : %s", url_tokens[1]);
op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
- op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, AXIS2_QNAME_GET_LOCALPART(op_qname, env));
+ op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, axis2_qname_get_localpart(op_qname, env));
axis2_qname_free(op_qname, env);
if (op)
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
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=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Sat Mar 17 00:34:24 2007
@@ -112,7 +112,7 @@
if (!op)
{
const axis2_char_t * op_name = NULL;
- op_name = AXIS2_RINDEX(action, '/');
+ op_name = axis2_rindex(action, '/');
if (op_name)
{
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Sat Mar 17 00:34:24 2007
@@ -99,7 +99,7 @@
phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
phase_list, env, i);
phase_name_l = AXIS2_PHASE_GET_NAME(phase, env);
- if (0 == AXIS2_STRCMP(phase_name_l, phase_name))
+ if (0 == axis2_strcmp(phase_name_l, phase_name))
{
return AXIS2_TRUE;
}
@@ -164,7 +164,7 @@
phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
phase_list, env, i);
phase_name_l = AXIS2_PHASE_GET_NAME(phase, env);
- if (0 == AXIS2_STRCMP(phase_name_l, phase_name))
+ if (0 == axis2_strcmp(phase_name_l, phase_name))
{
return phase;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org