You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 21:24:23 UTC
svn commit: r524243 [5/17] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/
guththila/samples/ guththila/src/ include/ modu...
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <axis2_svc_builder.h>
#include <axutil_class_loader.h>
#include <axis2_utils.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
struct axis2_svc_builder
{
@@ -139,15 +139,15 @@
axiom_element_t *svc_element = NULL;
axiom_children_qname_iterator_t *itr = NULL;
axiom_children_qname_iterator_t *operation_itr = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qdesc = NULL;
- axis2_qname_t *qmodulest = NULL;
- axis2_qname_t *qinflowst = NULL;
- axis2_qname_t *qoutflowst = NULL;
- axis2_qname_t *qin_faultflowst = NULL;
- axis2_qname_t *qout_faultflowst = NULL;
- axis2_qname_t *qopst = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qdesc = NULL;
+ axutil_qname_t *qmodulest = NULL;
+ axutil_qname_t *qinflowst = NULL;
+ axutil_qname_t *qoutflowst = NULL;
+ axutil_qname_t *qin_faultflowst = NULL;
+ axutil_qname_t *qout_faultflowst = NULL;
+ axutil_qname_t *qopst = NULL;
+ axutil_qname_t *qattname = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_svc_grp_t *parent = NULL;
axiom_element_t *desc_element = NULL;
@@ -167,7 +167,7 @@
axis2_char_t *class_name = NULL;
axis2_char_t *svc_dll_name = NULL;
axutil_dll_desc_t *dll_desc = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
axis2_arch_file_data_t *arch_file_data = NULL;
axutil_file_t *svc_folder = NULL;
axis2_char_t *dll_path = NULL;
@@ -181,7 +181,7 @@
svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
/* Processing service level paramters */
- qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
+ qparamst = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
if (!qparamst)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -189,7 +189,7 @@
}
itr = axiom_element_get_children_with_qname(svc_element, env, qparamst,
svc_node);
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
qparamst = NULL;
parent = axis2_svc_get_parent(svc_builder->svc, env);
@@ -208,10 +208,10 @@
* name
*/
/* -------------------------service description-------------------- */
- qdesc = axis2_qname_create(env, AXIS2_DESCRIPTION, NULL, NULL);
+ qdesc = axutil_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) ;
+ axutil_qname_free(qdesc, env) ;
qdesc = NULL;
if( desc_element)
{
@@ -229,18 +229,18 @@
}
/* --------------------services description end -------------------- */
/* my logic to get set service name */
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
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);
+ axutil_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 = axutil_dll_desc_create(env);
impl_info_param =
- axis2_param_container_get_param(
+ axutil_param_container_get_param(
axis2_svc_get_param_container(svc_builder->svc, env),
env,
AXIS2_SERVICE_CLASS);
@@ -249,7 +249,7 @@
axutil_dll_desc_free(dll_desc, env);
return AXIS2_FAILURE;
}
- class_name = axis2_param_get_value(impl_info_param, env);
+ class_name = axutil_param_get_value(impl_info_param, env);
svc_dll_name =
axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
@@ -273,8 +273,8 @@
dll_path = NULL;
axutil_dll_desc_set_type(dll_desc, env, AXIS2_SVC_DLL);
- status = axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env,
+ status = axutil_param_set_value(impl_info_param, env, dll_desc);
+ axutil_param_set_value_free(impl_info_param, env,
axutil_dll_desc_free_void_arg);
if (AXIS2_SUCCESS != status)
{
@@ -283,10 +283,10 @@
}
/* end of my logic */
/* processing service wide modules which required to engage globally */
- qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
+ qmodulest = axutil_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) ;
+ axutil_qname_free(qmodulest, env) ;
qmodulest = NULL;
status = axis2_svc_builder_process_module_refs(svc_builder, env, module_refs);
if (AXIS2_SUCCESS != status)
@@ -295,35 +295,35 @@
}
/* process IN_FLOW */
- qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
+ qinflowst = axutil_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) ;
+ axutil_qname_free(qinflowst, env) ;
qinflowst = NULL;
- qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
+ qoutflowst = axutil_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) ;
+ axutil_qname_free(qoutflowst, env) ;
qoutflowst = NULL;
- qin_faultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
+ qin_faultflowst = axutil_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) ;
+ axutil_qname_free(qin_faultflowst, env) ;
qin_faultflowst = NULL;
- qout_faultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
+ qout_faultflowst = axutil_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) ;
+ axutil_qname_free(qout_faultflowst, env) ;
qout_faultflowst = NULL;
/* processing operations */
- qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
+ qopst = axutil_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) ;
+ axutil_qname_free(qopst, env) ;
qopst = NULL;
ops = axis2_svc_builder_process_ops(svc_builder, env, operation_itr);
if (ops)
@@ -343,16 +343,16 @@
sizej = axutil_array_list_size(params, env);
for (j = 0; j < sizej; j++)
{
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
axis2_char_t *param_name = NULL;
param = axutil_array_list_get(params, env, j);
- param_name = axis2_param_get_name(param, env);
+ param_name = axutil_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 *) axutil_param_get_value(param, env);
axis2_svc_add_mapping(svc_builder->svc, env, key, op_desc);
}
}
@@ -379,12 +379,12 @@
axiom_node_t *op_node = NULL;
axiom_attribute_t *op_name_att = NULL;
axiom_attribute_t *op_mep_att = NULL;
- axis2_qname_t *qmep = NULL;
- axis2_qname_t *qopname = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qmsgrecv = NULL;
- axis2_qname_t *qmodulest = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qmep = NULL;
+ axutil_qname_t *qopname = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qmsgrecv = NULL;
+ axutil_qname_t *qmodulest = NULL;
+ axutil_qname_t *qattname = NULL;
axis2_char_t *mep_url = NULL;
axis2_char_t *op_name = NULL;
axis2_op_t *op_desc = NULL;
@@ -398,9 +398,9 @@
op_node = axiom_children_qname_iterator_next(op_itr, env);
/* getting operation name */
op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
op_name_att = axiom_element_get_attribute(op_element, env, qattname);
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
qattname = NULL;
if (! op_name_att)
{
@@ -409,9 +409,9 @@
return AXIS2_FAILURE;
}
/* set the mep of the operation */
- qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
+ qmep = axutil_qname_create(env, AXIS2_MEP, NULL, NULL);
op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
- axis2_qname_free(qmep, env);
+ axutil_qname_free(qmep, env);
qmep = NULL;
if (op_mep_att)
{
@@ -423,7 +423,7 @@
*/
}
op_name = axiom_attribute_get_value(op_name_att, env);
- qopname = axis2_qname_create(env, op_name, NULL, NULL);
+ qopname = axutil_qname_create(env, op_name, NULL, NULL);
op_desc = axis2_op_create(env);
if(mep_url)
{
@@ -431,13 +431,13 @@
}
axis2_op_set_qname(op_desc, env, qopname);
- axis2_qname_free(qopname, env);
+ axutil_qname_free(qopname, env);
qopname = NULL;
/* operation parameters */
- qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
+ qparamst = axutil_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);
+ axutil_qname_free(qparamst, env);
qparamst = NULL;
status = axis2_desc_builder_process_params(svc_builder->desc_builder,
env, params_itr,
@@ -448,10 +448,10 @@
env, op_node, op_desc);
/* loading the message receivers */
- qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
+ qmsgrecv = axutil_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);
+ axutil_qname_free(qmsgrecv, env);
qmsgrecv = NULL;
if (recv_element && NULL != recv_node)
{
@@ -469,10 +469,10 @@
axis2_op_set_msg_recv(op_desc, env, msg_recv);
}
/* process module refs */
- qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
+ qmodulest = axutil_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);
+ axutil_qname_free(qmodulest, env);
qmodulest = NULL;
status = axis2_desc_builder_process_op_module_refs(svc_builder->
desc_builder, env, module_itr, op_desc);
@@ -502,7 +502,7 @@
axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
const axutil_env_t *env,
axiom_children_qname_iterator_t *module_confs,
- axis2_param_container_t *parent,
+ axutil_param_container_t *parent,
axis2_svc_t *svc)
{
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_confs, env))
@@ -510,15 +510,15 @@
axiom_element_t *module_conf_element = NULL;
axiom_node_t *module_conf_node = NULL;
axiom_attribute_t *module_name_att = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qattname = NULL;
module_conf_node = axiom_children_qname_iterator_next(module_confs, env);
module_conf_element = AXIOM_NODE_GET_DATA_ELEMENT(module_conf_node,
env);
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
module_name_att = axiom_element_get_attribute(module_conf_element,
env, qattname);
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
qattname = NULL;
if (! module_name_att)
{
@@ -545,22 +545,22 @@
axiom_element_t *module_ref_element = NULL;
axiom_node_t *module_ref_node = NULL;
axiom_attribute_t *module_ref_att = NULL;
- axis2_qname_t *qref = NULL;
+ axutil_qname_t *qref = NULL;
module_ref_node = axiom_children_qname_iterator_next(module_refs, env);
module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node,
env);
- qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
+ qref = axutil_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = axiom_element_get_attribute(module_ref_element,
env, qref);
- axis2_qname_free(qref, env);
+ axutil_qname_free(qref, env);
if (module_ref_att)
{
axis2_char_t *ref_name = NULL;
- axis2_qname_t *qrefname = NULL;
+ axutil_qname_t *qrefname = NULL;
ref_name = axiom_attribute_get_value(module_ref_att, env);
- qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
+ qrefname = axutil_qname_create(env, ref_name, NULL, NULL);
if (! axis2_dep_engine_get_module(
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env),
env, qrefname))
@@ -573,7 +573,7 @@
{
axis2_svc_add_module_qname(svc_builder->svc, env, qrefname);
}
- axis2_qname_free(qrefname, env);
+ axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Fri Mar 30 12:24:00 2007
@@ -98,23 +98,23 @@
axiom_children_qname_iterator_t *itr = NULL;
axiom_children_qname_iterator_t *module_ref_itr = NULL;
axiom_children_qname_iterator_t *svc_itr = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qmodulest = NULL;
- axis2_qname_t *qsvc_element = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qmodulest = NULL;
+ axutil_qname_t *qsvc_element = NULL;
axiom_element_t *svc_grp_element = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_conf_t *parent = NULL;
/* Processing service level paramters */
svc_grp_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_grp_builder->svc_grp, env);
- qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
+ qparamst = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
itr = axiom_element_get_children_with_qname(svc_grp_element, env, qparamst,
svc_grp_builder->svc_grp);
if (qparamst)
{
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
qparamst = NULL;
}
@@ -124,25 +124,25 @@
axis2_conf_get_param_container(parent, env));
/* Processing service modules required to be engaged globally */
- qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
+ qmodulest = axutil_qname_create(env, AXIS2_MODULEST, NULL, NULL);
module_ref_itr = axiom_element_get_children_with_qname(svc_grp_element, env,
qmodulest, svc_grp_builder->svc_grp);
if (qmodulest)
{
- axis2_qname_free(qmodulest, env);
+ axutil_qname_free(qmodulest, env);
qmodulest = NULL;
}
axis2_svc_grp_builder_process_module_refs(svc_grp_builder, env, module_ref_itr,
svc_grp);
- qsvc_element = axis2_qname_create(env, AXIS2_SVC_ELEMENT, NULL, NULL);
+ qsvc_element = axutil_qname_create(env, AXIS2_SVC_ELEMENT, NULL, NULL);
svc_itr = axiom_element_get_children_with_qname(svc_grp_element, env,
qsvc_element, svc_grp_builder->svc_grp);
if (qsvc_element)
{
- axis2_qname_free(qsvc_element, env);
+ axutil_qname_free(qsvc_element, env);
qsvc_element = NULL;
}
@@ -152,17 +152,17 @@
axiom_element_t *svc_element = NULL;
axiom_attribute_t *svc_name_att = NULL;
axis2_char_t *svc_name = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qattname = NULL;
svc_node = (axiom_node_t *) axiom_children_qname_iterator_next(
svc_itr, env);
svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
svc_name_att = axiom_element_get_attribute(svc_element, env, qattname);
if (qattname)
{
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
qattname = NULL;
}
@@ -186,11 +186,11 @@
axis_svc = axis2_arch_file_data_get_svc(file_data, env, svc_name);
if (! axis_svc)
{
- axis2_qname_t *qsvc_name = NULL;
+ axutil_qname_t *qsvc_name = NULL;
- qsvc_name = axis2_qname_create(env, svc_name, NULL, NULL);
+ qsvc_name = axutil_qname_create(env, svc_name, NULL, NULL);
axis_svc = axis2_svc_create_with_qname(env, qsvc_name);
- axis2_qname_free(qsvc_name, env);
+ axutil_qname_free(qsvc_name, env);
axis2_arch_file_data_add_svc(file_data, env, axis_svc);
}
@@ -226,23 +226,23 @@
axiom_node_t *module_ref_node = NULL;
axiom_element_t *module_ref_element = NULL;
axiom_attribute_t *module_ref_att = NULL;
- axis2_qname_t *qref = NULL;
+ axutil_qname_t *qref = NULL;
module_ref_node = (axiom_node_t *)
axiom_children_qname_iterator_next(module_refs, env);
module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
- qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
+ qref = axutil_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = axiom_element_get_attribute(module_ref_element, env,
qref);
if (module_ref_att)
{
axis2_char_t *ref_name = NULL;
- axis2_qname_t *qrefname = NULL;
+ axutil_qname_t *qrefname = NULL;
axis2_module_desc_t *module = NULL;
ref_name = axiom_attribute_get_value(module_ref_att, env);
- qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
+ qrefname = axutil_qname_create(env, ref_name, NULL, NULL);
module = axis2_dep_engine_get_module(
axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env),
env, qrefname);
@@ -256,9 +256,9 @@
{
axis2_svc_grp_add_module_ref(svc_grp, env, qrefname);
}
- axis2_qname_free(qrefname, env);
+ axutil_qname_free(qrefname, env);
}
- axis2_qname_free(qref, env);
+ axutil_qname_free(qref, env);
}
return AXIS2_SUCCESS;
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/desc.c Fri Mar 30 12:24:00 2007
@@ -16,13 +16,13 @@
*/
#include <axis2_desc.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axis2_msg.h>
struct axis2_desc
{
/** parameter container */
- axis2_param_container_t *param_container;
+ axutil_param_container_t *param_container;
/** children of this description */
axutil_hash_t *children;
@@ -47,8 +47,8 @@
desc->param_container = NULL;
desc->children = NULL;
- desc->param_container = (axis2_param_container_t *)
- axis2_param_container_create(env);
+ desc->param_container = (axutil_param_container_t *)
+ axutil_param_container_create(env);
if (!(desc->param_container))
{
axis2_desc_free(desc, env);
@@ -92,7 +92,7 @@
if (desc->param_container)
{
- axis2_param_container_free(desc->param_container, env);
+ axutil_param_container_free(desc->param_container, env);
}
if (desc)
@@ -106,21 +106,21 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_desc_add_param(axis2_desc_t *desc,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
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 axutil_param_container_add_param(desc->param_container, env, param);
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_desc_get_param(const axis2_desc_t *desc,
const axutil_env_t *env,
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 axutil_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 axutil_param_container_get_params(desc->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -138,14 +138,14 @@
const axutil_env_t *env,
const axis2_char_t *param_name)
{
- axis2_param_t *param_l = NULL;
+ axutil_param_t *param_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
param_l = axis2_desc_get_param(desc, env, param_name);
- return (param_l && axis2_param_is_locked(param_l, env));
+ return (param_l && axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Fri Mar 30 12:24:00 2007
@@ -16,14 +16,14 @@
*/
#include <axis2_handler_desc.h>
-#include <axis2_param_container.h>
-#include <axis2_string.h>
+#include <axutil_param_container.h>
+#include <axutil_string.h>
#include <axis2_handler.h>
struct axis2_handler_desc
{
/** name */
- axis2_string_t *name;
+ axutil_string_t *name;
/** phase rules */
axis2_phase_rule_t *rules;
/** handler represented by meta information*/
@@ -31,14 +31,14 @@
/** class name */
axis2_char_t *class_name;
/** parent param container */
- axis2_param_container_t *parent;
+ axutil_param_container_t *parent;
/** parameter container */
- axis2_param_container_t *param_container;
+ axutil_param_container_t *param_container;
};
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
axis2_handler_desc_create(const axutil_env_t *env,
- axis2_string_t *name)
+ axutil_string_t *name)
{
axis2_handler_desc_t *handler_desc = NULL;
@@ -60,7 +60,7 @@
handler_desc->parent = NULL;
handler_desc->param_container =
- axis2_param_container_create(env);
+ axutil_param_container_create(env);
if (!handler_desc->param_container)
{
/** error code is already set by last param container create */
@@ -78,13 +78,13 @@
if (name)
{
- handler_desc->name = axis2_string_clone(name, env);
+ handler_desc->name = axutil_string_clone(name, env);
}
return handler_desc;
}
-AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN const axutil_string_t *AXIS2_CALL
axis2_handler_desc_get_name(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env)
{
@@ -94,18 +94,18 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_desc_set_name(axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
- axis2_string_t *name)
+ axutil_string_t *name)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (handler_desc->name)
{
- axis2_string_free(handler_desc->name, env);
+ axutil_string_free(handler_desc->name, env);
handler_desc->name = NULL;
}
if (name)
{
- handler_desc->name = axis2_string_clone(name, env);
+ handler_desc->name = axutil_string_clone(name, env);
}
return AXIS2_SUCCESS;
@@ -142,30 +142,30 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_handler_desc_get_param(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
const axis2_char_t *name)
{
- return axis2_param_container_get_param(handler_desc->param_container, env, name);
+ return axutil_param_container_get_param(handler_desc->param_container, env, name);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_desc_add_param(axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (axis2_param_container_is_param_locked(handler_desc->parent, env,
- axis2_param_get_name(param, env)))
+ if (axutil_param_container_is_param_locked(handler_desc->parent, env,
+ axutil_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 axutil_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 axutil_env_t *env)
{
- return axis2_param_container_get_params(handler_desc->param_container,
+ return axutil_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 (axutil_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 axutil_param_container_is_param_locked(handler_desc->param_container,
env, param_name);
}
@@ -255,7 +255,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_handler_desc_get_parent(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env)
{
@@ -265,7 +265,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_desc_set_parent(axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
- axis2_param_container_t *parent)
+ axutil_param_container_t *parent)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
handler_desc->parent = parent; /* shallow copy, because
@@ -281,12 +281,12 @@
if (handler_desc->param_container)
{
- axis2_param_container_free(handler_desc-> param_container, env);
+ axutil_param_container_free(handler_desc-> param_container, env);
}
if (handler_desc->name)
{
- axis2_string_free(handler_desc->name, env);
+ axutil_string_free(handler_desc->name, env);
}
if (handler_desc->rules)
@@ -311,7 +311,7 @@
return;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_handler_desc_get_param_container(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
struct axis2_module_desc
{
axis2_module_t *module;
- axis2_qname_t *qname;
+ axutil_qname_t *qname;
axis2_conf_t *parent;
/**
* To store module operations , which are supposed to be added to a service
@@ -37,7 +37,7 @@
* parameter container that stores all the parameters associated with
* the module
*/
- axis2_param_container_t *params;
+ axutil_param_container_t *params;
};
AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
@@ -63,7 +63,7 @@
module_desc->flow_container = NULL;
module_desc->ops = NULL;
- module_desc->params = axis2_param_container_create(env);
+ module_desc->params = axutil_param_container_create(env);
if (! module_desc->params)
{
axis2_module_desc_free(module_desc, env);
@@ -92,7 +92,7 @@
AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
axis2_module_desc_create_with_qname(const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
axis2_module_desc_t *module_desc = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -105,7 +105,7 @@
return NULL;
}
- module_desc->qname = (axis2_qname_t *)qname;
+ module_desc->qname = (axutil_qname_t *)qname;
return module_desc;
}
@@ -123,7 +123,7 @@
if (module_desc->params)
{
- axis2_param_container_free(module_desc->params, env);
+ axutil_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);
+ axutil_qname_free(module_desc->qname, env);
}
if (module_desc->ops)
@@ -253,7 +253,7 @@
env, fault_out_flow);
}
-AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
axis2_module_desc_get_qname(const axis2_module_desc_t *module_desc,
const axutil_env_t *env)
{
@@ -263,17 +263,17 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_module_desc_set_qname(axis2_module_desc_t *module_desc,
const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
if (module_desc->qname)
{
- axis2_qname_free(module_desc->qname, env);
+ axutil_qname_free(module_desc->qname, env);
}
- module_desc->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+ module_desc->qname = axutil_qname_clone((axutil_qname_t *)qname, env);
return AXIS2_SUCCESS;
}
@@ -283,7 +283,7 @@
const axutil_env_t *env,
axis2_op_t *op)
{
- const axis2_qname_t *op_qname = NULL;
+ const axutil_qname_t *op_qname = NULL;
axis2_char_t *op_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -302,7 +302,7 @@
{
return AXIS2_FAILURE;
}
- op_name = axis2_qname_to_string((axis2_qname_t *)op_qname, env);
+ op_name = axutil_qname_to_string((axutil_qname_t *)op_qname, env);
axutil_hash_set(module_desc->ops, op_name, AXIS2_HASH_KEY_STRING, op);
return AXIS2_SUCCESS;
@@ -337,14 +337,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_module_desc_add_param(axis2_module_desc_t *module_desc,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
axis2_char_t *param_name_l = NULL;
axis2_status_t ret_status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- param_name_l = axis2_param_get_name(param, env);
+ param_name_l = axutil_param_get_name(param, env);
if (! param_name_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
@@ -360,26 +360,26 @@
}
else
{
- ret_status = axis2_param_container_add_param(module_desc->params, env, param);
+ ret_status = axutil_param_container_add_param(module_desc->params, env, param);
}
return ret_status;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_module_desc_get_param(const axis2_module_desc_t *module_desc,
const axutil_env_t *env,
const axis2_char_t *name)
{
AXIS2_PARAM_CHECK(env->error, name, NULL);
- return axis2_param_container_get_param(module_desc->params, env, name);
+ return axutil_param_container_get_param(module_desc->params, env, name);
}
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_module_desc_get_all_params(const axis2_module_desc_t *module_desc,
const axutil_env_t *env)
{
- return axis2_param_container_get_params(module_desc->params, env);
+ return axutil_param_container_get_params(module_desc->params, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -389,7 +389,7 @@
{
axis2_bool_t locked = AXIS2_FALSE;
axis2_bool_t ret_state = AXIS2_FALSE;
- axis2_param_t *param_l = NULL;
+ axutil_param_t *param_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
@@ -410,7 +410,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 == axutil_param_is_locked(param_l, env))
ret_state = AXIS2_TRUE;
else
ret_state = AXIS2_FALSE;
@@ -437,7 +437,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_module_desc_get_param_container(const axis2_module_desc_t *module_desc,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_msg.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
struct axis2_msg
{
@@ -27,11 +27,11 @@
/** name of the message */
axis2_char_t *name;
/** XML schema element qname */
- axis2_qname_t *element_qname;
+ axutil_qname_t *element_qname;
/** direction of message */
axis2_char_t *direction;
/** parameter container to hold message parameters */
- struct axis2_param_container *param_container;
+ struct axutil_param_container *param_container;
};
AXIS2_EXTERN axis2_msg_t *AXIS2_CALL
@@ -57,7 +57,7 @@
msg->direction = NULL;
msg->param_container =
- (axis2_param_container_t *)axis2_param_container_create(env);
+ (axutil_param_container_t *)axutil_param_container_create(env);
if (!msg->param_container)
{
axis2_msg_free(msg, env);
@@ -92,7 +92,7 @@
if (msg->element_qname)
{
- axis2_qname_free(msg->element_qname, env);
+ axutil_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);
+ axutil_param_container_free(msg->param_container, env);
}
msg->parent = NULL;
@@ -118,14 +118,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_msg_add_param(axis2_msg_t *msg,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
axis2_char_t *param_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FALSE);
- param_name = axis2_param_get_name(param, env);
+ param_name = axutil_param_get_name(param, env);
if (AXIS2_TRUE == axis2_msg_is_param_locked(msg, env, param_name))
{
AXIS2_ERROR_SET(env->error,
@@ -134,21 +134,21 @@
}
else
{
- return axis2_param_container_add_param(msg->param_container, env,
+ return axutil_param_container_add_param(msg->param_container, env,
param);
}
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_msg_get_param(const axis2_msg_t *msg,
const axutil_env_t *env,
const axis2_char_t *param_name)
{
AXIS2_PARAM_CHECK(env->error, param_name, NULL);
- return axis2_param_container_get_param(msg->param_container, env, param_name);
+ return axutil_param_container_get_param(msg->param_container, env, param_name);
}
AXIS2_EXTERN axutil_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 axutil_param_container_get_params(msg->param_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -190,7 +190,7 @@
const axis2_char_t *param_name)
{
axis2_op_t *parent_l = NULL;
- axis2_param_t *param_l = NULL;
+ axutil_param_t *param_l = NULL;
axis2_bool_t locked = AXIS2_FALSE;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -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 && axutil_param_is_locked(param_l, env));
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -264,7 +264,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
axis2_msg_get_element_qname(const axis2_msg_t *msg,
const axutil_env_t *env)
{
@@ -274,19 +274,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_msg_set_element_qname(axis2_msg_t *msg,
const axutil_env_t *env,
- const axis2_qname_t *element_qname)
+ const axutil_qname_t *element_qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (msg->element_qname)
{
- axis2_qname_free(msg->element_qname, env);
+ axutil_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 = axutil_qname_clone((axutil_qname_t *)element_qname, env);
if (!(msg->element_qname))
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_op.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axis2_msg.h>
#include <axis2_desc.h>
#include <axis2_conf_ctx.h>
@@ -34,11 +34,11 @@
axutil_array_list_t *engaged_module_list;
axutil_array_list_t *wsamapping_list;
axis2_bool_t from_module;
- axis2_qname_t *qname;
+ axutil_qname_t *qname;
axis2_char_t *msg_exchange_pattern;
axis2_char_t *style;
/** parameter container to hold operation related parameters */
- struct axis2_param_container *param_container;
+ struct axutil_param_container *param_container;
};
AXIS2_EXTERN axis2_op_t *AXIS2_CALL
@@ -72,8 +72,8 @@
op->style = NULL;
op->style = axis2_strdup(env, AXIS2_STYLE_DOC);
- op->param_container = (axis2_param_container_t *)
- axis2_param_container_create(env);
+ op->param_container = (axutil_param_container_t *)
+ axutil_param_container_create(env);
if (!op->param_container)
{
axis2_op_free(op, env);
@@ -156,7 +156,7 @@
AXIS2_EXTERN axis2_op_t *AXIS2_CALL
axis2_op_create_with_qname(
const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
axis2_op_t *op = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -196,7 +196,7 @@
}
if (op->param_container)
{
- axis2_param_container_free(op->param_container, env);
+ axutil_param_container_free(op->param_container, env);
}
op->parent = NULL;
@@ -210,12 +210,12 @@
int i = 0;
for (i = 0; i < axutil_array_list_size(op->module_qnames, env); i++)
{
- axis2_qname_t *module_ref = NULL;
+ axutil_qname_t *module_ref = NULL;
module_ref = axutil_array_list_get(op->module_qnames, env, i);
if (module_ref)
{
- axis2_qname_free(module_ref, env);
+ axutil_qname_free(module_ref, env);
}
}
axutil_array_list_free(op->module_qnames, env);
@@ -231,7 +231,7 @@
if (op->qname)
{
- axis2_qname_free(op->qname, env);
+ axutil_qname_free(op->qname, env);
}
if (op->msg_exchange_pattern)
@@ -268,7 +268,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_add_param(axis2_op_t *op,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
axis2_char_t *param_name = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -276,7 +276,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 = axutil_param_get_name(param, env);
if (AXIS2_TRUE == axis2_op_is_param_locked(op, env, param_name))
{
AXIS2_ERROR_SET(env->error,
@@ -285,23 +285,23 @@
}
else
{
- status = axis2_param_container_add_param(op->param_container, env,
+ status = axutil_param_container_add_param(op->param_container, env,
param);
}
return status;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_op_get_param(const axis2_op_t *op,
const axutil_env_t *env,
const axis2_char_t *param_name)
{
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
AXIS2_PARAM_CHECK(env->error, param_name, NULL);
- param = axis2_param_container_get_param(op->param_container, env, param_name);
+ param = axutil_param_container_get_param(op->param_container, env, param_name);
if (!param && op->parent)
{
param = axis2_svc_get_param(op->parent, env, param_name);
@@ -313,7 +313,7 @@
axis2_op_get_all_params(const axis2_op_t *op,
const axutil_env_t *env)
{
- return axis2_param_container_get_params(op->param_container, env);
+ return axutil_param_container_get_params(op->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -322,7 +322,7 @@
const axis2_char_t *param_name)
{
axis2_svc_t *parent = NULL;
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
axis2_bool_t locked = AXIS2_FALSE;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -339,7 +339,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 == axutil_param_is_locked(param, env));
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -393,25 +393,25 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_set_qname(axis2_op_t *op,
const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (op->qname)
{
- axis2_qname_free(op->qname, env);
+ axutil_qname_free(op->qname, env);
op->qname = NULL;
}
if (qname)
{
- op->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+ op->qname = axutil_qname_clone((axutil_qname_t *)qname, env);
}
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
axis2_op_get_qname(void *op,
const axutil_env_t *env)
{
@@ -497,8 +497,8 @@
for (index = 0; index < size; index++)
{
- const axis2_qname_t *qname1 = NULL;
- const axis2_qname_t *qname2 = NULL;
+ const axutil_qname_t *qname1 = NULL;
+ const axutil_qname_t *qname2 = NULL;
module_desc = (axis2_module_desc_t *) axutil_array_list_get(collection_module,
env, index);
@@ -508,7 +508,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 (axutil_qname_equals(qname1, env, qname2))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Module already engaged to operation");
@@ -553,7 +553,7 @@
axis2_module_desc_t *module_desc_l = NULL;
int size = 0;
int index = 0;
- const axis2_qname_t *module_qname = NULL;
+ const axutil_qname_t *module_qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
@@ -571,13 +571,13 @@
module_qname = axis2_module_desc_get_qname(module_desc, env);
for (index = 0; index < size; index++)
{
- const axis2_qname_t *module_qname_l = NULL;
+ const axutil_qname_t *module_qname_l = NULL;
module_desc_l =
(axis2_module_desc_t *) axutil_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 (axutil_qname_equals(module_qname, env, module_qname_l))
{
return AXIS2_SUCCESS;
}
@@ -809,13 +809,13 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_add_module_qname(axis2_op_t *op,
const axutil_env_t *env,
- const axis2_qname_t *module_qname)
+ const axutil_qname_t *module_qname)
{
- axis2_qname_t *module_qname_l = NULL;
+ axutil_qname_t *module_qname_l = NULL;
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 = axutil_qname_clone((axutil_qname_t *)module_qname, env);
return axutil_array_list_add(op->module_qnames, env, module_qname_l);
}
@@ -1142,7 +1142,7 @@
return op->wsamapping_list;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_op_get_param_container(const axis2_op_t *op,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/phase_rule.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/phase_rule.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <axis2_const.h>
#include <axis2_phase_rule.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
struct axis2_phase_rule
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <axis2_svc.h>
#include <axis2_addr.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axis2_module.h>
#include "../deployment/axis2_desc_builder.h"
@@ -83,11 +83,11 @@
int sc_calc_count;
void *impl_class;
- axis2_qname_t *qname;
+ axutil_qname_t *qname;
axis2_char_t *style;
axutil_array_list_t *engaged_modules;
/** parameter container to hold service related parameters */
- struct axis2_param_container *param_container;
+ struct axutil_param_container *param_container;
/** flow container that encapsulates the flow related data */
struct axis2_flow_container *flow_container;
};
@@ -133,7 +133,7 @@
svc->qname = NULL;
svc->style = NULL;
- svc->param_container = axis2_param_container_create(env);
+ svc->param_container = axutil_param_container_create(env);
if (! svc->param_container)
{
axis2_svc_free(svc, env);
@@ -218,7 +218,7 @@
AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
axis2_svc_create_with_qname(const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
axis2_svc_t *svc = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -250,7 +250,7 @@
if (svc->param_container)
{
- axis2_param_container_free(svc->param_container, env);
+ axutil_param_container_free(svc->param_container, env);
}
if (svc->flow_container)
@@ -280,11 +280,11 @@
size = axutil_array_list_size(svc->module_list, env);
for (i = 0; i < size; i++)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
qname = axutil_array_list_get(svc->module_list, env, i);
if (qname)
{
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
}
}
axutil_array_list_free(svc->module_list, env);
@@ -368,7 +368,7 @@
if (svc->qname)
{
- axis2_qname_free(svc->qname, env);
+ axutil_qname_free(svc->qname, env);
}
if(svc->style)
@@ -393,7 +393,7 @@
{
axis2_status_t status = AXIS2_FAILURE;
axis2_msg_recv_t *msg_recv = NULL;
- const axis2_qname_t *qname = NULL;
+ const axutil_qname_t *qname = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -412,7 +412,7 @@
}
qname = axis2_op_get_qname(op, env);
if (qname)
- key = axis2_qname_get_localpart(qname, env);
+ key = axutil_qname_get_localpart(qname, env);
if (key)
axutil_hash_set(svc->op_alias_map, key, AXIS2_HASH_KEY_STRING, op);
return AXIS2_SUCCESS;
@@ -421,7 +421,7 @@
AXIS2_EXTERN axis2_op_t *AXIS2_CALL
axis2_svc_get_op_with_qname(const axis2_svc_t *svc,
const axutil_env_t *env,
- const axis2_qname_t *op_qname)
+ const axutil_qname_t *op_qname)
{
axis2_op_t *op = NULL;
axis2_char_t *key = NULL;
@@ -429,7 +429,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, op_qname, NULL);
- key = axis2_qname_get_localpart(op_qname, env);
+ key = axutil_qname_get_localpart(op_qname, env);
op = axutil_hash_get(svc->op_alias_map, key, AXIS2_HASH_KEY_STRING);
if (! op)
{
@@ -485,23 +485,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_set_qname(axis2_svc_t *svc,
const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
if (svc->qname)
{
- axis2_qname_free(svc->qname, env);
+ axutil_qname_free(svc->qname, env);
}
if (qname)
{
- svc->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+ svc->qname = axutil_qname_clone((axutil_qname_t *)qname, env);
}
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
axis2_svc_get_qname(const axis2_svc_t *svc,
const axutil_env_t *env)
{
@@ -512,14 +512,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_add_param(axis2_svc_t *svc,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if (AXIS2_TRUE == axis2_svc_is_param_locked(svc, env,
- axis2_param_get_name(param, env)))
+ axutil_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -527,21 +527,21 @@
}
else
{
- return axis2_param_container_add_param(svc->param_container, env, param);
+ return axutil_param_container_add_param(svc->param_container, env, param);
}
return AXIS2_FAILURE;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_svc_get_param(const axis2_svc_t *svc,
const axutil_env_t *env,
const axis2_char_t *name)
{
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
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 = axutil_param_container_get_param(svc->param_container, env, name);
if (param == NULL && svc->parent)
{
param = axis2_svc_grp_get_param(svc->parent, env, name);
@@ -555,7 +555,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_param_container_get_params(svc->param_container, env);
+ return axutil_param_container_get_params(svc->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -564,7 +564,7 @@
const axis2_char_t *param_name)
{
axis2_bool_t locked = AXIS2_FALSE;
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
axis2_svc_grp_t *parent = NULL;
axis2_bool_t ret = AXIS2_FALSE;
@@ -583,7 +583,7 @@
param = axis2_svc_get_param(svc, env, param_name);
if (param)
{
- ret = axis2_param_is_locked(param, env);
+ ret = axutil_param_is_locked(param, env);
}
return ret;
}
@@ -610,7 +610,7 @@
module_desc);
if (status)
{
- const axis2_qname_t *qname = NULL;
+ const axutil_qname_t *qname = NULL;
status = axutil_array_list_add(svc->engaged_modules, env, module_desc);
qname = axis2_module_desc_get_qname(module_desc, env);
axis2_svc_add_module_qname(svc, env, qname);
@@ -626,20 +626,20 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_svc_is_module_engaged(axis2_svc_t *svc,
const axutil_env_t *env,
- axis2_qname_t *module_qname)
+ axutil_qname_t *module_qname)
{
int i = 0, size = 0;
size = axutil_array_list_size(svc->engaged_modules, env);
for (i = 0; i < size; i++)
{
- const axis2_qname_t *module_qname_l = NULL;
+ const axutil_qname_t *module_qname_l = NULL;
axis2_module_desc_t *module_desc_l = NULL;
module_desc_l = (axis2_module_desc_t *) axutil_array_list_get(
svc->engaged_modules, env, i);
module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
- if (axis2_qname_equals(module_qname, env, module_qname_l))
+ if (axutil_qname_equals(module_qname, env, module_qname_l))
{
return AXIS2_TRUE;
}
@@ -746,7 +746,7 @@
if (svc->qname)
{
- return axis2_qname_get_localpart(svc->qname, env);
+ return axutil_qname_get_localpart(svc->qname, env);
}
return NULL;
@@ -865,14 +865,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_add_module_qname(axis2_svc_t *svc,
const axutil_env_t *env,
- const axis2_qname_t *module_qname)
+ const axutil_qname_t *module_qname)
{
- axis2_qname_t *qmodule_qname_l = NULL;
+ axutil_qname_t *qmodule_qname_l = NULL;
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 = axutil_qname_clone((axutil_qname_t *)module_qname, env);
return axutil_array_list_add(svc->module_list, env,
qmodule_qname_l);
}
@@ -1025,7 +1025,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_svc_get_param_container(const axis2_svc_t *svc,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Fri Mar 30 12:24:00 2007
@@ -31,7 +31,7 @@
/** list of module references */
axutil_array_list_t *module_list;
/** parameter container to hold service related parameters */
- axis2_param_container_t *param_container;
+ axutil_param_container_t *param_container;
};
AXIS2_EXTERN axis2_svc_grp_t *AXIS2_CALL
@@ -56,7 +56,7 @@
svc_grp->svc_grp_name = NULL;
svc_grp->module_list = NULL;
- svc_grp->param_container = axis2_param_container_create(env);
+ svc_grp->param_container = axutil_param_container_create(env);
if (!svc_grp->param_container)
{
axis2_svc_grp_free(svc_grp, env);
@@ -118,7 +118,7 @@
if (svc_grp->param_container)
{
- axis2_param_container_free(svc_grp->param_container,
+ axutil_param_container_free(svc_grp->param_container,
env);
}
@@ -186,7 +186,7 @@
{
axis2_phase_resolver_t *handler_resolver = NULL;
axis2_status_t status = AXIS2_FAILURE;
- const axis2_qname_t *svc_qname = NULL;
+ const axutil_qname_t *svc_qname = NULL;
axis2_char_t *svc_name = NULL;
AXIS2_ENV_CHECK(env, 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 = axutil_qname_to_string((axutil_qname_t *)svc_qname, env);
axutil_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, svc);
handler_resolver = axis2_phase_resolver_create_with_config_and_svc(env,
@@ -249,14 +249,14 @@
axis2_svc_grp_get_svc(
const axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
axis2_char_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
- name = axis2_qname_to_string((axis2_qname_t *)qname, env);
+ name = axutil_qname_to_string((axutil_qname_t *)qname, env);
return (axis2_svc_t *) axutil_hash_get(svc_grp->svcs, name,
AXIS2_HASH_KEY_STRING);
}
@@ -273,7 +273,7 @@
axis2_svc_grp_remove_svc(
axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
- const axis2_qname_t *svc_qname)
+ const axutil_qname_t *svc_qname)
{
axis2_svc_t *svc = NULL;
axis2_char_t *svc_name = NULL;
@@ -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 = axutil_qname_to_string((axutil_qname_t *)svc_qname, env);
axutil_hash_set(svc_grp->svcs, svc_name,
AXIS2_HASH_KEY_STRING, NULL);
@@ -294,13 +294,13 @@
axis2_svc_grp_add_param(
axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
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)))
+ axutil_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -308,23 +308,23 @@
}
else
{
- return axis2_param_container_add_param(svc_grp->param_container, env, param);
+ return axutil_param_container_add_param(svc_grp->param_container, env, param);
}
return AXIS2_FAILURE;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_svc_grp_get_param(
const axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
const axis2_char_t *name)
{
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
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 = axutil_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 axutil_param_container_get_params(svc_grp->param_container, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -350,7 +350,7 @@
{
axis2_bool_t locked = AXIS2_FALSE;
axis2_conf_t *parent = NULL;
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
axis2_bool_t ret = AXIS2_FALSE;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -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 == axutil_param_is_locked(param, env))
{
ret = AXIS2_TRUE;
}
@@ -382,7 +382,7 @@
axis2_svc_grp_add_module_qname(
axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
- const axis2_qname_t *module_qname)
+ const axutil_qname_t *module_qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -417,11 +417,11 @@
axis2_svc_grp_engage_module(
axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
- const axis2_qname_t *module_name)
+ const axutil_qname_t *module_name)
{
int i = 0;
axis2_status_t status = AXIS2_FAILURE;
- axis2_qname_t *modu = NULL;
+ axutil_qname_t *modu = NULL;
axis2_char_t *modu_local = NULL;
axis2_char_t *module_name_local = NULL;
axutil_hash_t *svc_map = NULL;
@@ -441,8 +441,8 @@
for (i = 0; size; i++)
{
modu = axutil_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);
+ modu_local = axutil_qname_get_localpart(modu, env);
+ module_name_local = axutil_qname_get_localpart(module_name, env);
if (0 == axis2_strcmp(modu_local, module_name_local))
{
AXIS2_ERROR_SET(env->error,
@@ -511,7 +511,7 @@
axis2_svc_grp_add_module_ref(
axis2_svc_grp_t *svc_grp,
const axutil_env_t *env,
- const axis2_qname_t *moduleref)
+ const axutil_qname_t *moduleref)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, moduleref, AXIS2_FAILURE);
@@ -552,7 +552,7 @@
return svc_grp_ctx;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_svc_grp_get_param_container(const axis2_svc_grp_t *svc_grp,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Fri Mar 30 12:24:00 2007
@@ -31,7 +31,7 @@
axis2_phase_t *in_phase;
axis2_phase_t *fault_phase;
/** parameter container to hold transport in related parameters */
- axis2_param_container_t *param_container;
+ axutil_param_container_t *param_container;
};
AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
@@ -59,7 +59,7 @@
transport_in->recv = NULL;
transport_in->param_container = NULL;
- transport_in->param_container = axis2_param_container_create(env);
+ transport_in->param_container = axutil_param_container_create(env);
if (! transport_in->param_container)
{
axis2_transport_in_desc_free(transport_in, env);
@@ -84,7 +84,7 @@
if (transport_in->param_container)
{
- axis2_param_container_free(transport_in->param_container, env);
+ axutil_param_container_free(transport_in->param_container, env);
}
if (transport_in->in_flow)
@@ -270,23 +270,23 @@
axis2_status_t AXIS2_CALL
axis2_transport_in_desc_add_param(axis2_transport_in_desc_t *transport_in_desc,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
- return axis2_param_container_add_param(transport_in_desc->
+ return axutil_param_container_add_param(transport_in_desc->
param_container, env, param);
}
-axis2_param_t *AXIS2_CALL
+axutil_param_t *AXIS2_CALL
axis2_transport_in_desc_get_param(const axis2_transport_in_desc_t *transport_in_desc,
const axutil_env_t *env,
const axis2_char_t *param_name)
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_param_container_get_param(transport_in_desc->param_container,
+ return axutil_param_container_get_param(transport_in_desc->param_container,
env, param_name);
}
@@ -299,11 +299,11 @@
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 axutil_param_container_is_param_locked(transport_in_desc->
param_container, env, param_name);
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_transport_in_desc_param_container(const axis2_transport_in_desc_t *transport_in_desc,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Fri Mar 30 12:24:00 2007
@@ -26,7 +26,7 @@
axis2_phase_t *out_phase;
axis2_phase_t *fault_phase;
/** parameter container that holds parameter */
- axis2_param_container_t *param_container;
+ axutil_param_container_t *param_container;
};
AXIS2_EXTERN axis2_transport_out_desc_t *AXIS2_CALL
@@ -54,7 +54,7 @@
transport_out->sender = NULL;
transport_out->param_container = NULL;
- transport_out->param_container = axis2_param_container_create(env);
+ transport_out->param_container = axutil_param_container_create(env);
if (! transport_out->param_container)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -78,7 +78,7 @@
if (transport_out->param_container)
{
- axis2_param_container_free(transport_out->param_container, env);
+ axutil_param_container_free(transport_out->param_container, env);
}
if (transport_out->out_flow)
@@ -263,23 +263,23 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_add_param(axis2_transport_out_desc_t *transport_out_desc,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
- return axis2_param_container_add_param(transport_out_desc->
+ return axutil_param_container_add_param(transport_out_desc->
param_container, env, param);
}
-axis2_param_t *AXIS2_CALL
+axutil_param_t *AXIS2_CALL
axis2_transport_out_desc_get_param(const axis2_transport_out_desc_t *transport_out_desc,
const axutil_env_t *env,
const axis2_char_t *param_name)
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_param_container_get_param(transport_out_desc->param_container,
+ return axutil_param_container_get_param(transport_out_desc->param_container,
env, param_name);
}
@@ -292,11 +292,11 @@
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 axutil_param_container_is_param_locked(transport_out_desc->
param_container, env, param_name);
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_transport_out_desc_param_container(const axis2_transport_out_desc_t *transport_out_desc,
const axutil_env_t *env)
{
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <axis2_disp.h>
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_relates_to.h>
#include <axis2_svc.h>
#include <axis2_const.h>
@@ -50,11 +50,11 @@
{
axis2_disp_t *disp = NULL;
axis2_handler_t *handler = NULL;
- axis2_string_t *name = NULL;
+ axutil_string_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- name = axis2_string_create_const(env, (axis2_char_t**)&AXIS2_ADDR_DISP_NAME);
+ name = axutil_string_create_const(env, (axis2_char_t**)&AXIS2_ADDR_DISP_NAME);
if (!name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -65,7 +65,7 @@
if (!disp)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- axis2_string_free(name, env);
+ axutil_string_free(name, env);
return NULL;
}
@@ -73,13 +73,13 @@
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
- axis2_string_free(name, env);
+ axutil_string_free(name, env);
return NULL;
}
handler->ops->invoke = axis2_addr_disp_invoke;
- axis2_string_free(name, env);
+ axutil_string_free(name, env);
return disp;
}
@@ -161,7 +161,7 @@
axis2_svc_t *svc)
{
const axis2_char_t *action = NULL;
- axis2_qname_t *name = NULL;
+ axutil_qname_t *name = NULL;
axis2_op_t *op = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -174,12 +174,12 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Checking for operation using WSA Action : %s", action);
- name = axis2_qname_create(env, action, NULL, NULL);
+ name = axutil_qname_create(env, action, NULL, NULL);
op = axis2_svc_get_op_with_qname(svc, env, name);
if (op)
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Operation found using WSA Action");
- axis2_qname_free(name, env);
+ axutil_qname_free(name, env);
}
return op;
@@ -238,10 +238,10 @@
svc_grp_ctx = axis2_svc_ctx_get_parent(svc_ctx, env);
if (svc_grp_ctx)
{
- axis2_string_t *svc_grp_ctx_id_str =
- axis2_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
+ axutil_string_t *svc_grp_ctx_id_str =
+ axutil_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
- axis2_string_free(svc_grp_ctx_id_str, env);
+ axutil_string_free(svc_grp_ctx_id_str, env);
}
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/axis2_disp_checker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/axis2_disp_checker.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/axis2_disp_checker.h (original)
+++ webservices/axis2/trunk/c/modules/core/engine/axis2_disp_checker.h Fri Mar 30 12:24:00 2007
@@ -30,7 +30,7 @@
*/
#include <axis2_defines.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_handler.h>
#ifdef __cplusplus
@@ -59,7 +59,7 @@
* @return returns a pointer to the QName, returns a reference not a
* cloned copy
*/
- AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axis2_disp_checker_get_name(const axis2_disp_checker_t *disp_checker,
const axutil_env_t *env);
@@ -73,7 +73,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_disp_checker_set_name(axis2_disp_checker_t *disp_checker,
const axutil_env_t *env,
- const axis2_string_t *name);
+ const axutil_string_t *name);
/**
* Frees dispatcher checker.
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org