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 [1/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...
Author: samisa
Date: Sun Apr 1 04:19:13 2007
New Revision: 524582
URL: http://svn.apache.org/viewvc?view=rev&rev=524582
Log:
Removed macros form axiom_node
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_node.h
webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_comment.c
webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
webservices/axis2/trunk/c/axiom/src/om/om_document.c
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_navigator.c
webservices/axis2/trunk/c/axiom/src/om/om_node.c
webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
webservices/axis2/trunk/c/samples/client/echo/echo.c
webservices/axis2/trunk/c/samples/client/google/google_client.c
webservices/axis2/trunk/c/samples/client/math/math_client.c
webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
webservices/axis2/trunk/c/samples/client/notify/notify_client.c
webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
webservices/axis2/trunk/c/samples/server/Calculator/calc.c
webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
webservices/axis2/trunk/c/samples/server/echo/echo.c
webservices/axis2/trunk/c/samples/server/math/math.c
webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
webservices/axis2/trunk/c/samples/server/mtom/mtom.c
webservices/axis2/trunk/c/samples/server/notify/notify.c
webservices/axis2/trunk/c/samples/server/sg_math/add.c
webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/div.c
webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/mul.c
webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/sub.c
webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_node.h?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_node.h Sun Apr 1 04:19:13 2007
@@ -96,7 +96,7 @@
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
AXIS2_EXTERN void AXIS2_CALL
- axiom_node_free(axiom_node_t *om_node,
+ axiom_node_free_tree(axiom_node_t *om_node,
const axutil_env_t *env);
/**
* Adds given node as child to parent. child should not have a parent
@@ -273,41 +273,6 @@
const axutil_env_t *env,
struct axiom_output *om_output);
-#define AXIOM_NODE_FREE_TREE(om_node,env) \
- axiom_node_free(om_node,env)
-#define AXIOM_NODE_ADD_CHILD(om_node, env, child) \
- axiom_node_add_child(om_node, env, child)
-#define AXIOM_NODE_DETACH(om_node,env) \
- axiom_node_detach(om_node,env)
-#define AXIOM_NODE_INSERT_SIBLING_AFTER(om_node,env,node_to_insert) \
- axiom_node_insert_sibling_after(om_node,env,node_to_insert)
-#define AXIOM_NODE_INSERT_SIBLING_BEFORE(om_node,env,node_to_insert) \
- axiom_node_insert_sibling_before(om_node,env,node_to_insert)
-#define AXIOM_NODE_SERIALIZE(om_node,env, om_output) \
- axiom_node_serialize(om_node,env,om_output)
-#define AXIOM_NODE_GET_PARENT(om_node,env) \
- axiom_node_get_parent(om_node,env)
-#define AXIOM_NODE_GET_FIRST_CHILD(om_node,env) \
- axiom_node_get_first_child(om_node,env)
-#define AXIOM_NODE_GET_LAST_CHILD(om_node,env) \
- axiom_node_get_last_child(om_node,env)
-#define AXIOM_NODE_GET_NEXT_SIBLING(om_node,env) \
- axiom_node_get_next_sibling(om_node,env)
-#define AXIOM_NODE_GET_PREVIOUS_SIBLING(om_node,env) \
- axiom_node_get_previous_sibling(om_node,env)
-#define AXIOM_NODE_GET_FIRST_ELEMENT(om_node,env) \
- axiom_node_get_first_element(om_node,env)
-#define AXIOM_NODE_IS_COMPLETE(om_node,env) \
- axiom_node_is_complete(om_node,env)
-#define AXIOM_NODE_GET_DATA_ELEMENT(om_node,env) \
- axiom_node_get_data_element(om_node,env)
-#define AXIOM_NODE_GET_NODE_TYPE(om_node,env) \
- axiom_node_get_node_type(om_node,env)
-#define AXIOM_NODE_GET_DOCUMENT(om_node, env) \
- axiom_node_get_document(om_node, env)
-
-#define AXIOM_NODE_TO_STRING(om_node, env) \
- axiom_node_to_string(om_node, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c Sun Apr 1 04:19:13 2007
@@ -79,8 +79,8 @@
if (!(iterator->last_child))
return AXIS2_FAILURE;
- last_child = AXIOM_NODE_DETACH(iterator->last_child, env);
- AXIOM_NODE_FREE_TREE(last_child, env);
+ last_child = axiom_node_detach(iterator->last_child, env);
+ axiom_node_free_tree(last_child, env);
return AXIS2_SUCCESS;
}
@@ -108,12 +108,12 @@
iterator->last_child = iterator->current_child;
do
{
- iterator->current_child = AXIOM_NODE_GET_NEXT_SIBLING(
+ iterator->current_child = axiom_node_get_next_sibling(
iterator->current_child, env);
}
while (iterator->current_child &&
- (AXIOM_NODE_GET_NODE_TYPE(iterator->current_child, env)
+ (axiom_node_get_node_type(iterator->current_child, env)
!= AXIOM_ELEMENT));
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c Sun Apr 1 04:19:13 2007
@@ -93,10 +93,10 @@
{
return AXIS2_FAILURE;
}
- om_node = AXIOM_NODE_DETACH(iterator->last_child, env);
+ om_node = axiom_node_detach(iterator->last_child, env);
if (om_node)
{
- AXIOM_NODE_FREE_TREE(om_node, env);
+ axiom_node_free_tree(om_node, env);
}
return AXIS2_SUCCESS;
}
@@ -121,7 +121,7 @@
if (iterator->current_child)
{
iterator->last_child = iterator->current_child;
- iterator->current_child = AXIOM_NODE_GET_NEXT_SIBLING(
+ iterator->current_child = axiom_node_get_next_sibling(
iterator->current_child, env);
return iterator->last_child;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Sun Apr 1 04:19:13 2007
@@ -107,10 +107,10 @@
if (!(iterator->last_child))
return AXIS2_FAILURE;
- last_child = AXIOM_NODE_DETACH(iterator->last_child, env);
+ last_child = axiom_node_detach(iterator->last_child, env);
if (last_child)
{
- AXIOM_NODE_FREE_TREE(last_child, env);
+ axiom_node_free_tree(last_child, env);
}
return AXIS2_SUCCESS;
}
@@ -126,9 +126,9 @@
if (iterator->current_child)
{
axiom_element_t *om_element = NULL;
- if (AXIOM_NODE_GET_NODE_TYPE(iterator->current_child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(iterator->current_child, env) == AXIOM_ELEMENT)
{
- om_element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ om_element = (axiom_element_t *)axiom_node_get_data_element(
iterator->current_child, env);
}
@@ -142,7 +142,7 @@
}
else
{
- iterator->current_child = AXIOM_NODE_GET_NEXT_SIBLING(iterator->current_child, env);
+ iterator->current_child = axiom_node_get_next_sibling(iterator->current_child, env);
if (iterator->current_child)
{
iterator->need_to_move_forward = AXIS2_TRUE;
@@ -179,7 +179,7 @@
if (iterator->current_child)
{
iterator->current_child =
- AXIOM_NODE_GET_NEXT_SIBLING(iterator->current_child, env);
+ axiom_node_get_next_sibling(iterator->current_child, env);
}
return iterator->last_child;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Sun Apr 1 04:19:13 2007
@@ -105,10 +105,10 @@
if (!(iterator->last_child))
return AXIS2_FAILURE;
- last_child = AXIOM_NODE_DETACH(iterator->last_child, env);
+ last_child = axiom_node_detach(iterator->last_child, env);
if (last_child)
{
- AXIOM_NODE_FREE_TREE(last_child, env);
+ axiom_node_free_tree(last_child, env);
last_child = NULL;
}
return AXIS2_SUCCESS;
@@ -129,12 +129,12 @@
}
while (need_to_move_forward)
{
- if (AXIOM_NODE_GET_NODE_TYPE(iterator->current_child, env)
+ if (axiom_node_get_node_type(iterator->current_child, env)
== AXIOM_ELEMENT)
{
axiom_attribute_t *om_attr = NULL;
axiom_element_t *om_ele = NULL;
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(
iterator->current_child, env);
om_attr = axiom_element_get_attribute(om_ele, env,
iterator->attr_qname);
@@ -149,7 +149,7 @@
else
{
iterator->current_child =
- AXIOM_NODE_GET_NEXT_SIBLING(
+ axiom_node_get_next_sibling(
iterator->current_child, env);
need_to_move_forward = (iterator->current_child != NULL);
@@ -159,7 +159,7 @@
{
iterator->current_child =
- AXIOM_NODE_GET_NEXT_SIBLING(
+ axiom_node_get_next_sibling(
iterator->current_child, env);
need_to_move_forward = (iterator->current_child != NULL);
}
@@ -179,14 +179,14 @@
iterator->next_called = AXIS2_TRUE;
iterator->remove_called = AXIS2_FALSE;
iterator->last_child = iterator->current_child;
- iterator->current_child = AXIOM_NODE_GET_NEXT_SIBLING(
+ iterator->current_child = axiom_node_get_next_sibling(
iterator->current_child, env);
if (iterator->last_child && iterator->detach
- && (AXIOM_NODE_GET_PARENT(iterator->last_child, env)))
+ && (axiom_node_get_parent(iterator->last_child, env)))
{
- last_child = AXIOM_NODE_DETACH(iterator->last_child, env);
+ last_child = axiom_node_detach(iterator->last_child, env);
if (last_child)
- AXIOM_NODE_FREE_TREE(last_child, env);
+ axiom_node_free_tree(last_child, env);
}
return iterator->last_child;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_comment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_comment.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_comment.c Sun Apr 1 04:19:13 2007
@@ -71,7 +71,7 @@
if (parent)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
return comment;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_data_source.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_data_source.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_data_source.c Sun Apr 1 04:19:13 2007
@@ -75,9 +75,9 @@
return NULL;
}
- if (parent && AXIOM_NODE_GET_NODE_TYPE(parent, env) == AXIOM_ELEMENT)
+ if (parent && axiom_node_get_node_type(parent, env) == AXIOM_ELEMENT)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
return data_source;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_doctype.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_doctype.c Sun Apr 1 04:19:13 2007
@@ -71,7 +71,7 @@
if (parent)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
return doctype;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_document.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_document.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.c Sun Apr 1 04:19:13 2007
@@ -75,7 +75,7 @@
if (document->root_element)
{
- AXIOM_NODE_FREE_TREE(document->root_element, env);
+ axiom_node_free_tree(document->root_element, env);
}
AXIS2_FREE(env->allocator, document);
return;
@@ -106,7 +106,7 @@
return last_child;
}
else if ((document->root_element) &&
- (AXIOM_NODE_IS_COMPLETE(document->root_element, env) == AXIS2_TRUE))
+ (axiom_node_is_complete(document->root_element, env) == AXIS2_TRUE))
return NULL; /* Nothing wrong but done with pulling */
last_child = axiom_stax_builder_next(document->builder, env);
@@ -156,7 +156,7 @@
if (document->root_element)
{
- AXIOM_NODE_FREE_TREE(document->root_element, env);
+ axiom_node_free_tree(document->root_element, env);
document->root_element = node;
return AXIS2_SUCCESS;
}
@@ -188,7 +188,7 @@
ret_val = axiom_document_build_next(document, env);
if (!ret_val)
{
- if (AXIOM_NODE_IS_COMPLETE(document->root_element, env) == AXIS2_TRUE)
+ if (axiom_node_is_complete(document->root_element, env) == AXIS2_TRUE)
{
/** document is completly build */
return document->root_element;
@@ -200,7 +200,7 @@
}
}
}
- while (!AXIOM_NODE_IS_COMPLETE(document->root_element, env));
+ while (!axiom_node_is_complete(document->root_element, env));
return document->root_element;
}
else
@@ -230,7 +230,7 @@
}
if (document->root_element)
{
- return AXIOM_NODE_SERIALIZE(document->root_element,
+ return axiom_node_serialize(document->root_element,
env, om_output);
}
else
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Sun Apr 1 04:19:13 2007
@@ -101,7 +101,7 @@
}
if (parent)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
axiom_node_set_complete((*node), env, AXIS2_FALSE);
axiom_node_set_node_type((*node), env, AXIOM_ELEMENT);
@@ -168,7 +168,7 @@
axis2_char_t *temp_prefix = NULL;
axiom_namespace_t *ns = NULL;
- om_element = ((axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT((*node), env));
+ om_element = ((axiom_element_t *)axiom_node_get_data_element((*node), env));
temp_nsuri = axutil_qname_get_uri(qname, env);
temp_prefix = axutil_qname_get_prefix(qname, env);
if (!om_element)
@@ -224,8 +224,8 @@
AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
return NULL;
}
- if (!AXIOM_NODE_GET_DATA_ELEMENT(element_node, env) ||
- AXIOM_NODE_GET_NODE_TYPE(element_node, env) != AXIOM_ELEMENT)
+ if (!axiom_node_get_data_element(element_node, env) ||
+ axiom_node_get_node_type(element_node, env) != AXIOM_ELEMENT)
{
/* wrong element type or null node */
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -304,14 +304,14 @@
/** could not find the namespace in current element scope
look in the parent */
- parent = AXIOM_NODE_GET_PARENT(element_node, env);
+ parent = axiom_node_get_parent(element_node, env);
if (parent)
{
- if (AXIOM_NODE_GET_NODE_TYPE(parent, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(parent, env) == AXIOM_ELEMENT)
{
axiom_element_t *om_element = NULL;
- om_element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(parent, env);
+ om_element = (axiom_element_t *)axiom_node_get_data_element(parent, env);
if (om_element)
{ /** parent exist, parent is om element so find in parent*/
return axiom_element_find_namespace(om_element, env,
@@ -924,7 +924,7 @@
else
{
om_element->children_iter = axiom_children_iterator_create(env,
- AXIOM_NODE_GET_FIRST_CHILD(element_node, env));
+ axiom_node_get_first_child(element_node, env));
return om_element->children_iter;
}
return NULL;
@@ -943,7 +943,7 @@
om_element->children_qname_iter = NULL;
}
om_element->children_qname_iter = axiom_children_qname_iterator_create(env,
- AXIOM_NODE_GET_FIRST_CHILD(element_node, env),
+ axiom_node_get_first_child(element_node, env),
element_qname);
return om_element->children_qname_iter;
}
@@ -962,7 +962,7 @@
AXIS2_PARAM_CHECK(env->error, element_node, NULL);
children_iterator = axiom_children_qname_iterator_create(env,
- AXIOM_NODE_GET_FIRST_CHILD(element_node, env),
+ axiom_node_get_first_child(element_node, env),
element_qname);
if (!children_iterator)
{
@@ -973,7 +973,7 @@
{
om_node = axiom_children_qname_iterator_next(children_iterator, env);
}
- if (om_node && (AXIOM_NODE_GET_NODE_TYPE(om_node, env) == AXIOM_ELEMENT))
+ if (om_node && (axiom_node_get_node_type(om_node, env) == AXIOM_ELEMENT))
{
axiom_children_qname_iterator_free(children_iterator, env);
@@ -981,7 +981,7 @@
{
*child_node = om_node;
}
- return (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+ return (axiom_element_t*)axiom_node_get_data_element(om_node, env);
}
else
{
@@ -1025,20 +1025,20 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, element_node, NULL);
- temp_node = AXIOM_NODE_GET_FIRST_CHILD(element_node, env);
+ temp_node = axiom_node_get_first_child(element_node, env);
while (temp_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(temp_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(temp_node, env) == AXIOM_ELEMENT)
{
if (first_ele_node)
{
*first_ele_node = temp_node;
}
- return (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(temp_node, env);
+ return (axiom_element_t *)axiom_node_get_data_element(temp_node, env);
}
else
{
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(temp_node, env);
+ temp_node = axiom_node_get_next_sibling(temp_node, env);
}
}
return NULL;
@@ -1063,17 +1063,17 @@
om_element->text_value = NULL;
}
- temp_node = AXIOM_NODE_GET_FIRST_CHILD(element_node, env);
+ temp_node = axiom_node_get_first_child(element_node, env);
while (temp_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(temp_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(temp_node, env) == AXIOM_TEXT)
{
int dest_len = 0;
int curr_len = 0;
axis2_char_t *temp_dest = NULL;
- text_node = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(temp_node, env);
+ text_node = (axiom_text_t *)axiom_node_get_data_element(temp_node, env);
if (text_node)
{
temp_text = axiom_text_get_value(text_node, env);
@@ -1100,7 +1100,7 @@
}
}
}
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(temp_node, env);
+ temp_node = axiom_node_get_next_sibling(temp_node, env);
}
om_element->text_value = dest;
@@ -1120,20 +1120,20 @@
AXIS2_PARAM_CHECK(env->error, text, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, element_node, AXIS2_FAILURE);
- temp_node = AXIOM_NODE_GET_FIRST_CHILD(element_node, env);
+ temp_node = axiom_node_get_first_child(element_node, env);
while (temp_node)
{
- if (AXIOM_NODE_GET_NODE_TYPE(temp_node, env) == AXIOM_TEXT)
+ if (axiom_node_get_node_type(temp_node, env) == AXIOM_TEXT)
{
- node_to_free = AXIOM_NODE_DETACH(temp_node, env);
- AXIOM_NODE_FREE_TREE(node_to_free, env);
+ node_to_free = axiom_node_detach(temp_node, env);
+ axiom_node_free_tree(node_to_free, env);
}
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(temp_node, env);
+ temp_node = axiom_node_get_next_sibling(temp_node, env);
}
temp_node = NULL;
om_text = axiom_text_create(env, NULL, text, &temp_node);
- AXIOM_NODE_ADD_CHILD(element_node, env, temp_node);
+ axiom_node_add_child(element_node, env, temp_node);
return AXIS2_SUCCESS;
}
@@ -1162,7 +1162,7 @@
return NULL;
}
- status = AXIOM_NODE_SERIALIZE(element_node, env, om_output);
+ status = axiom_node_serialize(element_node, env, om_output);
if (status == AXIS2_SUCCESS)
{
xml = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
@@ -1202,7 +1202,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_ele_node, AXIS2_FAILURE);
- if (AXIOM_NODE_GET_NODE_TYPE(om_ele_node, env) != AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(om_ele_node, env) != AXIOM_ELEMENT)
{
return AXIS2_FAILURE;
}
@@ -1212,7 +1212,7 @@
{
return AXIS2_FAILURE;
}
- while (!AXIOM_NODE_IS_COMPLETE(om_ele_node, env) &&
+ while (!axiom_node_is_complete(om_ele_node, env) &&
!axiom_stax_builder_is_complete(builder, env))
{
void *value = NULL;
@@ -1246,13 +1246,13 @@
}
}
- parent_node = AXIOM_NODE_GET_PARENT(element_node, env);
+ parent_node = axiom_node_get_parent(element_node, env);
if ((parent_node) &&
- (AXIOM_NODE_GET_NODE_TYPE(parent_node, env) == AXIOM_ELEMENT))
+ (axiom_node_get_node_type(parent_node, env) == AXIOM_ELEMENT))
{
axiom_element_t *parent_ele = NULL;
parent_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ axiom_node_get_data_element(parent_node, env);
if (parent_ele)
{
return axiom_element_get_default_namespace(parent_ele, env, parent_node);
@@ -1326,13 +1326,13 @@
}
}
- parent_node = AXIOM_NODE_GET_PARENT(element_node, env);
+ parent_node = axiom_node_get_parent(element_node, env);
if ((parent_node) &&
- (AXIOM_NODE_GET_NODE_TYPE(parent_node, env) == AXIOM_ELEMENT))
+ (axiom_node_get_node_type(parent_node, env) == AXIOM_ELEMENT))
{
axiom_element_t *parent_ele = NULL;
parent_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ axiom_node_get_data_element(parent_node, env);
if (parent_ele)
{
return axiom_element_find_namespace_uri(parent_ele, env, prefix, parent_node);
@@ -1554,7 +1554,7 @@
}
if (parent)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
axiom_node_set_complete((*node), env, AXIS2_FALSE);
axiom_node_set_node_type((*node), env, AXIOM_ELEMENT);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_navigator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_navigator.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_navigator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_navigator.c Sun Apr 1 04:19:13 2007
@@ -159,14 +159,14 @@
return;
}
- if ((AXIOM_ELEMENT == AXIOM_NODE_GET_NODE_TYPE(om_navigator->next, env)) &&
+ if ((AXIOM_ELEMENT == axiom_node_get_node_type(om_navigator->next, env)) &&
!(om_navigator->visited))
{
- if (AXIOM_NODE_GET_FIRST_CHILD(om_navigator->next, env))
+ if (axiom_node_get_first_child(om_navigator->next, env))
{
- om_navigator->next = AXIOM_NODE_GET_FIRST_CHILD(om_navigator->next, env);
+ om_navigator->next = axiom_node_get_first_child(om_navigator->next, env);
}
- else if (AXIS2_TRUE == AXIOM_NODE_IS_COMPLETE(om_navigator->next, env))
+ else if (AXIS2_TRUE == axiom_node_is_complete(om_navigator->next, env))
{
om_navigator->backtracked = AXIS2_TRUE;
}
@@ -180,15 +180,15 @@
axiom_node_t *parent = NULL;
axiom_node_t *next_sibling = NULL;
- next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(om_navigator->next, env);
+ next_sibling = axiom_node_get_next_sibling(om_navigator->next, env);
- parent = AXIOM_NODE_GET_PARENT(om_navigator->next, env);
+ parent = axiom_node_get_parent(om_navigator->next, env);
if (next_sibling)
{
om_navigator->next = next_sibling;
}
- else if ((parent) && AXIOM_NODE_IS_COMPLETE(parent, env))
+ else if ((parent) && axiom_node_is_complete(parent, env))
{
om_navigator->next = parent;
om_navigator->backtracked = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Sun Apr 1 04:19:13 2007
@@ -83,7 +83,7 @@
* before calling this function
*/
AXIS2_EXTERN void AXIS2_CALL
-axiom_node_free(axiom_node_t *om_node,
+axiom_node_free_tree(axiom_node_t *om_node,
const axutil_env_t *env)
{
axiom_node_t *child_node = NULL;
@@ -97,10 +97,10 @@
{
while ((om_node->first_child))
{
- child_node = AXIOM_NODE_DETACH(om_node->first_child, env);
+ child_node = axiom_node_detach(om_node->first_child, env);
if (child_node)
{
- AXIOM_NODE_FREE_TREE(child_node , env);
+ axiom_node_free_tree(child_node , env);
}
}
}
@@ -154,7 +154,7 @@
if (child->parent)
{
- child = AXIOM_NODE_DETACH(child, env);
+ child = axiom_node_detach(child, env);
}
if (!(om_node->first_child))
@@ -457,7 +457,7 @@
}
}
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(om_node, env);
+ temp_node = axiom_node_get_next_sibling(om_node, env);
if (temp_node)
{
om_node = temp_node;
@@ -482,7 +482,7 @@
}
}
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(om_node, env);
+ temp_node = axiom_node_get_next_sibling(om_node, env);
}
if (temp_node && count > 1)
@@ -659,7 +659,7 @@
}
}
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(om_node, env);
+ temp_node = axiom_node_get_next_sibling(om_node, env);
if (temp_node)
{
om_node = temp_node;
@@ -684,7 +684,7 @@
}
}
- temp_node = AXIOM_NODE_GET_NEXT_SIBLING(om_node, env);
+ temp_node = axiom_node_get_next_sibling(om_node, env);
}
if (temp_node && count > 1)
@@ -759,9 +759,9 @@
/**********************************************************/
first_element = om_node->first_child;
- while (first_element && (AXIOM_NODE_GET_NODE_TYPE(first_element, env) != AXIOM_ELEMENT))
+ while (first_element && (axiom_node_get_node_type(first_element, env) != AXIOM_ELEMENT))
{
- first_element = AXIOM_NODE_GET_NEXT_SIBLING (first_element, env);
+ first_element = axiom_node_get_next_sibling (first_element, env);
}
return first_element;
@@ -792,7 +792,7 @@
}
while (!(om_node->next_sibling) && om_node->parent &&
- om_node->builder && !(AXIOM_NODE_IS_COMPLETE(om_node->parent, env)))
+ om_node->builder && !(axiom_node_is_complete(om_node->parent, env)))
{
token = axiom_stax_builder_next_with_token(om_node->builder, env);
if (token == -1)
@@ -1008,7 +1008,7 @@
AXIOM_XML_WRITER_FREE(xml_writer, env);
return NULL;
}
- status = AXIOM_NODE_SERIALIZE(om_node, env, om_output);
+ status = axiom_node_serialize(om_node, env, om_output);
if (status == AXIS2_SUCCESS)
{
xml = axis2_strdup(env, (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env));
Modified: webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c Sun Apr 1 04:19:13 2007
@@ -94,7 +94,7 @@
axiom_node_set_node_type(*node, env, AXIOM_PROCESSING_INSTRUCTION);
if (parent)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
return processing_instruction;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Sun Apr 1 04:19:13 2007
@@ -128,7 +128,7 @@
if (axis2_strcmp(uri, "") != 0)
{
axiom_element_t *om_ele = NULL;
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(element_node, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(element_node, env);
if (om_ele)
{
ns = axiom_element_find_namespace(om_ele ,
@@ -161,7 +161,7 @@
return AXIS2_FAILURE;
}
- temp_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(element_node, env);
+ temp_ele = (axiom_element_t*)axiom_node_get_data_element(element_node, env);
if (temp_ele)
{
status = axiom_element_add_attribute(temp_ele,
@@ -215,10 +215,10 @@
temp_value_str = axutil_string_create_assume_ownership(env, &temp_value);
- if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
+ if (axiom_node_is_complete(om_builder->lastnode, env))
{
axiom_text_create_str(env,
- AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+ axiom_node_get_parent(om_builder->lastnode, env),
temp_value_str, &node);
}
@@ -247,7 +247,7 @@
element = om_builder->lastnode;
- if (AXIOM_NODE_IS_COMPLETE(element, env) || !(om_builder->cache))
+ if (axiom_node_is_complete(element, env) || !(om_builder->cache))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD, AXIS2_FAILURE);
@@ -260,20 +260,20 @@
while (AXIOM_XML_READER_NEXT(om_builder->parser, env)
!= AXIOM_XML_READER_END_ELEMENT);
}
- while (!(AXIOM_NODE_IS_COMPLETE(element, env)));
+ while (!(axiom_node_is_complete(element, env)));
/*All children of this element is pulled now */
- prev_node = AXIOM_NODE_GET_PREVIOUS_SIBLING(element, env);
+ prev_node = axiom_node_get_previous_sibling(element, env);
if (prev_node)
{
- AXIOM_NODE_FREE_TREE(AXIOM_NODE_GET_NEXT_SIBLING(prev_node, env), env);
+ axiom_node_free_tree(axiom_node_get_next_sibling(prev_node, env), env);
axiom_node_set_next_sibling(prev_node, env, NULL);
}
else
{
- parent = AXIOM_NODE_GET_PARENT(element, env);
- AXIOM_NODE_FREE_TREE(AXIOM_NODE_GET_FIRST_CHILD(parent, env), env);
+ parent = axiom_node_get_parent(element, env);
+ axiom_node_free_tree(axiom_node_get_first_child(parent, env), env);
axiom_node_set_first_child(parent, env, NULL);
om_builder->lastnode = parent;
}
@@ -321,7 +321,7 @@
/** !temp_ns_prefix is for guththila */
axiom_element_t *om_ele = NULL;
temp_ns_prefix_str = axutil_string_create(env, "");
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(node, env);
om_ns = axiom_namespace_create_str(env, temp_ns_uri_str, temp_ns_prefix_str);
if (!om_ns || !om_ele)
@@ -341,7 +341,7 @@
{
axiom_element_t *om_ele = NULL;
axis2_char_t *prefix = 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);
om_ns = axiom_namespace_create_str(env, temp_ns_uri_str, temp_ns_prefix_str);
if (!om_ns || !om_ele)
@@ -373,7 +373,7 @@
if (om_ns)
{
axiom_element_t *om_ele = 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)
{
axiom_element_set_namespace_assume_param_ownership(om_ele, env, om_ns);
@@ -437,10 +437,10 @@
env, element_node);
}
}
- else if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
+ else if (axiom_node_is_complete(om_builder->lastnode, env))
{
om_ele = axiom_element_create_str(env,
- AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+ axiom_node_get_parent(om_builder->lastnode, env),
temp_localname_str, NULL, &element_node);
if (!om_ele)
{
@@ -507,10 +507,10 @@
AXIOM_XML_READER_XML_FREE(om_builder->parser , env, comment_value);
return NULL;
}
- else if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
+ else if (axiom_node_is_complete(om_builder->lastnode, env))
{
axiom_comment_create(env,
- AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+ axiom_node_get_parent(om_builder->lastnode, env),
comment_value , &comment_node);
axiom_node_set_next_sibling(om_builder->lastnode, env, comment_node);
@@ -590,11 +590,11 @@
AXIOM_XML_READER_XML_FREE(om_builder->parser , env, value);
return NULL;
}
- else if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env) ||
- (AXIOM_NODE_GET_NODE_TYPE(om_builder->lastnode, env) == AXIOM_TEXT))
+ else if (axiom_node_is_complete(om_builder->lastnode, env) ||
+ (axiom_node_get_node_type(om_builder->lastnode, env) == AXIOM_TEXT))
{
axiom_processing_instruction_create(env,
- AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+ axiom_node_get_parent(om_builder->lastnode, env),
target, value, &pi_node);
axiom_node_set_next_sibling(om_builder->lastnode, env, pi_node);
@@ -633,9 +633,9 @@
if (om_builder->lastnode)
{
- if (AXIOM_NODE_IS_COMPLETE((om_builder->lastnode), env))
+ if (axiom_node_is_complete((om_builder->lastnode), env))
{
- parent = AXIOM_NODE_GET_PARENT((om_builder->lastnode), env);
+ parent = axiom_node_get_parent((om_builder->lastnode), env);
if (parent)
{
axiom_node_set_complete(parent, env, AXIS2_TRUE);
@@ -649,7 +649,7 @@
}
if (om_builder->root_node)
{
- if (AXIOM_NODE_IS_COMPLETE(om_builder->root_node , env))
+ if (axiom_node_is_complete(om_builder->root_node , env))
{
om_builder->done = AXIS2_TRUE;
}
@@ -780,7 +780,7 @@
{
if (om_builder->root_node)
{
- AXIOM_NODE_FREE_TREE(om_builder->root_node, env);
+ axiom_node_free_tree(om_builder->root_node, env);
om_builder->root_node = NULL;
}
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Sun Apr 1 04:19:13 2007
@@ -101,9 +101,9 @@
axiom_node_set_node_type((*node), env, AXIOM_TEXT);
axiom_node_set_complete((*node), env, AXIS2_FALSE);
- if (parent && AXIOM_NODE_GET_NODE_TYPE(parent, env) == AXIOM_ELEMENT)
+ if (parent && axiom_node_get_node_type(parent, env) == AXIOM_ELEMENT)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
return om_text;
@@ -570,9 +570,9 @@
axiom_node_set_node_type((*node), env, AXIOM_TEXT);
axiom_node_set_complete((*node), env, AXIS2_FALSE);
- if (parent && AXIOM_NODE_GET_NODE_TYPE(parent, env) == AXIOM_ELEMENT)
+ if (parent && axiom_node_get_node_type(parent, env) == AXIOM_ELEMENT)
{
- AXIOM_NODE_ADD_CHILD(parent, env, (*node));
+ axiom_node_add_child(parent, env, (*node));
}
return om_text;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Sun Apr 1 04:19:13 2007
@@ -103,7 +103,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_element_node, AXIS2_FAILURE);
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(om_element_node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(om_element_node, env);
ele_localname = axiom_element_get_localname(om_ele, env);
if (!ele_localname)
@@ -168,7 +168,7 @@
if (!fault_value_node)
return AXIS2_FAILURE;
- fault_value_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ fault_value_ele = (axiom_element_t *)axiom_node_get_data_element(
fault_value_node, env);
axiom_stax_builder_set_lastnode(builder_helper->om_builder,
@@ -278,10 +278,10 @@
axiom_element_t *parent_element = NULL;
axis2_char_t *parent_localname = NULL;
- parent_node = AXIOM_NODE_GET_PARENT(om_element_node, env);
+ parent_node = axiom_node_get_parent(om_element_node, env);
if (!parent_node)
return AXIS2_FAILURE;
- parent_element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_element = (axiom_element_t *)axiom_node_get_data_element(
om_element_node, env);
parent_localname = axiom_element_get_localname(parent_element, env);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Sun Apr 1 04:19:13 2007
@@ -127,7 +127,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_ele_node, AXIS2_FAILURE);
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(om_ele_node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(om_ele_node, env);
if (!om_ele)
return AXIS2_FAILURE;
@@ -369,11 +369,11 @@
axiom_node_t *parent_node = NULL;
axiom_element_t *parent_ele = NULL;
axis2_char_t *parent_localname = NULL;
- parent_node = AXIOM_NODE_GET_PARENT(om_ele_node, env);
+ parent_node = axiom_node_get_parent(om_ele_node, env);
if (!parent_node)
return AXIS2_FAILURE;
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
return AXIS2_FAILURE;
@@ -482,9 +482,6 @@
return AXIS2_FAILURE;
axiom_soap_fault_reason_add_soap_fault_text(fault_reason, env, soap_fault_text);
- /*****************
- AXIOM_NODE_SET_BUILD_STATUS(om_ele_node, env, AXIS2_FALSE);
- ******************/
builder_helper->reason_processing = AXIS2_FALSE;
axiom_soap_builder_set_bool_processing_mandatory_fault_elements(builder_helper->soap_builder, env, AXIS2_FALSE);
@@ -522,11 +519,11 @@
axiom_element_t *parent_ele = NULL;
axis2_char_t *parent_localname = NULL;
- parent_node = AXIOM_NODE_GET_PARENT(om_ele_node, env);
+ parent_node = axiom_node_get_parent(om_ele_node, env);
if (!parent_node)
return AXIS2_FAILURE;
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_body.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_body.c Sun Apr 1 04:19:13 2007
@@ -91,7 +91,7 @@
axiom_soap_body_free(soap_body, env);
return NULL;
}
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
@@ -147,7 +147,7 @@
{
if (soap_body->soap_builder)
{
- while (!(soap_body->soap_fault) && !(AXIOM_NODE_IS_COMPLETE(soap_body->om_ele_node, env)))
+ while (!(soap_body->soap_fault) && !(axiom_node_is_complete(soap_body->om_ele_node, env)))
{
status = axiom_soap_builder_next(soap_body->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -182,7 +182,7 @@
}
else if (soap_body->soap_builder)
{
- while (!(soap_body->soap_fault) && !(AXIOM_NODE_IS_COMPLETE(soap_body->om_ele_node, env)))
+ while (!(soap_body->soap_fault) && !(axiom_node_is_complete(soap_body->om_ele_node, env)))
{
int status = AXIS2_SUCCESS;
status = axiom_soap_builder_next(soap_body->soap_builder, env);
@@ -213,7 +213,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;
@@ -242,7 +242,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (soap_body->om_ele_node && soap_body->soap_builder)
{
- while (AXIOM_NODE_IS_COMPLETE(soap_body->om_ele_node, env) != AXIS2_TRUE)
+ while (axiom_node_is_complete(soap_body->om_ele_node, env) != AXIS2_TRUE)
{
status = axiom_soap_builder_next(soap_body->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -286,7 +286,7 @@
if (soap_body->om_ele_node)
{
- return AXIOM_NODE_ADD_CHILD(soap_body->om_ele_node, env, child);
+ return axiom_node_add_child(soap_body->om_ele_node, env, child);
}
return AXIS2_FAILURE;
}
@@ -301,7 +301,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (!soap_body->om_ele_node)
return AXIS2_FAILURE;
- body_ele = AXIOM_NODE_GET_DATA_ELEMENT(soap_body->om_ele_node, env);
+ body_ele = axiom_node_get_data_element(soap_body->om_ele_node, env);
if (!body_ele)
return AXIS2_FAILURE;
om_ns = axiom_element_get_namespace(body_ele, env, soap_body->om_ele_node);
@@ -348,7 +348,7 @@
if (fault_code_om_node)
{
fault_code_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_code_om_node, env);
+ axiom_node_get_data_element(fault_code_om_node, env);
if (fault_code_om_ele)
{
axiom_element_set_localname(fault_code_om_ele,
@@ -361,9 +361,9 @@
fault_value_om_node = axiom_soap_fault_value_get_base_node(fault_value, env);
if (fault_value_om_node)
{
- fault_value_om_node = AXIOM_NODE_DETACH(fault_value_om_node, env);
+ fault_value_om_node = axiom_node_detach(fault_value_om_node, env);
fault_value_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_value_om_node, env);
+ axiom_node_get_data_element(fault_value_om_node, env);
if (fault_value_om_ele)
{
text = axiom_element_get_text(fault_value_om_ele, env, fault_value_om_node);
@@ -371,7 +371,7 @@
{
axiom_element_set_text(fault_code_om_ele, env, text, fault_code_om_node);
}
- AXIOM_NODE_FREE_TREE(fault_value_om_node, env);
+ axiom_node_free_tree(fault_value_om_node, env);
}
}
@@ -393,7 +393,7 @@
if (fault_reason_om_node)
{
fault_reason_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_reason_om_node, env);
+ axiom_node_get_data_element(fault_reason_om_node, env);
if (fault_reason_om_ele)
{
@@ -408,9 +408,9 @@
fault_text_om_node = axiom_soap_fault_text_get_base_node(fault_text, env);
if (fault_text_om_node)
{
- fault_text_om_node = AXIOM_NODE_DETACH(fault_text_om_node, env);
+ fault_text_om_node = axiom_node_detach(fault_text_om_node, env);
fault_text_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_text_om_node, env);
+ axiom_node_get_data_element(fault_text_om_node, env);
if (fault_text_om_ele)
{
text = axiom_element_get_text(fault_text_om_ele, env, fault_text_om_node);
@@ -420,7 +420,7 @@
env, text, fault_reason_om_node);
}
}
- AXIOM_NODE_FREE_TREE(fault_text_om_node, env);
+ axiom_node_free_tree(fault_text_om_node, env);
}
}
}
@@ -437,7 +437,7 @@
if (fault_role_om_node)
{
fault_role_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_role_om_node, env);
+ axiom_node_get_data_element(fault_role_om_node, env);
if (fault_role_om_ele)
{
axiom_element_set_localname(fault_role_om_ele, env,
@@ -455,7 +455,7 @@
if (fault_detail_om_node)
{
fault_detail_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_detail_om_node, env);
+ axiom_node_get_data_element(fault_detail_om_node, env);
if (fault_detail_om_ele)
{
axiom_element_set_localname(fault_detail_om_ele,
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Sun Apr 1 04:19:13 2007
@@ -330,7 +330,7 @@
{
int element_level = 0;
axiom_node_t *parent_node = NULL;
- parent_node = AXIOM_NODE_GET_PARENT(current_node, env);
+ parent_node = axiom_node_get_parent(current_node, env);
if (!soap_builder->om_builder)
return AXIS2_FAILURE;
@@ -378,7 +378,7 @@
soap_builder->om_builder, env);
/* get om element struct from node */
om_element = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(om_element_node, env);
+ axiom_node_get_data_element(om_element_node, env);
if (!om_element)
return AXIS2_FAILURE;
/* get element localname */
@@ -439,7 +439,7 @@
if (parent)
{
/** a parent node exist , so not soap envelope element */
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(parent, env);
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(parent, env);
if (parent_ele)
parent_localname = axiom_element_get_localname(parent_ele, env);
}
@@ -649,9 +649,9 @@
if (!is_soap_element)
return AXIS2_SUCCESS;
- 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_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)
{
om_ns = axiom_element_get_namespace(om_ele, env, om_node);
@@ -703,7 +703,7 @@
if (!envelope_node)
return AXIS2_FAILURE;
- om_ele = (axiom_element_t *) AXIOM_NODE_GET_DATA_ELEMENT(envelope_node, env);
+ om_ele = (axiom_element_t *) axiom_node_get_data_element(envelope_node, env);
if (!om_ele)
return AXIS2_FAILURE;
@@ -772,7 +772,7 @@
om_node = axiom_soap_header_get_base_node(soap_header, env);
if (om_node)
{
- while (!AXIOM_NODE_IS_COMPLETE(om_node, env))
+ while (!axiom_node_is_complete(om_node, env))
{
status = axiom_soap_builder_next(soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -866,7 +866,7 @@
soap_builder->om_builder, env);
om_element = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(om_element_node, env);
+ axiom_node_get_data_element(om_element_node, env);
if (!om_element)
return AXIS2_FAILURE;
@@ -878,7 +878,7 @@
return AXIS2_FAILURE;
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(parent, env);
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(parent, env);
if (!parent_ele)
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Sun Apr 1 04:19:13 2007
@@ -164,7 +164,7 @@
}
else
{
- AXIOM_NODE_FREE_TREE(soap_envelope->om_ele_node, env);
+ axiom_node_free_tree(soap_envelope->om_ele_node, env);
}
}
@@ -187,7 +187,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;
@@ -227,7 +227,7 @@
}
else if (soap_envelope->soap_builder)
{
- while (!(soap_envelope->header) && !AXIOM_NODE_IS_COMPLETE(
+ while (!(soap_envelope->header) && !axiom_node_is_complete(
soap_envelope->om_ele_node, env))
{
status = axiom_soap_builder_next(soap_envelope->soap_builder, env);
@@ -272,7 +272,7 @@
}
else if (soap_envelope->soap_builder)
{
- while (!(soap_envelope->body) && !AXIOM_NODE_IS_COMPLETE(soap_envelope->om_ele_node, env))
+ while (!(soap_envelope->body) && !axiom_node_is_complete(soap_envelope->om_ele_node, env))
{
status = axiom_soap_builder_next(soap_envelope->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -311,7 +311,7 @@
Otherwise default values will be written
*/
axiom_output_get_content_type(om_output, env);
- return AXIOM_NODE_SERIALIZE(soap_envelope->om_ele_node, env, om_output);
+ return axiom_node_serialize(soap_envelope->om_ele_node, env, om_output);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -361,9 +361,9 @@
if (soap_envelope->om_ele_node)
{
axiom_element_t *ele = NULL;
- if (AXIOM_NODE_GET_NODE_TYPE(soap_envelope->om_ele_node, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(soap_envelope->om_ele_node, env) == AXIOM_ELEMENT)
{
- ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(soap_envelope->om_ele_node, env);
+ ele = (axiom_element_t*)axiom_node_get_data_element(soap_envelope->om_ele_node, env);
if (ele)
{
return axiom_element_get_namespace(ele, env, soap_envelope->om_ele_node);
@@ -559,7 +559,7 @@
}
env_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(soap_envelope->om_ele_node,
+ axiom_node_get_data_element(soap_envelope->om_ele_node,
env);
if (!env_ele)
{
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c Sun Apr 1 04:19:13 2007
@@ -103,7 +103,7 @@
soap_fault->soap_version =
axiom_soap_body_get_soap_version(body, env);
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
{
@@ -221,7 +221,7 @@
}
else if (soap_fault->soap_builder)
{
- while (!(soap_fault->fcode) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
+ while (!(soap_fault->fcode) && !(axiom_node_is_complete(soap_fault->om_ele_node, env)))
{
status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -263,7 +263,7 @@
}
else if (soap_fault->soap_builder)
{
- while (!(soap_fault->freason) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
+ while (!(soap_fault->freason) && !(axiom_node_is_complete(soap_fault->om_ele_node, env)))
{
status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -306,7 +306,7 @@
}
else if (soap_fault->soap_builder)
{
- while (!(soap_fault->fnode) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
+ while (!(soap_fault->fnode) && !(axiom_node_is_complete(soap_fault->om_ele_node, env)))
{
status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -350,7 +350,7 @@
}
else if (soap_fault->soap_builder)
{
- while (!(soap_fault->frole) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
+ while (!(soap_fault->frole) && !(axiom_node_is_complete(soap_fault->om_ele_node, env)))
{
status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -394,7 +394,7 @@
}
else if (soap_fault->soap_builder)
{
- while (!(soap_fault->fdetail) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
+ while (!(soap_fault->fdetail) && !(axiom_node_is_complete(soap_fault->om_ele_node, env)))
{
status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -412,7 +412,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;
@@ -450,7 +450,7 @@
detail_node = axiom_soap_fault_detail_get_base_node(detail, env);
if (detail_node)
{
- detail_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ detail_ele = (axiom_element_t *)axiom_node_get_data_element(
detail_node, env);
qn = axutil_qname_create(env,
@@ -558,14 +558,14 @@
if (!soap_fault_code)
{
axiom_soap_fault_free(soap_fault, env);
- AXIOM_NODE_FREE_TREE(fault_node, env);
+ axiom_node_free_tree(fault_node, env);
return NULL;
}
soap_fault_reason = axiom_soap_fault_reason_create_with_parent(env, soap_fault);
if (!soap_fault_reason)
{
axiom_soap_fault_free(soap_fault, env);
- AXIOM_NODE_FREE_TREE(fault_node, env);
+ axiom_node_free_tree(fault_node, env);
return NULL;
}
@@ -573,7 +573,7 @@
if (!soap_fault_value)
{
axiom_soap_fault_free(soap_fault, env);
- AXIOM_NODE_FREE_TREE(fault_node, env);
+ axiom_node_free_tree(fault_node, env);
return NULL;
}
@@ -582,7 +582,7 @@
{
return NULL;
}
- value_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(value_node, env);
+ value_ele = (axiom_element_t *)axiom_node_get_data_element(value_node, env);
axiom_element_set_text(value_ele, env, code_value, value_node);
@@ -590,7 +590,7 @@
if (!soap_fault_text)
{
axiom_soap_fault_free(soap_fault, env);
- AXIOM_NODE_FREE_TREE(fault_node, env);
+ axiom_node_free_tree(fault_node, env);
return NULL;
}
axiom_soap_fault_text_set_lang(soap_fault_text, env, "en");
@@ -600,7 +600,7 @@
{
return NULL;
}
- text_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
+ text_ele = (axiom_element_t *)axiom_node_get_data_element(text_node, env);
axiom_element_set_text(text_ele, env, reason_text, text_node);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c Sun Apr 1 04:19:13 2007
@@ -87,7 +87,7 @@
axiom_soap_fault_code_free(fault_code, env);
return NULL;
}
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
@@ -221,7 +221,7 @@
else if (fault_code->builder)
{
while (!(fault_code->subcode) &&
- !(AXIOM_NODE_IS_COMPLETE(fault_code->om_ele_node, env)))
+ !(axiom_node_is_complete(fault_code->om_ele_node, env)))
{
status = axiom_soap_builder_next(fault_code->builder, env);
if (status == AXIS2_FAILURE)
@@ -246,7 +246,7 @@
else if (fault_code->builder)
{
while (!(fault_code->value) &&
- !(AXIOM_NODE_IS_COMPLETE(fault_code->om_ele_node, env)))
+ !(axiom_node_is_complete(fault_code->om_ele_node, env)))
{
status = axiom_soap_builder_next(fault_code->builder, env);
if (status == AXIS2_FAILURE)
@@ -266,7 +266,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/soap/soap_fault_detail.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c Sun Apr 1 04:19:13 2007
@@ -70,7 +70,7 @@
if (!parent_node)
return NULL;
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
return NULL;
@@ -113,14 +113,14 @@
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_OM_ELEMENT_EXPECTED, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- AXIOM_NODE_ADD_CHILD(fault_detail->om_ele_node, env, node);
+ axiom_node_add_child(fault_detail->om_ele_node, env, node);
return AXIS2_SUCCESS;
}
@@ -133,7 +133,7 @@
if (fault_detail->om_ele_node)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_detail->om_ele_node, env);
+ axiom_node_get_data_element(fault_detail->om_ele_node, env);
return axiom_element_get_children(om_ele, env,
fault_detail->om_ele_node);
}
@@ -150,7 +150,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/soap/soap_fault_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c Sun Apr 1 04:19:13 2007
@@ -71,7 +71,7 @@
return NULL;
}
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
{
@@ -123,7 +123,7 @@
if (fault_node->om_ele_node)
{
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(
fault_node->om_ele_node, env);
if (om_ele)
@@ -145,7 +145,7 @@
AXIS2_ENV_CHECK(env, NULL);
if (fault_node->om_ele_node)
{
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(
fault_node->om_ele_node, env);
if (om_ele)
{
@@ -163,7 +163,7 @@
axiom_node_t *node)
{
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);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c Sun Apr 1 04:19:13 2007
@@ -82,7 +82,7 @@
{
return NULL;
}
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
{
@@ -166,9 +166,9 @@
{
if (fault_reason->soap_builder &&
- !(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
+ !(axiom_node_is_complete(fault_reason->om_ele_node, env)))
{
- while (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
+ while (!(axiom_node_is_complete(fault_reason->om_ele_node, env)))
{
status = axiom_soap_builder_next(fault_reason->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -211,7 +211,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);
@@ -251,9 +251,9 @@
if (!(fault_reason->fault_texts) && (fault_reason->soap_builder))
{
- if (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
+ if (!(axiom_node_is_complete(fault_reason->om_ele_node, env)))
{
- while (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
+ while (!(axiom_node_is_complete(fault_reason->om_ele_node, env)))
{
status = axiom_soap_builder_next(fault_reason->soap_builder, env);
if (status == AXIS2_FAILURE)
@@ -274,9 +274,9 @@
if (!(fault_reason->fault_texts) && (fault_reason->soap_builder))
{
- if (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
+ if (!(axiom_node_is_complete(fault_reason->om_ele_node, env)))
{
- while (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
+ while (!(axiom_node_is_complete(fault_reason->om_ele_node, env)))
{
status = axiom_soap_builder_next(fault_reason->soap_builder, env);
if (status == AXIS2_FAILURE)
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c Sun Apr 1 04:19:13 2007
@@ -75,7 +75,7 @@
axiom_soap_fault_role_free(fault_role, env);
return NULL;
}
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
@@ -129,7 +129,7 @@
if (!fault_role->om_ele_node)
return AXIS2_FAILURE;
- role_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT
+ role_ele = (axiom_element_t*)axiom_node_get_data_element
(fault_role->om_ele_node, env);
if (role_ele)
@@ -150,7 +150,7 @@
if (!fault_role->om_ele_node)
return NULL;
- role_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT
+ role_ele = (axiom_element_t *)axiom_node_get_data_element
(fault_role->om_ele_node, env);
if (role_ele)
@@ -170,7 +170,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/soap/soap_fault_sub_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c Sun Apr 1 04:19:13 2007
@@ -81,7 +81,7 @@
return NULL;
}
- parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
+ parent_ele = (axiom_element_t *)axiom_node_get_data_element(
parent_node, env);
if (!parent_ele)
{
@@ -195,7 +195,7 @@
if (fault_sub_code->builder)
{
while (!(fault_sub_code->value) &&
- !AXIOM_NODE_IS_COMPLETE(fault_sub_code->om_ele_node, env))
+ !axiom_node_is_complete(fault_sub_code->om_ele_node, env))
{
status = axiom_soap_builder_next(fault_sub_code->builder, env);
if (status == AXIS2_FAILURE)
@@ -239,7 +239,7 @@
if (fault_sub_code->builder)
{
while (!(fault_sub_code->subcode) &&
- !AXIOM_NODE_IS_COMPLETE(fault_sub_code->om_ele_node, env))
+ !axiom_node_is_complete(fault_sub_code->om_ele_node, env))
{
status = axiom_soap_builder_next(fault_sub_code->builder, env);
if (status == AXIS2_FAILURE)
@@ -258,7 +258,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/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Sun Apr 1 04:19:13 2007
@@ -95,7 +95,7 @@
}
parent_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
{
axiom_soap_fault_text_free(fault_text, env);
@@ -177,7 +177,7 @@
if (!fault_text->om_ele_node)
return AXIS2_FAILURE;
- om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(fault_text->om_ele_node, env);
+ om_ele = (axiom_element_t*)axiom_node_get_data_element(fault_text->om_ele_node, env);
if (!om_ele)
return AXIS2_FAILURE;
@@ -206,7 +206,7 @@
return NULL;
om_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_text->om_ele_node, env);
+ axiom_node_get_data_element(fault_text->om_ele_node, env);
if (!om_ele)
return NULL;
@@ -239,7 +239,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);
@@ -270,7 +270,7 @@
{
axiom_element_t *text_ele = NULL;
text_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_text->om_ele_node, env);
+ axiom_node_get_data_element(fault_text->om_ele_node, env);
if (text_ele)
{
axiom_element_set_text(text_ele, env, value, fault_text->om_ele_node);
@@ -295,7 +295,7 @@
{
axiom_element_t *text_ele = NULL;
text_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_text->om_ele_node, env);
+ axiom_node_get_data_element(fault_text->om_ele_node, env);
if (text_ele)
{
text = axiom_element_get_text(text_ele, env,
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c Sun Apr 1 04:19:13 2007
@@ -80,7 +80,7 @@
}
parent_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
{
@@ -142,7 +142,7 @@
return NULL;
}
parent_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
{
axiom_soap_fault_value_free(fault_value, env);
@@ -186,7 +186,7 @@
{
AXIS2_ENV_CHECK(env, 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);
@@ -216,7 +216,7 @@
if (!value_node)
return NULL;
- value_element = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(
+ value_element = (axiom_element_t*)axiom_node_get_data_element(
value_node, env);
if (!value_element)
@@ -233,11 +233,11 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, text, AXIS2_FAILURE);
if (fault_value->om_ele_node &&
- AXIOM_NODE_GET_NODE_TYPE(fault_value->om_ele_node, env) == AXIOM_ELEMENT)
+ axiom_node_get_node_type(fault_value->om_ele_node, env) == AXIOM_ELEMENT)
{
axiom_element_t *om_ele = NULL;
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_value->om_ele_node, env);
+ axiom_node_get_data_element(fault_value->om_ele_node, env);
return axiom_element_set_text(om_ele, env, text, fault_value->om_ele_node);
}
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=524582&r1=524581&r2=524582
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Sun Apr 1 04:19:13 2007
@@ -104,23 +104,23 @@
parent_node = axiom_soap_envelope_get_base_node(envelope, env);
if (!parent_node ||
- AXIOM_NODE_GET_NODE_TYPE(parent_node, env) != AXIOM_ELEMENT)
+ axiom_node_get_node_type(parent_node, env) != AXIOM_ELEMENT)
{
axiom_soap_header_free(soap_header, env);
return NULL;
}
parent_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
{
axiom_soap_header_free(soap_header, env);
return NULL;
}
- if (AXIOM_NODE_GET_FIRST_CHILD(parent_node, env))
+ if (axiom_node_get_first_child(parent_node, env))
{
- body_node = AXIOM_NODE_GET_FIRST_CHILD(parent_node, env);
- AXIOM_NODE_DETACH(body_node, env);
+ body_node = axiom_node_get_first_child(parent_node, env);
+ axiom_node_detach(body_node, env);
}
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
@@ -137,7 +137,7 @@
if (body_node)
{
- AXIOM_NODE_ADD_CHILD(parent_node, env, body_node);
+ axiom_node_add_child(parent_node, env, body_node);
}
return soap_header;
}
@@ -228,7 +228,7 @@
axiom_node_set_complete(header_block_node, env, AXIS2_TRUE);
hb_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+ axiom_node_get_data_element(header_block_node, env);
if (hb_ele)
{
axiom_namespace_t *dec_ns = NULL;
@@ -275,7 +275,7 @@
if (!soap_header->om_ele_node)
return NULL;
- om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(soap_header->om_ele_node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(soap_header->om_ele_node, env);
if (om_ele)
{
@@ -323,7 +323,7 @@
return NULL;
header_om_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(soap_header->om_ele_node, env);
+ axiom_node_get_data_element(soap_header->om_ele_node, env);
if (header_om_ele)
{
@@ -350,7 +350,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);
@@ -479,7 +479,7 @@
if (header_block_om_node)
{
header_block_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(header_block_om_node, env);
+ axiom_node_get_data_element(header_block_om_node, env);
if (header_block_om_ele)
{
ns = axiom_element_get_namespace(header_block_om_ele, env,
@@ -560,12 +560,12 @@
{
axutil_qname_t *element_qname = NULL;
- ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ ele = (axiom_element_t*)axiom_node_get_data_element(node, env);
element_qname = axiom_element_get_qname(ele, env, node);
if (axiom_soap_header_qname_matches(env, element_qname, qname) == AXIS2_TRUE)
{
- AXIOM_NODE_DETACH(node, env);
- AXIOM_NODE_FREE_TREE(node, env);
+ axiom_node_detach(node, env);
+ axiom_node_free_tree(node, env);
axutil_hash_set(soap_header->header_blocks, key, AXIS2_HASH_KEY_STRING,
NULL);
axiom_soap_header_block_free(header_block, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org