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 sa...@apache.org on 2005/10/14 15:14:33 UTC
svn commit: r321102 - in /webservices/axis2/trunk/c/include:
axis2_om_document.h axis2_om_element.h axis2_om_stax_builder.h
Author: samisa
Date: Fri Oct 14 06:14:25 2005
New Revision: 321102
URL: http://svn.apache.org/viewcvs?rev=321102&view=rev
Log:
Fixed compilation problems and stax builder naming
Modified:
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_stax_builder.h
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=321102&r1=321101&r2=321102&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_document.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_document.h Fri Oct 14 06:14:25 2005
@@ -1,114 +1,112 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AXIS2_OM_DOCUMENT_H
-#define AXIS2_OM_DOCUMENT_H
-#include <axis2_om_node.h>
-
-/*typedef struct axis2_stax_om_builder_t axis2_stax_om_builder_t;*/
-
-/**
- * @file axis2_om_node.h
- * @brief om_document represents a xml document
- *
- */
-
-
-
-#define CHAR_SET_ENCODING "UTF-8"
-#define XML_VERSION "1.0"
-
-
-typedef struct axis2_om_document_t
-{
- axis2_om_node_t *root_element;
- axis2_om_node_t *last_child;
- axis2_om_node_t *first_child;
- int done;
- axis2_stax_om_builder_t *builder;
- char *char_set_encoding;
- char *xml_version;
-
-}axis2_om_document_t;
-
-
-/**
- * creates and returns axis2_om_document returns null if there isn't enough memory
- * @param root_ele pointer to document's root node IF NUll is parsed a document root
- * will be set to NULL
- * @param builder pointer to xml builder
- */
-
-axis2_om_document_t *axis2_om_document_create(axis2_om_node_t *root_ele,axis2_stax_om_builder_t *builder);
-
-/**
- * Free axis2_om_document_t struct
- * @param document
- */
-
-
-void axis2_free_om_document(axis2_om_document_t *document);
-
-/**
- * causes the parser to proceed if the xml input is not finised yet
- * @param document
- */
-
-
-void axis2_om_document_build_next(axis2_om_document_t *document);
-
-/**
- * adds the child node as a child to the back of the list
- */
-void axis2_om_document_add_child(axis2_om_document_t *document,axis2_om_node_t *child);
-
-/**
- * This cause the parser to proceed
- * @param document
- * @ returns The first
- */
-
-
-axis2_om_node_t *axis2_om_document_get_root_element(axis2_om_document_t *document);
-
-/**
- * set the CHAR SET ENCODING of this document
- */
-void axis2_document_set_char_set_encoding(axis2_om_document_t *char_set_encoding);
-
-/**
- * set the xml version of this document
- */
-void axis2_document_set_xmlversion(axis2_om_document_t *document);
-
-
-axis2_om_node_t *axis2_om_document_get_next_sibling(axis2_om_document_t *document);
-
-
-axis2_om_node_t *axis2_om_document_get_first_child(axis2_om_document_t *document);
-
-axis2_om_node_t *axis2_om_document_get_current_child(axis2_om_document_t *document);
-
-/* to implement
- * get first child with qname
- * get children iterator
- * get children with name
- */
-
-
-
-
-#endif // AXIS2_OM_DOCUMENT_H
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AXIS2_OM_DOCUMENT_H
+#define AXIS2_OM_DOCUMENT_H
+
+#include <axis2_om_node.h>
+
+/*typedef struct axis2_om_stax_builder_t axis2_om_stax_builder_t;*/
+
+/**
+ * @file axis2_om_node.h
+ * @brief om_document represents a xml document
+ *
+ */
+
+typedef struct axis2_om_stax_builder axis2_om_stax_builder_t;
+
+#define CHAR_SET_ENCODING "UTF-8"
+#define XML_VERSION "1.0"
+
+
+typedef struct axis2_om_document_t
+{
+ axis2_om_node_t *root_element;
+ axis2_om_node_t *last_child;
+ axis2_om_node_t *first_child;
+ int done;
+ axis2_om_stax_builder_t *builder;
+ char *char_set_encoding;
+ char *xml_version;
+
+}axis2_om_document_t;
+
+
+/**
+ * creates and returns axis2_om_document returns null if there isn't enough memory
+ * @param root_ele pointer to document's root node IF NUll is parsed a document root
+ * will be set to NULL
+ * @param builder pointer to xml builder
+ */
+
+axis2_om_document_t *axis2_om_document_create(axis2_om_node_t *root_ele,axis2_om_stax_builder_t *builder);
+
+/**
+ * Free axis2_om_document_t struct
+ * @param document
+ */
+
+
+void axis2_free_om_document(axis2_om_document_t *document);
+
+/**
+ * causes the parser to proceed if the xml input is not finised yet
+ * @param document
+ */
+
+
+void axis2_om_document_build_next(axis2_om_document_t *document);
+
+/**
+ * adds the child node as a child to the back of the list
+ */
+void axis2_om_document_add_child(axis2_om_document_t *document,axis2_om_node_t *child);
+
+/**
+ * This cause the parser to proceed
+ * @param document
+ * @ returns The first
+ */
+
+
+axis2_om_node_t *axis2_om_document_get_root_element(axis2_om_document_t *document);
+
+/**
+ * set the CHAR SET ENCODING of this document
+ */
+void axis2_document_set_char_set_encoding(axis2_om_document_t *char_set_encoding);
+
+/**
+ * set the xml version of this document
+ */
+void axis2_document_set_xmlversion(axis2_om_document_t *document);
+
+
+axis2_om_node_t *axis2_om_document_get_next_sibling(axis2_om_document_t *document);
+
+
+axis2_om_node_t *axis2_om_document_get_first_child(axis2_om_document_t *document);
+
+axis2_om_node_t *axis2_om_document_get_current_child(axis2_om_document_t *document);
+
+/* to implement
+ * get first child with qname
+ * get children iterator
+ * get children with name
+ */
+
+#endif /* AXIS2_OM_DOCUMENT_H */
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=321102&r1=321101&r2=321102&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_element.h Fri Oct 14 06:14:25 2005
@@ -58,7 +58,7 @@
,axis2_om_node_t **node);
axis2_om_element_t *axis2_om_element_create_with_builder(axis2_om_node_t *parent,
- const char *localname,axis2_om_namespace_t *ns,axis2_stax_om_builder_t *builder,axis2_om_node_t **node);
+ const char *localname,axis2_om_namespace_t *ns,axis2_om_stax_builder_t *builder,axis2_om_node_t **node);
/*
Modified: webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_stax_builder.h?rev=321102&r1=321101&r2=321102&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_stax_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_stax_builder.h Fri Oct 14 06:14:25 2005
@@ -1,139 +1,128 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AXIS2_STAX_OMBUILDER_H
-#define AXIS2_STAX_OMBUILDER_H
-
-/**
- * @file axis2_stax_om_builder.h
- * @brief om model stax builder
- */
-
-
-
-
-
-#include <guththila_xml_pull_parser.h>
-#include <axis2_om_node.h>
-#include <axis2_om_document.h>
-
-struct axis2_stax_om_builder_s
-{
- guththila_xml_pull_parser_t *parser;
- axis2_om_node_t *lastnode;
- axis2_om_document_t *document;
- int done;
- int parser_accessed;
- int cache;
- /*apr_array_header_t *element_stack;*/
-};
-
-/**
- * create an stax_om_builder
- * @param parser This is the XMLStreamReader of xmlparser
- * [ Guththila ]
- */
-
-axis2_stax_om_builder_t *axis2_stax_om_builder_create(guththila_xml_pull_parser_t *parser);
-
-/**
- * Create an om element and adds to the document
- * @param builder pointer to the builder
- * @param returns a pointer to axis2_om_node_t containing the element or NULL if there
- * isn't enough memory
- */
-
-axis2_om_node_t *axis2_stax_om_builder_create_om_element(
- axis2_stax_om_builder_t *builder);
-
-/**
- * creates an om comment
- * @param builder
- * @returns
- */
-
-
-axis2_om_node_t *axis2_stax_om_builder_create_om_comment(
- axis2_stax_om_builder_t *builder);
-
-/**
- * create an om doctype
- *
- */
-axis2_om_node_t *axis2_stax_om_builder_create_om_doctype(
- axis2_stax_om_builder_t *builder_t);
-
-/**
- * create om_processing_instruction
- */
-
-axis2_om_node_t *axis2_stax_om_builder_create_om_processing_instruction(
- axis2_stax_om_builder_t *builder);
-
-/**
- * End element processing
- */
-void axis2_stax_om_builder_end_element(axis2_stax_om_builder_t *builder);
-/**
- * move parser forward and reacts to events
- */
-
-int axis2_stax_om_builder_next(axis2_stax_om_builder_t *builder);
-
-/**
- * process attrbites
- *
- */
-
-void axis2_stax_om_builder_process_attributes(axis2_stax_om_builder_t *builder,axis2_om_node_t *element_node);
-
-/**
- * create om text
- *
- */
-axis2_om_node_t *axis2_stax_om_builder_create_om_text(axis2_stax_om_builder_t *builder);
-
-/**
- * discard building an element
- */
-
-
-void axis2_stax_om_builder_discard(axis2_stax_om_builder_t *builder,axis2_om_node_t *element_node);
-
-/**
- * process namespaces
- *
- */
-
-axis2_om_node_t *axis2_stax_om_builder_process_namespace_data(axis2_stax_om_builder_t *builder,axis2_om_node_t *element,int is_soap_element);
-
-char *axis2_stax_om_builder_get_attribute_name(axis2_stax_om_builder_t *builder,int i);
-
-char *axis2_stax_om_builder_get_attribute_prefix(axis2_stax_om_builder_t *builder,int i);
-
-void axis2_stax_om_builder_process_start_document(axis2_stax_om_builder_t* builder);
-
-
-
-
-char *axis2_stax_om_builder_get_attribute_namespace(axis2_stax_om_builder_t *builder,int i);
-
-
-int axis2_stax_om_builder_get_attribute_count(axis2_stax_om_builder_t *builder);
-
-
-
-#endif // AXIS2_STAX_OMBUILDER_H
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AXIS2_OM_STAX_BUILDER_H
+#define AXIS2_OM_STAX_BUILDER_H
+
+/**
+ * @file axis2_om_stax_builder.h
+ * @brief om model stax builder
+ */
+
+#include <guththila_xml_pull_parser.h>
+#include <axis2_om_node.h>
+#include <axis2_om_document.h>
+
+struct axis2_om_stax_builder
+{
+ guththila_xml_pull_parser_t *parser;
+ axis2_om_node_t *lastnode;
+ axis2_om_document_t *document;
+ int done;
+ int parser_accessed;
+ int cache;
+ /*apr_array_header_t *element_stack;*/
+};
+
+/**
+ * create an stax_om_builder
+ * @param parser This is the XMLStreamReader of xmlparser
+ * [ Guththila ]
+ */
+
+axis2_om_stax_builder_t *axis2_om_stax_builder_create(guththila_xml_pull_parser_t *parser);
+
+/**
+ * Create an om element and adds to the document
+ * @param builder pointer to the builder
+ * @param returns a pointer to axis2_om_node_t containing the element or NULL if there
+ * isn't enough memory
+ */
+
+axis2_om_node_t *axis2_om_stax_builder_create_om_element(
+ axis2_om_stax_builder_t *builder);
+
+/**
+ * creates an om comment
+ * @param builder
+ * @returns
+ */
+
+axis2_om_node_t *axis2_om_stax_builder_create_om_comment(
+ axis2_om_stax_builder_t *builder);
+
+/**
+ * create an om doctype
+ *
+ */
+axis2_om_node_t *axis2_om_stax_builder_create_om_doctype(
+ axis2_om_stax_builder_t *builder_t);
+
+/**
+ * create om_processing_instruction
+ */
+
+axis2_om_node_t *axis2_om_stax_builder_create_om_processing_instruction(
+ axis2_om_stax_builder_t *builder);
+
+/**
+ * End element processing
+ */
+void axis2_om_stax_builder_end_element(axis2_om_stax_builder_t *builder);
+/**
+ * move parser forward and reacts to events
+ */
+
+int axis2_om_stax_builder_next(axis2_om_stax_builder_t *builder);
+
+/**
+ * process attrbites
+ *
+ */
+
+void axis2_om_stax_builder_process_attributes(axis2_om_stax_builder_t *builder,axis2_om_node_t *element_node);
+
+/**
+ * create om text
+ *
+ */
+axis2_om_node_t *axis2_om_stax_builder_create_om_text(axis2_om_stax_builder_t *builder);
+
+/**
+ * discard building an element
+ */
+
+
+void axis2_om_stax_builder_discard(axis2_om_stax_builder_t *builder,axis2_om_node_t *element_node);
+
+/**
+ * process namespaces
+ *
+ */
+
+axis2_om_node_t *axis2_om_stax_builder_process_namespace_data(axis2_om_stax_builder_t *builder,axis2_om_node_t *element,int is_soap_element);
+
+char *axis2_om_stax_builder_get_attribute_name(axis2_om_stax_builder_t *builder,int i);
+
+char *axis2_om_stax_builder_get_attribute_prefix(axis2_om_stax_builder_t *builder,int i);
+
+void axis2_om_stax_builder_process_start_document(axis2_om_stax_builder_t* builder);
+
+char *axis2_om_stax_builder_get_attribute_namespace(axis2_om_stax_builder_t *builder,int i);
+
+int axis2_om_stax_builder_get_attribute_count(axis2_om_stax_builder_t *builder);
+
+#endif /* AXIS2_OM_STAX_BUILDER_H */