refactoring.

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@926481 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 20 insertions, 170 deletions

diff --git a/axiom/include/axiom_document.h b/axiom/include/axiom_document.h
index ac014df..8cc54dd 100644
--- a/axiom/include/axiom_document.h
+++ b/axiom/include/axiom_document.h
@@ -48,52 +48,6 @@ extern "C"
     typedef struct axiom_document axiom_document_t;
 
     /**
-      * creates an axiom_document_t struct
-      * @param env Environment. MUST NOT be NULL.
-      * @param root pointer to document's root node. Optional, can be NULL
-      * @param builder pointer to axiom_stax_builder 
-      * @return pointer to the newly created document.
-      */
-    AXIS2_EXTERN axiom_document_t *AXIS2_CALL
-    axiom_document_create(
-        const axutil_env_t * env,
-        axiom_node_t * root,
-        struct axiom_stax_builder *builder);
-
-    /**
-      * Free document struct
-      * @param document pointer to axiom_document_t struct to be freed
-      * @param env Environment. MUST NOT be NULL  
-      * @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE.
-      */
-    AXIS2_EXTERN void AXIS2_CALL
-    axiom_document_free(
-        struct axiom_document *document,
-        const axutil_env_t * env);
-
-    /**
-     * Free document struct only, Does not free the associated axiom struture.
-     * @param document pointer to axiom_document_t struct to be freed
-     * @param env Environment. MUST NOT be NULL  
-     * @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE.
-     */
-    AXIS2_EXTERN void AXIS2_CALL
-    axiom_document_free_self(
-        struct axiom_document *document,
-        const axutil_env_t * env);
-
-    /** Builds the next node if the builder is not finished with input xml stream
-      * @param document document whose next node is to be built. cannot be NULL
-      * @param env Environment. MUST NOT be NULL.  
-      * @return pointer to the next node. NULL on error.
-      */
-
-    AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-    axiom_document_build_next(
-        struct axiom_document *document,
-        const axutil_env_t * env);
-
-    /**
       * Gets the root element of the document.
       * @param document document to return the root of
       * @param env Environment. MUST NOT be NULL.  
@@ -106,20 +60,6 @@ extern "C"
         const axutil_env_t * env);
 
     /**
-      * set the root element of the document. IF a root node is already exist,it is freed 
-      * before setting to root element 
-      * @param document document struct to return the root of
-      * @param env Environment. MUST NOT be NULL.  
-      * @return returns status code AXIS2_SUCCESS on success ,AXIS2_FAILURE on error. 
-      */
-
-    AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axiom_document_set_root_element(
-        struct axiom_document *document,
-        const axutil_env_t * env,
-        axiom_node_t * om_node);
-
-    /**
      * This method builds the rest of the xml input stream from current position till
      * the root element is completed .
      * @param document pointer to axiom_document_t struct to be built.
@@ -130,40 +70,6 @@ extern "C"
         struct axiom_document *document,
         const axutil_env_t * env);
 
-    /**
-     * get builder
-     * @param document pointer to axiom_document_t struct to be built.
-     * @param env environment MUST NOT be NULL.
-     * @return builder, returns NULL if a builder is not associated with 
-     * document
-     */
-    AXIS2_EXTERN struct axiom_stax_builder *AXIS2_CALL
-    axiom_document_get_builder(
-        struct axiom_document *document,
-        const axutil_env_t * env);
-
-    /**
-     * sets builder for document.
-     * @param document pointer to axiom_document_t struct to be built.
-     * @param env environment MUST NOT be NULL.
-     * @param builder pointer to builder to associate with document
-     */ 
-    AXIS2_EXTERN void AXIS2_CALL
-    axiom_document_set_builder(
-        axiom_document_t * document,
-        const axutil_env_t * env,
-        struct axiom_stax_builder * builder);
-
-    /**
-     * @param om_document
-     * @return status code AXIS2_SUCCESS on success , otherwise AXIS2_FAILURE
-     */
-    AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axiom_document_serialize(
-        struct axiom_document *document,
-        const axutil_env_t * env,
-        axiom_output_t * om_output);
-
     /** @} */
 
 #ifdef __cplusplus
diff --git a/axiom/include/axiom_element.h b/axiom/include/axiom_element.h
index ceb4417..fd6a1d8 100644
--- a/axiom/include/axiom_element.h
+++ b/axiom/include/axiom_element.h
@@ -506,22 +506,7 @@ extern "C"
         const axutil_env_t * env,
         axiom_node_t * element_node);
 
