You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/04/01 13:19:17 UTC
svn commit: r524582 [2/3] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/soap/ axiom/src/util/ modules/core/clientapi/
modules/core/deployment/ modules/core/engine/ modules/core/receivers/
modules/core/transport/http/sender/ mo...
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Sun Apr 1 04:19:13 2007
@@ -287,14 +287,14 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, attr_name, AXIS2_FAILURE);
- header_node = AXIOM_NODE_GET_PARENT(header_block->om_ele_node, env);
+ header_node = axiom_node_get_parent(header_block->om_ele_node, env);
if (!header_node)
{
return AXIS2_FAILURE;
}
- if (AXIOM_NODE_GET_NODE_TYPE(header_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(header_node, env) == AXIOM_ELEMENT)
{
- header_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
+ header_ele = (axiom_element_t*)axiom_node_get_data_element(header_node, env);
if (!header_ele)
{
return AXIS2_FAILURE;
@@ -314,7 +314,7 @@
return AXIS2_FAILURE;
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(
header_block->om_ele_node, env);
om_attr = axiom_element_get_attribute(om_ele, env, qn);
@@ -363,14 +363,14 @@
AXIS2_PARAM_CHECK(env->error, attr_name, NULL);
AXIS2_PARAM_CHECK(env->error, soap_envelope_namespace_uri, NULL);
- header_node = AXIOM_NODE_GET_PARENT(header_block->om_ele_node, env);
+ header_node = axiom_node_get_parent(header_block->om_ele_node, env);
if (!header_node)
{
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(header_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(header_node, env) == AXIOM_ELEMENT)
{
- header_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
+ header_ele = (axiom_element_t*)axiom_node_get_data_element(header_node, env);
if (!header_ele)
{
return NULL;
@@ -383,7 +383,7 @@
qn = axutil_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
if (!qn)
return NULL;
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(
header_block->om_ele_node, env);
om_attr = axiom_element_get_attribute(om_ele, env, qn);
if (om_attr)
@@ -419,7 +419,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
- if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Sun Apr 1 04:19:13 2007
@@ -37,16 +37,16 @@
return NULL;
}
- child_node = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
+ child_node = axiom_node_get_first_child(ele_node, env);
while (child_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
axiom_element_t *child_ele = NULL;
axiom_namespace_t *ns = NULL;
child_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
+ axiom_node_get_data_element(child_node, env);
ns = axiom_element_get_namespace(child_ele, env, child_node);
if (ns)
{
@@ -59,7 +59,7 @@
}
}
}
- child_node = AXIOM_NODE_GET_NEXT_SIBLING(child_node, env);
+ child_node = axiom_node_get_next_sibling(child_node, env);
}
return NULL;
}
@@ -78,16 +78,16 @@
return NULL;
}
- next_sib_node = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
+ next_sib_node = axiom_node_get_next_sibling(ele_node, env);
while (next_sib_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sib_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sib_node, env) == AXIOM_ELEMENT)
{
axiom_element_t *sib_ele = NULL;
axiom_namespace_t *ns = NULL;
sib_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sib_node, env);
+ axiom_node_get_data_element(next_sib_node, env);
ns = axiom_element_get_namespace(sib_ele, env, next_sib_node);
if (ns)
{
@@ -100,7 +100,7 @@
}
}
}
- next_sib_node = AXIOM_NODE_GET_NEXT_SIBLING(next_sib_node, env);
+ next_sib_node = axiom_node_get_next_sibling(next_sib_node, env);
}
return NULL;
}
@@ -127,17 +127,17 @@
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
- last_node = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
+ last_node = axiom_node_get_last_child(ele_node, env);
while (last_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(last_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(last_node, env) == AXIOM_ELEMENT)
{
*child_node = last_node;
return (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(last_node, env);
+ axiom_node_get_data_element(last_node, env);
}
- last_node = AXIOM_NODE_GET_PREVIOUS_SIBLING(ele_node, env);
+ last_node = axiom_node_get_previous_sibling(ele_node, env);
}
return NULL;
}
@@ -151,16 +151,16 @@
axiom_node_t *next_sibling = NULL;
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
+ next_sibling = axiom_node_get_next_sibling(ele_node, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
*next_node = next_sibling;
return (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ axiom_node_get_data_element(next_sibling, env);
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -180,13 +180,13 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
AXIS2_PARAM_CHECK(env->error, localname, NULL);
- child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
+ child = axiom_node_get_first_child(ele_node, env);
if (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(child, env);
+ axiom_node_get_data_element(child, env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -201,13 +201,13 @@
child_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
+ next_sibling = axiom_node_get_next_sibling(child, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -221,7 +221,7 @@
om_ele = NULL;
child_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -242,13 +242,13 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
- child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
+ child = axiom_node_get_last_child(ele_node, env);
while (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
+ axiom_node_get_data_element(ele_node, env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -263,7 +263,7 @@
om_ele = NULL;
child_localname = NULL;
}
- child = AXIOM_NODE_GET_PREVIOUS_SIBLING(child, env);
+ child = axiom_node_get_previous_sibling(child, env);
}
return NULL;
}
@@ -281,13 +281,13 @@
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
+ next_sibling = axiom_node_get_next_sibling(ele_node, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
ele_localname = axiom_element_get_localname(om_ele, env);
@@ -300,7 +300,7 @@
om_ele = NULL;
ele_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -325,15 +325,15 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
AXIS2_PARAM_CHECK(env->error, uri, NULL);
- child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
+ child = axiom_node_get_first_child(ele_node, env);
if (!child)
{
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(ele_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(ele_node, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(child , env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(child , env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -357,12 +357,12 @@
ns = NULL;
ns_uri = NULL;
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
+ next_sibling = axiom_node_get_next_sibling(child, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -386,7 +386,7 @@
ns = NULL;
ns_uri = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -409,12 +409,12 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
AXIS2_PARAM_CHECK(env->error, uri, NULL);
- child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
+ child = axiom_node_get_last_child(ele_node, env);
while (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(ele_node, env);
if (om_ele)
{
ns = axiom_element_get_namespace(om_ele, env, ele_node);
@@ -436,7 +436,7 @@
ns = NULL;
ns_uri = NULL;
}
- child = AXIOM_NODE_GET_PREVIOUS_SIBLING(child, env);
+ child = axiom_node_get_previous_sibling(child, env);
}
return NULL;
}
@@ -456,13 +456,13 @@
axis2_char_t *ns_uri = NULL;
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
+ next_sibling = axiom_node_get_next_sibling(ele_node, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
ns = axiom_element_get_namespace(om_ele, env, next_sibling);
@@ -484,7 +484,7 @@
ns_uri = NULL;
ns = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -507,12 +507,12 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
AXIS2_PARAM_CHECK(env->error, names, NULL);
- child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
+ child = axiom_node_get_first_child(ele_node, env);
if (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(child, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(child, env);
if (om_ele)
{
size = axutil_array_list_size(names, env);
@@ -538,12 +538,12 @@
size = 0;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
+ next_sibling = axiom_node_get_next_sibling(child, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
size = axutil_array_list_size(names, env);
@@ -564,7 +564,7 @@
child_localname = NULL;
given_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
@@ -589,13 +589,13 @@
AXIS2_PARAM_CHECK(env->error, names, NULL);
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
- child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
+ child = axiom_node_get_last_child(ele_node, env);
while (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
+ axiom_node_get_data_element(ele_node, env);
if (om_ele)
{
size = axutil_array_list_size(names, env);
@@ -615,7 +615,7 @@
child_localname = NULL;
given_localname = NULL;
}
- child = AXIOM_NODE_GET_PREVIOUS_SIBLING(child, env);
+ child = axiom_node_get_previous_sibling(child, env);
}
return NULL;
}
@@ -638,13 +638,13 @@
AXIS2_PARAM_CHECK(env->error, next_node, NULL);
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
+ next_sibling = axiom_node_get_next_sibling(ele_node, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
size = axutil_array_list_size(names, env);
@@ -664,7 +664,7 @@
om_ele = NULL;
ele_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -694,13 +694,13 @@
AXIS2_PARAM_CHECK(env->error, attr_name, NULL);
AXIS2_PARAM_CHECK(env->error, attr_value, NULL);
- child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
+ child = axiom_node_get_first_child(ele_node, env);
if (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(child, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(child, env);
if (om_ele)
{
@@ -745,12 +745,12 @@
hi = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
+ next_sibling = axiom_node_get_next_sibling(child, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -793,7 +793,7 @@
om_ele = NULL;
child_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -821,12 +821,12 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
- child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
+ child = axiom_node_get_last_child(ele_node, env);
while (child)
{
- if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(child, env) == AXIOM_ELEMENT)
{
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(ele_node, env);
if (om_ele)
{
child_localname = axiom_element_get_localname(om_ele, env);
@@ -870,7 +870,7 @@
om_ele = NULL;
child_localname = NULL;
}
- child = AXIOM_NODE_GET_PREVIOUS_SIBLING(child, env);
+ child = axiom_node_get_previous_sibling(child, env);
}
return NULL;
}
@@ -896,13 +896,13 @@
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
+ next_sibling = axiom_node_get_next_sibling(ele_node, env);
while (next_sibling)
{
- if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+ axiom_node_get_data_element(next_sibling, env);
if (om_ele)
{
ele_localname = axiom_element_get_localname(om_ele, env);
@@ -944,7 +944,7 @@
om_ele = NULL;
ele_localname = NULL;
}
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+ next_sibling = axiom_node_get_next_sibling(next_sibling, env);
}
return NULL;
}
@@ -958,12 +958,12 @@
{
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(om_node, env) != AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(om_node, env) != AXIOM_ELEMENT)
{
return NULL;
}
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(om_node, env);
if (om_ele)
{
@@ -983,11 +983,11 @@
{
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
return NULL;
}
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(node, env);
if (om_ele)
{
return axiom_element_get_localname(om_ele, env);
@@ -1005,9 +1005,9 @@
{
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(om_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(om_node, env) == AXIOM_ELEMENT)
{
- om_ele = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+ om_ele = axiom_node_get_data_element(om_node, env);
if (! om_ele)
{
return NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Sun Apr 1 04:19:13 2007
@@ -184,7 +184,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
msg_ctx_map = axis2_op_ctx_get_msg_ctx_map(op_client->op_ctx, env);
-
+
out_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT];
in_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN];
@@ -755,7 +755,7 @@
node = axiom_soap_body_get_base_node(soap_body, env);
if (node)
{
- AXIOM_NODE_ADD_CHILD(node, env, to_send);
+ axiom_node_add_child(node, env, to_send);
}
}
}
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Sun Apr 1 04:19:13 2007
@@ -478,7 +478,7 @@
if (node)
{
- AXIOM_NODE_FREE_TREE(node, env);
+ axiom_node_free_tree(node, env);
node = NULL;
}
}
@@ -675,7 +675,7 @@
soap_node = axiom_soap_body_get_base_node(soap_body, env);
if (soap_node)
{
- return AXIOM_NODE_GET_FIRST_ELEMENT(soap_node, env);
+ return axiom_node_get_first_element(soap_node, env);
}
}
}
@@ -776,7 +776,7 @@
{
return NULL;
}
- return AXIOM_NODE_GET_FIRST_ELEMENT(soap_node, env);
+ return axiom_node_get_first_element(soap_node, env);
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
@@ -1225,7 +1225,7 @@
node = axutil_array_list_get(svc_client->headers, env, i);
if (node)
{
- AXIOM_NODE_ADD_CHILD(header_node, env, node);
+ axiom_node_add_child(header_node, env, node);
}
}
}
@@ -1242,7 +1242,7 @@
node = axiom_soap_body_get_base_node(soap_body, env);
if (node)
{
- AXIOM_NODE_ADD_CHILD(node, env, (axiom_node_t *)payload);
+ axiom_node_add_child(node, env, (axiom_node_t *)payload);
}
}
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Sun Apr 1 04:19:13 2007
@@ -156,7 +156,7 @@
if (svcs)
{
- svcs_element = AXIOM_NODE_GET_DATA_ELEMENT(svcs, env);
+ svcs_element = axiom_node_get_data_element(svcs, env);
if (svcs_element)
{
root_element_name = axiom_element_get_localname(svcs_element, env);
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=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Sun Apr 1 04:19:13 2007
@@ -158,7 +158,7 @@
{
return AXIS2_FAILURE;
}
- conf_element = AXIOM_NODE_GET_DATA_ELEMENT(conf_node, env);
+ conf_element = axiom_node_get_data_element(conf_node, env);
/* processing Paramters */
/* Processing service level paramters */
qparamst = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
@@ -185,7 +185,7 @@
msg_recv_node = (axiom_node_t *)
axiom_children_qname_iterator_next(msg_recvs, env);
msg_recv_element = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(msg_recv_node, env);
+ axiom_node_get_data_element(msg_recv_node, env);
msg_recv = axis2_desc_builder_load_msg_recv(conf_builder->desc_builder,
env, msg_recv_element);
if (!msg_recv)
@@ -310,7 +310,7 @@
{
return AXIS2_FAILURE;
}
- module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
+ module_ref_element = axiom_node_get_data_element(module_ref_node, env);
qref = axutil_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = axiom_element_get_attribute(module_ref_element, env,
qref);
@@ -356,7 +356,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, disp_order_node, AXIS2_FAILURE);
- disp_order_element = AXIOM_NODE_GET_DATA_ELEMENT(disp_order_node, env);
+ disp_order_element = axiom_node_get_data_element(disp_order_node, env);
qdisp = axutil_qname_create(env, AXIS2_DISPATCHER, NULL, NULL);
disps = axiom_element_get_children_with_qname(disp_order_element,
env, qdisp, disp_order_node);
@@ -480,7 +480,7 @@
phase_orders, env);
if (phase_orders_node)
{
- phase_orders_element = AXIOM_NODE_GET_DATA_ELEMENT(phase_orders_node,
+ phase_orders_element = axiom_node_get_data_element(phase_orders_node,
env);
}
if (phase_orders_element)
@@ -542,7 +542,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, phase_orders_node, AXIS2_FAILURE);
- phase_orders_element = AXIOM_NODE_GET_DATA_ELEMENT(phase_orders_node,
+ phase_orders_element = axiom_node_get_data_element(phase_orders_node,
env);
if (!phase_orders_element)
{
@@ -573,7 +573,7 @@
phases, env);
if (phase_node)
{
- phase_element = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(
+ phase_element = (axiom_element_t*)axiom_node_get_data_element(
phase_node, env);
}
@@ -622,7 +622,7 @@
if (transport_node)
{
transport_element = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(transport_node, env);
+ axiom_node_get_data_element(transport_node, env);
if (!transport_element)
{
return AXIS2_FAILURE;
@@ -886,7 +886,7 @@
axiom_children_qname_iterator_next(trs_recvs, env);
if (transport_node)
{
- transport_element = AXIOM_NODE_GET_DATA_ELEMENT(transport_node,
+ transport_element = axiom_node_get_data_element(transport_node,
env);
if (!transport_element)
{
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=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Sun Apr 1 04:19:13 2007
@@ -279,7 +279,7 @@
}
/* Setting Handler name */
attr_qname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
- handler_element = AXIOM_NODE_GET_DATA_ELEMENT(handler_node, env);
+ handler_element = axiom_node_get_data_element(handler_node, env);
name_attrib = axiom_element_get_attribute(handler_element, env,
attr_qname);
if (attr_qname)
@@ -548,7 +548,7 @@
axis2_char_t *pname = NULL;
node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(childs, env);
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
param = axutil_param_create(env, NULL, NULL);
pname = axiom_element_get_localname(element, env);
status = axutil_param_set_name(param, env, pname);
@@ -604,7 +604,7 @@
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
- op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
+ op_element = axiom_node_get_data_element(op_node, env);
qname = axutil_qname_create(env, AXIS2_ACTION_MAPPING, NULL, NULL);
if(op_element)
{
@@ -635,7 +635,7 @@
*/
mapping_node = (axiom_node_t *)
axiom_children_qname_iterator_next(action_mappings, env);
- mapping_element = AXIOM_NODE_GET_DATA_ELEMENT(mapping_node, env);
+ mapping_element = axiom_node_get_data_element(mapping_node, env);
temp_str = axiom_element_get_text(mapping_element, env,
mapping_node);
input_action_string = axis2_strtrim(env, temp_str, NULL);
@@ -686,7 +686,7 @@
*/
param_node = (axiom_node_t *)
axiom_children_qname_iterator_next(params, env);
- param_element = AXIOM_NODE_GET_DATA_ELEMENT(param_node, env);
+ param_element = axiom_node_get_data_element(param_node, env);
param = axutil_param_create(env, NULL, NULL);
/* TODO Setting param_element. Do not set element like following.
* break it and set
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=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Sun Apr 1 04:19:13 2007
@@ -132,7 +132,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
module_node = axis2_desc_builder_build_om(module_builder->desc_builder, env);
- module_element = AXIOM_NODE_GET_DATA_ELEMENT(module_node, env);
+ module_element = axiom_node_get_data_element(module_node, env);
if (!module_element)
{
return AXIS2_FAILURE;
@@ -370,7 +370,7 @@
op_node = (axiom_node_t *)
axiom_children_qname_iterator_next(op_itr, env);
- op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
+ op_element = axiom_node_get_data_element(op_node, env);
/* getting operation name */
qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
op_name_att = axiom_element_get_attribute(op_element, env, qattname);
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=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Sun Apr 1 04:19:13 2007
@@ -181,7 +181,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_node, AXIS2_FAILURE);
- svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
+ svc_element = axiom_node_get_data_element(svc_node, env);
/* Processing service level paramters */
qparamst = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
if (!qparamst)
@@ -418,7 +418,7 @@
op_node = axiom_children_qname_iterator_next(op_itr, env);
/* getting operation name */
- op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
+ op_element = axiom_node_get_data_element(op_node, env);
qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
op_name_att = axiom_element_get_attribute(op_element, env, qattname);
axutil_qname_free(qattname, env);
@@ -534,7 +534,7 @@
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,
+ module_conf_element = axiom_node_get_data_element(module_conf_node,
env);
qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
module_name_att = axiom_element_get_attribute(module_conf_element,
@@ -569,7 +569,7 @@
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,
+ module_ref_element = axiom_node_get_data_element(module_ref_node,
env);
qref = axutil_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = axiom_element_get_attribute(module_ref_element,
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=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Sun Apr 1 04:19:13 2007
@@ -106,7 +106,7 @@
axis2_conf_t *parent = NULL;
/* Processing service level paramters */
- svc_grp_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_grp_builder->svc_grp, env);
+ svc_grp_element = axiom_node_get_data_element(svc_grp_builder->svc_grp, env);
qparamst = axutil_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
itr = axiom_element_get_children_with_qname(svc_grp_element, env, qparamst,
@@ -156,7 +156,7 @@
svc_node = (axiom_node_t *) axiom_children_qname_iterator_next(
svc_itr, env);
- svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
+ svc_element = axiom_node_get_data_element(svc_node, env);
qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
svc_name_att = axiom_element_get_attribute(svc_element, env, qattname);
@@ -230,7 +230,7 @@
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);
+ module_ref_element = axiom_node_get_data_element(module_ref_node, env);
qref = axutil_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = axiom_element_get_attribute(module_ref_element, env,
qref);
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Sun Apr 1 04:19:13 2007
@@ -102,14 +102,14 @@
if (body_node)
{
axiom_node_t *body_first_child_node =
- AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
+ axiom_node_get_first_element(body_node, env);
if (body_first_child_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(body_first_child_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(body_first_child_node, env) == AXIOM_ELEMENT)
{
axiom_element_t *element = NULL;
- element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ element = (axiom_element_t *)axiom_node_get_data_element(
body_first_child_node, env);
if (element)
{
@@ -198,15 +198,15 @@
if (body_node)
{
axiom_node_t *body_first_child_node =
- AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
+ axiom_node_get_first_element(body_node, env);
if (body_first_child_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(body_first_child_node, env) ==
+ if (axiom_node_get_node_type(body_first_child_node, env) ==
AXIOM_ELEMENT)
{
axiom_element_t *element = NULL;
- element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ element = (axiom_element_t *)axiom_node_get_data_element(
body_first_child_node, env);
if (element)
{
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Sun Apr 1 04:19:13 2007
@@ -127,8 +127,8 @@
envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
body = axiom_soap_envelope_get_body(envelope, env);
om_node = axiom_soap_body_get_base_node(body, env);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- om_node = AXIOM_NODE_GET_FIRST_ELEMENT(om_node, env);
+ om_element = axiom_node_get_data_element(om_node, env);
+ om_node = axiom_node_get_first_element(om_node, env);
}
else if (0 == axis2_strcmp(AXIS2_STYLE_RPC, style))
{
@@ -140,7 +140,7 @@
envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
body = axiom_soap_envelope_get_body(envelope, env);
op_node = axiom_soap_body_get_base_node(body, env);
- op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
+ op_element = axiom_node_get_data_element(op_node, env);
if (op_element)
{
local_name = axiom_element_get_localname(op_element, env);
@@ -172,8 +172,8 @@
if (AXIS2_TRUE == matches)
{
- om_node = AXIOM_NODE_GET_FIRST_CHILD(op_node, env);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+ om_node = axiom_node_get_first_child(op_node, env);
+ om_element = axiom_node_get_data_element(om_node, env);
}
else
{
@@ -226,7 +226,7 @@
{
body_content_element = axiom_element_create(env, NULL, res_name,
ns, &body_content_node);
- AXIOM_NODE_ADD_CHILD(body_content_node, env, result_node);
+ axiom_node_add_child(body_content_node, env, result_node);
}
}
else
@@ -320,7 +320,7 @@
if (body_content_node)
{
- AXIOM_NODE_ADD_CHILD(out_node , env, body_content_node);
+ axiom_node_add_child(out_node , env, body_content_node);
status = axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
}
else if (soap_fault)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Sun Apr 1 04:19:13 2007
@@ -200,7 +200,7 @@
{
return AXIS2_FAILURE;
}
- data_out = AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
+ data_out = axiom_node_get_first_element(body_node, env);
method = (axutil_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD);
@@ -289,7 +289,7 @@
}
else
{
- AXIOM_NODE_SERIALIZE(data_out, env, sender->om_output);
+ axiom_node_serialize(data_out, env, sender->om_output);
}
@@ -1009,14 +1009,14 @@
}
body_node = axiom_soap_body_get_base_node(
axiom_soap_envelope_get_body(soap_env, env), env);
- data_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+ data_node = axiom_node_get_first_child(body_node, env);
if (! data_node)
{
return NULL;
}
param_list = axutil_array_list_create(env, AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
- data_element = AXIOM_NODE_GET_DATA_ELEMENT(data_node, env);
+ data_element = axiom_node_get_data_element(data_node, env);
iterator = axiom_element_get_child_elements(data_element, env, data_node);
@@ -1030,7 +1030,7 @@
axis2_char_t *encoded_value = NULL;
node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(iterator, env);
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
name = axiom_element_get_localname(element, env);
value = axiom_element_get_text(element, env, node);
if(value){
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Sun Apr 1 04:19:13 2007
@@ -335,8 +335,8 @@
xml_writer = NULL;
return AXIS2_FAILURE;
}
- data_out = AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
- if (! data_out || AXIOM_NODE_GET_NODE_TYPE(data_out, env)
+ data_out = axiom_node_get_first_element(body_node, env);
+ if (! data_out || axiom_node_get_node_type(data_out, env)
!= AXIOM_ELEMENT)
{
axiom_output_free(om_output, env);
@@ -344,7 +344,7 @@
xml_writer = NULL;
return AXIS2_FAILURE;
}
- AXIOM_NODE_SERIALIZE(data_out, env, om_output);
+ axiom_node_serialize(data_out, env, om_output);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
buffer_size = AXIOM_XML_WRITER_GET_XML_SIZE(xml_writer, env);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Sun Apr 1 04:19:13 2007
@@ -124,7 +124,7 @@
{
return AXIS2_FAILURE;
}
- data_out = AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
+ data_out = axiom_node_get_first_element(body_node, env);
method = (axutil_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD);
@@ -240,7 +240,7 @@
axutil_hash_t *content_type_hash = NULL;
axis2_char_t *content_type_value = NULL;
- AXIOM_NODE_SERIALIZE(data_out, env, om_output);
+ axiom_node_serialize(data_out, env, om_output);
content_type_property = (axutil_property_t *) axis2_msg_ctx_get_property(
msg_ctx, env,
AXIS2_USER_DEFINED_HTTP_HEADER_CONTENT_TYPE);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Sun Apr 1 04:19:13 2007
@@ -1446,7 +1446,7 @@
element = axiom_element_create(env, NULL, (axis2_char_t *)name,
NULL, &node);
axiom_element_set_text(element, env, (axis2_char_t *)value, node);
- AXIOM_NODE_ADD_CHILD(body_child_node, env, node);
+ axiom_node_add_child(body_child_node, env, node);
}
}
}
@@ -1573,7 +1573,7 @@
element = axiom_element_create(env, NULL, (axis2_char_t *)name,
NULL, &node);
axiom_element_set_text(element, env, (axis2_char_t *)value, node);
- AXIOM_NODE_ADD_CHILD(body_child_node, env, node);
+ axiom_node_add_child(body_child_node, env, node);
}
}
return soap_env;
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Sun Apr 1 04:19:13 2007
@@ -202,10 +202,10 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
node = axiom_soap_header_get_base_node(soap_header, env);
- if (node && AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
+ if (node && axiom_node_get_node_type(node, env) == AXIOM_ELEMENT)
{
axutil_qname_t *qname = NULL;
- element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = (axiom_element_t *)axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI,
AXIS2_NAMESPACE_PREFIX);
if (qname)
@@ -321,7 +321,7 @@
header_block = (axiom_soap_header_block_t *)hb;
header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
- header_block_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+ header_block_ele = (axiom_element_t*)axiom_node_get_data_element(header_block_node, env);
ele_localname = axiom_element_get_localname(header_block_ele, env);
role = axiom_soap_header_block_get_role(header_block, env);
@@ -514,7 +514,7 @@
AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
header_block_node = axiom_soap_header_block_get_base_node(soap_header_block, env);
- header_block_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+ header_block_ele = (axiom_element_t *)axiom_node_get_data_element(header_block_node, env);
child_ele_iter = axiom_element_get_child_elements(header_block_ele, env, header_block_node);
@@ -529,7 +529,7 @@
axiom_element_t *child_ele = NULL;
axutil_qname_t *child_qn = NULL;
child_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(child_ele_iter, env);
- child_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
+ child_ele = (axiom_element_t*)axiom_node_get_data_element(child_node, env);
child_qn = axiom_element_get_qname(child_ele, env, child_node);
@@ -550,7 +550,7 @@
axiom_node_t *om_node = NULL;
axiom_element_t *om_ele = NULL;
om_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(ref_param_iter, env);
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(om_node, env);
}
}
@@ -597,11 +597,11 @@
header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
if (header_block_node &&
- (AXIOM_NODE_GET_NODE_TYPE(header_block_node, env) == AXIOM_ELEMENT))
+ (axiom_node_get_node_type(header_block_node, env) == AXIOM_ELEMENT))
{
axiom_attribute_t *om_attr = NULL;
axis2_char_t *attr_value = NULL;
- header_block_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+ header_block_ele = (axiom_element_t*)axiom_node_get_data_element(header_block_node, env);
om_attr = axiom_element_get_attribute(header_block_ele, env, wsa_qname);
if (om_attr)
{
@@ -659,7 +659,7 @@
header_block = (axiom_soap_header_block_t*)hb;
header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
header_block_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+ axiom_node_get_data_element(header_block_node, env);
is_ref_param_attr = axiom_element_get_attribute(header_block_ele, env, is_ref_qn);
if (is_ref_param_attr)
{
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Sun Apr 1 04:19:13 2007
@@ -226,7 +226,7 @@
soap_header_node = axiom_soap_header_get_base_node(soap_header, env);
soap_header_ele =
(axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(soap_header_node, env);
+ axiom_node_get_data_element(soap_header_node, env);
axiom_element_declare_namespace(soap_header_ele, env,
soap_header_node, addressing_namespace);
@@ -275,7 +275,7 @@
if (to_header_block_node)
{
axiom_element_t *to_header_block_element = NULL;
- to_header_block_element = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(to_header_block_node, env);
+ to_header_block_element = (axiom_element_t*)axiom_node_get_data_element(to_header_block_node, env);
if (to_header_block_element)
{
axiom_element_set_text(to_header_block_element, env, address, to_header_block_node);
@@ -414,7 +414,7 @@
axiom_namespace_t *dec_ns = NULL;
relates_to_header_ele =
(axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(relates_to_header_node,
+ axiom_node_get_data_element(relates_to_header_node,
env);
if (relates_to_header_ele)
{
@@ -496,7 +496,7 @@
axiom_soap_header_block_get_base_node(header_block, env);
header_block_ele =
(axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+ axiom_node_get_data_element(header_block_node, env);
if (header_block_ele)
{
axiom_namespace_t *dec_ns = NULL;
@@ -559,7 +559,7 @@
axiom_element_t *address_ele = NULL;
hb_node = axiom_soap_header_block_get_base_node(header_block, env);
hb_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(hb_node, env);
+ axiom_node_get_data_element(hb_node, env);
addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
@@ -620,7 +620,7 @@
axiom_node_t *ref_node = (axiom_node_t *)axutil_array_list_get(ref_param_list, env, i);
if (ref_node)
{
- AXIOM_NODE_ADD_CHILD(reference_node, env, ref_node);
+ axiom_node_add_child(reference_node, env, ref_node);
}
}
@@ -664,7 +664,7 @@
axiom_node_t *ref_node = (axiom_node_t *)axutil_array_list_get(meta_data_list, env, i);
if (ref_node)
{
- AXIOM_NODE_ADD_CHILD(reference_node, env, ref_node);
+ axiom_node_add_child(reference_node, env, ref_node);
}
}
}
@@ -678,7 +678,7 @@
axiom_node_t *ref_node = (axiom_node_t *)axutil_array_list_get(extension_list, env, i);
if (ref_node)
{
- AXIOM_NODE_ADD_CHILD(header_block_node, env, ref_node);
+ axiom_node_add_child(header_block_node, env, ref_node);
}
}
}
Modified: webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c Sun Apr 1 04:19:13 2007
@@ -81,7 +81,7 @@
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(ret_node, env);
+ om_str = axiom_node_to_string(ret_node, env);
if(om_str)
{
AXIS2_LOG_INFO(env->log, "Input msg: %s", om_str);
Modified: webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c Sun Apr 1 04:19:13 2007
@@ -80,7 +80,7 @@
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(ret_node, env);
+ om_str = axiom_node_to_string(ret_node, env);
if(om_str)
{
AXIS2_LOG_INFO(env->log, "Output msg: %s", om_str);
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Sun Apr 1 04:19:13 2007
@@ -126,7 +126,7 @@
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(response, env);
+ om_str = axiom_node_to_string(response, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("status:%s\n", "Successful");
@@ -188,7 +188,7 @@
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(response, env);
+ om_str = axiom_node_to_string(response, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("status:%s\n", "Success");
@@ -252,7 +252,7 @@
AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
om_output = axiom_output_create(env, xml_writer);
- AXIOM_NODE_SERIALIZE(add_om_node, env, om_output);
+ axiom_node_serialize(add_om_node, env, om_output);
buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("\nOM node in XML : %s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
@@ -309,7 +309,7 @@
AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
om_output = axiom_output_create(env, xml_writer);
- AXIOM_NODE_SERIALIZE(add_om_node, env, om_output);
+ axiom_node_serialize(add_om_node, env, om_output);
buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("\nOM node in XML : %s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Sun Apr 1 04:19:13 2007
@@ -101,7 +101,7 @@
if (ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(ret_node, env);
+ om_str = axiom_node_get_data_element(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -122,7 +122,7 @@
if (ret_node2)
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(ret_node2, env);
+ om_str = axiom_node_get_data_element(ret_node2, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -169,7 +169,7 @@
text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
axiom_element_set_text(text_om_ele, env, "Hello World!", text_om_node);
- om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
+ om_str = axiom_node_get_data_element(echo_om_node, env);
if (om_str)
{
printf("\nSending OM : %s\n", om_str);
Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Sun Apr 1 04:19:13 2007
@@ -123,7 +123,7 @@
if (soap_fault)
{
printf("\nReturned SOAP fault: %s\n",
- AXIOM_NODE_TO_STRING(axiom_soap_fault_get_base_node(soap_fault,env),
+ axiom_node_get_data_element(axiom_soap_fault_get_base_node(soap_fault,env),
env));
}
return -1;
@@ -131,26 +131,26 @@
if (ret_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(ret_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(ret_node, env) == AXIOM_ELEMENT)
{
axis2_char_t *result = NULL;
axiom_element_t *result_ele = NULL;
axiom_node_t *ret_node1 = NULL;
- result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
+ result_ele = (axiom_element_t*)axiom_node_get_data_element(ret_node, env);
if (axis2_strcmp(axiom_element_get_localname(result_ele, env), "doSpellingSuggestionResponse") != 0)
{
print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
- ret_node1 = AXIOM_NODE_GET_FIRST_ELEMENT(ret_node, env); /*return*/
+ ret_node1 = axiom_node_get_first_element(ret_node, env); /*return*/
if (!ret_node1)
{
print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
- result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node1, env);
+ result_ele = (axiom_element_t*)axiom_node_get_data_element(ret_node1, env);
result = axiom_element_get_text(result_ele, env, ret_node1);
printf("\nResult = %s\n", result);
}
@@ -213,7 +213,7 @@
axiom_element_add_attribute(text_om_ele, env, attri1, text_om_node);
axiom_element_set_text(text_om_ele, env, word_to_spell, text_om_node);
- buffer = AXIOM_NODE_TO_STRING(google_om_node, env);
+ buffer = axiom_node_to_string(google_om_node, env);
printf("%s\n", buffer);
return google_om_node;
}
@@ -221,6 +221,6 @@
void print_invalid_om(const axutil_env_t *env, axiom_node_t *ret_node)
{
axis2_char_t *buffer = NULL;
- buffer = AXIOM_NODE_TO_STRING(ret_node, env);
+ buffer = axiom_node_get_data_element(ret_node, env);
printf("\nReceived OM as result : %s\n", buffer);
}
Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Sun Apr 1 04:19:13 2007
@@ -79,10 +79,10 @@
ret_node = axis2_math_stub_add(stub, env, node);
if (ret_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(ret_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(ret_node, env) == AXIOM_ELEMENT)
{
axis2_char_t *result = NULL;
- axiom_element_t *result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
+ axiom_element_t *result_ele = (axiom_element_t*)axiom_node_get_data_element(ret_node, env);
result = axiom_element_get_text(result_ele, env, ret_node);
printf("\nResult = %s\n", result);
@@ -96,7 +96,7 @@
AXIS2_XML_PARSER_TYPE_BUFFER);
om_output = axiom_output_create(env, writer);
- AXIOM_NODE_SERIALIZE(ret_node, env, om_output);
+ axiom_node_serialize(ret_node, env, om_output);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, env);
printf("\nReceived invalid OM as result : %s\n", buffer);
if (buffer)
@@ -165,7 +165,7 @@
AXIS2_XML_PARSER_TYPE_BUFFER);
om_output = axiom_output_create(env, xml_writer);
- AXIOM_NODE_SERIALIZE(math_om_node, env, om_output);
+ axiom_node_serialize(math_om_node, env, om_output);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
if (om_output)
Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Sun Apr 1 04:19:13 2007
@@ -113,7 +113,7 @@
if (ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(ret_node, env);
+ om_str = axiom_node_get_data_element(ret_node, env);
if (om_str)
{
printf("\nReceived OM : %s\n", om_str);
@@ -176,7 +176,7 @@
data_handler = axiom_data_handler_create(env, image_name, "image/jpeg");
data_text = axiom_text_create_with_data_handler(env, image_om_node, data_handler, &data_om_node);
axiom_text_set_optimize(data_text, env, optimized);
- om_str = AXIOM_NODE_TO_STRING(mtom_om_node, env);
+ om_str = axiom_node_to_string(mtom_om_node, env);
if (om_str)
{
printf("%s", om_str);
Modified: webservices/axis2/trunk/c/samples/client/notify/notify_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/notify_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Sun Apr 1 04:19:13 2007
@@ -133,7 +133,7 @@
notify_om_ele = axiom_element_create(env, NULL, "notify", ns1, ¬ify_om_node);
axiom_element_set_text(notify_om_ele, env, "notify5", notify_om_node);
- buffer = AXIOM_NODE_TO_STRING(notify_om_node, env);
+ buffer = axiom_node_to_string(notify_om_node, env);
if (buffer)
{
printf("\nSending OM node in XML : %s \n", buffer);
Modified: webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Sun Apr 1 04:19:13 2007
@@ -147,12 +147,12 @@
format_output (const axutil_env_t *env, axiom_node_t *node)
{
axiom_node_t *child_node;
- child_node = AXIOM_NODE_GET_FIRST_CHILD (node, env);
- while (AXIOM_NODE_IS_COMPLETE (node, env) && child_node)
+ child_node = axiom_node_get_first_child (node, env);
+ while (axiom_node_is_complete (node, env) && child_node)
{
printf ("\n\n");
format_output_one (env, child_node);
- child_node = AXIOM_NODE_GET_NEXT_SIBLING (child_node, env);
+ child_node = axiom_node_get_next_sibling (child_node, env);
}
@@ -162,16 +162,16 @@
format_output_one (const axutil_env_t *env, axiom_node_t *node)
{
axiom_node_t *child_node;
- child_node = AXIOM_NODE_GET_FIRST_CHILD (node, env);
- while (AXIOM_NODE_IS_COMPLETE (node, env) && child_node)
+ child_node = axiom_node_get_first_child (node, env);
+ while (axiom_node_is_complete (node, env) && child_node)
{
- axis2_char_t *om_str = AXIOM_NODE_TO_STRING (child_node, env);
+ axis2_char_t *om_str = axiom_node_to_string(child_node, env);
if (om_str)
{
printf ("\t%s\n", om_str);
AXIS2_FREE(env->allocator, om_str);
}
- child_node = AXIOM_NODE_GET_NEXT_SIBLING (child_node, env);
+ child_node = axiom_node_get_next_sibling (child_node, env);
}
}
Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc.c Sun Apr 1 04:19:13 2007
@@ -37,14 +37,14 @@
printf("Calculator client request ERROR: input parameter NULL\n");
return NULL;
}
- complex_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+ complex_node = axiom_node_get_first_child(node, env);
if (!complex_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Calculator service ERROR: invalid XML in request\n");
return NULL;
}
- seq_node = AXIOM_NODE_GET_FIRST_CHILD(complex_node, env);
+ seq_node = axiom_node_get_first_child(complex_node, env);
if (!seq_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -52,23 +52,23 @@
return NULL;
}
- param1_node = AXIOM_NODE_GET_FIRST_CHILD(seq_node, env);
+ param1_node = axiom_node_get_first_child(seq_node, env);
if (!param1_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Calculator service ERROR: invalid XML in request\n");
return NULL;
}
- param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
+ param1_text_node = axiom_node_get_first_child(param1_node, env);
if (!param1_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Calculator service ERROR: invalid XML in request\n");
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param1_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param1_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param1_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -81,23 +81,23 @@
return NULL;
}
- param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
+ param2_node = axiom_node_get_next_sibling(param1_node, env);
if (!param2_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Calculator service ERROR: invalid XML in request\n");
return NULL;
}
- param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
+ param2_text_node = axiom_node_get_first_child(param2_node, env);
if (!param2_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Calculator service ERROR: invalid XML in request\n");
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param2_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param2_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param2_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -160,7 +160,7 @@
return NULL;
}
- param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+ param1_node = axiom_node_get_first_child(node, env);
if (!param1_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -168,7 +168,7 @@
return NULL;
}
- param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
+ param1_text_node = axiom_node_get_first_child(param1_node, env);
if (!param1_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -176,9 +176,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param1_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param1_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param1_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -191,7 +191,7 @@
return NULL;
}
- param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
+ param2_node = axiom_node_get_next_sibling(param1_node, env);
if (!param2_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -199,7 +199,7 @@
return NULL;
}
- param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
+ param2_text_node = axiom_node_get_first_child(param2_node, env);
if (!param2_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -207,9 +207,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param2_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param2_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param2_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -273,7 +273,7 @@
return NULL;
}
- param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+ param1_node = axiom_node_get_first_child(node, env);
if (!param1_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -281,7 +281,7 @@
return NULL;
}
- param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
+ param1_text_node = axiom_node_get_first_child(param1_node, env);
if (!param1_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -289,9 +289,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param1_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param1_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param1_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -304,7 +304,7 @@
return NULL;
}
- param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
+ param2_node = axiom_node_get_next_sibling(param1_node, env);
if (!param2_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -312,7 +312,7 @@
return NULL;
}
- param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
+ param2_text_node = axiom_node_get_first_child(param2_node, env);
if (!param2_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -320,9 +320,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param2_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param2_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param2_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -386,7 +386,7 @@
return NULL;
}
- param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+ param1_node = axiom_node_get_first_child(node, env);
if (!param1_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -394,7 +394,7 @@
return NULL;
}
- param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
+ param1_text_node = axiom_node_get_first_child(param1_node, env);
if (!param1_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -402,9 +402,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param1_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param1_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param1_str = (axis2_char_t *)axiom_text_get_value(text, env);
@@ -417,7 +417,7 @@
return NULL;
}
- param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
+ param2_node = axiom_node_get_next_sibling(param1_node, env);
if (!param2_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -425,7 +425,7 @@
return NULL;
}
- param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
+ param2_text_node = axiom_node_get_first_child(param2_node, env);
if (!param2_text_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -433,9 +433,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(param2_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(param2_text_node, env);
if (text && axiom_text_get_value(text , env))
{
param2_str = (axis2_char_t *)axiom_text_get_value(text, env);
Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c Sun Apr 1 04:19:13 2007
@@ -98,10 +98,10 @@
*/
if (node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(node, env) == AXIOM_ELEMENT)
{
axiom_element_t *element = NULL;
- element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = (axiom_element_t *)axiom_node_get_data_element(node, env);
if (element)
{
axis2_char_t *op_name = axiom_element_get_localname(element, env);
Modified: webservices/axis2/trunk/c/samples/server/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo.c Sun Apr 1 04:19:13 2007
@@ -42,7 +42,7 @@
return NULL;
}
- text_parent_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+ text_parent_node = axiom_node_get_first_child(node, env);
if (!text_parent_node) /* 'text' node */
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -50,7 +50,7 @@
return NULL;
}
- text_node = AXIOM_NODE_GET_FIRST_CHILD(text_parent_node, env);
+ text_node = axiom_node_get_first_child(text_parent_node, env);
if (!text_node) /* actual text to echo */
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -58,9 +58,9 @@
return NULL;
}
- if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(text_node, env);
if (text && axiom_text_get_value(text , env))
{
axis2_char_t *text_str = (axis2_char_t *)axiom_text_get_value(text, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org