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 [4/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/axis2_desc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h Fri Mar 30 12:24:00 2007
@@ -35,7 +35,7 @@
#include <axiom_document.h>
#include <axiom_element.h>
#include <axiom_node.h>
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
#include <axis2_handler_desc.h>
#include <axiom_attribute.h>
#include <axiom_xml_reader.h>
@@ -91,7 +91,7 @@
axis2_desc_builder_process_flow(axis2_desc_builder_t *desc_builder,
const axutil_env_t *env,
axiom_element_t *flow_element,
- axis2_param_container_t *parent,
+ axutil_param_container_t *parent,
axiom_node_t *node);
/**
@@ -106,22 +106,22 @@
axis2_desc_builder_process_handler(axis2_desc_builder_t *desc_builder,
const axutil_env_t *env,
axiom_node_t *handler_element,
- axis2_param_container_t *parent);
+ axutil_param_container_t *parent);
/**
* To get the Param out from the OM
* @param desc_builder pointer to desc builder
* @param env pointer to environment struct
- * @param params <code>axis2_param_t</code>
- * @param param_container <code>axis2_param_container_t</code>
- * @param parent <code>axis2_param_container_t</code>
+ * @param params <code>axutil_param_t</code>
+ * @param param_container <code>axutil_param_container_t</code>
+ * @param parent <code>axutil_param_container_t</code>
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_desc_builder_process_params(axis2_desc_builder_t *desc_builder,
const axutil_env_t *env,
axiom_children_qname_iterator_t *params,
- axis2_param_container_t *param_container,
- axis2_param_container_t *parent );
+ axutil_param_container_t *param_container,
+ axutil_param_container_t *parent );
/**
* @param desc_builder pointer to desc builder
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_module_desc.h>
#include <axis2_dep_engine.h>
#include <axis2_desc_builder.h>
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axutil_array_list.h>
#include "axis2_ws_info_list.h"
#include "axis2_dep_engine.h"
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_desc_builder.h>
#include <axis2_addr.h>
#include <axis2_dep_engine.h>
@@ -74,7 +74,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);
/**
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h Fri Mar 30 12:24:00 2007
@@ -32,7 +32,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_desc_builder.h>
#include <axis2_svc_builder.h>
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_conf.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Fri Mar 30 12:24:00 2007
@@ -33,7 +33,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_conf.h>
#include "axis2_deployment.h"
#include <axutil_file_handler.h>
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Fri Mar 30 12:24:00 2007
@@ -129,14 +129,14 @@
axis2_conf_builder_populate_conf(axis2_conf_builder_t *conf_builder,
const axutil_env_t *env)
{
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qmsgrecv = NULL;
- axis2_qname_t *qdisporder = NULL;
- axis2_qname_t *qmodulest = NULL;
- axis2_qname_t *qtransportsender = NULL;
- axis2_qname_t *qtransportrecv = NULL;
- axis2_qname_t *qphaseorder = NULL;
- axis2_qname_t *qdefmodver = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qmsgrecv = NULL;
+ axutil_qname_t *qdisporder = NULL;
+ axutil_qname_t *qmodulest = NULL;
+ axutil_qname_t *qtransportsender = NULL;
+ axutil_qname_t *qtransportrecv = NULL;
+ axutil_qname_t *qphaseorder = NULL;
+ axutil_qname_t *qdefmodver = NULL;
axiom_children_qname_iterator_t *itr = NULL;
axiom_children_qname_iterator_t *msg_recvs = NULL;
axiom_children_qname_iterator_t *module_itr = NULL;
@@ -149,7 +149,7 @@
axiom_element_t *disp_order_element = NULL;
axiom_node_t *disp_order_node = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -161,25 +161,25 @@
conf_element = AXIOM_NODE_GET_DATA_ELEMENT(conf_node, env);
/* processing Paramters */
/* Processing service level paramters */
- 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(conf_element, env, qparamst,
conf_node);
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
axis2_desc_builder_process_params(conf_builder->desc_builder, env, itr,
axis2_conf_get_param_container(conf_builder->conf, env),
axis2_conf_get_param_container(conf_builder->conf, env));
/* process Message Reciver */
- qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
+ qmsgrecv = axutil_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
msg_recvs = axiom_element_get_children_with_qname(conf_element, env,
qmsgrecv, conf_node);
- axis2_qname_free(qmsgrecv, env);
+ axutil_qname_free(qmsgrecv, env);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(msg_recvs, env))
{
axiom_node_t *msg_recv_node = NULL;
axiom_element_t *msg_recv_element = NULL;
axis2_msg_recv_t *msg_recv = NULL;
axiom_attribute_t *mep_att = NULL;
- axis2_qname_t *qmep = NULL;
+ axutil_qname_t *qmep = NULL;
axis2_char_t *att_value = NULL;
msg_recv_node = (axiom_node_t *)
@@ -192,18 +192,18 @@
{
return AXIS2_FAILURE;
}
- qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
+ qmep = axutil_qname_create(env, AXIS2_MEP, NULL, NULL);
mep_att = axiom_element_get_attribute(msg_recv_element, env, qmep);
att_value = axiom_attribute_get_value(mep_att, env);
axis2_conf_add_msg_recv(conf_builder->conf, env, att_value, msg_recv);
- axis2_qname_free(qmep, env);
+ axutil_qname_free(qmep, env);
}
/* processing Dispatching Order */
- qdisporder = axis2_qname_create(env, AXIS2_DISPATCH_ORDER, NULL, NULL);
+ qdisporder = axutil_qname_create(env, AXIS2_DISPATCH_ORDER, NULL, NULL);
disp_order_element = axiom_element_get_first_child_with_qname(
conf_element, env, qdisporder, conf_node, &disp_order_node);
- axis2_qname_free(qdisporder, env);
+ axutil_qname_free(qdisporder, env);
if (disp_order_element)
{
axis2_conf_builder_process_disp_order(conf_builder, env, disp_order_node);
@@ -222,42 +222,42 @@
}
/* 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(conf_element, env,
qmodulest, conf_node);
- axis2_qname_free(qmodulest, env);
+ axutil_qname_free(qmodulest, env);
status = axis2_conf_builder_process_module_refs(conf_builder, env, module_itr);
if (AXIS2_SUCCESS != status)
{
return AXIS2_FAILURE;
}
/* Proccessing Transport Sennders */
- qtransportsender = axis2_qname_create(env, AXIS2_TRANSPORTSENDER, NULL, NULL);
+ qtransportsender = axutil_qname_create(env, AXIS2_TRANSPORTSENDER, NULL, NULL);
trs_senders = axiom_element_get_children_with_qname(conf_element, env,
qtransportsender, conf_node);
- axis2_qname_free(qtransportsender, env);
+ axutil_qname_free(qtransportsender, env);
axis2_conf_builder_process_transport_senders(conf_builder, env, trs_senders);
/* Proccessing Transport Recivers */
- qtransportrecv = axis2_qname_create(env, AXIS2_TRANSPORTRECEIVER, NULL, NULL);
+ qtransportrecv = axutil_qname_create(env, AXIS2_TRANSPORTRECEIVER, NULL, NULL);
trs_recvs = axiom_element_get_children_with_qname(conf_element, env,
qtransportrecv, conf_node);
- axis2_qname_free(qtransportrecv, env);
+ axutil_qname_free(qtransportrecv, env);
axis2_conf_builder_process_transport_recvs(conf_builder, env, trs_recvs);
/* processing Phase orders */
- qphaseorder = axis2_qname_create(env, AXIS2_PHASE_ORDER, NULL, NULL);
+ qphaseorder = axutil_qname_create(env, AXIS2_PHASE_ORDER, NULL, NULL);
phase_orders = axiom_element_get_children_with_qname(conf_element, env,
qphaseorder, conf_node);
- axis2_qname_free(qphaseorder, env);
+ axutil_qname_free(qphaseorder, env);
axis2_conf_builder_process_phase_orders(conf_builder, env, phase_orders);
/* Processing default module versions */
- qdefmodver = axis2_qname_create(env, AXIS2_DEFAULT_MODULE_VERSION, NULL,
+ qdefmodver = axutil_qname_create(env, AXIS2_DEFAULT_MODULE_VERSION, NULL,
NULL);
def_mod_versions = axiom_element_get_children_with_qname(conf_element,
env, qdefmodver, conf_node);
- axis2_qname_free(qdefmodver, env);
+ axutil_qname_free(qdefmodver, env);
if (def_mod_versions)
{
status = axis2_conf_builder_process_default_module_versions(conf_builder,
@@ -269,13 +269,13 @@
}
/* TODO processing Axis Storages */
- param = axis2_param_container_get_param(
+ param = axutil_param_container_get_param(
axis2_conf_get_param_container(conf_builder->conf, env),
env, AXIS2_ENABLE_MTOM);
if (param)
{
axis2_char_t *value = NULL;
- value = axis2_param_get_value(param, env);
+ value = axutil_param_get_value(param, env);
if (value)
{
axis2_conf_set_enable_mtom(conf_builder->conf, env,
@@ -301,7 +301,7 @@
{
axiom_node_t *module_ref_node = NULL;
axiom_element_t *module_ref_element = NULL;
- axis2_qname_t *qref = NULL;
+ axutil_qname_t *qref = NULL;
axiom_attribute_t *module_ref_att = NULL;
module_ref_node = (axiom_node_t *)
@@ -311,28 +311,28 @@
return AXIS2_FAILURE;
}
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 (qref)
{
- axis2_qname_free(qref, env);
+ axutil_qname_free(qref, env);
}
if (module_ref_att)
{
- axis2_qname_t *qrefname = NULL;
+ axutil_qname_t *qrefname = NULL;
axis2_char_t *ref_name = NULL;
ref_name = axiom_attribute_get_value(module_ref_att, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module %s found in axis2.xml",
ref_name);
- qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
+ qrefname = axutil_qname_create(env, ref_name, NULL, NULL);
status = axis2_dep_engine_add_module(
axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
env, qrefname);
if (qrefname)
{
- axis2_qname_free(qrefname, env);
+ axutil_qname_free(qrefname, env);
}
}
}
@@ -346,7 +346,7 @@
{
axiom_element_t *disp_order_element = NULL;
axiom_children_qname_iterator_t *disps = NULL;
- axis2_qname_t *qdisp = NULL;
+ axutil_qname_t *qdisp = NULL;
axis2_bool_t found_disp = AXIS2_FALSE;
axis2_phase_t *disp_phase = NULL;
int count = 0;
@@ -357,10 +357,10 @@
AXIS2_PARAM_CHECK(env->error, disp_order_node, AXIS2_FAILURE);
disp_order_element = AXIOM_NODE_GET_DATA_ELEMENT(disp_order_node, env);
- qdisp = axis2_qname_create(env, AXIS2_DISPATCHER, NULL, NULL);
+ qdisp = axutil_qname_create(env, AXIS2_DISPATCHER, NULL, NULL);
disps = axiom_element_get_children_with_qname(disp_order_element,
env, qdisp, disp_order_node);
- axis2_qname_free(qdisp, env);
+ axutil_qname_free(qdisp, env);
disp_phase = axis2_phase_create(env, AXIS2_PHASE_DISPATCH);
if (! disp_phase)
{
@@ -378,19 +378,19 @@
axiom_attribute_t *disp_att = NULL;
axis2_char_t *class_name = NULL;
axis2_char_t *dll_name = NULL;
- axis2_qname_t *class_qname = NULL;
+ axutil_qname_t *class_qname = NULL;
axis2_disp_t *disp_dll = NULL;
axutil_dll_desc_t *dll_desc = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
axis2_handler_desc_t *handler_desc = NULL;
axis2_handler_t *handler = NULL;
found_disp = AXIS2_TRUE;
disp_node = (axiom_node_t *)
axiom_children_qname_iterator_next(disps, env);
- class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
+ class_qname = axutil_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
disp_att = axiom_element_get_attribute(disp_element, env, class_qname);
- axis2_qname_free(class_qname, env);
+ axutil_qname_free(class_qname, env);
if (!disp_att)
{
qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
@@ -406,14 +406,14 @@
* set full dll path here instead of dll lib name only */
axutil_dll_desc_set_name(dll_desc, env, dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
- impl_info_param = axis2_param_create(env, class_name, NULL);
+ impl_info_param = axutil_param_create(env, class_name, NULL);
if (!impl_info_param)
{
axis2_phase_free(disp_phase, env);
return AXIS2_FAILURE;
}
- axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env,
+ 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);
axutil_class_loader_init(env);
disp_dll = (axis2_disp_t *) axutil_class_loader_create_dll(env,
@@ -472,7 +472,7 @@
axiom_node_t *phase_orders_node = NULL;
axiom_element_t *phase_orders_element = NULL;
axiom_attribute_t *phase_orders_att = NULL;
- axis2_qname_t *qtype = NULL;
+ axutil_qname_t *qtype = NULL;
axis2_char_t *flow_type = NULL;
axutil_array_list_t *phase_list = NULL;
@@ -485,10 +485,10 @@
}
if (phase_orders_element)
{
- qtype = axis2_qname_create(env, AXIS2_TYPE, NULL, NULL);
+ qtype = axutil_qname_create(env, AXIS2_TYPE, NULL, NULL);
phase_orders_att = axiom_element_get_attribute(phase_orders_element,
env, qtype);
- axis2_qname_free(qtype, env);
+ axutil_qname_free(qtype, env);
}
if (phase_orders_att)
@@ -536,7 +536,7 @@
{
axutil_array_list_t *phase_list = NULL;
axiom_children_qname_iterator_t *phases = NULL;
- axis2_qname_t *qphase = NULL;
+ axutil_qname_t *qphase = NULL;
axiom_element_t *phase_orders_element;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -551,10 +551,10 @@
return NULL;
}
phase_list = axutil_array_list_create(env, 0);
- qphase = axis2_qname_create(env, AXIS2_PHASE, NULL, NULL);
+ qphase = axutil_qname_create(env, AXIS2_PHASE, NULL, NULL);
phases = axiom_element_get_children_with_qname(phase_orders_element, env,
qphase, phase_orders_node);
- axis2_qname_free(qphase, env);
+ axutil_qname_free(qphase, env);
if (!phases)
{
axutil_array_list_free(phase_list, env);
@@ -566,7 +566,7 @@
axiom_node_t *phase_node = NULL;
axiom_element_t *phase_element = NULL;
axiom_attribute_t *phase_att = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qattname = NULL;
axis2_char_t *att_value = NULL;
phase_node = (axiom_node_t *) axiom_children_qname_iterator_next(
@@ -577,7 +577,7 @@
phase_node, env);
}
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
if (phase_element)
{
phase_att = axiom_element_get_attribute(phase_element, env,
@@ -592,7 +592,7 @@
axutil_array_list_add(phase_list, env, att_value);
}
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
}
return phase_list;
}
@@ -614,7 +614,7 @@
axiom_node_t *transport_node = NULL;
axiom_element_t *transport_element = NULL;
axiom_attribute_t *trs_name = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qattname = NULL;
transport_node = (axiom_node_t *)
axiom_children_qname_iterator_next(trs_senders, env);
@@ -634,13 +634,13 @@
}
/* getting trsnport Name */
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
if (transport_element)
{
trs_name = axiom_element_get_attribute(transport_element, env,
qattname);
}
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
if (trs_name)
{
axis2_char_t *name = NULL;
@@ -648,12 +648,12 @@
axis2_char_t *dll_name = NULL;
axis2_char_t *class_name = NULL;
axiom_children_qname_iterator_t *itr = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qinflowst = NULL;
- axis2_qname_t *qoutflowst = NULL;
- axis2_qname_t *qinfaultflowst = NULL;
- axis2_qname_t *qoutfaultflowst = NULL;
- axis2_qname_t *qdllname = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qinflowst = NULL;
+ axutil_qname_t *qoutflowst = NULL;
+ axutil_qname_t *qinfaultflowst = NULL;
+ axutil_qname_t *qoutfaultflowst = NULL;
+ axutil_qname_t *qdllname = NULL;
axiom_element_t *in_flow_element = NULL;
axiom_node_t *in_flow_node = NULL;
axiom_element_t *out_flow_element = NULL;
@@ -663,7 +663,7 @@
axiom_element_t *out_fault_flow_element = NULL;
axiom_node_t *out_fault_flow_node = NULL;
axutil_dll_desc_t *dll_desc = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
void *transport_sender = NULL;
axis2_char_t *path_qualified_dll_name = NULL;
axis2_char_t *repos_name = NULL;
@@ -709,10 +709,10 @@
}
/* transport impl class */
- qdllname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
+ qdllname = axutil_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
trs_dll_att = axiom_element_get_attribute(transport_element, env,
qdllname);
- axis2_qname_free(qdllname, env);
+ axutil_qname_free(qdllname, env);
if (! trs_dll_att)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_TRANSPORT_SENDER_ERROR,
@@ -720,7 +720,7 @@
return AXIS2_FAILURE;
}
class_name = axiom_attribute_get_value(trs_dll_att, env);
- impl_info_param = axis2_param_create(env, class_name, NULL);
+ impl_info_param = axutil_param_create(env, class_name, NULL);
if (!impl_info_param)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -744,8 +744,8 @@
axutil_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
AXIS2_FREE(env->allocator, path_qualified_dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
- axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env,
+ 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);
axutil_class_loader_init(env);
transport_sender = axutil_class_loader_create_dll(env, impl_info_param);
@@ -761,10 +761,10 @@
/* Process Parameters */
/* Processing service level paramters */
- 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(transport_element,
env, qparamst, transport_node);
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
status = axis2_desc_builder_process_params(conf_builder->desc_builder, env,
itr,
axis2_transport_out_desc_param_container(transport_out, env),
@@ -775,11 +775,11 @@
return status;
}
/* 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(transport_element,
env, qinflowst, transport_node, &in_flow_node);
- axis2_qname_free(qinflowst, env);
+ axutil_qname_free(qinflowst, env);
if (in_flow_element)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -787,11 +787,11 @@
AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- 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(transport_element,
env, qoutflowst, transport_node, &out_flow_node);
- axis2_qname_free(qoutflowst, env);
+ axutil_qname_free(qoutflowst, env);
if (out_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -809,13 +809,13 @@
}
/* process IN FAULT FLOW */
- qinfaultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL,
+ qinfaultflowst = axutil_qname_create(env, AXIS2_IN_FAILTFLOW, NULL,
NULL);
in_fault_flow_element =
axiom_element_get_first_child_with_qname(transport_element,
env, qinfaultflowst, transport_node,
&in_fault_flow_node);
- axis2_qname_free(qinfaultflowst, env);
+ axutil_qname_free(qinfaultflowst, env);
if (in_fault_flow_element)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -824,13 +824,13 @@
return AXIS2_FAILURE;
}
- qoutfaultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL,
+ qoutfaultflowst = axutil_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL,
NULL);
out_fault_flow_element =
axiom_element_get_first_child_with_qname(transport_element,
env, qoutfaultflowst, transport_node,
&out_fault_flow_node);
- axis2_qname_free(qoutfaultflowst, env);
+ axutil_qname_free(qoutfaultflowst, env);
if (out_fault_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -880,7 +880,7 @@
axiom_node_t *transport_node = NULL;
axiom_element_t *transport_element = NULL;
axiom_attribute_t *trs_name = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qattname = NULL;
transport_node = (axiom_node_t *)
axiom_children_qname_iterator_next(trs_recvs, env);
@@ -899,22 +899,22 @@
}
/* getting transport Name */
- qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
trs_name = axiom_element_get_attribute(transport_element, env,
qattname);
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
if (trs_name)
{
axis2_char_t *name = NULL;
axiom_attribute_t *trs_class_name = NULL;
axiom_children_qname_iterator_t *itr = NULL;
- axis2_qname_t *class_qname = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qinflowst = NULL;
- axis2_qname_t *qoutflowst = NULL;
- axis2_qname_t *qinfaultflowst = NULL;
- axis2_qname_t *qoutfaultflowst = NULL;
+ axutil_qname_t *class_qname = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qinflowst = NULL;
+ axutil_qname_t *qoutflowst = NULL;
+ axutil_qname_t *qinfaultflowst = NULL;
+ axutil_qname_t *qoutfaultflowst = NULL;
axiom_element_t *in_flow_element = NULL;
axiom_node_t *in_flow_node = NULL;
axiom_element_t *out_flow_element = NULL;
@@ -962,17 +962,17 @@
}
/* transport impl class */
- class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
+ class_qname = axutil_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
trs_class_name = axiom_element_get_attribute(transport_element, env,
class_qname);
- axis2_qname_free(class_qname, env);
+ axutil_qname_free(class_qname, env);
if (trs_class_name)
{
axis2_char_t *class_name = NULL;
axis2_char_t *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_transport_receiver_t *recv = NULL;
axis2_status_t stat = AXIS2_FAILURE;
axis2_char_t *path_qualified_dll_name = NULL;
@@ -982,7 +982,7 @@
axis2_char_t *temp_path3 = NULL;
class_name = axiom_attribute_get_value(trs_class_name, env);
- impl_info_param = axis2_param_create(env, class_name, NULL);
+ impl_info_param = axutil_param_create(env, class_name, NULL);
dll_desc = axutil_dll_desc_create(env);
dll_name =
axutil_dll_desc_create_platform_specific_dll_name(dll_desc,
@@ -1003,8 +1003,8 @@
AXIS2_FREE(env->allocator, path_qualified_dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
- axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env,
+ 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);
axutil_class_loader_init(env);
recv = (axis2_transport_receiver_t *)
@@ -1018,10 +1018,10 @@
/* process Parameters */
/* processing Paramters */
/* Processing service level paramters */
- 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(transport_element,
env, qparamst, transport_node);
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
status = axis2_desc_builder_process_params(conf_builder->desc_builder, env,
itr,
axis2_transport_in_desc_param_container(transport_in, env),
@@ -1032,10 +1032,10 @@
return status;
}
/* process OUT_FLOW */
- 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(transport_element,
env, qoutflowst, transport_node, &out_flow_node);
- axis2_qname_free(qoutflowst, env);
+ axutil_qname_free(qoutflowst, env);
if (out_flow_element)
{
axis2_transport_in_desc_free(transport_in, env);
@@ -1044,10 +1044,10 @@
return AXIS2_FAILURE;
}
- 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(
transport_element, env, qinflowst, transport_node, &in_flow_node);
- axis2_qname_free(qinflowst, env);
+ axutil_qname_free(qinflowst, env);
if (in_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -1065,13 +1065,13 @@
}
}
- qinfaultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL,
+ qinfaultflowst = axutil_qname_create(env, AXIS2_IN_FAILTFLOW, NULL,
NULL);
in_fault_flow_element =
axiom_element_get_first_child_with_qname(transport_element,
env, qinfaultflowst, transport_node,
&in_fault_flow_node);
- axis2_qname_free(qinfaultflowst, env);
+ axutil_qname_free(qinfaultflowst, env);
if (in_fault_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -1089,7 +1089,7 @@
}
}
- qoutfaultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL,
+ qoutfaultflowst = axutil_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL,
NULL);
out_fault_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qoutfaultflowst, transport_node,
@@ -1110,7 +1110,7 @@
return status;
}
- axis2_qname_free(qoutfaultflowst, env);
+ axutil_qname_free(qoutfaultflowst, env);
}
}
@@ -1130,7 +1130,7 @@
axiom_element_t *om_element = NULL;
axis2_char_t *name = NULL;
axis2_char_t *default_version = NULL;
- axis2_qname_t *attribute_qname = NULL;
+ axutil_qname_t *attribute_qname = NULL;
om_element = (axiom_element_t *)
axiom_children_qname_iterator_next(module_versions, env);
@@ -1138,20 +1138,20 @@
{
continue;
}
- attribute_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ attribute_qname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
if (! attribute_qname)
{
continue;
}
name = axiom_element_get_attribute_value(om_element, env,
attribute_qname);
- axis2_qname_free(attribute_qname, env);
+ axutil_qname_free(attribute_qname, env);
attribute_qname = NULL;
if (! name)
{
return AXIS2_FAILURE;
}
- attribute_qname = axis2_qname_create(env,
+ attribute_qname = axutil_qname_create(env,
AXIS2_ATTRIBUTE_DEFAULT_VERSION, NULL, NULL);
if (! attribute_qname)
{
@@ -1159,7 +1159,7 @@
}
default_version = axiom_element_get_attribute_value(om_element, env,
attribute_qname);
- axis2_qname_free(attribute_qname, env);
+ axutil_qname_free(attribute_qname, env);
attribute_qname = NULL;
if (! default_version)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Mar 30 12:24:00 2007
@@ -27,7 +27,7 @@
#include <axis2_svc_grp_builder.h>
#include <axiom_node.h>
#include <axutil_class_loader.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_utils.h>
#include <axis2_core_utils.h>
#include <axis2_module.h>
@@ -417,11 +417,11 @@
for (i = 0; i < size; i++)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
qname = axutil_array_list_get(dep_engine->module_list, env, i);
if (qname)
{
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
}
}
axutil_array_list_free(dep_engine->module_list, env);
@@ -456,20 +456,20 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_dep_engine_add_module(axis2_dep_engine_t *dep_engine,
const axutil_env_t *env,
- axis2_qname_t *module_qname)
+ axutil_qname_t *module_qname)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
- qname = axis2_qname_clone(module_qname, env);
+ qname = axutil_qname_clone(module_qname, env);
if (!dep_engine->module_list)
{
dep_engine->module_list = axutil_array_list_create(env, 0);
if (!dep_engine->module_list)
{
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
return AXIS2_FAILURE;
}
}
@@ -479,7 +479,7 @@
struct axis2_module_desc *AXIS2_CALL
axis2_dep_engine_get_module(const axis2_dep_engine_t *dep_engine,
const axutil_env_t *env,
- axis2_qname_t *module_name)
+ axutil_qname_t *module_name)
{
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
@@ -540,8 +540,8 @@
const axutil_env_t *env)
{
axis2_char_t *value = NULL;
- axis2_param_t *para_hot_dep = NULL;
- axis2_param_t *para_hot_update = NULL;
+ axutil_param_t *para_hot_dep = NULL;
+ axutil_param_t *para_hot_update = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -552,7 +552,7 @@
if (para_hot_dep)
{
- value = (axis2_char_t *) axis2_param_get_value(para_hot_dep, env);
+ value = (axis2_char_t *) axutil_param_get_value(para_hot_dep, env);
if (0 == axis2_strcasecmp("false", value))
{
dep_engine->hot_dep = AXIS2_FALSE;
@@ -560,7 +560,7 @@
}
if (para_hot_update)
{
- value = (axis2_char_t *) axis2_param_get_value(para_hot_update, env);
+ value = (axis2_char_t *) axutil_param_get_value(para_hot_update, env);
if (0 == axis2_strcasecmp("false", value))
{
dep_engine->hot_update = AXIS2_FALSE;
@@ -824,8 +824,8 @@
for (i = 0; i < size; i++)
{
- axis2_qname_t *qname = NULL;
- qname = (axis2_qname_t *)
+ axutil_qname_t *qname = NULL;
+ qname = (axutil_qname_t *)
axutil_array_list_get(dep_engine->module_list, env, i);
if (qname && dep_engine->conf)
{
@@ -919,9 +919,9 @@
for (j = 0; j < sizej; j++)
{
axis2_module_desc_t *module_desc = NULL;
- axis2_qname_t *qmodulename = NULL;
+ axutil_qname_t *qmodulename = NULL;
- qmodulename = (axis2_qname_t *) axutil_array_list_get(grp_modules,
+ qmodulename = (axutil_qname_t *) axutil_array_list_get(grp_modules,
env, j);
module_desc = axis2_conf_get_module(dep_engine->conf, env,
qmodulename);
@@ -945,9 +945,9 @@
for (j = 0; j < sizej; j++)
{
axis2_module_desc_t *module_desc = NULL;
- axis2_qname_t *qmodulename = NULL;
+ axutil_qname_t *qmodulename = NULL;
- qmodulename = (axis2_qname_t *) axutil_array_list_get(list,
+ qmodulename = (axutil_qname_t *) axutil_array_list_get(list,
env, j);
module_desc = axis2_conf_get_module(dep_engine->conf, env,
qmodulename);
@@ -990,10 +990,10 @@
}
for (k = 0; k < sizek; k++)
{
- axis2_qname_t *module_qname = NULL;
+ axutil_qname_t *module_qname = NULL;
axis2_module_desc_t *module = NULL;
- module_qname = (axis2_qname_t *) axutil_array_list_get(modules,
+ module_qname = (axutil_qname_t *) axutil_array_list_get(modules,
env, k);
module = axis2_conf_get_module(dep_engine->conf, env,
module_qname);
@@ -1024,7 +1024,7 @@
axis2_char_t *read_in_dll = NULL;
axis2_module_t *module = NULL;
axutil_dll_desc_t *dll_desc = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
axutil_file_t *module_folder = NULL;
AXIS2_TIME_T timestamp = 0;
axis2_char_t *module_folder_path = NULL;
@@ -1063,9 +1063,9 @@
dll_path = NULL;
axutil_dll_desc_set_type(dll_desc, env, AXIS2_MODULE_DLL);
- impl_info_param = axis2_param_create(env, read_in_dll, NULL);
- axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env, axutil_dll_desc_free_void_arg);
+ impl_info_param = axutil_param_create(env, read_in_dll, NULL);
+ 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);
axutil_class_loader_init(env);
module = (axis2_module_t *) axutil_class_loader_create_dll(env,
impl_info_param);
@@ -1096,13 +1096,13 @@
{
axis2_handler_desc_t *handlermd = NULL;
axis2_handler_t *handler = NULL;
- const axis2_string_t *handler_name = NULL;
+ const axutil_string_t *handler_name = NULL;
AXIS2_HANDLER_CREATE_FUNC handler_create_func = NULL;
handlermd = axis2_flow_get_handler(flow, env, j);
handler_name = axis2_handler_desc_get_name(handlermd, env);
handler_create_func = axutil_hash_get(handler_create_func_map,
- axis2_string_get_buffer(handler_name, env), AXIS2_HASH_KEY_STRING);
+ axutil_string_get_buffer(handler_name, env), AXIS2_HASH_KEY_STRING);
handler = handler_create_func(env, handler_name);
AXIS2_HANDLER_INIT(handler, env, handlermd);
axis2_handler_desc_set_handler(handlermd, env, handler);
@@ -1116,7 +1116,7 @@
axis2_char_t *class_name)
{
axutil_dll_desc_t *dll_desc = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
axis2_handler_t *handler = NULL;
axis2_char_t *dll_name = NULL;
@@ -1131,8 +1131,8 @@
axutil_dll_desc_set_name(dll_desc, env, dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axutil_class_loader_init(env);
- impl_info_param = axis2_param_create(env, NULL, NULL);
- axis2_param_set_value(impl_info_param, env, dll_desc);
+ impl_info_param = axutil_param_create(env, NULL, NULL);
+ axutil_param_set_value(impl_info_param, env, dll_desc);
handler = (axis2_handler_t *) axutil_class_loader_create_dll(env,
impl_info_param);
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_desc_builder.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axutil_class_loader.h>
#include <axis2_utils.h>
#include <axutil_generic_obj.h>
@@ -33,7 +33,7 @@
};
static axis2_status_t
-set_attrs_and_value(axis2_param_t *param,
+set_attrs_and_value(axutil_param_t *param,
const axutil_env_t *env,
axiom_element_t *param_element,
axiom_node_t *param_node);
@@ -197,12 +197,12 @@
axis2_desc_builder_process_flow(axis2_desc_builder_t *desc_builder,
const axutil_env_t *env,
axiom_element_t *flow_element,
- axis2_param_container_t *parent,
+ axutil_param_container_t *parent,
axiom_node_t *flow_node)
{
axis2_flow_t *flow = NULL;
axiom_children_qname_iterator_t *handlers = NULL;
- axis2_qname_t *qchild = NULL;
+ axutil_qname_t *qchild = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, parent, NULL);
@@ -220,12 +220,12 @@
return NULL;
}
- qchild = axis2_qname_create(env, AXIS2_HANDLERST, NULL, NULL);
+ qchild = axutil_qname_create(env, AXIS2_HANDLERST, NULL, NULL);
handlers = axiom_element_get_children_with_qname(flow_element, env,
qchild, flow_node);
if (qchild)
{
- axis2_qname_free(qchild, env);
+ axutil_qname_free(qchild, env);
}
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(handlers , env))
@@ -254,19 +254,19 @@
axis2_desc_builder_process_handler(axis2_desc_builder_t *desc_builder,
const axutil_env_t *env,
axiom_node_t *handler_node,
- struct axis2_param_container *parent)
+ struct axutil_param_container *parent)
{
axis2_handler_desc_t *handler_desc = NULL;
axiom_attribute_t *name_attrib = NULL;
- axis2_qname_t *attr_qname = NULL;
+ axutil_qname_t *attr_qname = NULL;
axiom_attribute_t *class_attrib = NULL;
- axis2_qname_t *class_qname = NULL;
+ axutil_qname_t *class_qname = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_char_t *attrib_value = NULL;
axiom_element_t *handler_element = NULL;
axiom_node_t *order_node = NULL;
axiom_element_t *order_element = NULL;
- axis2_qname_t *order_qname = NULL;
+ axutil_qname_t *order_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, handler_node, NULL);
@@ -278,13 +278,13 @@
return NULL;
}
/* Setting Handler name */
- attr_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ attr_qname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
handler_element = AXIOM_NODE_GET_DATA_ELEMENT(handler_node, env);
name_attrib = axiom_element_get_attribute(handler_element, env,
attr_qname);
if (attr_qname)
{
- axis2_qname_free(attr_qname, env);
+ axutil_qname_free(attr_qname, env);
}
if (!name_attrib)
@@ -296,15 +296,15 @@
}
else
{
- axis2_string_t *handler_name = NULL;
+ axutil_string_t *handler_name = NULL;
axis2_char_t *value = NULL;
value = axiom_attribute_get_value(name_attrib, env);
- handler_name = axis2_string_create(env, value);
+ handler_name = axutil_string_create(env, value);
status = axis2_handler_desc_set_name(handler_desc, env, handler_name);
if (handler_name)
{
- axis2_string_free(handler_name, env);
+ axutil_string_free(handler_name, env);
}
if (AXIS2_SUCCESS != status)
@@ -315,12 +315,12 @@
}
/*Setting Handler Class name */
- class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
+ class_qname = axutil_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
class_attrib = axiom_element_get_attribute(handler_element, env,
class_qname);
if (class_qname)
{
- axis2_qname_free(class_qname, env);
+ axutil_qname_free(class_qname, env);
}
if (! class_attrib)
@@ -338,12 +338,12 @@
/*processing phase Rules (order) */
- order_qname = axis2_qname_create(env, AXIS2_ORDER, NULL, NULL);
+ order_qname = axutil_qname_create(env, AXIS2_ORDER, NULL, NULL);
order_element = axiom_element_get_first_child_with_qname(handler_element,
env, order_qname, handler_node, &order_node);
if (order_qname)
{
- axis2_qname_free(order_qname, env);
+ axutil_qname_free(order_qname, env);
}
if (! order_element || ! order_node)
@@ -357,7 +357,7 @@
{
axutil_hash_t *order_itr = NULL;
axiom_children_qname_iterator_t *params = NULL;
- axis2_qname_t *param_qname = NULL;
+ axutil_qname_t *param_qname = NULL;
axutil_hash_index_t *index_i = NULL;
order_itr = axiom_element_get_all_attributes(order_element, env);
@@ -372,7 +372,7 @@
while (index_i)
{
axiom_attribute_t *order_attrib = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *name = NULL;
axis2_char_t *value = NULL;
void *v = NULL;
@@ -380,7 +380,7 @@
axutil_hash_this(index_i, NULL, NULL, &v);
order_attrib = (axiom_attribute_t *) v;
qname = axiom_attribute_get_qname(order_attrib, env);
- name = axis2_qname_get_localpart(qname, env);
+ name = axutil_qname_get_localpart(qname, env);
value = axiom_attribute_get_value(order_attrib, env);
if (0 == axis2_strcmp(AXIS2_AFTER, name))
@@ -454,10 +454,10 @@
index_i = axutil_hash_next(env, index_i);
}
- param_qname = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
+ param_qname = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
params = axiom_element_get_children_with_qname(handler_element,
env, param_qname, handler_node);
- axis2_qname_free(param_qname, env);
+ axutil_qname_free(param_qname, env);
status = axis2_desc_builder_process_params(desc_builder, env, params,
axis2_handler_desc_get_param_container(handler_desc, env), parent);
if (AXIS2_SUCCESS != status)
@@ -478,7 +478,7 @@
}
static axis2_status_t
-set_attrs_and_value(axis2_param_t *param,
+set_attrs_and_value(axutil_param_t *param,
const axutil_env_t *env,
axiom_element_t *param_element,
axiom_node_t *param_node)
@@ -504,19 +504,19 @@
void *v = NULL;
axiom_attribute_t *value = NULL;
axutil_generic_obj_t *obj = NULL;
- axis2_qname_t *attr_qname = NULL;
+ axutil_qname_t *attr_qname = NULL;
axis2_char_t *attr_name = NULL;
axutil_hash_this(i, NULL, NULL, &v);
if (!v)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return AXIS2_FAILURE;
}
obj = axutil_generic_obj_create(env);
if (!obj)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -526,10 +526,10 @@
axutil_generic_obj_set_free_func(obj, env,
axiom_attribute_free_void_arg);
attr_qname = axiom_attribute_get_qname(value, env);
- attr_name = axis2_qname_to_string(attr_qname, env);
+ attr_name = axutil_qname_to_string(attr_qname, env);
axutil_hash_set(attrs, attr_name, AXIS2_HASH_KEY_STRING, obj);
}
- axis2_param_set_attributes(param, env, attrs);
+ axutil_param_set_attributes(param, env, attrs);
}
childs = axiom_element_get_child_elements(param_element, env, param_node);
@@ -538,26 +538,26 @@
axutil_array_list_t *value_list = NULL;
value_list = axutil_array_list_create(env, 0);
- axis2_param_set_value_list(param, env, value_list);
+ axutil_param_set_value_list(param, env, value_list);
while (AXIS2_TRUE == AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(childs, env))
{
axiom_node_t *node = NULL;
axiom_element_t *element = NULL;
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
axis2_char_t *pname = NULL;
node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(childs, env);
element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- param = axis2_param_create(env, NULL, NULL);
+ param = axutil_param_create(env, NULL, NULL);
pname = axiom_element_get_localname(element, env);
- status = axis2_param_set_name(param, env, pname);
+ status = axutil_param_set_name(param, env, pname);
if (AXIS2_SUCCESS != status)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return status;
}
- axis2_param_set_param_type(param, env, AXIS2_DOM_PARAM);
+ axutil_param_set_param_type(param, env, AXIS2_DOM_PARAM);
set_attrs_and_value(param, env, element, node);
axutil_array_list_add(value_list, env, param);
}
@@ -570,14 +570,14 @@
temp = axiom_element_get_text(
param_element, env, param_node);
para_test_value = axis2_strdup(env, temp);
- status = axis2_param_set_value(param, env, para_test_value);
+ status = axutil_param_set_value(param, env, para_test_value);
if (AXIS2_SUCCESS != status)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
AXIS2_FREE(env->allocator, para_test_value);
return status;
}
- axis2_param_set_param_type(param, env, AXIS2_TEXT_PARAM);
+ axutil_param_set_param_type(param, env, AXIS2_TEXT_PARAM);
}
return AXIS2_SUCCESS;
}
@@ -597,7 +597,7 @@
axis2_op_t *op_desc)
{
axiom_element_t *op_element = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axiom_children_qname_iterator_t *action_mappings = NULL;
axutil_array_list_t *mapping_list = axutil_array_list_create(env, 0);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -605,14 +605,14 @@
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
- qname = axis2_qname_create(env, AXIS2_ACTION_MAPPING, NULL, NULL);
+ qname = axutil_qname_create(env, AXIS2_ACTION_MAPPING, NULL, NULL);
if(op_element)
{
action_mappings = axiom_element_get_children_with_qname(op_element, env,
qname,op_node);
}
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
qname = NULL;
if(!action_mappings)
{
@@ -660,8 +660,8 @@
axis2_desc_builder_process_params(axis2_desc_builder_t *desc_builder,
const axutil_env_t *env,
axiom_children_qname_iterator_t *params,
- axis2_param_container_t *param_container,
- axis2_param_container_t *parent)
+ axutil_param_container_t *param_container,
+ axutil_param_container_t *parent)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -673,12 +673,12 @@
{
axiom_element_t *param_element = NULL;
axiom_node_t *param_node = NULL;
- axis2_param_t *param = NULL;
- axis2_param_t *parent_para = NULL;
+ axutil_param_t *param = NULL;
+ axutil_param_t *parent_para = NULL;
axiom_attribute_t *para_name = NULL;
axiom_attribute_t *para_locked = NULL;
- axis2_qname_t *att_locked = NULL;
- axis2_qname_t *att_qname = NULL;
+ axutil_qname_t *att_locked = NULL;
+ axutil_qname_t *att_qname = NULL;
axis2_char_t *pname = NULL;
/* This is to check whether some one has locked the parmter at the top
@@ -687,32 +687,32 @@
param_node = (axiom_node_t *)
axiom_children_qname_iterator_next(params, env);
param_element = AXIOM_NODE_GET_DATA_ELEMENT(param_node, env);
- param = axis2_param_create(env, NULL, NULL);
+ param = axutil_param_create(env, NULL, NULL);
/* TODO Setting param_element. Do not set element like following.
* break it and set
*/
/*status = AXIS2_PARAM_SET_ELEMENT(param, env, param_node);
if(AXIS2_SUCCESS != status)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return status;
}*/
/* Setting paramter name */
- att_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
+ att_qname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
para_name = axiom_element_get_attribute(param_element, env,
att_qname);
- axis2_qname_free(att_qname, env);
+ axutil_qname_free(att_qname, env);
if (!para_name)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return AXIS2_FAILURE;
}
pname = axiom_attribute_get_value(para_name, env);
- status = axis2_param_set_name(param, env, pname);
+ status = axutil_param_set_name(param, env, pname);
if (AXIS2_SUCCESS != status)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return status;
}
@@ -720,16 +720,16 @@
set_attrs_and_value(param, env, param_element, param_node);
/* Setting locking attrib */
- att_locked = axis2_qname_create(env, AXIS2_ATTLOCKED, NULL, NULL);
+ att_locked = axutil_qname_create(env, AXIS2_ATTLOCKED, NULL, NULL);
para_locked = axiom_element_get_attribute(param_element, env,
att_locked);
- axis2_qname_free(att_locked, env);
+ axutil_qname_free(att_locked, env);
if (parent)
{
axis2_char_t *param_name = NULL;
- param_name = axis2_param_get_name(param, env);
- parent_para = axis2_param_container_get_param(parent, env,
+ param_name = axutil_param_get_name(param, env);
+ parent_para = axutil_param_container_get_param(parent, env,
param_name);
}
if (para_locked)
@@ -743,24 +743,24 @@
/*if the parameter is locked at some level parameter value replace
* by that
*/
- param_name = axis2_param_get_name(param, env);
- is_param_locked = axis2_param_container_is_param_locked(parent,
+ param_name = axutil_param_get_name(param, env);
+ is_param_locked = axutil_param_container_is_param_locked(parent,
env, param_name);
if (parent && AXIS2_TRUE == is_param_locked)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_CONFIG_NOT_FOUND, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else
{
- axis2_param_set_locked(param, env, AXIS2_TRUE);
+ axutil_param_set_locked(param, env, AXIS2_TRUE);
}
}
else
{
- axis2_param_set_locked(param, env, AXIS2_FALSE);
+ axutil_param_set_locked(param, env, AXIS2_FALSE);
}
}
@@ -770,26 +770,26 @@
axis2_char_t *name = NULL;
axis2_bool_t bvalue = AXIS2_FALSE;
- name = axis2_param_get_name(param, env);
- bvalue = axis2_param_container_is_param_locked(parent, env, name);
+ name = axutil_param_get_name(param, env);
+ bvalue = axutil_param_container_is_param_locked(parent, env, name);
if (parent_para || AXIS2_FALSE == bvalue)
{
- status = axis2_param_container_add_param(param_container, env,
+ status = axutil_param_container_add_param(param_container, env,
param);
if (AXIS2_SUCCESS != status)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return status;
}
}
}
else
{
- status = axis2_param_container_add_param(param_container, env,
+ status = axutil_param_container_add_param(param_container, env,
param);
if (AXIS2_SUCCESS != status)
{
- axis2_param_free(param, env);
+ axutil_param_free(param, env);
return status;
}
}
@@ -806,7 +806,7 @@
{
axiom_element_t *moduleref = NULL;
axiom_attribute_t *module_ref_attrib = NULL;
- axis2_qname_t *qref = NULL;
+ axutil_qname_t *qref = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -817,22 +817,22 @@
{
moduleref = (axiom_element_t *)
axiom_children_qname_iterator_next(module_refs, env);
- qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
+ qref = axutil_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_attrib = axiom_element_get_attribute(moduleref, env, qref);
- axis2_qname_free(qref, env);
+ axutil_qname_free(qref, env);
if (module_ref_attrib)
{
axis2_char_t *ref_name = NULL;
- axis2_qname_t *ref_qname = NULL;
+ axutil_qname_t *ref_qname = NULL;
axis2_module_desc_t *module_desc = NULL;
ref_name = axiom_attribute_get_value(module_ref_attrib, env);
- ref_qname = axis2_qname_create(env, ref_name, NULL, NULL);
+ ref_qname = axutil_qname_create(env, ref_name, NULL, NULL);
module_desc = axis2_dep_engine_get_module(desc_builder->engine, env,
ref_qname);
if (! module_desc)
{
- axis2_qname_free(ref_qname, env);
+ axutil_qname_free(ref_qname, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -840,7 +840,7 @@
else
{
status = axis2_op_add_module_qname(op, env, ref_qname);
- axis2_qname_free(ref_qname, env);
+ axutil_qname_free(ref_qname, env);
if (AXIS2_SUCCESS != status)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
@@ -861,8 +861,8 @@
axiom_attribute_t *recv_name = NULL;
axis2_char_t *class_name = NULL;
axis2_msg_recv_t *msg_recv = NULL;
- axis2_qname_t *class_qname = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_qname_t *class_qname = NULL;
+ axutil_param_t *impl_info_param = NULL;
axutil_dll_desc_t *dll_desc = NULL;
axis2_char_t *repos_name = NULL;
axis2_char_t *dll_name = NULL;
@@ -875,9 +875,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, recv_element, NULL);
- class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
+ class_qname = axutil_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
recv_name = axiom_element_get_attribute(recv_element, env, class_qname);
- axis2_qname_free(class_qname, env);
+ axutil_qname_free(class_qname, env);
class_name = axiom_attribute_get_value(recv_name, env);
conf = axis2_dep_engine_get_axis_conf(desc_builder->engine, env);
@@ -904,9 +904,9 @@
axutil_dll_desc_set_name(dll_desc, env, dll_name);
AXIS2_FREE(env->allocator, dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_MSG_RECV_DLL);
- impl_info_param = axis2_param_create(env, class_name, NULL);
- axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env, axutil_dll_desc_free_void_arg);
+ impl_info_param = axutil_param_create(env, class_name, NULL);
+ 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);
/* set the impl_info_param(which contain dll_desc as value) so that
* loaded msg_recv loader lib can be re-used in future
*/
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Fri Mar 30 12:24:00 2007
@@ -102,13 +102,13 @@
{
axiom_element_t *module_element = NULL;
axiom_node_t *module_node = NULL;
- axis2_qname_t *qdllname = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qinflowst = NULL;
- axis2_qname_t *qoutflowst = NULL;
- axis2_qname_t *qinfaultflow = NULL;
- axis2_qname_t *qoutfaultflow = NULL;
- axis2_qname_t *qopst = NULL;
+ axutil_qname_t *qdllname = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qinflowst = NULL;
+ axutil_qname_t *qoutflowst = NULL;
+ axutil_qname_t *qinfaultflow = NULL;
+ axutil_qname_t *qoutfaultflow = NULL;
+ axutil_qname_t *qopst = NULL;
axiom_attribute_t *module_dll_att = NULL;
axiom_children_qname_iterator_t *itr = NULL;
axiom_children_qname_iterator_t *op_itr = NULL;
@@ -122,7 +122,7 @@
axiom_node_t *out_fault_flow_node = NULL;
axis2_conf_t *parent = NULL;
axutil_array_list_t *ops = NULL;
- axis2_param_container_t *parent_container = NULL;
+ axutil_param_container_t *parent_container = NULL;
int size = 0;
int i = 0;
axis2_status_t status = AXIS2_FAILURE;
@@ -140,29 +140,29 @@
{
axis2_arch_file_data_t *file_data = NULL;
axis2_char_t *module_name = NULL;
- axis2_qname_t *module_qname = NULL;
+ axutil_qname_t *module_qname = NULL;
file_data = axis2_dep_engine_get_current_file_item(
axis2_desc_builder_get_dep_engine(module_builder->desc_builder, env),
env);
module_name = axis2_arch_file_data_get_module_name(file_data, env);
- module_qname = axis2_qname_create(env, module_name, NULL, NULL);
+ module_qname = axutil_qname_create(env, module_name, NULL, NULL);
axis2_module_desc_set_qname(module_builder->module_desc, env, module_qname);
if (module_qname)
{
- axis2_qname_free(module_qname, env);
+ axutil_qname_free(module_qname, env);
}
}
/* Setting Module Dll Name , if it is there */
- qdllname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
+ qdllname = axutil_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
module_dll_att = axiom_element_get_attribute(module_element, env, qdllname);
if (qdllname)
{
- axis2_qname_free(qdllname, env);
+ axutil_qname_free(qdllname, env);
}
if (module_dll_att)
@@ -190,12 +190,12 @@
/* Processing Paramters */
/* Processing service level paramters */
- 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(module_element, env,
qparamst, module_node);
if (qparamst)
{
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
}
parent = axis2_module_desc_get_parent(module_builder->module_desc, env);
@@ -208,12 +208,12 @@
parent_container);
/* 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(module_element,
env, qinflowst, module_node, &in_flow_node);
if (qinflowst)
{
- axis2_qname_free(qinflowst, env);
+ axutil_qname_free(qinflowst, env);
}
if (in_flow_element && NULL != in_flow_node)
@@ -236,12 +236,12 @@
}
}
- 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(module_element,
env, qoutflowst, module_node, &out_flow_node);
if (qoutflowst)
{
- axis2_qname_free(qoutflowst, env);
+ axutil_qname_free(qoutflowst, env);
}
if (out_flow_element && NULL != out_flow_node)
@@ -261,12 +261,12 @@
}
}
- qinfaultflow = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
+ qinfaultflow = axutil_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
in_fault_flow_element = axiom_element_get_first_child_with_qname(module_element,
env, qinfaultflow, module_node, &in_fault_flow_node);
if (qinfaultflow)
{
- axis2_qname_free(qinfaultflow, env);
+ axutil_qname_free(qinfaultflow, env);
}
if (in_fault_flow_element && NULL != in_fault_flow_node)
@@ -287,12 +287,12 @@
}
}
- qoutfaultflow = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
+ qoutfaultflow = axutil_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
out_fault_flow_element = axiom_element_get_first_child_with_qname(module_element,
env, qoutfaultflow, module_node, &out_fault_flow_node);
if (qoutfaultflow)
{
- axis2_qname_free(qoutfaultflow, env);
+ axutil_qname_free(qoutfaultflow, env);
}
if (out_fault_flow_element && NULL != out_fault_flow_node)
@@ -313,12 +313,12 @@
}
/* Processing Operations */
- qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
+ qopst = axutil_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
op_itr = axiom_element_get_children_with_qname(module_element, env,
qopst, module_node);
if (qopst)
{
- axis2_qname_free(qopst, env);
+ axutil_qname_free(qopst, env);
}
ops = axis2_module_builder_process_ops(module_builder, env, op_itr);
size = axutil_array_list_size(ops, env);
@@ -353,14 +353,14 @@
axiom_node_t *op_node = NULL;
axiom_attribute_t *op_name_att = NULL;
axiom_attribute_t *op_mep_att = NULL;
- axis2_qname_t *qattname = NULL;
+ axutil_qname_t *qattname = NULL;
axis2_char_t *mep_url = NULL;
axis2_char_t *op_name = NULL;
- axis2_qname_t *qopname = NULL;
- axis2_qname_t *qmsgrecv = NULL;
- axis2_qname_t *qparamst = NULL;
- axis2_qname_t *qmodulest = NULL;
- axis2_qname_t *qmep = NULL;
+ axutil_qname_t *qopname = NULL;
+ axutil_qname_t *qmsgrecv = NULL;
+ axutil_qname_t *qparamst = NULL;
+ axutil_qname_t *qmodulest = NULL;
+ axutil_qname_t *qmep = NULL;
axiom_children_qname_iterator_t *params = NULL;
axiom_children_qname_iterator_t *modules = NULL;
axiom_element_t *recv_element = NULL;
@@ -372,11 +372,11 @@
axiom_children_qname_iterator_next(op_itr, env);
op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
/* getting operation name */
- 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);
if (qattname)
{
- axis2_qname_free(qattname, env);
+ axutil_qname_free(qattname, env);
}
if (! op_name_att)
@@ -385,11 +385,11 @@
AXIS2_FAILURE);
return NULL;
}
- 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);
if (qmep)
{
- axis2_qname_free(qmep, env);
+ axutil_qname_free(qmep, env);
}
if (op_mep_att)
@@ -410,20 +410,20 @@
}
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);
axis2_op_set_qname(op_desc, env, qopname);
if (qopname)
{
- axis2_qname_free(qopname, env);
+ axutil_qname_free(qopname, env);
}
/* Operation parameters */
- qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
+ qparamst = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
params = axiom_element_get_children_with_qname(op_element, env,
qparamst, op_node);
if (qparamst)
{
- axis2_qname_free(qparamst, env);
+ axutil_qname_free(qparamst, env);
}
axis2_desc_builder_process_params(module_builder->desc_builder, env,
@@ -437,12 +437,12 @@
/* setting the mep of the operation */
/* 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);
if (qmsgrecv)
{
- axis2_qname_free(qmsgrecv, env);
+ axutil_qname_free(qmsgrecv, env);
}
if (recv_element && NULL != recv_node)
{
@@ -460,12 +460,12 @@
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);
modules = axiom_element_get_children_with_qname(op_element, env,
qmodulest, op_node);
if (qmodulest)
{
- axis2_qname_free(qmodulest, env);
+ axutil_qname_free(qmodulest, env);
}
axis2_desc_builder_process_op_module_refs(module_builder->desc_builder,
env, modules, op_desc);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org