-    /**
-     * builds this om_element_node completely, This is only possible 
-     * if the om_stax_builder is associated with the om_element_node,
-     * @param om_element pointer to om_element
-     * @param env environment MUST not be NULL
-     * @param om_node pointer to this element node
-     * @param element_node corresponding om element node of this om element
-     * struct 
-     * @returns AXIS2_SUCCESS if this element node was successfully completed,
-     * otherwise returns AXIS2_FAILURE
-     */
-    AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axiom_element_build(
-        axiom_element_t * om_element,
-        const axutil_env_t * env,
-        axiom_node_t * element_node);
+
 
     /**
      * retrieves the default namespace of this element , if available,
@@ -738,6 +723,25 @@ extern "C"
         axiom_element_t * root_element,
         axutil_hash_t *inscope_namespaces);
 
+#if 0
+    /**
+     * builds this om_element_node completely, This is only possible
+     * if the om_stax_builder is associated with the om_element_node,
+     * @param om_element pointer to om_element
+     * @param env environment MUST not be NULL
+     * @param om_node pointer to this element node
+     * @param element_node corresponding om element node of this om element
+     * struct
+     * @returns AXIS2_SUCCESS if this element node was successfully completed,
+     * otherwise returns AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axiom_element_build(
+        axiom_element_t * om_element,
+        const axutil_env_t * env,
+        axiom_node_t * element_node);
+
+#endif
     /** @} */
 
 #ifdef __cplusplus
diff --git a/axiom/include/axiom_stax_builder.h b/axiom/include/axiom_stax_builder.h
index fb4a1ec..8b85e12 100644
--- a/axiom/include/axiom_stax_builder.h
+++ b/axiom/include/axiom_stax_builder.h
@@ -34,7 +34,6 @@ extern "C"
      * @ingroup axiom_om
      * @{
      */
-
     typedef struct axiom_stax_builder axiom_stax_builder_t;
 
     /**
@@ -50,30 +49,6 @@ extern "C"
         axiom_xml_reader_t * parser);
 
     /**
-      * Builds the next node from stream. Moves pull parser forward and reacts 
-      * to events.
-      * @param builder pointer to stax builder struct to be used
-      * @param environment Environment. MUST NOT be NULL.
-      * @return a pointer to the next node, or NULL if there are no more nodes.
-      *     On erros sets the error and returns NULL.
-      */
-    AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-    axiom_stax_builder_next(
-        struct axiom_stax_builder *builder,
-        const axutil_env_t * env);
-
-    /**
-      * Discards the element that is being built currently.
-      * @param environment Environment. MUST NOT be NULL, .
-      * @param builder pointer to stax builder struct to be used
-      * @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE.
-      */
-    AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axiom_stax_builder_discard_current_element(
-        struct axiom_stax_builder *builder,
-        const axutil_env_t * env);
-
-    /**
       * Free the build struct instance and its associated document,axiom tree.
       * @param builder pointer to builder struct
       * @param env environment, MUST NOT be NULL
@@ -110,41 +85,6 @@ extern "C"
         struct axiom_stax_builder *builder,
         const axutil_env_t * env);
 
-    /**
-      * builder is finished building om structure
-      * @param builder pointer to stax builder struct to be used
-      * @param environment Environment. MUST NOT be NULL.
-      *
-      * @return AXIS2_TRUE if is complete or AXIS2_FALSE otherwise
-      */
-
-    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-    axiom_stax_builder_is_complete(
-        struct axiom_stax_builder *builder,
-        const axutil_env_t * env);
-
-    /**
-      * moves the reader to next event and returns the token returned by the xml_reader ,
-      * @param builder pointer to STAX builder struct to be used
-      * @param environment Environment. MUST NOT be NULL.
-      * @return next event axiom_xml_reader_event_types. Returns -1 on error
-      */
-    AXIS2_EXTERN int AXIS2_CALL
-    axiom_stax_builder_next_with_token(
-        struct axiom_stax_builder *builder,
-        const axutil_env_t * env);
-
-    AXIS2_EXTERN axiom_xml_reader_t *AXIS2_CALL
-    axiom_stax_builder_get_parser(
-        axiom_stax_builder_t * om_builder,
-        const axutil_env_t * env);
-
-    AXIS2_EXTERN void AXIS2_CALL
-    axiom_stax_builder_set_cache(
-        axiom_stax_builder_t * om_builder,
-        const axutil_env_t * env,
-        axis2_bool_t enable_cache);
-
     /** @} */
 
 #ifdef __cplusplus