You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/12 10:23:02 UTC
svn commit: r413605 [3/10] - in /webservices/axis2/trunk/c/axiom: include/
src/attachments/ src/om/ src/soap/ src/util/ test/om/ test/soap/ test/unit/
test/unit/om/
Copied: webservices/axis2/trunk/c/axiom/include/axiom_text.h (from r413601, webservices/axis2/trunk/c/axiom/include/axis2_om_text.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_text.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_text.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_om_text.h&r1=413601&r2=413605&rev=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_text.h Mon Jun 12 01:22:58 2006
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#ifndef AXIS2_OM_TEXT_H
-#define AXIS2_OM_TEXT_H
+#ifndef AXIOM_TEXT_H
+#define AXIOM_TEXT_H
/**
- * @file axis2_om_text.h
+ * @file axiom_text.h
* @brief Axis2 OM XML text
*/
#include <axis2_env.h>
-#include <axis2_om_node.h>
-#include <axis2_om_output.h>
+#include <axiom_node.h>
+#include <axiom_output.h>
#include <axis2_data_handler.h>
#ifdef __cplusplus
@@ -32,30 +32,30 @@
{
#endif
- struct axis2_om_text;
- struct axis2_om_text_ops;
+ struct axiom_text;
+ struct axiom_text_ops;
/**
- * @defgroup axis2_om_text OM Text
- * @ingroup axis2_om
+ * @defgroup axiom_text OM Text
+ * @ingroup axiom
* @{
*/
/**
* @brief OM text ops struct
- * Encapsulator struct for ops of axis2_om_text
+ * Encapsulator struct for ops of axiom_text
*/
- AXIS2_DECLARE_DATA typedef struct axis2_om_text_ops
+ AXIS2_DECLARE_DATA typedef struct axiom_text_ops
{
/**
- * Free an axis2_om_text struct
+ * Free an axiom_text struct
* @param env environment. MUST NOT be NULL.
* @param om_text pointer to om text struct to be freed.
* @return satus of the op. AXIS2_SUCCESS on success
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- free) (struct axis2_om_text *om_text,
+ free) (struct axiom_text *om_text,
const axis2_env_t *env);
/**
@@ -67,9 +67,9 @@
* AXIS2_FAILURE on error
*/
axis2_status_t (AXIS2_CALL *
- serialize) (struct axis2_om_text *om_text,
+ serialize) (struct axiom_text *om_text,
const axis2_env_t *env,
- axis2_om_output_t *om_output);
+ axiom_output_t *om_output);
/**
* set the text value
* @param om_text om_text struct
@@ -79,7 +79,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- set_value)(struct axis2_om_text *om_text,
+ set_value)(struct axiom_text *om_text,
const axis2_env_t *env,
const axis2_char_t *value);
/**
@@ -89,7 +89,7 @@
* @return text value , NULL is returned if there is no text value.
*/
axis2_char_t* (AXIS2_CALL *
- get_value)(struct axis2_om_text *om_text,
+ get_value)(struct axiom_text *om_text,
const axis2_env_t *env);
/**
* set optimized
@@ -99,7 +99,7 @@
* @returns AXIS2_SUCCESS
*/
axis2_status_t (AXIS2_CALL *
- set_optimize)(struct axis2_om_text *om_text,
+ set_optimize)(struct axiom_text *om_text,
const axis2_env_t *env,
axis2_bool_t optimize);
@@ -110,92 +110,92 @@
* @returns AXIS2_SUCCESS
*/
axis2_status_t (AXIS2_CALL *
- set_is_binary)(struct axis2_om_text *om_text,
+ set_is_binary)(struct axiom_text *om_text,
const axis2_env_t *env,
axis2_bool_t is_binary);
axis2_data_handler_t* (AXIS2_CALL *
- get_data_handler)(struct axis2_om_text *om_text,
+ get_data_handler)(struct axiom_text *om_text,
const axis2_env_t *env);
axis2_char_t* (AXIS2_CALL *
- get_content_id)(struct axis2_om_text *om_text,
+ get_content_id)(struct axiom_text *om_text,
const axis2_env_t *env);
- } axis2_om_text_ops_t;
+ } axiom_text_ops_t;
/**
* \brief OM Text struct
* Handles the XML text in OM
*/
- typedef struct axis2_om_text
+ typedef struct axiom_text
{
/** OM text related ops */
- axis2_om_text_ops_t *ops;
+ axiom_text_ops_t *ops;
- } axis2_om_text_t;
+ } axiom_text_t;
/**
* Creates a new text struct
* @param env Environment. MUST NOT be NULL, .
* @param parent parent of the new node. Optinal, can be NULL.
- * The parent element must be of type AXIS2_OM_ELEMENT
+ * The parent element must be of type AXIOM_ELEMENT
* @param value Text value. Optinal, can be NULL.
* @param comment_node This is an out parameter. cannot be NULL.
* Returns the node corresponding to the text struct created.
- * Node type will be set to AXIS2_OM_TEXT
+ * Node type will be set to AXIOM_TEXT
* @return pointer to newly created text struct
*/
- AXIS2_EXTERN axis2_om_text_t * AXIS2_CALL
- axis2_om_text_create (const axis2_env_t *env,
- axis2_om_node_t *parent,
+ AXIS2_EXTERN axiom_text_t * AXIS2_CALL
+ axiom_text_create (const axis2_env_t *env,
+ axiom_node_t *parent,
const axis2_char_t *value,
- axis2_om_node_t ** node);
+ axiom_node_t ** node);
/**
* Creates a new text struct for binary data (MTOM)
* @param env Environment. MUST NOT be NULL, .
* @param parent parent of the new node. Optinal, can be NULL.
- * The parent element must be of type AXIS2_OM_ELEMENT
+ * The parent element must be of type AXIOM_ELEMENT
* @param data_handler data handler. Optinal, can be NULL.
* @param comment_node This is an out parameter. cannot be NULL.
* Returns the node corresponding to the text struct created.
- * Node type will be set to AXIS2_OM_TEXT
+ * Node type will be set to AXIOM_TEXT
* @return pointer to newly created text struct
*/
- AXIS2_EXTERN axis2_om_text_t* AXIS2_CALL
- axis2_om_text_create_with_data_handler (const axis2_env_t *env,
- axis2_om_node_t * parent,
+ AXIS2_EXTERN axiom_text_t* AXIS2_CALL
+ axiom_text_create_with_data_handler (const axis2_env_t *env,
+ axiom_node_t * parent,
axis2_data_handler_t* data_handler,
- axis2_om_node_t **node);
+ axiom_node_t **node);
/** frees given text */
-#define AXIS2_OM_TEXT_FREE( om_text,env) \
+#define AXIOM_TEXT_FREE( om_text,env) \
((om_text)->ops->free(om_text,env))
/** serializes given text */
-#define AXIS2_OM_TEXT_SERIALIZE(om_text, env, om_output) \
+#define AXIOM_TEXT_SERIALIZE(om_text, env, om_output) \
((om_text)->ops->serialize(om_text, env, om_output))
/** get the text value */
-#define AXIS2_OM_TEXT_GET_VALUE(om_text, env) \
+#define AXIOM_TEXT_GET_VALUE(om_text, env) \
((om_text)->ops->get_value(om_text, env))
/** set text value */
-#define AXIS2_OM_TEXT_SET_VALUE(om_text, env, value) \
+#define AXIOM_TEXT_SET_VALUE(om_text, env, value) \
((om_text)->ops->set_value(om_text, env, value))
/** set whether it is to be optimized */
-#define AXIS2_OM_TEXT_SET_OPTIMIZE(om_text, env, optimize) \
+#define AXIOM_TEXT_SET_OPTIMIZE(om_text, env, optimize) \
((om_text)->ops->set_optimize(om_text, env, optimize))
/** set whether it binary */
-#define AXIS2_OM_TEXT_SET_IS_BINARY(om_text, env, is_binary) \
+#define AXIOM_TEXT_SET_IS_BINARY(om_text, env, is_binary) \
((om_text)->ops->set_is_binary(om_text, env, is_binary))
-#define AXIS2_OM_TEXT_SET_GET_DATA_HANDLER(om_text, env) \
+#define AXIOM_TEXT_SET_GET_DATA_HANDLER(om_text, env) \
((om_text)->ops->get_data_handler(om_text, env))
-#define AXIS2_OM_TEXT_SET_GET_CONTENT_ID(om_text, env) \
+#define AXIOM_TEXT_SET_GET_CONTENT_ID(om_text, env) \
((om_text)->ops->get_content_id(om_text, env))
/** @} */
@@ -204,4 +204,4 @@
}
#endif
-#endif /* AXIS2_OM_TEXT_H */
+#endif /* AXIOM_TEXT_H */
Copied: webservices/axis2/trunk/c/axiom/include/axiom_util.h (from r413601, webservices/axis2/trunk/c/axiom/include/axis2_om_util.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_util.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_util.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_om_util.h&r1=413601&r2=413605&rev=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_util.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_util.h Mon Jun 12 01:22:58 2006
@@ -14,170 +14,170 @@
* limitations under the License.
*/
-#ifndef AXIS2_OM_UTIL_H
-#define AXIS2_OM_UTIL_H
+#ifndef AXIOM_UTIL_H
+#define AXIOM_UTIL_H
#include <axis2_array_list.h>
#include <axis2_string.h>
-#include <axis2_om.h>
+#include <axiom.h>
#ifdef __cplusplus
extern "C"
{
#endif
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_uri(
- axis2_om_node_t *ele_node,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_first_child_element_with_uri(
+ axiom_node_t *ele_node,
const axis2_env_t *env,
axis2_char_t *uri,
- axis2_om_node_t **child);
+ axiom_node_t **child);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_sibling_element_with_uri(
- axis2_om_node_t *ele_node,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_next_sibling_element_with_uri(
+ axiom_node_t *ele_node,
const axis2_env_t *env,
axis2_char_t *uri,
- axis2_om_node_t **next_node);
+ axiom_node_t **next_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_first_child_element(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_om_node_t **child_node);
+ axiom_node_t *ele_node,
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_last_child_element(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_om_node_t **child_node);
+ axiom_node_t *ele_node,
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_sibling_element(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_next_sibling_element(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_om_node_t **next_node);
+ axiom_node_t *ele_node,
+ axiom_node_t **next_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_localname(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_first_child_element_with_localname(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
- axis2_om_node_t **child_node);
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element_with_localname(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_last_child_element_with_localname(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
- axis2_om_node_t **child_node);
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_siblng_element_with_localname(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_next_siblng_element_with_localname(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
- axis2_om_node_t **next_node);
+ axiom_node_t **next_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_uri_localname(
- axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_first_child_element_with_uri_localname(
+ axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
- axis2_om_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele,
+ axiom_node_t **child_node);
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_last_child_element_with_uri_localname(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
- axis2_om_node_t **child_node); AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_sibling_element_with_uri_localname(axis2_om_element_t *ele,
+ axiom_node_t **child_node); AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_next_sibling_element_with_uri_localname(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
- axis2_om_node_t **next_node);
+ axiom_node_t **next_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_localnames(axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_first_child_element_with_localnames(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_array_list_t *names,
- axis2_om_node_t **child_node);
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element_with_localnames(axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_last_child_element_with_localnames(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_array_list_t *names,
- axis2_om_node_t **child_node);
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_siblng_element_with_localnames(axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_next_siblng_element_with_localnames(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_array_list_t *names,
- axis2_om_node_t **next_node);
+ axiom_node_t **next_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_localname_attr(axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_first_child_element_with_localname_attr(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
axis2_char_t *attr_value,
- axis2_om_node_t **child_node);
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element_with_localname_attr(axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_last_child_element_with_localname_attr(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
axis2_char_t *attr_value,
- axis2_om_node_t **child_node);
+ axiom_node_t **child_node);
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_siblng_element_with_localname_attr(axis2_om_element_t *ele,
+AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+axiom_util_get_next_siblng_element_with_localname_attr(axiom_element_t *ele,
const axis2_env_t *env,
- axis2_om_node_t *ele_node,
+ axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
axis2_char_t *attr_value,
- axis2_om_node_t **next_node);
+ axiom_node_t **next_node);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_om_util_get_child_text(axis2_om_node_t *node,
+axiom_util_get_child_text(axiom_node_t *node,
const axis2_env_t *env);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_om_util_get_localname(axis2_om_node_t *node,
+axiom_util_get_localname(axiom_node_t *node,
const axis2_env_t *env);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_om_util_get_node_namespace_uri(axis2_om_node_t *om_node,
+axiom_util_get_node_namespace_uri(axiom_node_t *om_node,
const axis2_env_t *env);
-AXIS2_EXTERN axis2_om_child_element_iterator_t* AXIS2_CALL
-axis2_om_util_get_child_elements(axis2_om_element_t *om_ele,
+AXIS2_EXTERN axiom_child_element_iterator_t* AXIS2_CALL
+axiom_util_get_child_elements(axiom_element_t *om_ele,
const axis2_env_t *env,
- axis2_om_node_t *om_node);
+ axiom_node_t *om_node);
#ifdef __cplusplus
}
#endif
-#endif /* AXIS2_OM_UTIL_H */
+#endif /* AXIOM_UTIL_H */
Modified: webservices/axis2/trunk/c/axiom/include/axis2_mime_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_mime_const.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_mime_const.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_mime_const.h Mon Jun 12 01:22:58 2006
@@ -18,7 +18,7 @@
#define AXIS2_MIME_CONST_H
/**
-* @file axis2_om.h
+* @file axiom.h
* @brief includes all headers in MIME_CONST
*/
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_body.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_body.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_body.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_body.h Mon Jun 12 01:22:58 2006
@@ -23,9 +23,9 @@
*/
#include <axis2_env.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
-#include <axis2_om_namespace.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
+#include <axiom_namespace.h>
#include <axis2_soap_fault.h>
#include <axis2_soap_envelope.h>
@@ -100,9 +100,9 @@
* get the underlying om_node
* @param body soap_body
* @param env environment must not be null
- * @returns axis2_om_node_t
+ * @returns axiom_node_t
*/
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_body_t *body,
const axis2_env_t *env);
@@ -136,7 +136,7 @@
axis2_status_t (AXIS2_CALL *
add_child)(axis2_soap_body_t *body,
const axis2_env_t *env,
- axis2_om_node_t *child);
+ axiom_node_t *child);
};
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_builder.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_builder.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_builder.h Mon Jun 12 01:22:58 2006
@@ -17,7 +17,7 @@
#ifndef AXIS2_SOAP_BUILDER_H
#define AXIS2_SOAP_BUILDER_H
- #include <axis2_om_stax_builder.h>
+ #include <axiom_stax_builder.h>
#include <axis2_soap_envelope.h>
/**
@@ -54,7 +54,7 @@
(axis2_soap_builder_t *builder,
const axis2_env_t *env);
- axis2_om_document_t* (AXIS2_CALL *get_document)
+ axiom_document_t* (AXIS2_CALL *get_document)
(axis2_soap_builder_t *builder,
const axis2_env_t *env);
@@ -62,7 +62,7 @@
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *get_document_element)
+ axiom_node_t* (AXIS2_CALL *get_document_element)
(axis2_soap_builder_t *builder,
const axis2_env_t *env);
@@ -87,7 +87,7 @@
axis2_status_t (AXIS2_CALL *process_namespace_data)
(axis2_soap_builder_t *builder,
const axis2_env_t *env,
- axis2_om_node_t *om_node,
+ axiom_node_t *om_node,
axis2_bool_t is_soap_element);
axis2_status_t (AXIS2_CALL *
set_mime_body_parts)
@@ -115,7 +115,7 @@
AXIS2_EXTERN axis2_soap_builder_t * AXIS2_CALL
axis2_soap_builder_create(const axis2_env_t *env,
- axis2_om_stax_builder_t *builder,
+ axiom_stax_builder_t *builder,
const axis2_char_t *soap_version);
/******************** Macros **************************************************/
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_envelope.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_envelope.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_envelope.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_envelope.h Mon Jun 12 01:22:58 2006
@@ -23,9 +23,9 @@
* corresponds to root element of soap message
*/
#include <axis2_env.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
-#include <axis2_om_namespace.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
+#include <axiom_namespace.h>
#include <axis2_array_list.h>
#ifdef __cplusplus
@@ -85,14 +85,14 @@
axis2_status_t (AXIS2_CALL *
serialize)(axis2_soap_envelope_t *envelope,
const axis2_env_t *env,
- axis2_om_output_t *om_output,
+ axiom_output_t *om_output,
axis2_bool_t cache);
/**
* Free function, This function deallocate all the resources associated
* with the soap_envelope
* IT frees it's soap body and soap headers as well as the underlying
- * om node tree by calling AXIS2_OM_NODE_FREE_TREE function
+ * om node tree by calling AXIOM_NODE_FREE_TREE function
* @param envelope soap_envelope
* @param env environment
* @return status code AXIS2_SUCCESS on success , AXIS2_FAILURE otherwise
@@ -105,9 +105,9 @@
* returns the om_node associated with this soap envelope
* @param envelope soap_envelope
* @param env environment
- * @return axis2_om_node_t pointer
+ * @return axiom_node_t pointer
*/
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_envelope_t *envelope,
const axis2_env_t *env);
@@ -124,9 +124,9 @@
/** return the soap envelope namespace
* @param envelope
* @param env
- * @return axis2_om_namespace_t
+ * @return axiom_namespace_t
*/
- axis2_om_namespace_t* (AXIS2_CALL *
+ axiom_namespace_t* (AXIS2_CALL *
get_namespace)(axis2_soap_envelope_t *envelope,
const axis2_env_t *env);
@@ -154,7 +154,7 @@
*/
AXIS2_EXTERN axis2_soap_envelope_t* AXIS2_CALL
axis2_soap_envelope_create(const axis2_env_t *env,
- axis2_om_namespace_t *ns);
+ axiom_namespace_t *ns);
/**
* @param env Environment. MUST NOT be NULL
@@ -181,7 +181,7 @@
const axis2_char_t *reason_text,
const int soap_version,
axis2_array_list_t *sub_codes,
- axis2_om_node_t *detail_node);
+ axiom_node_t *detail_node);
/******************** Macros **************************************************/
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault.h Mon Jun 12 01:22:58 2006
@@ -24,8 +24,8 @@
*/
#include <axis2_soap_const.h>
#include <axis2_env.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
#ifdef __cplusplus
@@ -142,14 +142,14 @@
const axis2_env_t *env,
axis2_char_t *exception);
/**
- * returns the axis2_om_node_t struct which is wrapped by
+ * returns the axiom_node_t struct which is wrapped by
* this soap fault struct
* @param fault soap fault struct
* @param env environment must not be NULL
- * @returns a pointer to axis2_om_node_t struct if an om node is associated
+ * @returns a pointer to axiom_node_t struct if an om node is associated
* with this soap fault struct, otherwise return NULL
*/
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_t *fault,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_code.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_code.h Mon Jun 12 01:22:58 2006
@@ -74,7 +74,7 @@
(axis2_soap_fault_code_t *fault_code,
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_code_t *fault_code,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_detail.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_detail.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_detail.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_detail.h Mon Jun 12 01:22:58 2006
@@ -24,7 +24,7 @@
#include <axis2_env.h>
#include <axis2_soap_fault.h>
-#include <axis2_om_children_iterator.h>
+#include <axiom_children_iterator.h>
#ifdef __cplusplus
extern "C"
@@ -61,13 +61,13 @@
axis2_status_t (AXIS2_CALL *
add_detail_entry)(axis2_soap_fault_detail_t *fault_detail,
const axis2_env_t *env,
- axis2_om_node_t *ele_node);
+ axiom_node_t *ele_node);
- axis2_om_children_iterator_t* (AXIS2_CALL *
+ axiom_children_iterator_t* (AXIS2_CALL *
get_all_detail_entries) (axis2_soap_fault_detail_t *fault_detail,
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_detail_t *fault_code,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_node.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_node.h Mon Jun 12 01:22:58 2006
@@ -64,7 +64,7 @@
get_value)(axis2_soap_fault_node_t *fault_node,
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_node_t *fault_node,
const axis2_env_t *env);
};
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_reason.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_reason.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_reason.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_reason.h Mon Jun 12 01:22:58 2006
@@ -76,7 +76,7 @@
const axis2_env_t *env,
struct axis2_soap_fault_text *fault_text);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_reason_t *fault_reason,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h Mon Jun 12 01:22:58 2006
@@ -65,7 +65,7 @@
get_role_value)(axis2_soap_fault_role_t *fault_role,
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_role_t *fault_role,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h Mon Jun 12 01:22:58 2006
@@ -65,7 +65,7 @@
get_value)(axis2_soap_fault_sub_code_t *fault_sub_code,
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node) (axis2_soap_fault_sub_code_t *fault_sub_code,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h Mon Jun 12 01:22:58 2006
@@ -64,7 +64,7 @@
get_lang)(axis2_soap_fault_text_t *fault_text,
const axis2_env_t *env);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_text_t *fault_text,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h Mon Jun 12 01:22:58 2006
@@ -72,7 +72,7 @@
* @param env Environment. MUST NOT BE NULL
* @param text value to be set
*/
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_fault_value_t *fault_value,
const axis2_env_t *env);
/**
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h Mon Jun 12 01:22:58 2006
@@ -22,11 +22,11 @@
* @brief axis2_soap_header struct
*/
#include <axis2_env.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
#include <axis2_array_list.h>
-#include <axis2_om_children_qname_iterator.h>
-#include <axis2_om_children_with_specific_attribute_iterator.h>
+#include <axiom_children_qname_iterator.h>
+#include <axiom_children_with_specific_attribute_iterator.h>
#include <axis2_hash.h>
#include <axis2_soap_envelope.h>
@@ -77,7 +77,7 @@
add_header_block)(axis2_soap_header_t* header,
const axis2_env_t *env,
const axis2_char_t *localname,
- axis2_om_namespace_t *ns);
+ axiom_namespace_t *ns);
/**
* returns a hash_table of all the soap_header_block_t struct in this
* soap_header_t object that have the the specified actor. An
@@ -109,10 +109,10 @@
* returns an iterator to iterate through all soap header block's om nodes
* @param header
* @param env environment
- * @returns axis2_om_children_qname_iterator_t or null if no header blocks
+ * @returns axiom_children_qname_iterator_t or null if no header blocks
* present
*/
- axis2_om_children_qname_iterator_t* (AXIS2_CALL *
+ axiom_children_qname_iterator_t* (AXIS2_CALL *
examine_all_header_blocks)(axis2_soap_header_t* header,
const axis2_env_t *env);
/**
@@ -124,18 +124,18 @@
* @returns iterator or null if no header blocks present with matching
* role attribute
*/
- axis2_om_children_with_specific_attribute_iterator_t *(AXIS2_CALL *
+ axiom_children_with_specific_attribute_iterator_t *(AXIS2_CALL *
extract_header_blocks)(axis2_soap_header_t *header,
const axis2_env_t *env,
axis2_char_t *role);
/**
- * returns the axis2_om_node_t struct wrapped in soap_header
+ * returns the axiom_node_t struct wrapped in soap_header
* @param header soap_header_t
* @param env environment must not be null
- * @return axis2_om_node_t
+ * @return axiom_node_t
*/
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_header_t *header,
const axis2_env_t *env);
/**
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h Mon Jun 12 01:22:58 2006
@@ -23,8 +23,8 @@
* @brief axis2_soap_header_block struct
*/
#include <axis2_env.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
#include <axis2_array_list.h>
#include <axis2_soap_header.h>
@@ -106,7 +106,7 @@
axis2_char_t *soap_envelope_namespace_uri);
- axis2_om_node_t* (AXIS2_CALL *
+ axiom_node_t* (AXIS2_CALL *
get_base_node)(axis2_soap_header_block_t *header_block,
const axis2_env_t *env);
@@ -137,7 +137,7 @@
AXIS2_EXTERN axis2_soap_header_block_t * AXIS2_CALL
axis2_soap_header_block_create_with_parent(const axis2_env_t *env,
const axis2_char_t *localname,
- axis2_om_namespace_t *ns,
+ axiom_namespace_t *ns,
struct axis2_soap_header *parent);
/******************** Macros **************************************************/
Modified: webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h Mon Jun 12 01:22:58 2006
@@ -66,7 +66,7 @@
axis2_status_t (AXIS2_CALL *
serialize)(axis2_soap_message_t *message,
const axis2_env_t *env,
- axis2_om_output_t *om_output);
+ axiom_output_t *om_output);
};
@@ -89,7 +89,7 @@
AXIS2_EXTERN axis2_soap_message_t * AXIS2_CALL
axis2_soap_message_create(const axis2_env_t *env,
axis2_soap_builder_t *soap_builder,
- axis2_om_document_t *om_doc);
+ axiom_document_t *om_doc);
/******************** Macros **************************************************/
Modified: webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h Mon Jun 12 01:22:58 2006
@@ -36,7 +36,7 @@
/**
* @defgroup axis2_xml_reader
- * @ingroup axis2_om_parser
+ * @ingroup axiom_parser
* @{
*/
Modified: webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h Mon Jun 12 01:22:58 2006
@@ -35,7 +35,7 @@
/**
* @defgroup axis2_xml_writer
- * @ingroup axis2_om_parser
+ * @ingroup axiom_parser
* @{
*/
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Mon Jun 12 01:22:58 2006
@@ -18,7 +18,7 @@
#include "axis2_data_handler.h"
#include "axis2_mime_body_part.h"
#include <axis2_string.h>
-#include <axis2_om_text.h>
+#include <axiom_text.h>
#include <axis2_mime_const.h>
axis2_char_t AXIS2_CRLF[] = { 13, 10 };
@@ -75,7 +75,7 @@
int *output_stream_size, axis2_char_t *boundary);
axis2_mime_body_part_t * AXIS2_CALL
-axis2_create_mime_body_part (axis2_om_text_t *text, const axis2_env_t *env);
+axis2_create_mime_body_part (axiom_text_t *text, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_write_body_part (axis2_mime_output_t *mime_output, const axis2_env_t *env,
@@ -225,7 +225,7 @@
int temp_size = 0;
for (j = 0; j < AXIS2_ARRAY_LIST_SIZE(binary_node_list, env); j++)
{
- axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_ARRAY_LIST_GET(binary_node_list, env, j);
+ axiom_text_t *text = (axiom_text_t *)AXIS2_ARRAY_LIST_GET(binary_node_list, env, j);
if (text)
{
axis2_mime_body_part_t *mime_body_part = NULL;
@@ -379,7 +379,7 @@
}
axis2_mime_body_part_t * AXIS2_CALL
-axis2_create_mime_body_part (axis2_om_text_t *text, const axis2_env_t *env)
+axis2_create_mime_body_part (axiom_text_t *text, const axis2_env_t *env)
{
axis2_data_handler_t *data_handler = NULL;
const axis2_char_t *content_type = "application/octet-stream";
@@ -387,7 +387,7 @@
axis2_char_t *content_id = (axis2_char_t *)"<";
if (!mime_body_part)
return NULL;
- data_handler = AXIS2_OM_TEXT_SET_GET_DATA_HANDLER(text, env);
+ data_handler = AXIOM_TEXT_SET_GET_DATA_HANDLER(text, env);
if (data_handler)
{
@@ -397,7 +397,7 @@
AXIS2_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env,
data_handler);
content_id = AXIS2_STRACAT(content_id,
- AXIS2_OM_TEXT_SET_GET_CONTENT_ID(text, env), env);
+ AXIOM_TEXT_SET_GET_CONTENT_ID(text, env), env);
content_id = AXIS2_STRACAT(content_id, ">", env);
AXIS2_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-id", content_id);
AXIS2_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-type", content_type);
Copied: webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h (from r413601, webservices/axis2/trunk/c/axiom/src/om/axis2_om_namespace_internal.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h?p2=webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h&p1=webservices/axis2/trunk/c/axiom/src/om/axis2_om_namespace_internal.h&r1=413601&r2=413605&rev=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axis2_om_namespace_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h Mon Jun 12 01:22:58 2006
@@ -14,18 +14,18 @@
* limitations under the License.
*/
- #ifndef AXIS2_OM_NAMESPACE_INTERNAL_H
- #define AXIS2_OM_NAMESPACE_INTERNAL_H
+ #ifndef AXIOM_NAMESPACE_INTERNAL_H
+ #define AXIOM_NAMESPACE_INTERNAL_H
- /** @defgroup axis2_om AXIOM (Axis Object Model)
+ /** @defgroup axiom AXIOM (Axis Object Model)
* @ingroup axis2
* @{
*/
/** @} */
-#include <axis2_om_namespace.h>
+#include <axiom_namespace.h>
#ifdef __cplusplus
extern "C"
@@ -33,7 +33,7 @@
#endif
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_namespace_set_uri(axis2_om_namespace_t *ns,
+axiom_namespace_set_uri(axiom_namespace_t *ns,
const axis2_env_t *env,
const axis2_char_t *ns_uri);
@@ -41,4 +41,4 @@
}
#endif
-#endif /** AXIS2_OM_NAMESPACE_H */
+#endif /** AXIOM_NAMESPACE_H */
Copied: webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h (from r413601, webservices/axis2/trunk/c/axiom/src/om/axis2_om_node_internal.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h?p2=webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h&p1=webservices/axis2/trunk/c/axiom/src/om/axis2_om_node_internal.h&r1=413601&r2=413605&rev=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axis2_om_node_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h Mon Jun 12 01:22:58 2006
@@ -14,18 +14,18 @@
* limitations under the License.
*/
- #ifndef AXIS2_OM_NODE_INTERNAL_H
- #define AXIS2_OM_NODE_INTERNAL_H
+ #ifndef AXIOM_NODE_INTERNAL_H
+ #define AXIOM_NODE_INTERNAL_H
- /** @defgroup axis2_om AXIOM (Axis Object Model)
+ /** @defgroup axiom AXIOM (Axis Object Model)
* @ingroup axis2
* @{
*/
/** @} */
-#include <axis2_om_node.h>
+#include <axiom_node.h>
#ifdef __cplusplus
extern "C"
@@ -33,12 +33,12 @@
#endif
/**
- * @defgroup axis2_om_node OM Node
- * @ingroup axis2_om
+ * @defgroup axiom_node OM Node
+ * @ingroup axiom
* @{
*/
-struct axis2_om_document;
-struct axis2_om_stax_builder;
+struct axiom_document;
+struct axiom_stax_builder;
/**
* Sets a parent node to a given node, if a parent already exist for this node
@@ -50,9 +50,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_parent (axis2_om_node_t * om_node,
+axiom_node_set_parent (axiom_node_t * om_node,
const axis2_env_t *env,
- axis2_om_node_t * parent);
+ axiom_node_t * parent);
/**
* sets a node as first child of om_node
@@ -61,9 +61,9 @@
* @param first_child child to be set as first child
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_first_child(axis2_om_node_t *om_node,
+axiom_node_set_first_child(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *first_child);
+ axiom_node_t *first_child);
/**
* set previous sibling
* @param om_node
@@ -75,9 +75,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_previous_sibling(axis2_om_node_t *om_node,
+axiom_node_set_previous_sibling(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *prev_sibling);
+ axiom_node_t *prev_sibling);
/**
* set next sibling
* @param om_node
@@ -88,9 +88,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_next_sibling(axis2_om_node_t *om_node,
+axiom_node_set_next_sibling(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *next_sibling);
+ axiom_node_t *next_sibling);
/**
* set node type
* @param om_node
@@ -100,9 +100,9 @@
* AXIS2_FAILURE on error
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_node_type(axis2_om_node_t *om_node,
+axiom_node_set_node_type(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_types_t type);
+ axiom_types_t type);
/**
* set data element
@@ -113,7 +113,7 @@
* AXIS2_FAILURE on error
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_data_element(axis2_om_node_t *om_node,
+axiom_node_set_data_element(axiom_node_t *om_node,
const axis2_env_t *env,
void* data_element);
/**
@@ -124,7 +124,7 @@
* @param done
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_complete(axis2_om_node_t *om_node,
+axiom_node_set_complete(axiom_node_t *om_node,
const axis2_env_t *env,
axis2_bool_t done);
@@ -133,20 +133,20 @@
* do not use this function
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_document(axis2_om_node_t *om_node,
+axiom_node_set_document(axiom_node_t *om_node,
const axis2_env_t *env,
- struct axis2_om_document *om_doc);
+ struct axiom_document *om_doc);
/**
* sets the builder
*
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_builder(axis2_om_node_t *om_node,
+axiom_node_set_builder(axiom_node_t *om_node,
const axis2_env_t *env,
- struct axis2_om_stax_builder *builder);
+ struct axiom_stax_builder *builder);
-AXIS2_EXTERN struct axis2_om_stax_builder * AXIS2_CALL
-axis2_om_node_get_builder(axis2_om_node_t *om_node,
+AXIS2_EXTERN struct axiom_stax_builder * AXIS2_CALL
+axiom_node_get_builder(axiom_node_t *om_node,
const axis2_env_t *env);
/** @} */
@@ -154,4 +154,4 @@
}
#endif
-#endif /** AXIS2_OM_NODE_INTERNAL_H */
+#endif /** AXIOM_NODE_INTERNAL_H */
Copied: webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h (from r413601, webservices/axis2/trunk/c/axiom/src/om/axis2_om_stax_builder_internal.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h?p2=webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h&p1=webservices/axis2/trunk/c/axiom/src/om/axis2_om_stax_builder_internal.h&r1=413601&r2=413605&rev=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axis2_om_stax_builder_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h Mon Jun 12 01:22:58 2006
@@ -14,18 +14,18 @@
* limitations under the License.
*/
- #ifndef AXIS2_OM_STAX_BUILDER_INTERNAL_H
- #define AXIS2_OM_STAX_BUILDER_INTERNAL_H
+ #ifndef AXIOM_STAX_BUILDER_INTERNAL_H
+ #define AXIOM_STAX_BUILDER_INTERNAL_H
- /** @defgroup axis2_om AXIOM (Axis Object Model)
+ /** @defgroup axiom AXIOM (Axis Object Model)
* @ingroup axis2
* @{
*/
/** @} */
-#include <axis2_om_stax_builder.h>
+#include <axiom_stax_builder.h>
#ifdef __cplusplus
extern "C"
@@ -33,30 +33,30 @@
#endif
/**
- * @defgroup axis2_om_stax builder
- * @ingroup axis2_om
+ * @defgroup axiom_stax builder
+ * @ingroup axiom
* @{
*/
AXIS2_EXTERN int AXIS2_CALL
-axis2_om_stax_builder_get_current_event(axis2_om_stax_builder_t *builder,
+axiom_stax_builder_get_current_event(axiom_stax_builder_t *builder,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_stax_builder_set_lastnode(axis2_om_stax_builder_t *builder,
+axiom_stax_builder_set_lastnode(axiom_stax_builder_t *builder,
const axis2_env_t *env,
- axis2_om_node_t *om_node);
+ axiom_node_t *om_node);
AXIS2_EXTERN int AXIS2_CALL
-axis2_om_stax_builder_get_element_level(axis2_om_stax_builder_t* builder,
+axiom_stax_builder_get_element_level(axiom_stax_builder_t* builder,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_stax_builder_set_element_level(axis2_om_stax_builder_t* builder,
+axiom_stax_builder_set_element_level(axiom_stax_builder_t* builder,
const axis2_env_t *env,
int element_level);
-AXIS2_EXTERN axis2_om_node_t* AXIS2_CALL
-axis2_om_stax_builder_get_lastnode(axis2_om_stax_builder_t *builder,
+AXIS2_EXTERN axiom_node_t* AXIS2_CALL
+axiom_stax_builder_get_lastnode(axiom_stax_builder_t *builder,
const axis2_env_t *env);
/** @} */
@@ -65,4 +65,4 @@
}
#endif
-#endif /** AXIS2_OM_STAX_BUILDER_INTERNAL_H */
+#endif /** AXIOM_STAX_BUILDER_INTERNAL_H */
Modified: webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.c Mon Jun 12 01:22:58 2006
@@ -14,92 +14,92 @@
* limitations under the License.
*/
-#include <axis2_om_attribute.h>
+#include <axiom_attribute.h>
#include <string.h>
#include <axis2_utils_defines.h>
axis2_status_t AXIS2_CALL
-axis2_om_attribute_free (axis2_om_attribute_t *om_attribute,
+axiom_attribute_free (axiom_attribute_t *om_attribute,
const axis2_env_t *env);
axis2_qname_t * AXIS2_CALL
-axis2_om_attribute_get_qname (axis2_om_attribute_t *om_attribute,
+axiom_attribute_get_qname (axiom_attribute_t *om_attribute,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_attribute_serialize (axis2_om_attribute_t *om_attribute,
+axiom_attribute_serialize (axiom_attribute_t *om_attribute,
const axis2_env_t *env,
- axis2_om_output_t *om_output);
+ axiom_output_t *om_output);
axis2_char_t* AXIS2_CALL
-axis2_om_attribute_get_localname(axis2_om_attribute_t *om_attribute,
+axiom_attribute_get_localname(axiom_attribute_t *om_attribute,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_om_attribute_get_value(axis2_om_attribute_t *om_attribute,
+axiom_attribute_get_value(axiom_attribute_t *om_attribute,
const axis2_env_t *env);
-axis2_om_namespace_t* AXIS2_CALL
-axis2_om_attribute_get_namespace(axis2_om_attribute_t *om_attribute,
+axiom_namespace_t* AXIS2_CALL
+axiom_attribute_get_namespace(axiom_attribute_t *om_attribute,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_attribute_set_localname(axis2_om_attribute_t *om_attribute,
+axiom_attribute_set_localname(axiom_attribute_t *om_attribute,
const axis2_env_t *env,
const axis2_char_t *localname);
axis2_status_t AXIS2_CALL
-axis2_om_attribute_set_value(axis2_om_attribute_t *om_attribute,
+axiom_attribute_set_value(axiom_attribute_t *om_attribute,
const axis2_env_t *env,
const axis2_char_t *value);
axis2_status_t AXIS2_CALL
-axis2_om_attribute_set_namespace(axis2_om_attribute_t *om_attribute,
+axiom_attribute_set_namespace(axiom_attribute_t *om_attribute,
const axis2_env_t *env,
- axis2_om_namespace_t *om_namespace);
+ axiom_namespace_t *om_namespace);
-axis2_om_attribute_t* AXIS2_CALL
-axis2_om_attribute_clone(axis2_om_attribute_t *om_attribute,
+axiom_attribute_t* AXIS2_CALL
+axiom_attribute_clone(axiom_attribute_t *om_attribute,
const axis2_env_t *env);
-/*********************************** axis2_om_attribute_impl_t ************************/
+/*********************************** axiom_attribute_impl_t ************************/
-typedef struct axis2_om_attribute_impl
+typedef struct axiom_attribute_impl
{
- axis2_om_attribute_t om_attribute;
+ axiom_attribute_t om_attribute;
/** localname of this attribute */
axis2_char_t *localname;
/** value of this attribute */
axis2_char_t *value;
/** attribute namespace */
- axis2_om_namespace_t *ns;
+ axiom_namespace_t *ns;
/** store qname here */
axis2_qname_t *qname;
-}axis2_om_attribute_impl_t;
+}axiom_attribute_impl_t;
/***************************************** macro *******************************/
-#define AXIS2_INTF_TO_IMPL(om_attr) ((axis2_om_attribute_impl_t*)om_attr)
+#define AXIS2_INTF_TO_IMPL(om_attr) ((axiom_attribute_impl_t*)om_attr)
/*************************************** ***************************************/
-AXIS2_EXTERN axis2_om_attribute_t* AXIS2_CALL
-axis2_om_attribute_create (const axis2_env_t *env,
+AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
+axiom_attribute_create (const axis2_env_t *env,
const axis2_char_t * localname,
const axis2_char_t * value,
- axis2_om_namespace_t * ns)
+ axiom_namespace_t * ns)
{
- axis2_om_attribute_impl_t *attribute_impl = NULL;
+ axiom_attribute_impl_t *attribute_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
/* localname is mandatory */
AXIS2_PARAM_CHECK(env->error, localname, NULL);
- attribute_impl = (axis2_om_attribute_impl_t *) AXIS2_MALLOC (env->allocator,
- sizeof (axis2_om_attribute_impl_t));
+ attribute_impl = (axiom_attribute_impl_t *) AXIS2_MALLOC (env->allocator,
+ sizeof (axiom_attribute_impl_t));
if (!attribute_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -132,9 +132,9 @@
}
attribute_impl->ns = ns;
- attribute_impl->om_attribute.ops = (axis2_om_attribute_ops_t*)AXIS2_MALLOC(
+ attribute_impl->om_attribute.ops = (axiom_attribute_ops_t*)AXIS2_MALLOC(
env->allocator,
- sizeof (axis2_om_attribute_ops_t));
+ sizeof (axiom_attribute_ops_t));
if (!(attribute_impl->om_attribute.ops))
{
@@ -145,28 +145,28 @@
return NULL;
}
- attribute_impl->om_attribute.ops->free = axis2_om_attribute_free;
- attribute_impl->om_attribute.ops->get_qname = axis2_om_attribute_get_qname;
- attribute_impl->om_attribute.ops->serialize = axis2_om_attribute_serialize;
-
- attribute_impl->om_attribute.ops->get_localname = axis2_om_attribute_get_localname;
- attribute_impl->om_attribute.ops->get_value = axis2_om_attribute_get_value;
- attribute_impl->om_attribute.ops->get_namespace = axis2_om_attribute_get_namespace;
-
- attribute_impl->om_attribute.ops->set_localname = axis2_om_attribute_set_localname;
- attribute_impl->om_attribute.ops->set_namespace = axis2_om_attribute_set_namespace;
- attribute_impl->om_attribute.ops->set_value = axis2_om_attribute_set_value;
+ attribute_impl->om_attribute.ops->free = axiom_attribute_free;
+ attribute_impl->om_attribute.ops->get_qname = axiom_attribute_get_qname;
+ attribute_impl->om_attribute.ops->serialize = axiom_attribute_serialize;
+
+ attribute_impl->om_attribute.ops->get_localname = axiom_attribute_get_localname;
+ attribute_impl->om_attribute.ops->get_value = axiom_attribute_get_value;
+ attribute_impl->om_attribute.ops->get_namespace = axiom_attribute_get_namespace;
+
+ attribute_impl->om_attribute.ops->set_localname = axiom_attribute_set_localname;
+ attribute_impl->om_attribute.ops->set_namespace = axiom_attribute_set_namespace;
+ attribute_impl->om_attribute.ops->set_value = axiom_attribute_set_value;
- attribute_impl->om_attribute.ops->clone = axis2_om_attribute_clone;
+ attribute_impl->om_attribute.ops->clone = axiom_attribute_clone;
return &(attribute_impl->om_attribute);
}
axis2_status_t AXIS2_CALL
-axis2_om_attribute_free (axis2_om_attribute_t *om_attribute,
+axiom_attribute_free (axiom_attribute_t *om_attribute,
const axis2_env_t *env)
{
- axis2_om_attribute_impl_t *attribute_impl = NULL;
+ axiom_attribute_impl_t *attribute_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
attribute_impl = AXIS2_INTF_TO_IMPL(om_attribute);
@@ -192,24 +192,24 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_attribute_free_void_arg (
+axiom_attribute_free_void_arg (
void *om_attribute,
const axis2_env_t *env)
{
- axis2_om_attribute_t *om_attribute_l = NULL;
+ axiom_attribute_t *om_attribute_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- om_attribute_l = (axis2_om_attribute_t *) om_attribute;
- return axis2_om_attribute_free(om_attribute_l, env);
+ om_attribute_l = (axiom_attribute_t *) om_attribute;
+ return axiom_attribute_free(om_attribute_l, env);
}
axis2_qname_t * AXIS2_CALL
-axis2_om_attribute_get_qname (axis2_om_attribute_t *om_attribute,
+axiom_attribute_get_qname (axiom_attribute_t *om_attribute,
const axis2_env_t *env)
{
axis2_qname_t *qname = NULL;
- axis2_om_attribute_impl_t *attribute_impl = NULL;
+ axiom_attribute_impl_t *attribute_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
attribute_impl = AXIS2_INTF_TO_IMPL(om_attribute);
if(!(attribute_impl->qname))
@@ -218,8 +218,8 @@
{
qname = axis2_qname_create (env,
attribute_impl->localname,
- AXIS2_OM_NAMESPACE_GET_URI(attribute_impl->ns, env),
- AXIS2_OM_NAMESPACE_GET_PREFIX(attribute_impl->ns, env));
+ AXIOM_NAMESPACE_GET_URI(attribute_impl->ns, env),
+ AXIOM_NAMESPACE_GET_PREFIX(attribute_impl->ns, env));
}
else
{ qname = axis2_qname_create (env,attribute_impl->localname,
@@ -233,12 +233,12 @@
axis2_status_t AXIS2_CALL
-axis2_om_attribute_serialize (axis2_om_attribute_t *om_attribute,
+axiom_attribute_serialize (axiom_attribute_t *om_attribute,
const axis2_env_t *env,
- axis2_om_output_t *om_output)
+ axiom_output_t *om_output)
{
int status = AXIS2_SUCCESS;
- axis2_om_attribute_impl_t *attribute = NULL;
+ axiom_attribute_impl_t *attribute = NULL;
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
@@ -250,32 +250,32 @@
axis2_char_t *uri = NULL;
axis2_char_t *prefix = NULL;
- uri = AXIS2_OM_NAMESPACE_GET_URI(attribute->ns,env);
- prefix = AXIS2_OM_NAMESPACE_GET_PREFIX(attribute->ns,env);
+ uri = AXIOM_NAMESPACE_GET_URI(attribute->ns,env);
+ prefix = AXIOM_NAMESPACE_GET_PREFIX(attribute->ns,env);
if((NULL != uri) && (NULL != prefix) && (AXIS2_STRCMP(prefix, "") != 0))
{
- status = axis2_om_output_write (om_output, env, AXIS2_OM_ATTRIBUTE, 4,
+ status = axiom_output_write (om_output, env, AXIOM_ATTRIBUTE, 4,
attribute->localname,
attribute->value,
uri , prefix );
}
else if(NULL != uri)
{
- status = axis2_om_output_write (om_output, env, AXIS2_OM_ATTRIBUTE, 3,
+ status = axiom_output_write (om_output, env, AXIOM_ATTRIBUTE, 3,
attribute->localname, attribute->value, uri);
}
}
else
{
- status = axis2_om_output_write ( om_output, env, AXIS2_OM_ATTRIBUTE, 2,
+ status = axiom_output_write ( om_output, env, AXIOM_ATTRIBUTE, 2,
attribute->localname, attribute->value);
}
return status;
}
axis2_char_t* AXIS2_CALL
-axis2_om_attribute_get_localname(axis2_om_attribute_t *om_attribute,
+axiom_attribute_get_localname(axiom_attribute_t *om_attribute,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -284,15 +284,15 @@
}
axis2_char_t* AXIS2_CALL
-axis2_om_attribute_get_value(axis2_om_attribute_t *om_attribute,
+axiom_attribute_get_value(axiom_attribute_t *om_attribute,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_attribute)->value;
}
-axis2_om_namespace_t* AXIS2_CALL
-axis2_om_attribute_get_namespace(axis2_om_attribute_t *om_attribute,
+axiom_namespace_t* AXIS2_CALL
+axiom_attribute_get_namespace(axiom_attribute_t *om_attribute,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -300,11 +300,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_attribute_set_localname(axis2_om_attribute_t *om_attribute,
+axiom_attribute_set_localname(axiom_attribute_t *om_attribute,
const axis2_env_t *env,
const axis2_char_t *localname)
{
- axis2_om_attribute_impl_t *attr_impl = NULL;
+ axiom_attribute_impl_t *attr_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(om_attribute);
@@ -327,11 +327,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_attribute_set_value(axis2_om_attribute_t *om_attribute,
+axiom_attribute_set_value(axiom_attribute_t *om_attribute,
const axis2_env_t *env,
const axis2_char_t *value)
{
- axis2_om_attribute_impl_t *attr_impl = NULL;
+ axiom_attribute_impl_t *attr_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
@@ -352,9 +352,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_attribute_set_namespace(axis2_om_attribute_t *om_attribute,
+axiom_attribute_set_namespace(axiom_attribute_t *om_attribute,
const axis2_env_t *env,
- axis2_om_namespace_t *om_namespace)
+ axiom_namespace_t *om_namespace)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FUNC_PARAM_CHECK(om_namespace, env, AXIS2_FAILURE);
@@ -362,19 +362,19 @@
return AXIS2_SUCCESS;
}
-axis2_om_attribute_t* AXIS2_CALL
-axis2_om_attribute_clone(axis2_om_attribute_t *om_attribute,
+axiom_attribute_t* AXIS2_CALL
+axiom_attribute_clone(axiom_attribute_t *om_attribute,
const axis2_env_t *env)
{
- axis2_om_attribute_impl_t *attr_impl = NULL;
- axis2_om_attribute_t *cloned_attr = NULL;
+ axiom_attribute_impl_t *attr_impl = NULL;
+ axiom_attribute_t *cloned_attr = NULL;
if(!om_attribute) return NULL;
AXIS2_ENV_CHECK(env, NULL);
attr_impl = AXIS2_INTF_TO_IMPL(om_attribute);
/** namespace is not cloned since it is a shollow copy*/
- cloned_attr = axis2_om_attribute_create(env,
+ cloned_attr = axiom_attribute_create(env,
attr_impl->localname,
attr_impl->value,
attr_impl->ns );
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?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- 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 Mon Jun 12 01:22:58 2006
@@ -14,60 +14,60 @@
* limitations under the License.
*/
- #include <axis2_om_child_element_iterator.h>
+ #include <axiom_child_element_iterator.h>
/************** function prototypes *************************************/
axis2_status_t AXIS2_CALL
-axis2_om_child_element_iterator_free
+axiom_child_element_iterator_free
(void *iterator,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_child_element_iterator_remove
- (axis2_om_child_element_iterator_t *iterator,
+axiom_child_element_iterator_remove
+ (axiom_child_element_iterator_t *iterator,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_child_element_iterator_has_next
- (axis2_om_child_element_iterator_t *iterator,
+axiom_child_element_iterator_has_next
+ (axiom_child_element_iterator_t *iterator,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_child_element_iterator_next
- (axis2_om_child_element_iterator_t *iterator,
+axiom_node_t* AXIS2_CALL
+axiom_child_element_iterator_next
+ (axiom_child_element_iterator_t *iterator,
const axis2_env_t *env);
/*************** end function prototypes **********************************/
-typedef struct axis2_om_child_element_iterator_impl_t
+typedef struct axiom_child_element_iterator_impl_t
{
- axis2_om_child_element_iterator_t iterator;
- axis2_om_node_t *current_child;
- axis2_om_node_t *last_child;
+ axiom_child_element_iterator_t iterator;
+ axiom_node_t *current_child;
+ axiom_node_t *last_child;
axis2_bool_t next_called;
axis2_bool_t remove_called;
-}axis2_om_child_element_iterator_impl_t;
+}axiom_child_element_iterator_impl_t;
/***************** end impl struct ****************************************/
#define AXIS2_INTF_TO_IMPL(iterator) \
- ((axis2_om_child_element_iterator_impl_t *)iterator)
+ ((axiom_child_element_iterator_impl_t *)iterator)
/**************** end macro ***********************************************/
-AXIS2_EXTERN axis2_om_child_element_iterator_t * AXIS2_CALL
-axis2_om_child_element_iterator_create(const axis2_env_t *env,
- axis2_om_node_t *current_child)
+AXIS2_EXTERN axiom_child_element_iterator_t * AXIS2_CALL
+axiom_child_element_iterator_create(const axis2_env_t *env,
+ axiom_node_t *current_child)
{
- axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
+ axiom_child_element_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- iterator_impl = (axis2_om_child_element_iterator_impl_t *)AXIS2_MALLOC(
+ iterator_impl = (axiom_child_element_iterator_impl_t *)AXIS2_MALLOC(
env->allocator,
- sizeof(axis2_om_child_element_iterator_impl_t));
+ sizeof(axiom_child_element_iterator_impl_t));
if(!iterator_impl)
{
@@ -83,35 +83,35 @@
iterator_impl->iterator.ops = NULL;
iterator_impl->iterator.ops =
- (axis2_om_child_element_iterator_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_om_child_element_iterator_ops_t));
+ (axiom_child_element_iterator_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_child_element_iterator_ops_t));
if(!(iterator_impl->iterator.ops))
{
- AXIS2_OM_CHILD_ELEMENT_ITERATOR_FREE(&(iterator_impl->iterator), env);
+ AXIOM_CHILD_ELEMENT_ITERATOR_FREE(&(iterator_impl->iterator), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
iterator_impl->current_child = current_child;
iterator_impl->iterator.ops->free_fn =
- axis2_om_child_element_iterator_free;
+ axiom_child_element_iterator_free;
iterator_impl->iterator.ops->remove =
- axis2_om_child_element_iterator_remove;
+ axiom_child_element_iterator_remove;
iterator_impl->iterator.ops->has_next =
- axis2_om_child_element_iterator_has_next;
+ axiom_child_element_iterator_has_next;
iterator_impl->iterator.ops->next =
- axis2_om_child_element_iterator_next;
+ axiom_child_element_iterator_next;
return &(iterator_impl->iterator);
}
axis2_status_t AXIS2_CALL
-axis2_om_child_element_iterator_free
+axiom_child_element_iterator_free
(void *iterator,
const axis2_env_t *env)
{
- axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
+ axiom_child_element_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -123,12 +123,12 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_child_element_iterator_remove
- (axis2_om_child_element_iterator_t *iterator,
+axiom_child_element_iterator_remove
+ (axiom_child_element_iterator_t *iterator,
const axis2_env_t *env)
{
- axis2_om_node_t *last_child = NULL;
- axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
+ axiom_node_t *last_child = NULL;
+ axiom_child_element_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -141,29 +141,29 @@
if(!(iterator_impl->last_child))
return AXIS2_FAILURE;
- last_child = AXIS2_OM_NODE_DETACH(iterator_impl->last_child, env);
- AXIS2_OM_NODE_FREE_TREE(last_child, env);
+ last_child = AXIOM_NODE_DETACH(iterator_impl->last_child, env);
+ AXIOM_NODE_FREE_TREE(last_child, env);
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
-axis2_om_child_element_iterator_has_next
- (axis2_om_child_element_iterator_t *iterator,
+axiom_child_element_iterator_has_next
+ (axiom_child_element_iterator_t *iterator,
const axis2_env_t *env)
{
- axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
+ axiom_child_element_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
return (iterator_impl->current_child) ? AXIS2_TRUE : AXIS2_FALSE;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_child_element_iterator_next
- (axis2_om_child_element_iterator_t *iterator,
+axiom_node_t* AXIS2_CALL
+axiom_child_element_iterator_next
+ (axiom_child_element_iterator_t *iterator,
const axis2_env_t *env)
{
- axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
+ axiom_child_element_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -173,12 +173,12 @@
{
iterator_impl->last_child = iterator_impl->current_child;
do{
- iterator_impl->current_child = AXIS2_OM_NODE_GET_NEXT_SIBLING(
+ iterator_impl->current_child = AXIOM_NODE_GET_NEXT_SIBLING(
iterator_impl->current_child, env);
}while(iterator_impl->current_child &&
- (AXIS2_OM_NODE_GET_NODE_TYPE(iterator_impl->current_child, env)
- != AXIS2_OM_ELEMENT));
+ (AXIOM_NODE_GET_NODE_TYPE(iterator_impl->current_child, env)
+ != AXIOM_ELEMENT));
return iterator_impl->last_child;
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?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c Mon Jun 12 01:22:58 2006
@@ -14,56 +14,56 @@
* limitations under the License.
*/
- #include <axis2_om_children_iterator.h>
+ #include <axiom_children_iterator.h>
/************** function prototypes *************************************/
axis2_status_t AXIS2_CALL
-axis2_om_children_iterator_free(axis2_om_children_iterator_t *iterator,
+axiom_children_iterator_free(axiom_children_iterator_t *iterator,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_children_iterator_remove(axis2_om_children_iterator_t *iterator,
+axiom_children_iterator_remove(axiom_children_iterator_t *iterator,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_children_iterator_has_next(axis2_om_children_iterator_t *iterator,
+axiom_children_iterator_has_next(axiom_children_iterator_t *iterator,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_children_iterator_next(axis2_om_children_iterator_t *iterator,
+axiom_node_t* AXIS2_CALL
+axiom_children_iterator_next(axiom_children_iterator_t *iterator,
const axis2_env_t *env);
/*************** end function prototypes **********************************/
-typedef struct axis2_om_children_iterator_impl_t
+typedef struct axiom_children_iterator_impl_t
{
- axis2_om_children_iterator_t iterator;
- axis2_om_node_t *current_child;
- axis2_om_node_t *last_child;
+ axiom_children_iterator_t iterator;
+ axiom_node_t *current_child;
+ axiom_node_t *last_child;
axis2_bool_t next_called;
axis2_bool_t remove_called;
-}axis2_om_children_iterator_impl_t;
+}axiom_children_iterator_impl_t;
/***************** end impl struct ****************************************/
#define AXIS2_INTF_TO_IMPL(iterator) \
- ((axis2_om_children_iterator_impl_t *)iterator)
+ ((axiom_children_iterator_impl_t *)iterator)
/**************** end macro ***********************************************/
-AXIS2_EXTERN axis2_om_children_iterator_t * AXIS2_CALL
-axis2_om_children_iterator_create(const axis2_env_t *env,
- axis2_om_node_t *current_child)
+AXIS2_EXTERN axiom_children_iterator_t * AXIS2_CALL
+axiom_children_iterator_create(const axis2_env_t *env,
+ axiom_node_t *current_child)
{
- axis2_om_children_iterator_impl_t *iterator_impl = NULL;
+ axiom_children_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- iterator_impl = (axis2_om_children_iterator_impl_t *)AXIS2_MALLOC(
+ iterator_impl = (axiom_children_iterator_impl_t *)AXIS2_MALLOC(
env->allocator,
- sizeof(axis2_om_children_iterator_impl_t));
+ sizeof(axiom_children_iterator_impl_t));
if(!iterator_impl)
{
@@ -79,27 +79,27 @@
iterator_impl->iterator.ops = NULL;
iterator_impl->iterator.ops =
- (axis2_om_children_iterator_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_om_children_iterator_ops_t));
+ (axiom_children_iterator_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_children_iterator_ops_t));
if(!(iterator_impl->iterator.ops))
{
- AXIS2_OM_CHILDREN_ITERATOR_FREE(&(iterator_impl->iterator), env);
+ AXIOM_CHILDREN_ITERATOR_FREE(&(iterator_impl->iterator), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
iterator_impl->current_child = current_child;
- iterator_impl->iterator.ops->free_fn = axis2_om_children_iterator_free;
- iterator_impl->iterator.ops->remove = axis2_om_children_iterator_remove;
- iterator_impl->iterator.ops->has_next = axis2_om_children_iterator_has_next;
- iterator_impl->iterator.ops->next = axis2_om_children_iterator_next;
+ iterator_impl->iterator.ops->free_fn = axiom_children_iterator_free;
+ iterator_impl->iterator.ops->remove = axiom_children_iterator_remove;
+ iterator_impl->iterator.ops->has_next = axiom_children_iterator_has_next;
+ iterator_impl->iterator.ops->next = axiom_children_iterator_next;
return &(iterator_impl->iterator);
}
axis2_status_t AXIS2_CALL
-axis2_om_children_iterator_free(axis2_om_children_iterator_t *iterator,
+axiom_children_iterator_free(axiom_children_iterator_t *iterator,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -111,11 +111,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_children_iterator_remove(axis2_om_children_iterator_t *iterator,
+axiom_children_iterator_remove(axiom_children_iterator_t *iterator,
const axis2_env_t *env)
{
- axis2_om_children_iterator_impl_t *iterator_impl = NULL;
- axis2_om_node_t *om_node = NULL;
+ axiom_children_iterator_impl_t *iterator_impl = NULL;
+ axiom_node_t *om_node = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -134,31 +134,31 @@
if(!(iterator_impl->last_child))
return AXIS2_FAILURE;
- om_node = AXIS2_OM_NODE_DETACH(iterator_impl->last_child, env);
+ om_node = AXIOM_NODE_DETACH(iterator_impl->last_child, env);
if(om_node)
{
- AXIS2_OM_NODE_FREE_TREE(om_node, env);
+ AXIOM_NODE_FREE_TREE(om_node, env);
om_node = NULL;
}
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
-axis2_om_children_iterator_has_next(axis2_om_children_iterator_t *iterator,
+axiom_children_iterator_has_next(axiom_children_iterator_t *iterator,
const axis2_env_t *env)
{
- axis2_om_children_iterator_impl_t *iterator_impl = NULL;
+ axiom_children_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
return (iterator_impl->current_child) ? AXIS2_TRUE : AXIS2_FALSE;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_children_iterator_next(axis2_om_children_iterator_t *iterator,
+axiom_node_t* AXIS2_CALL
+axiom_children_iterator_next(axiom_children_iterator_t *iterator,
const axis2_env_t *env)
{
- axis2_om_children_iterator_impl_t *iterator_impl = NULL;
+ axiom_children_iterator_impl_t *iterator_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -167,7 +167,7 @@
if(iterator_impl->current_child)
{
iterator_impl->last_child = iterator_impl->current_child;
- iterator_impl->current_child = AXIS2_OM_NODE_GET_NEXT_SIBLING(
+ iterator_impl->current_child = AXIOM_NODE_GET_NEXT_SIBLING(
iterator_impl->current_child, env);
return iterator_impl->last_child;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org