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 2005/10/04 07:23:40 UTC
svn commit: r293533 - in /webservices/axis2/trunk/c: include/
modules/test/om/src/ modules/xml/om/src/
Author: samisa
Date: Mon Oct 3 22:23:10 2005
New Revision: 293533
URL: http://svn.apache.org/viewcvs?rev=293533&view=rev
Log:
More changes in relation to om_node naming
Modified:
webservices/axis2/trunk/c/include/axis2_module_description.h
webservices/axis2/trunk/c/include/axis2_om_attribute.h
webservices/axis2/trunk/c/include/axis2_om_comment.h
webservices/axis2/trunk/c/include/axis2_om_doctype.h
webservices/axis2/trunk/c/include/axis2_om_document.h
webservices/axis2/trunk/c/include/axis2_om_element.h
webservices/axis2/trunk/c/include/axis2_om_node.h
webservices/axis2/trunk/c/include/axis2_om_output.h
webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
webservices/axis2/trunk/c/include/axis2_om_text.h
webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h
webservices/axis2/trunk/c/modules/test/om/src/test_om.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
Modified: webservices/axis2/trunk/c/include/axis2_module_description.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_module_description.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module_description.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module_description.h Mon Oct 3 22:23:10 2005
@@ -9,7 +9,7 @@
#include <axis2_operation_description.h>
#include <axis2_engine_config.h>
#include <axis2_description_param_include.h>
-#include <axis2_node.h>
+#include <axis2_om_node.h>
#include <apr_hash.h>
/**
Modified: webservices/axis2/trunk/c/include/axis2_om_attribute.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_attribute.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_attribute.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_attribute.h Mon Oct 3 22:23:10 2005
@@ -23,7 +23,7 @@
*/
#include <axis2_qname.h>
-#include <axis2_node.h>
+#include <axis2_om_node.h>
#include <axis2_om_namespace.h>
/**
Modified: webservices/axis2/trunk/c/include/axis2_om_comment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_comment.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_comment.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_comment.h Mon Oct 3 22:23:10 2005
@@ -22,7 +22,7 @@
* @brief defines axis2_om_comment_t struct, and manipulation functions
*/
-#include <axis2_node.h>
+#include <axis2_om_node.h>
typedef struct axis2_om_comment_t
{
@@ -33,7 +33,7 @@
* Create a comment struct and stores in in a node struct and returns a pointer
* to the axis2_om_comment_t struct
* the data_element field of node struct points to the acctual axis2_comment struct
- * The element type of axis2_node_t struct will be of type AXIS2_OM_COMMENT
+ * The element type of axis2_om_node_t struct will be of type AXIS2_OM_COMMENT
* @param value value of the comment
* @param comment_node This is an out parameter, stores the acctual om_comment in
* this node struct pointer
Modified: webservices/axis2/trunk/c/include/axis2_om_doctype.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_doctype.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_doctype.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_doctype.h Mon Oct 3 22:23:10 2005
@@ -22,7 +22,7 @@
*@brief defines struct representing xml DTD and its manipulation functions
*/
-#include <axis2_node.h>
+#include <axis2_om_node.h>
typedef struct axis2_om_doctype_t
{
@@ -33,9 +33,9 @@
* Create a doctype struct and stores in in a node struct and returns a pointer
* to the axis2_axis2_om_doctype_t struct
* the data_element field of node struct points to the acctual axis2_doctype_t struct
- * The element type of axis2_node_t struct will be of type AXIS2_OM_DOCTYPE
+ * The element type of axis2_om_node_t struct will be of type AXIS2_OM_DOCTYPE
* param doctype The out paremeter that must be passed
- * return pointer to a axis2_node_t struct containing the doctype struct
+ * return pointer to a axis2_om_node_t struct containing the doctype struct
*/
@@ -46,7 +46,7 @@
/**
* create an axis2_om_doctype_t struct with parent
* value field will be set to null
- * return poniter to a axis2_node_t
+ * return poniter to a axis2_om_node_t
*/
Modified: webservices/axis2/trunk/c/include/axis2_om_document.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_document.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_document.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_document.h Mon Oct 3 22:23:10 2005
@@ -16,12 +16,12 @@
#ifndef AXIS2_OM_DOCUMENT_H
#define AXIS2_OM_DOCUMENT_H
-#include <axis2_node.h>
+#include <axis2_om_node.h>
//typedef struct axis2_stax_om_builder_t axis2_stax_om_builder_t;
/**
- * @file axis2_node.h
+ * @file axis2_om_node.h
* @brief om_document represents a xml document
*
*/
Modified: webservices/axis2/trunk/c/include/axis2_om_element.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_element.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_element.h Mon Oct 3 22:23:10 2005
@@ -20,7 +20,7 @@
#include <axis2_om_namespace.h>
#include <axis2_om_attribute.h>
#include <axis2_om_output.h>
-#include <axis2_node.h>
+#include <axis2_om_node.h>
#include <apr.h>
#include <apr_hash.h>
Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Mon Oct 3 22:23:10 2005
@@ -18,7 +18,7 @@
#define AXIS2_NODE_H
/**
- * @file axis2_node.h
+ * @file axis2_om_node.h
* @brief defines node data structure, used for constructing the om tree and its
* manipulation functions
*/
@@ -73,13 +73,13 @@
* @return a node or NULL if there isn't enough memory
*/
-axis2_om_node_t *axis2_node_create();
+axis2_om_node_t *axis2_om_node_create();
/**
* destroy the node .
* @param node to free
*/
-void axis2_node_free(axis2_om_node_t *node);
+void axis2_om_node_free(axis2_om_node_t *node);
/**
* adds a child node to this node .
@@ -88,7 +88,7 @@
*/
-void axis2_node_add_child(axis2_om_node_t *parent,axis2_om_node_t *child);
+void axis2_om_node_add_child(axis2_om_node_t *parent,axis2_om_node_t *child);
/**
* detach a node from the tree and resets the links
@@ -96,7 +96,7 @@
*
*/
-axis2_om_node_t *axis2_node_detach(axis2_om_node_t *node_to_detach);
+axis2_om_node_t *axis2_om_node_detach(axis2_om_node_t *node_to_detach);
/**
* inserts a sibling node after the current node
@@ -104,12 +104,12 @@
* @param node_to_insert the node that will be inserted
*/
-void axis2_node_insert_sibling_after(axis2_om_node_t *current_nodee,axis2_om_node_t *node_to_insert);
+void axis2_om_node_insert_sibling_after(axis2_om_node_t *current_nodee,axis2_om_node_t *node_to_insert);
-void axis2_node_insert_sibling_before(axis2_om_node_t *current_ele,axis2_om_node_t *nodeto_insert);
+void axis2_om_node_insert_sibling_before(axis2_om_node_t *current_ele,axis2_om_node_t *nodeto_insert);
-//int axis2_node_build(axis2_om_node_t *node);
+//int axis2_om_node_build(axis2_om_node_t *node);
/**
* set a parent node to a given node
@@ -117,7 +117,7 @@
* @param parent the node that will be set as parent
*/
-void axis2_node_set_parent(axis2_om_node_t *node,axis2_om_node_t *parent);
+void axis2_om_node_set_parent(axis2_om_node_t *node,axis2_om_node_t *parent);
#endif // AXIS2_NODE_H
Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Mon Oct 3 22:23:10 2005
@@ -18,7 +18,7 @@
#define AXIS2_OM_OUTPUT_H
#include <guththila_xml_stream_writer.h>
-#include <axis2_node.h>
+#include <axis2_om_node.h>
#include <stdarg.h>
Modified: webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h Mon Oct 3 22:23:10 2005
@@ -22,7 +22,7 @@
* @brief represents a xml processing instruction also known as PI
*/
-#include <axis2_node.h>
+#include <axis2_om_node.h>
typedef struct axis2_om_processing_instruction_t {
char *target;
@@ -31,13 +31,13 @@
/**
* creates axis2_om_processing_instruction and
- * @return a pointer to axis2_node_t struct containing PI
+ * @return a pointer to axis2_om_node_t struct containing PI
*/
axis2_om_processing_instruction_t *axis2_om_processing_instruction_create(axis2_om_node_t *parent,const char *target,const char *value,axis2_om_node_t *node);
/**
* creates empty axis2_om_processing_instruction and
- * @return a pointer to axis2_node_t struct containing PI
+ * @return a pointer to axis2_om_node_t struct containing PI
*/
axis2_om_processing_instruction_t *axis2_om_processing_instruction_create_empty(axis2_om_node_t *parent,axis2_om_node_t *node);
Modified: webservices/axis2/trunk/c/include/axis2_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_text.h Mon Oct 3 22:23:10 2005
@@ -43,7 +43,7 @@
* Create a text struct and stores in in a node struct and returns a pointer
* to the axis2_om_text_t struct
* the data_element field of node struct points to the acctual axis2_text_t struct
- * The element type of axis2_node_t struct will be of type AXIS2_OM_TEXT
+ * The element type of axis2_om_node_t struct will be of type AXIS2_OM_TEXT
* @param parent This can be null The parent element should be of type AXIS2_OM_ELEMENT
* @return pointer to a axis2_om_text_t struct
*/
Modified: webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h Mon Oct 3 22:23:10 2005
@@ -28,7 +28,7 @@
#define XMLNS_PREFIX "xml"
#include <xmlpullparser.h>
-#include <axis2_node.h>
+#include <axis2_om_node.h>
#include <axis2_om_document.h>
struct axis2_stax_om_builder_s
@@ -52,7 +52,7 @@
/**
* Create an om element and adds to the document
* @param builder pointer to the builder
- * @param returns a pointer to axis2_node_t containing the element or NULL if there
+ * @param returns a pointer to axis2_om_node_t containing the element or NULL if there
* isn't enough memory
*/
Modified: webservices/axis2/trunk/c/modules/test/om/src/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/test_om.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/test_om.c (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/test_om.c Mon Oct 3 22:23:10 2005
@@ -1,5 +1,5 @@
#include <apr.h>
-#include <axis2_node.h>
+#include <axis2_om_node.h>
#include <axis2_om_element.h>
@@ -28,7 +28,7 @@
ele3 = axis2_om_element_create (NULL, "ele3", ns2, node3);
- axis2_node_add_child (node1, node2);
+ axis2_om_node_add_child (node1, node2);
printf("DONE\n");
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Mon Oct 3 22:23:10 2005
@@ -23,7 +23,7 @@
axis2_om_node_t *node = NULL;
axis2_om_comment_t *comment = NULL;
- node = axis2_node_create();
+ node = axis2_om_node_create();
if (!node)
{
fprintf(stderr, "%d Error", AXIS2_ERROR_OM_MEMORY_ALLOCATION);
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Mon Oct 3 22:23:10 2005
@@ -22,7 +22,7 @@
axis2_om_doctype_t *axis2_om_doctype_create(axis2_om_node_t *parent , const char *value, axis2_om_node_t *doc_node)
{
axis2_om_doctype_t *doctype = NULL;
- axis2_om_node_t *node = axis2_node_create();
+ axis2_om_node_t *node = axis2_om_node_create();
if (!node)
{
return NULL;
@@ -43,7 +43,7 @@
if (parent)
{
node->parent = parent;
- axis2_node_add_child(parent, node);
+ axis2_om_node_add_child(parent, node);
}
doc_node = node;
return doctype;
@@ -73,7 +73,7 @@
if (parent)
{
node->parent = parent;
- axis2_node_add_child(parent, node);
+ axis2_om_node_add_child(parent, node);
}
doc_node = node;
return doctype;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c Mon Oct 3 22:23:10 2005
@@ -34,7 +34,7 @@
return NULL;
}
- node = axis2_node_create ();
+ node = axis2_om_node_create ();
if (!node)
{
fprintf (stderr, "%d Error", AXIS2_ERROR_OM_MEMORY_ALLOCATION);
@@ -44,7 +44,7 @@
if (!element)
{
- axis2_node_free (node);
+ axis2_om_node_free (node);
return NULL;
}
element->ns = NULL;
@@ -56,7 +56,7 @@
if (parent)
{
node->parent = parent;
- axis2_node_add_child (parent, node);
+ axis2_om_node_add_child (parent, node);
}
node->done = true;
node->element_type = AXIS2_OM_ELEMENT;
@@ -102,7 +102,7 @@
return NULL;
}
- node = axis2_node_create ();
+ node = axis2_om_node_create ();
if (!node)
{
fprintf (stderr, "%d Error", AXIS2_ERROR_OM_MEMORY_ALLOCATION);
@@ -112,7 +112,7 @@
if (!element)
{
- axis2_node_free (node);
+ axis2_om_node_free (node);
return NULL;
}
element->localname = strdup (localname);
@@ -129,7 +129,7 @@
if (parent)
{
node->parent = parent;
- axis2_node_add_child (parent, node);
+ axis2_om_node_add_child (parent, node);
}
axis2_om_element_set_namespace (node, ns);
ele_node = node;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c Mon Oct 3 22:23:10 2005
@@ -16,7 +16,7 @@
#include <axis2_om_node.h>
-axis2_om_node_t *axis2_node_create()
+axis2_om_node_t *axis2_om_node_create()
{
axis2_om_node_t *node = (axis2_om_node_t *) malloc(sizeof(axis2_om_node_t));
@@ -38,13 +38,13 @@
}
-void axis2_node_free(axis2_om_node_t * node)
+void axis2_om_node_free(axis2_om_node_t * node)
{
if (!node)
return;
}
-void axis2_node_add_child(axis2_om_node_t * parent, axis2_om_node_t * child)
+void axis2_om_node_add_child(axis2_om_node_t * parent, axis2_om_node_t * child)
{
if (!parent || !child)
{
@@ -67,7 +67,7 @@
-axis2_om_node_t *axis2_node_detach(axis2_om_node_t * node_to_detach)
+axis2_om_node_t *axis2_om_node_detach(axis2_om_node_t * node_to_detach)
{
axis2_om_node_t *parent = NULL;
@@ -104,7 +104,7 @@
return node_to_detach;
}
-void axis2_node_set_parent(axis2_om_node_t * node,axis2_om_node_t *parent)
+void axis2_om_node_set_parent(axis2_om_node_t * node,axis2_om_node_t *parent)
{
if(!parent || !node)
{
@@ -120,7 +120,7 @@
if(!(node->parent))
{
- axis2_node_detach(node);
+ axis2_om_node_detach(node);
}
node->parent = parent;
}
@@ -131,7 +131,7 @@
* @param nodeto_insert the node that will be inserted
*/
-void axis2_node_insert_sibling_after(axis2_om_node_t *node,
+void axis2_om_node_insert_sibling_after(axis2_om_node_t *node,
axis2_om_node_t *node_to_insert)
{
if(!node || !node_to_insert )
@@ -151,7 +151,7 @@
}
-void axis2_node_insert_sibling_before(axis2_om_node_t *node,
+void axis2_om_node_insert_sibling_before(axis2_om_node_t *node,
axis2_om_node_t *node_to_insert)
{
if(!node || !node_to_insert )
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c Mon Oct 3 22:23:10 2005
@@ -22,7 +22,7 @@
axis2_om_processing_instruction_t *axis2_om_processing_instruction_create(axis2_om_node_t *parent,const char *target,const char *value,axis2_om_node_t *pinode)
{
axis2_om_processing_instruction_t *pi = NULL;
- axis2_om_node_t *pi_node = axis2_node_create();
+ axis2_om_node_t *pi_node = axis2_om_node_create();
if (pi_node)
{
@@ -50,7 +50,7 @@
if (parent)
{
pi_node->parent = parent;
- axis2_node_add_child(parent, pi_node);
+ axis2_om_node_add_child(parent, pi_node);
}
pinode = pi_node;
@@ -62,7 +62,7 @@
{
axis2_om_node_t *pi_node = NULL;
axis2_om_processing_instruction_t *pi = NULL;
- pi_node = axis2_node_create();
+ pi_node = axis2_om_node_create();
if (pi_node)
{
pi = (axis2_om_processing_instruction_t *)malloc(
@@ -81,7 +81,7 @@
if (parent)
{
pi_node->parent = parent;
- axis2_node_add_child(parent, pi_node);
+ axis2_om_node_add_child(parent, pi_node);
}
node = pi_node;
return pi;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c?rev=293533&r1=293532&r2=293533&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Mon Oct 3 22:23:10 2005
@@ -23,7 +23,7 @@
,axis2_om_node_t *text_node)
{
axis2_om_text_t *text;
- axis2_om_node_t *node = axis2_node_create();
+ axis2_om_node_t *node = axis2_om_node_create();
if (!node)
{
fprintf(stderr,"%d Error",AXIS2_ERROR_OM_MEMORY_ALLOCATION);
@@ -46,7 +46,7 @@
{
node->done = true;
node->parent = parent;
- axis2_node_add_child(parent,node);
+ axis2_om_node_add_child(parent,node);
}
text_node = node;
return text;