axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r524775 - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/om/ axiom/src/parser/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ build/win32/ include/ modules/core/engine/ modules/core/transport/ modules/core/transport/http/sen...
Date Mon, 02 Apr 2007 12:30:40 GMT
Author: samisa
Date: Mon Apr  2 05:30:38 2007
New Revision: 524775

URL: http://svn.apache.org/viewvc?view=rev&rev=524775
Log:
Removed macros form XML related and transport related files
Organized source accordingly

Added:
    webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c
    webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c
    webservices/axis2/trunk/c/modules/core/transport/transport_receiver.c
Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
    webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
    webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
    webservices/axis2/trunk/c/axiom/src/om/om_element.c
    webservices/axis2/trunk/c/axiom/src/om/om_node.c
    webservices/axis2/trunk/c/axiom/src/om/om_output.c
    webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
    webservices/axis2/trunk/c/axiom/src/om/om_text.c
    webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am
    webservices/axis2/trunk/c/build/win32/makefile
    webservices/axis2/trunk/c/include/axis2_transport_receiver.h
    webservices/axis2/trunk/c/modules/core/engine/Makefile.am
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
    webservices/axis2/trunk/c/samples/client/echo/echo.c
    webservices/axis2/trunk/c/samples/client/google/google_client.c
    webservices/axis2/trunk/c/samples/client/math/math_client.c
    webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h Mon Apr  2 05:30:38 2007
@@ -78,21 +78,6 @@
     AXIS2_EXTERN axiom_mime_parser_t * AXIS2_CALL
     axiom_mime_parser_create(const axutil_env_t *env);
 
-#define AXIOM_MIME_PARSER_FREE(mime_parser, env) \
-axiom_mime_parser_free (mime_parser, env)
-
-#define AXIOM_MIME_PARSER_PARSE(mime_parser, env, callback, callback_ctx, mime_boundary) \
-axiom_mime_parser_parse(mime_parser, env, callback, callback_ctx, mime_boundary)
-
-#define AXIOM_MIME_PARSER_GET_MIME_PARTS_MAP(mime_parser, env) \
-axiom_mime_parser_get_mime_parts_map(mime_parser, env)
-
-#define AXIOM_MIME_PARSER_GET_SOAP_BODY_LENGTH(mime_parser, env) \
-axiom_mime_parser_get_soap_body_len(mime_parser, env)
-
-#define AXIOM_MIME_PARSER_GET_SOAP_BODY_STR(mime_parser, env) \
-axiom_mime_parser_get_soap_body_str(mime_parser, env)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h Mon Apr  2 05:30:38 2007
@@ -111,7 +111,7 @@
           * @param env environment struct
           * @param i attribute index
           * @returns the attribute localname 
-          *          caller must free the value using AXIOM_XML_READER_XML_FREE macro       
+          *          caller must free the value using axiom_xml_reader_xml_free macro       
           */
         axis2_char_t*(AXIS2_CALL *
             get_attribute_name_by_number)(axiom_xml_reader_t *parser,
@@ -125,7 +125,7 @@
           * @param env environment, MUST NOT be NULL
           * @param i attribute index.
           * @returns the attribute prefix, returns NULL on error,  
-          *          caller must free the value using AXIOM_XML_READER_XML_FREE macro       
+          *          caller must free the value using axiom_xml_reader_xml_free macro       
           */
 
         axis2_char_t*(AXIS2_CALL *
@@ -140,7 +140,7 @@
          * @param env environment, MUST NOT be NULL.
          * @param i attribute index
          * @returns the attribute value, returns NULL on error,
-         *          caller must free the value using AXIOM_XML_READER_XML_FREE macro        
+         *          caller must free the value using axiom_xml_reader_xml_free macro        
          */
 
         axis2_char_t*(AXIS2_CALL *
@@ -155,7 +155,7 @@
          * @param env environment struct
          * @param i attribute index
          * @returns the attribute value, returns NULL on error  
-         *          caller must free the value using AXIOM_XML_READER_XML_FREE macro        
+         *          caller must free the value using axiom_xml_reader_xml_free macro        
          */
 
         axis2_char_t*(AXIS2_CALL *
@@ -167,7 +167,7 @@
           * @param parser pointer to parser
           * @param env environment, MUST not be NULL
           * @returns Text Value, NULL on error 
-          *          caller must free the value using AXIOM_XML_READER_XML_FREE macro 
+          *          caller must free the value using axiom_xml_reader_xml_free macro 
           */
         axis2_char_t*(AXIS2_CALL *
             get_value)(axiom_xml_reader_t *parser,
@@ -189,7 +189,7 @@
          * @param env environment 
          * @param i index
          * @returns namespace uri of corresponding namespace
-         * caller must free the value using AXIOM_XML_READER_XML_FREE macro        
+         * caller must free the value using axiom_xml_reader_xml_free macro        
          */
         axis2_char_t*(AXIS2_CALL *
             get_namespace_uri_by_number)(axiom_xml_reader_t *parser,
@@ -202,7 +202,7 @@
          * @param env environment 
          * @param i index
          * @returns namespace prefix of corresponding namespace 
-         * caller must free the value using AXIOM_XML_READER_XML_FREE macro        
+         * caller must free the value using axiom_xml_reader_xml_free macro        
          */
         axis2_char_t*(AXIS2_CALL *
             get_namespace_prefix_by_number)(axiom_xml_reader_t *parser,
@@ -214,7 +214,7 @@
          * @param parser parser struct 
          * @param env environment struct
          * @returns prefix , NULL on error 
-         * caller must free the value using AXIOM_XML_READER_XML_FREE macro
+         * caller must free the value using axiom_xml_reader_xml_free macro
          */
         axis2_char_t*(AXIS2_CALL *
             get_prefix)(axiom_xml_reader_t *parser,
@@ -225,7 +225,7 @@
          * @param parser parser struct 
          * @param env environment struct
          * @returns localname , NULL on error 
-         *          caller must free the value using AXIOM_XML_READER_XML_FREE macro
+         *          caller must free the value using axiom_xml_reader_xml_free macro
          */
         axis2_char_t*(AXIS2_CALL *
             get_name)(axiom_xml_reader_t *parser,
@@ -236,7 +236,7 @@
          * @param parser parser struct
          * @param env environment, MUST NOT be NULL.
          * @returns target value of processingInstruction
-         * caller must free the value using AXIOM_XML_READER_XML_FREE macro
+         * caller must free the value using axiom_xml_reader_xml_free macro
          */
         axis2_char_t*(AXIS2_CALL *
              get_pi_target)(axiom_xml_reader_t *parser,
@@ -247,7 +247,7 @@
          * @param parser parser struct
          * @param env environment, MUST NOT be NULL.
          * @returns data of processingInstruction
-         * caller must free the value using AXIOM_XML_READER_XML_FREE macro
+         * caller must free the value using axiom_xml_reader_xml_free macro
          */
         axis2_char_t*(AXIS2_CALL *
             get_pi_data)(axiom_xml_reader_t *parser,
@@ -373,73 +373,94 @@
     axiom_xml_reader_cleanup();
 
 
-    /********************************* Macros *************************************/
+AXIS2_EXTERN int AXIS2_CALL
+axiom_xml_reader_next(axiom_xml_reader_t *parser,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN void AXIS2_CALL 
+axiom_xml_reader_free(axiom_xml_reader_t *parser,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN int AXIS2_CALL
+axiom_xml_reader_get_attribute_count(axiom_xml_reader_t *parser,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_xml_reader_get_attribute_name_by_number(axiom_xml_reader_t *parser,
+    const axutil_env_t *env,
+    int i);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_attribute_prefix_by_number(axiom_xml_reader_t *parser,
+    const axutil_env_t *env,
+    int i);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_attribute_value_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_attribute_namespace_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_value(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN int AXIS2_CALL 
+axiom_xml_reader_get_namespace_count(axiom_xml_reader_t *parser,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_uri_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_prefix_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_prefix(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_name(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_pi_target(axiom_xml_reader_t *parser,
+      const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_pi_data(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_dtd(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN void AXIS2_CALL 
+axiom_xml_reader_xml_free(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     void *data);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_char_set_encoding(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_uri(axiom_xml_reader_t *parser,
+     const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_uri_by_prefix(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     axis2_char_t *prefix);
 
-    /** Macros corresponding to above declared function pointers */
-
-    /** causes the reader to read the next parse event.
-     returns an integer which identifies the type of event just read. */
-#define AXIOM_XML_READER_NEXT(parser, env) \
-        ((parser)->ops->next(parser, env))
-    /** Free pull parser struct */
-#define AXIOM_XML_READER_FREE(parser, env) \
-        ((parser)->ops->free(parser, env))
-    /** Get the Number of attributes in an element */
-#define AXIOM_XML_READER_GET_ATTRIBUTE_COUNT(parser, env) \
-        ((parser)->ops->get_attribute_count(parser, env))
-    /** Get the localname of the attribute corresponding to index i */
-#define AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(parser, env, i) \
-        ((parser)->ops->get_attribute_name_by_number(parser, env, i))
-    /** Get value of attribute corresponding to index i */
-#define AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(parser, env, i) \
-        ((parser)->ops->get_attribute_value_by_number(parser,env, i))
-    /** Get namespace uri of attribute corresponding to index i */
-#define AXIOM_XML_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(parser, env, i) \
-        ((parser)->ops->get_attribute_namespace_by_number(parser, env, i))
-    /** get prefix of attribute corresponding to index i */
-#define AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(parser, env, i) \
-        ((parser)->ops->get_attribute_prefix_by_number(parser, env, i))
-    /** get the localname of element */
-#define AXIOM_XML_READER_GET_NAME(parser, env) \
-        ((parser)->ops->get_name(parser, env))
-    /** get value of element */
-#define AXIOM_XML_READER_GET_VALUE(parser, env) \
-        ((parser)->ops->get_value(parser, env))
-    /** get prefix of element */
-#define AXIOM_XML_READER_GET_PREFIX(parser, env) \
-        ((parser)->ops->get_prefix(parser, env))
-    /** get the number of namespaces declared in an element */
-#define AXIOM_XML_READER_GET_NAMESPACE_COUNT(parser, env) \
-        ((parser)->ops->get_namespace_count(parser, env))
-    /** get the elements namespace uri corresponding to index i */
-#define AXIOM_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(parser, env, i) \
-        ((parser)->ops->get_namespace_uri_by_number(parser, env, i))
-    /** get the elements namespace prefix corresponding to index i */
-#define AXIOM_XML_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(parser, env, i) \
-        ((parser)->ops->get_namespace_prefix_by_number(parser, env, i))
-    /** get processing instruction data */
-#define AXIOM_XML_READER_GET_PI_DATA(parser, env) \
-        ((parser)->ops->get_pi_data(parser, env))
-    /** get processing instruction target */
-#define AXIOM_XML_READER_GET_PI_TARGET(parser, env) \
-        ((parser)->ops->get_pi_target(parser, env))
-    /** get document type declaration text */
-#define AXIOM_XML_READER_GET_DTD(parser, env) \
-        ((parser)->ops->get_dtd(parser, env))
-    /** macro to free values returned by pull parser */
-#define AXIOM_XML_READER_XML_FREE(parser, env, data) \
-        ((parser)->ops->xml_free(parser, env, data))
-
-#define AXIOM_XML_READER_GET_CHAR_SET_ENCODING(parser, env) \
-        ((parser)->ops->get_char_set_encoding(parser, env))
-
-#define AXIOM_XML_READER_GET_NAMESPACE_URI(parser, env) \
-        ((parser)->ops->get_namespace_uri(parser, env))
-
-#define AXIOM_XML_READER_GET_NAMESPACE_URI_BY_PREFIX(parser, env, prefix) \
-        ((parser)->ops->get_namespace_uri_by_prefix(parser, env, prefix))
-
-    /******************************* End Macros ***********************************/
     /** @} */
 
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h Mon Apr  2 05:30:38 2007
@@ -480,125 +480,183 @@
             int compression,
             int type);
 
-    /********************** start macros *******************************************/
-
-#define AXIOM_XML_WRITER_FREE(writer, env) \
-        ((writer)->ops->free(writer,env))
-
-#define AXIOM_XML_WRITER_WRITE_START_ELEMENT(writer, env, localname) \
-        ((writer)->ops->write_start_element(writer, env, localname))
-
-#define AXIOM_XML_WRITER_END_START_ELEMENT(writer, env) \
-        ((writer)->ops->end_start_element(writer,env))
-
-
-#define AXIOM_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(\
-        writer, env, localname, namespace_uri)\
-        ((writer)->ops->write_start_element_with_namespace(\
-        writer, env, localname, namespace_uri))
-
-#define AXIOM_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE_PREFIX(\
-        writer, env, localname, namespace_uri, prefix) \
-        ((writer)->ops->write_start_element_with_namespace_prefix(\
-        writer,env,localname,namespace_uri,prefix))
-
-
-#define AXIOM_XML_WRITER_WRITE_EMPTY_ELEMENT(writer,env,localname) \
-        ((writer)->ops->write_empty_element(writer,env,localname))
-
-#define AXIOM_XML_WRITER_WRITE_EMPTY_ELEMENT_WITH_NAMESPACE(\
-        writer, env,localname,namespace_uri) \
-        ((writer)->ops->write_empty_element_with_namespace(writer,env,localname,namespace_uri))
-
-#define AXIOM_XML_WRITER_WRITE_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX(\
-        writer, env, localname, namespace_uri, prefix) \
-        ((writer)->ops->write_empty_element_with_namespace_prefix(\
-        writer,env,localname,namespace_uri, prefix))
-
-#define AXIOM_XML_WRITER_WRITE_END_ELEMENT(writer, env) \
-        ((writer)->ops->write_end_element(writer,env))
-
-
-#define AXIOM_XML_WRITER_WRITE_END_DOCUMENT(writer, env) \
-        ((writer)->ops->write_end_document(writer,env))
-
-#define AXIOM_XML_WRITER_WRITE_ATTRIBUTE(writer, env, localname, value) \
-        ((writer)->ops->write_attribute(writer,env, localname, value))
-
-#define AXIOM_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(\
-        writer, env, localname, value, namespace_uri) \
-        ((writer)->ops->write_attribute_with_namespace(\
-        writer,env, localname, value,namespace_uri))
-
-#define AXIOM_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE_PREFIX(\
-        writer, env, localname, value, namespace_uri, prefix) \
-        ((writer)->ops->write_attribute_with_namespace_prefix(\
-        writer,env, localname, value,namespace_uri, prefix))
-
-#define AXIOM_XML_WRITER_WRITE_NAMESPACE(writer, env, prefix , namespace_uri) \
-        ((writer)->ops->write_namespace(writer, env, prefix, namespace_uri))
-
-#define AXIOM_XML_WRITER_WRITE_DEFAULT_NAMESPACE(writer, env, namespace_uri) \
-        ((writer)->ops->write_default_namespace(writer, env, namespace_uri))
-
-#define AXIOM_XML_WRITER_WRITE_COMMENT(writer, env, value) \
-        ((writer)->ops->write_comment(writer, env, value))
-
-#define AXIOM_XML_WRITER_WRITE_PROCESSING_INSTRUCTION(writer, env, target) \
-        ((writer)->ops->write_processing_instruction(writer, env, target))
-
-#define AXIOM_XML_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(writer, env, target, data) \
-        ((writer)->ops->write_processing_instruction_data(writer, env, target, data))
-
-#define AXIOM_XML_WRITER_WRITE_CDATA(writer, env, data) \
-        ((writer)->ops->write_cdata(writer, env, data))
-
-#define AXIOM_XML_WRITER_WRITE_DTD(writer, env, dtd) \
-        ((writer)->ops->write_cdata(writer, env, dtd))
-
-#define AXIOM_XML_WRITER_WRITE_ENTITY_REF(writer, env, entity_ref) \
-        ((writer)->ops->write_entity_ref(writer, env, entity_ref))
-
-#define AXIOM_XML_WRITER_WRITE_START_DOCUMENT(writer, env) \
-        ((writer)->ops->write_start_document(writer,env))
-
-#define AXIOM_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION(writer, env, version) \
-        ((writer)->ops->write_start_document_with_version(writer, env, version))
-
-#define AXIOM_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(\
-        writer, env,  version, encoding) \
-        ((writer)->ops->write_start_document_with_version_encoding(\
-        writer, env, version, encoding))
-
-#define AXIOM_XML_WRITER_WRITE_CHARACTERS(writer, env, text) \
-        ((writer)->ops->write_characters(writer, env, text))
-
-#define AXIOM_XML_WRITER_GET_PREFIX(writer, env, uri) \
-        ((writer)->ops->get_prefix(writer, env, uri))
-
-#define AXIOM_XML_WRITER_SET_PREFIX(writer, env, prefix, uri) \
-        ((writer)->ops->set_prefix(writer, env, prefix, uri))
-
-#define AXIOM_XML_WRITER_SET_DEFAULT_PREFIX(writer, env, uri) \
-        ((writer)->ops->set_default_prefix(writer, env, uri))
-
-#define AXIOM_XML_WRITER_WRITE_ENCODED(writer, env, text, in_attr) \
-        ((writer)->ops->write_encoded(writer, env, text, in_attr))
-
-#define AXIOM_XML_WRITER_GET_XML(writer, env) \
-        ((writer)->ops->get_xml(writer, env))
-
-#define AXIOM_XML_WRITER_GET_XML_SIZE(writer, env) \
-        ((writer)->ops->get_xml_size(writer, env))
-
-#define AXIOM_XML_WRITER_FLUSH(writer, env) \
-        ((writer)->ops->flush(writer, env))
-
-#define AXIOM_XML_WRITER_GET_TYPE(writer, env) \
-        ((writer)->ops->get_type(writer, env))
-
-#define AXIOM_XML_WRITER_WRITE_RAW(writer, env, content) \
-        ((writer)->ops->write_raw(writer, env, content))
+AXIS2_EXTERN void AXIS2_CALL
+axiom_xml_writer_free(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_end_start_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_element_with_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_element_with_namespace_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri,
+    axis2_char_t *prefix);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_empty_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_empty_element_with_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_empty_element_with_namespace_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri,
+    axis2_char_t *prefix);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_end_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_end_document(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_attribute(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *value);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_attribute_with_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *value,
+    axis2_char_t *namespace_uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_attribute_with_namespace_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *value,
+    axis2_char_t *namespace_uri,
+    axis2_char_t *prefix);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *prefix,
+    axis2_char_t *namespace_uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_default_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *namespace_uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_comment(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *value);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_processing_instruction(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *target);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_processing_instruction_data(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *target,
+    axis2_char_t *data);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_cdata(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *data);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_dtd(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *dtd);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_entity_ref(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *name);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_document(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_document_with_version(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *version);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_document_with_version_encoding(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *version,
+    axis2_char_t *encoding);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_characters(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *text);
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+axiom_xml_writer_get_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_set_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *prefix,
+    axis2_char_t *uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_set_default_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *uri);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_encoded(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *text,
+    int in_attr);
+
+AXIS2_EXTERN void* AXIS2_CALL
+axiom_xml_writer_get_xml(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN unsigned int AXIS2_CALL
+axiom_xml_writer_get_xml_size(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN int AXIS2_CALL
+axiom_xml_writer_get_type(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_raw(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *content);
+
+AXIS2_EXTERN axis2_status_t  AXIS2_CALL
+axiom_xml_writer_flush(axiom_xml_writer_t *writer,
+    const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Mon Apr  2 05:30:38 2007
@@ -1165,7 +1165,7 @@
     status = axiom_node_serialize(element_node, env, om_output);
     if (status == AXIS2_SUCCESS)
     {
-        xml = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+        xml = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
     }
     axiom_output_free(om_output, env);
     return xml;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Mon Apr  2 05:30:38 2007
@@ -1005,13 +1005,13 @@
     om_output = axiom_output_create(env, xml_writer);
     if (!om_output)
     {
-        AXIOM_XML_WRITER_FREE(xml_writer, env);
+        axiom_xml_writer_free(xml_writer, env);
         return NULL;
     }
     status = axiom_node_serialize(om_node, env, om_output);
     if (status == AXIS2_SUCCESS)
     {
-        xml = axis2_strdup(env, (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env));
+        xml = axis2_strdup(env, (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env));
     }
     axiom_output_free(om_output, env);
     return xml;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Mon Apr  2 05:30:38 2007
@@ -124,7 +124,7 @@
 
     if (om_output->xml_writer)
     {
-        AXIOM_XML_WRITER_FREE(om_output->xml_writer, env);
+        axiom_xml_writer_free(om_output->xml_writer, env);
     }
 
     if (om_output->binary_node_list)
@@ -429,19 +429,19 @@
         if (no_of_args == 0)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_END_ELEMENT(om_output->xml_writer,
+                axiom_xml_writer_write_end_element(om_output->xml_writer,
                     env);
         }
         else if (no_of_args == 1)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_START_ELEMENT(om_output->xml_writer,
+                axiom_xml_writer_write_start_element(om_output->xml_writer,
                     env, args_list[0]);
         }
         else if (no_of_args == 2)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(
+                axiom_xml_writer_write_start_element_with_namespace(
                     om_output->xml_writer,env,
                     args_list[0],
                     args_list[1]);
@@ -449,7 +449,7 @@
         else if (no_of_args == 3)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE_PREFIX(
+                axiom_xml_writer_write_start_element_with_namespace_prefix(
                     om_output->xml_writer,
                     env,
                     args_list[0],
@@ -459,7 +459,7 @@
     }
     else if (type == AXIOM_DATA_SOURCE)
     {
-        status = AXIOM_XML_WRITER_WRITE_RAW(om_output->xml_writer,
+        status = axiom_xml_writer_write_raw(om_output->xml_writer,
             env, args_list[0]); 
     }
     else if (type == AXIOM_ATTRIBUTE)
@@ -467,14 +467,14 @@
         if (no_of_args == 2)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_ATTRIBUTE(om_output->xml_writer,
+                axiom_xml_writer_write_attribute(om_output->xml_writer,
                     env,
                     args_list[0],
                     args_list[1]);
         }
         else if (no_of_args == 3)
         {
-            status = AXIOM_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(
+            status = axiom_xml_writer_write_attribute_with_namespace(
                 om_output->xml_writer, env,
                 args_list[0],
                 args_list[1],
@@ -483,7 +483,7 @@
         else if (no_of_args == 4)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE_PREFIX(
+                axiom_xml_writer_write_attribute_with_namespace_prefix(
                     om_output->xml_writer, env,
                     args_list[0],
                     args_list[1],
@@ -493,20 +493,20 @@
     }
     else if (type == AXIOM_NAMESPACE)
     {
-        status = AXIOM_XML_WRITER_WRITE_NAMESPACE(om_output->xml_writer,
+        status = axiom_xml_writer_write_namespace(om_output->xml_writer,
             env,
             args_list[0],
             args_list[1]);
     }
     else if (type == AXIOM_TEXT)
     {
-        status = AXIOM_XML_WRITER_WRITE_CHARACTERS(om_output->xml_writer,
+        status = axiom_xml_writer_write_characters(om_output->xml_writer,
             env,
             args_list[0]);
     }
     else if (type == AXIOM_COMMENT)
     {
-        status = AXIOM_XML_WRITER_WRITE_COMMENT(om_output->xml_writer,
+        status = axiom_xml_writer_write_comment(om_output->xml_writer,
             env,
             args_list[0]);
     }
@@ -515,13 +515,13 @@
         if (no_of_args == 1)
         {
             status =
-                AXIOM_XML_WRITER_WRITE_PROCESSING_INSTRUCTION(
+                axiom_xml_writer_write_processing_instruction(
                     om_output->xml_writer,
                     env, args_list[0]);
         }
         else if (no_of_args == 2)
         {
-            status = AXIOM_XML_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(
+            status = axiom_xml_writer_write_processing_instruction_data(
                 om_output->xml_writer,
                 env,
                 args_list[0],
@@ -530,7 +530,7 @@
     }
     else if (type == AXIOM_DOCTYPE)
     {
-        status = AXIOM_XML_WRITER_WRITE_DTD(om_output->xml_writer,
+        status = axiom_xml_writer_write_dtd(om_output->xml_writer,
             env,
             args_list[0]);
     }
@@ -548,7 +548,7 @@
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    return AXIOM_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(     om_output->xml_writer,
+    return axiom_xml_writer_write_start_document_with_version_encoding(     om_output->xml_writer,
         env,
         om_output->xml_version,
         om_output->char_set_encoding);
@@ -570,7 +570,7 @@
         axis2_byte_t* byte_stream = NULL;
         axis2_char_t *root_content_id = NULL;
         axis2_char_t *buffer =
-            (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(om_output->xml_writer, env);
+            (axis2_char_t*)axiom_xml_writer_get_xml(om_output->xml_writer, env);
         int stream_size = 0;
         if (om_output->is_soap11)
         {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Mon Apr  2 05:30:38 2007
@@ -111,17 +111,17 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, element_node, AXIS2_FAILURE);
 
-    attribute_count = AXIOM_XML_READER_GET_ATTRIBUTE_COUNT(om_builder->parser,
+    attribute_count = axiom_xml_reader_get_attribute_count(om_builder->parser,
         env);
     for (i = 1; i <= attribute_count ; i++)
     {
         axiom_element_t *temp_ele =  NULL;
 
         uri =
-            AXIOM_XML_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(om_builder->parser,
+            axiom_xml_reader_get_attribute_namespace_by_number(om_builder->parser,
                 env, i);
 
-        prefix = AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(om_builder->parser,
+        prefix = axiom_xml_reader_get_attribute_prefix_by_number(om_builder->parser,
             env, i);
         if (uri)
         {
@@ -143,12 +143,12 @@
             }
         }
 
-        attr_name = AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
+        attr_name = axiom_xml_reader_get_attribute_name_by_number(
             om_builder->parser, env, i);
 
         attr_name_str = axutil_string_create_assume_ownership(env, &attr_name);
 
-        attr_value = AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(
+        attr_value = axiom_xml_reader_get_attribute_value_by_number(
             om_builder->parser, env, i);
 
         attr_value_str = axutil_string_create_assume_ownership(env, &attr_value);
@@ -170,11 +170,11 @@
         }
         if (uri)
         {
-            AXIOM_XML_READER_XML_FREE(om_builder->parser, env, uri);
+            axiom_xml_reader_xml_free(om_builder->parser, env, uri);
         }
         if (prefix)
         {
-            AXIOM_XML_READER_XML_FREE(om_builder->parser, env, prefix);
+            axiom_xml_reader_xml_free(om_builder->parser, env, prefix);
         }
         if (attr_name_str)
         {
@@ -205,7 +205,7 @@
             AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL, AXIS2_FAILURE);
         return NULL;
     }
-    temp_value = AXIOM_XML_READER_GET_VALUE(om_builder->parser, env);
+    temp_value = axiom_xml_reader_get_value(om_builder->parser, env);
     if (!temp_value)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_VALUE_NULL,
@@ -257,7 +257,7 @@
     om_builder->cache = AXIS2_FALSE;
     do
     {
-        while (AXIOM_XML_READER_NEXT(om_builder->parser, env)
+        while (axiom_xml_reader_next(om_builder->parser, env)
             != AXIOM_XML_READER_END_ELEMENT);
     }
     while (!(axiom_node_is_complete(element, env)));
@@ -302,13 +302,13 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    namespace_count = AXIOM_XML_READER_GET_NAMESPACE_COUNT(om_builder->parser, env);
+    namespace_count = axiom_xml_reader_get_namespace_count(om_builder->parser, env);
     for (i = 1; i <= namespace_count; i++)
     {
-        temp_ns_prefix = AXIOM_XML_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(
+        temp_ns_prefix = axiom_xml_reader_get_namespace_prefix_by_number(
             om_builder->parser, env, i);
 
-        temp_ns_uri = AXIOM_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(
+        temp_ns_uri = axiom_xml_reader_get_namespace_uri_by_number(
             om_builder->parser, env , i);
 
         temp_ns_prefix_str = axutil_string_create_assume_ownership(env, &temp_ns_prefix);
@@ -364,7 +364,7 @@
         }
     }
     /* set own namespace */
-    temp_prefix = AXIOM_XML_READER_GET_PREFIX(om_builder->parser, env);
+    temp_prefix = axiom_xml_reader_get_prefix(om_builder->parser, env);
     if (temp_prefix)
     {
         om_ns = axutil_hash_get(om_builder->declared_namespaces,
@@ -388,7 +388,7 @@
     }
     if (temp_prefix)
     {
-        AXIOM_XML_READER_XML_FREE(om_builder->parser, env, temp_prefix);
+        axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
     }
     return status;
 }
@@ -405,7 +405,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, om_builder, NULL);
 
-    temp_localname  = AXIOM_XML_READER_GET_NAME(om_builder->parser, env);
+    temp_localname  = axiom_xml_reader_get_name(om_builder->parser, env);
 
     if (!temp_localname)
     {
@@ -493,7 +493,7 @@
     axis2_char_t *comment_value = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
-    comment_value  = AXIOM_XML_READER_GET_VALUE(om_builder->parser, env);
+    comment_value  = axiom_xml_reader_get_value(om_builder->parser, env);
     if (!comment_value)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL,
@@ -504,7 +504,7 @@
     if (!(om_builder->lastnode))
     {
         /* do nothing */
-        AXIOM_XML_READER_XML_FREE(om_builder->parser , env, comment_value);
+        axiom_xml_reader_xml_free(om_builder->parser , env, comment_value);
         return NULL;
     }
     else if (axiom_node_is_complete(om_builder->lastnode, env))
@@ -531,7 +531,7 @@
     }
 
     om_builder->element_level++;
-    AXIOM_XML_READER_XML_FREE(om_builder->parser , env, comment_value);
+    axiom_xml_reader_xml_free(om_builder->parser , env, comment_value);
 
     om_builder->lastnode = comment_node;
 
@@ -547,7 +547,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    doc_value = AXIOM_XML_READER_GET_DTD(om_builder->parser, env);
+    doc_value = axiom_xml_reader_get_dtd(om_builder->parser, env);
     if (!doc_value)
     {
         return NULL;
@@ -562,7 +562,7 @@
         }
     }
     om_builder->lastnode = doctype_node;
-    AXIOM_XML_READER_XML_FREE(om_builder->parser, env, doc_value);
+    axiom_xml_reader_xml_free(om_builder->parser, env, doc_value);
     return doctype_node;
 }
 
@@ -575,8 +575,8 @@
     axis2_char_t *value  = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    target = AXIOM_XML_READER_GET_PI_TARGET(om_builder->parser, env);
-    value  = AXIOM_XML_READER_GET_PI_DATA(om_builder->parser, env);
+    target = axiom_xml_reader_get_pi_target(om_builder->parser, env);
+    value  = axiom_xml_reader_get_pi_data(om_builder->parser, env);
     if (!target)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL,
@@ -586,8 +586,8 @@
     if (!(om_builder->lastnode))
     {
         /* do nothing */
-        AXIOM_XML_READER_XML_FREE(om_builder->parser , env, target);
-        AXIOM_XML_READER_XML_FREE(om_builder->parser , env, value);
+        axiom_xml_reader_xml_free(om_builder->parser , env, target);
+        axiom_xml_reader_xml_free(om_builder->parser , env, value);
         return NULL;
     }
     else if (axiom_node_is_complete(om_builder->lastnode, env) ||
@@ -612,11 +612,11 @@
 
     if (target)
     {
-        AXIOM_XML_READER_XML_FREE(om_builder->parser , env, target);
+        axiom_xml_reader_xml_free(om_builder->parser , env, target);
     }
     if (value)
     {
-        AXIOM_XML_READER_XML_FREE(om_builder->parser , env, value);
+        axiom_xml_reader_xml_free(om_builder->parser , env, value);
     }
 
     om_builder->lastnode = pi_node;
@@ -679,7 +679,7 @@
             return NULL;
         }
 
-        token = AXIOM_XML_READER_NEXT(om_builder->parser, env);
+        token = axiom_xml_reader_next(om_builder->parser, env);
         if (token == -1)
         {
             return NULL;
@@ -761,7 +761,7 @@
 
     if (om_builder->parser)
     {
-        AXIOM_XML_READER_FREE(om_builder->parser, env);
+        axiom_xml_reader_free(om_builder->parser, env);
         om_builder->parser = NULL;
     }
 
@@ -891,7 +891,7 @@
         return -1;
     }
 
-    token = AXIOM_XML_READER_NEXT(om_builder->parser, env);
+    token = axiom_xml_reader_next(om_builder->parser, env);
 
     if (token == -1)
     {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Mon Apr  2 05:30:38 2007
@@ -224,7 +224,7 @@
         else
         {
             text = axiom_text_get_text(om_text, env);
-            AXIOM_XML_WRITER_WRITE_CHARACTERS(om_output_xml_writer, env, (axis2_char_t*)text);
+            axiom_xml_writer_write_characters(om_output_xml_writer, env, (axis2_char_t*)text);
         }
     }
     return status;
@@ -438,17 +438,17 @@
         attribute_value = axiom_attribute_get_value(om_attribute, env);
         if (prefix)
         {
-            AXIOM_XML_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
+            axiom_xml_writer_write_attribute(xml_writer, env, attribute_local_name, attribute_value);
         }
         else
         {
-            AXIOM_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(xml_writer, env,
+            axiom_xml_writer_write_attribute_with_namespace(xml_writer, env,
                 attribute_local_name, attribute_value, namespace_uri);
         }
     }
     else
     {
-        AXIOM_XML_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
+        axiom_xml_writer_write_attribute(xml_writer, env, attribute_local_name, attribute_value);
     }
     axiom_namespace_free(om_namespace, env);
     return AXIS2_SUCCESS;
@@ -474,8 +474,8 @@
     {
         namespace_uri = axiom_namespace_get_uri(om_text->ns, env);
         namespace_prefix = axiom_namespace_get_prefix(om_text->ns, env);
-        AXIOM_XML_WRITER_WRITE_NAMESPACE(xml_writer, env, namespace_prefix, namespace_uri);
-        AXIOM_XML_WRITER_SET_PREFIX(xml_writer, env, namespace_prefix, namespace_uri);
+        axiom_xml_writer_write_namespace(xml_writer, env, namespace_prefix, namespace_uri);
+        axiom_xml_writer_set_prefix(xml_writer, env, namespace_prefix, namespace_uri);
     }
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/Makefile.am Mon Apr  2 05:30:38 2007
@@ -2,7 +2,7 @@
 
 libaxis2_parser_la_LIBADD = ../../../../guththila/src/libguththila.la
 
-libaxis2_parser_la_SOURCES = guththila_xml_writer_wrapper.c \
+libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c guththila_xml_writer_wrapper.c \
                                 guththila_xml_reader_wrapper.c 
 
 INCLUDES = -I$(top_builddir)/include \

Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am Mon Apr  2 05:30:38 2007
@@ -1,10 +1,10 @@
 lib_LTLIBRARIES = libaxis2_libxml2.la libaxis2_parser.la
-libaxis2_libxml2_la_SOURCES = libxml2_reader_wrapper.c \
+libaxis2_libxml2_la_SOURCES = ../xml_reader.c ../xml_writer.c libxml2_reader_wrapper.c \
                               libxml2_writer_wrapper.c
 
 libaxis2_libxml2_la_LIBADD = -lxml2
 
-libaxis2_parser_la_SOURCES = libxml2_reader_wrapper.c \
+libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c libxml2_reader_wrapper.c \
                               libxml2_writer_wrapper.c
 
 libaxis2_parser_la_LIBADD = -lxml2

Added: webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c?view=auto&rev=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c (added)
+++ webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c Mon Apr  2 05:30:38 2007
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+#include <axiom_xml_reader.h>
+
+AXIS2_EXTERN int AXIS2_CALL
+axiom_xml_reader_next(axiom_xml_reader_t *parser,
+    const axutil_env_t *env)
+{
+    return (parser)->ops->next(parser, env);
+}
+
+AXIS2_EXTERN  void AXIS2_CALL 
+axiom_xml_reader_free(axiom_xml_reader_t *parser,
+    const axutil_env_t *env)
+{
+    (parser)->ops->free(parser, env);
+}
+
+AXIS2_EXTERN  int AXIS2_CALL
+axiom_xml_reader_get_attribute_count(axiom_xml_reader_t *parser,
+    const axutil_env_t *env)
+{
+    return (parser)->ops->get_attribute_count(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL
+axiom_xml_reader_get_attribute_name_by_number(axiom_xml_reader_t *parser,
+    const axutil_env_t *env,
+    int i)
+{
+    return (parser)->ops->get_attribute_name_by_number(parser, env, i);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_attribute_prefix_by_number(axiom_xml_reader_t *parser,
+    const axutil_env_t *env,
+    int i)
+{
+    return (parser)->ops->get_attribute_prefix_by_number(parser, env, i);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_attribute_value_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i)
+{
+    return (parser)->ops->get_attribute_value_by_number(parser,env, i);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_attribute_namespace_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i)
+{
+    return (parser)->ops->get_attribute_namespace_by_number(parser, env, i);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_value(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_value(parser, env);
+}
+
+AXIS2_EXTERN  int AXIS2_CALL 
+axiom_xml_reader_get_namespace_count(axiom_xml_reader_t *parser,
+    const axutil_env_t *env)
+{
+    return (parser)->ops->get_namespace_count(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_uri_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i)
+{
+    return (parser)->ops->get_namespace_uri_by_number(parser, env, i);    
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_prefix_by_number(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     int i)
+{
+    return (parser)->ops->get_namespace_prefix_by_number(parser, env, i);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_prefix(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_prefix(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_name(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_name(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_pi_target(axiom_xml_reader_t *parser,
+      const axutil_env_t *env)
+{
+    return (parser)->ops->get_pi_target(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_pi_data(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_pi_data(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_dtd(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_dtd(parser, env);
+}
+
+AXIS2_EXTERN  void AXIS2_CALL 
+axiom_xml_reader_xml_free(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     void *data)
+{
+    (parser)->ops->xml_free(parser, env, data);
+}
+
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_char_set_encoding(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_char_set_encoding(parser, env);
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_uri(axiom_xml_reader_t *parser,
+     const axutil_env_t *env)
+{
+    return (parser)->ops->get_namespace_uri(parser, env);    
+}
+
+AXIS2_EXTERN  axis2_char_t *AXIS2_CALL 
+axiom_xml_reader_get_namespace_uri_by_prefix(axiom_xml_reader_t *parser,
+     const axutil_env_t *env,
+     axis2_char_t *prefix)
+{
+    return (parser)->ops->get_namespace_uri_by_prefix(parser, env, prefix);
+}

Added: webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c?view=auto&rev=524775
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c (added)
+++ webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c Mon Apr  2 05:30:38 2007
@@ -0,0 +1,308 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+#include <axiom_xml_writer.h>
+
+AXIS2_EXTERN void AXIS2_CALL
+axiom_xml_writer_free(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    (writer)->ops->free(writer,env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname)
+{
+    return (writer)->ops->write_start_element(writer, env, localname);
+
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_end_start_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->end_start_element(writer,env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_element_with_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri)
+{
+    return (writer)->ops->write_start_element_with_namespace(writer, env, 
+        localname, namespace_uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_element_with_namespace_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri,
+    axis2_char_t *prefix)
+{
+    return (writer)->ops->write_start_element_with_namespace_prefix(writer, 
+        env, localname, namespace_uri, prefix);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_empty_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname)
+{
+    return (writer)->ops->write_empty_element(writer, env, localname);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_empty_element_with_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri)
+{
+    return (writer)->ops->write_empty_element_with_namespace(writer, env, 
+        localname, namespace_uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_empty_element_with_namespace_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *namespace_uri,
+    axis2_char_t *prefix)
+{
+    return (writer)->ops->write_empty_element_with_namespace_prefix(writer, 
+        env, localname, namespace_uri, prefix);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_end_element(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->write_end_element(writer,env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_end_document(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->write_end_document(writer,env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_attribute(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *value)
+{
+    return (writer)->ops->write_attribute(writer,env, localname, value);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_attribute_with_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *value,
+    axis2_char_t *namespace_uri)
+{
+    return (writer)->ops->write_attribute_with_namespace(writer, env, 
+        localname, value, namespace_uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_attribute_with_namespace_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *localname,
+    axis2_char_t *value,
+    axis2_char_t *namespace_uri,
+    axis2_char_t *prefix)
+{
+    return (writer)->ops->write_attribute_with_namespace_prefix(writer, env, 
+        localname, value, namespace_uri, prefix);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *prefix,
+    axis2_char_t *namespace_uri)
+{
+    return (writer)->ops->write_namespace(writer, env, prefix, namespace_uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_default_namespace(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *namespace_uri)
+{
+    return (writer)->ops->write_default_namespace(writer, env, namespace_uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_comment(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *value)
+{
+    return (writer)->ops->write_comment(writer, env, value);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_processing_instruction(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *target)
+{
+    return (writer)->ops->write_processing_instruction(writer, env, target);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_processing_instruction_data(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *target,
+    axis2_char_t *data)
+{
+    return (writer)->ops->write_processing_instruction_data(writer, env, 
+        target, data);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_cdata(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *data)
+{
+    return (writer)->ops->write_cdata(writer, env, data);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_dtd(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *dtd)
+{
+    return (writer)->ops->write_cdata(writer, env, dtd);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_entity_ref(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *name)
+{
+    return (writer)->ops->write_entity_ref(writer, env, name);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_document(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->write_start_document(writer,env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_document_with_version(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *version)
+{
+    return (writer)->ops->write_start_document_with_version(writer, env, 
+        version);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_start_document_with_version_encoding(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *version,
+    axis2_char_t *encoding)
+{
+    return (writer)->ops->write_start_document_with_version_encoding(writer, env,
+        version, encoding);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_characters(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *text)
+{
+    return (writer)->ops->write_characters(writer, env, text);
+}
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+axiom_xml_writer_get_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *uri)
+{
+    return (writer)->ops->get_prefix(writer, env, uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_set_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *prefix,
+    axis2_char_t *uri)
+{
+    return (writer)->ops->set_prefix(writer, env, prefix, uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_set_default_prefix(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *uri)
+{
+    return (writer)->ops->set_default_prefix(writer, env, uri);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_encoded(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *text,
+    int in_attr)
+{
+    return (writer)->ops->write_encoded(writer, env, text, in_attr);
+}
+
+AXIS2_EXTERN void* AXIS2_CALL
+axiom_xml_writer_get_xml(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->get_xml(writer, env);
+}
+
+AXIS2_EXTERN unsigned int AXIS2_CALL
+axiom_xml_writer_get_xml_size(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->get_xml_size(writer, env);
+}
+
+AXIS2_EXTERN int AXIS2_CALL
+axiom_xml_writer_get_type(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->get_type(writer, env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_xml_writer_write_raw(axiom_xml_writer_t *writer,
+    const axutil_env_t *env,
+    axis2_char_t *content)
+{
+    return (writer)->ops->write_raw(writer, env, content);
+}
+
+AXIS2_EXTERN axis2_status_t  AXIS2_CALL
+axiom_xml_writer_flush(axiom_xml_writer_t *writer,
+    const axutil_env_t *env)
+{
+    return (writer)->ops->flush(writer, env);
+}

Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Mon Apr  2 05:30:38 2007
@@ -142,9 +142,11 @@
 		$(AXIS2_SOURCE_DIR)\util\src\minizip\*.c \
 		$(AXIS2_SOURCE_DIR)\util\src\*.c 
 
-AXIS2_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser\libxml2\*.c
+AXIS2_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser\*.c \
+		$(AXIS2_SOURCE_DIR)\axiom\src\parser\libxml2\*.c
 
-AXIS2_GUTHTHILA_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser\guththila\*.c
+AXIS2_GUTHTHILA_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser\*.c \
+		$(AXIS2_SOURCE_DIR)\axiom\src\parser\guththila\*.c
 
 AXIOM_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\om\*.c \
 		$(AXIS2_SOURCE_DIR)\axiom\src\soap\*.c \
@@ -178,6 +180,7 @@
 		$(AXIS2_SOURCE_DIR)\modules\core\phaseresolver\*.c \
 		$(AXIS2_SOURCE_DIR)\modules\core\receivers\*.c \
 		$(AXIS2_SOURCE_DIR)\modules\core\util\*.c \
+		$(AXIS2_SOURCE_DIR)\modules\core\transport\*.c \
 		$(AXIS2_SOURCE_DIR)\modules\core\transport\http\common\*.c \
 		$(AXIS2_SOURCE_DIR)\modules\core\transport\http\util\*.c
 		
@@ -585,7 +588,7 @@
 	if not exist $(AXIS2_INTDIR)\userguide\echo_blocking_soap11 mkdir $(AXIS2_INTDIR)\userguide\echo_blocking_soap11
 
 
-	$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH)  \
+	$(CC) $(CFLAGS) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH)  \
 	$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_blocking.c \
 	$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_blocking\ /c
 	$(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking\*.obj $(AXIS2_UTIL).lib \

Modified: webservices/axis2/trunk/c/include/axis2_transport_receiver.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_receiver.h?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_receiver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_receiver.h Mon Apr  2 05:30:38 2007
@@ -148,70 +148,48 @@
 
 /** Frees the transport receiver.
     @sa axis2_transport_receiver#free */
-static void AXIS2_CALL 
+AXIS2_EXTERN void AXIS2_CALL 
 axis2_transport_receiver_free(axis2_transport_receiver_t *transport_receiver,
-    const axutil_env_t *env)
-{
-      (transport_receiver->ops)->free (transport_receiver, env);
-}
+    const axutil_env_t *env);
 
 /** Initialize the transport receiver.
     @sa axis2_transport_receiver#init */
-static axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_transport_receiver_init(axis2_transport_receiver_t *transport_receiver,
     const axutil_env_t *env,
     struct axis2_conf_ctx *conf_ctx,
-    struct axis2_transport_in_desc *transport_in)
-{
-      return (transport_receiver->ops)->init (transport_receiver, env, 
-          conf_ctx, transport_in);
-}
+    struct axis2_transport_in_desc *transport_in);
 
 /** Start
     @sa axis2_transport_receiver#start */
-static axis2_status_t AXIS2_CALL 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_transport_receiver_start(axis2_transport_receiver_t *transport_receiver,
-    const axutil_env_t *env)
-{
-    return (transport_receiver->ops)->start (transport_receiver, env);
-}
+    const axutil_env_t *env);
 
 /** Stop.
     @sa axis2_transport_receiver#stop */
-static axis2_status_t AXIS2_CALL 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_transport_receiver_stop(axis2_transport_receiver_t *transport_receiver,
-    const axutil_env_t *env)
-{
-    return (transport_receiver->ops)->stop (transport_receiver, env);
-}
+    const axutil_env_t *env);
 
 /** Get reply to epr.
     @sa axis2_transport_receiver#get_reply_to_epr */
-static axis2_endpoint_ref_t* AXIS2_CALL 
+AXIS2_EXTERN axis2_endpoint_ref_t* AXIS2_CALL 
 axis2_transport_receiver_get_reply_to_epr(axis2_transport_receiver_t *transport_receiver,
     const axutil_env_t *env,
-    const axis2_char_t *svc_name)
-{
-    return (transport_receiver->ops)->get_reply_to_epr (transport_receiver, env, svc_name);
-}
+    const axis2_char_t *svc_name);
 
 /** Get conf ctx. 
     @sa axis2_transport_receiver#get_conf_ctx */
-static struct axis2_conf_ctx *AXIS2_CALL 
+AXIS2_EXTERN struct axis2_conf_ctx *AXIS2_CALL 
 axis2_transport_receiver_get_conf_ctx(axis2_transport_receiver_t *transport_receiver,
-    const axutil_env_t *env)
-{
-    return (transport_receiver)->ops->get_conf_ctx(transport_receiver, env);
-}
+    const axutil_env_t *env);
 
 /** Is running.
     @sa axis2_transport_receiver#is_running */
-static axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_transport_receiver_is_running(axis2_transport_receiver_t *transport_receiver,
-    const axutil_env_t *env)
-{
-    return (transport_receiver)->ops->is_running(transport_receiver, env);
-}
+    const axutil_env_t *env);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/modules/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/Makefile.am?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/Makefile.am Mon Apr  2 05:30:38 2007
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES=libaxis2_engine.la
 
-libaxis2_engine_la_SOURCES=handler.c \
+libaxis2_engine_la_SOURCES= ../transport/transport_receiver.c handler.c \
 				conf.c \
                         	phase.c \
                         	disp_checker.c \

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Apr  2 05:30:38 2007
@@ -300,7 +300,7 @@
 		}
 		else
 		{
-			buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+			buffer = axiom_xml_writer_get_xml(xml_writer, env);
 		}
 
 		if (! buffer && !doing_mtom)
@@ -351,7 +351,7 @@
 
 	if (!send_via_get)
 	{
-		buffer_size = AXIOM_XML_WRITER_GET_XML_SIZE(xml_writer, env);
+		buffer_size = axiom_xml_writer_get_xml_size(xml_writer, env);
 
 		if (AXIS2_FALSE == sender->chunked)
 		{

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon Apr  2 05:30:38 2007
@@ -246,7 +246,7 @@
     om_output = axiom_output_create(env, xml_writer);
     if (! om_output)
     {
-        AXIOM_XML_WRITER_FREE(xml_writer, env);
+        axiom_xml_writer_free(xml_writer, env);
         xml_writer = NULL;
         return AXIS2_FAILURE;
     }
@@ -339,8 +339,8 @@
                     return AXIS2_FAILURE;
                 }
                 axiom_node_serialize(data_out, env, om_output);
-                buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
-                buffer_size = AXIOM_XML_WRITER_GET_XML_SIZE(xml_writer, env);
+                buffer = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
+                buffer_size = axiom_xml_writer_get_xml_size(xml_writer, env);
             }
             else
             {
@@ -362,8 +362,8 @@
                 }
                 else
                 {
-                    buffer = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
-                    buffer_size = AXIOM_XML_WRITER_GET_XML_SIZE(xml_writer, env);
+                    buffer = (axis2_char_t *)axiom_xml_writer_get_xml(xml_writer, env);
+                    buffer_size = axiom_xml_writer_get_xml_size(xml_writer, env);
                 }
             }
             axutil_stream_write(out_stream, env, buffer, buffer_size);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Mon Apr  2 05:30:38 2007
@@ -260,10 +260,10 @@
 
 		}
 
-		buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+		buffer = axiom_xml_writer_get_xml(xml_writer, env);
 		if (!doing_mtom)
 		{
-			buffer_size = AXIOM_XML_WRITER_GET_XML_SIZE(xml_writer, env);
+			buffer_size = axiom_xml_writer_get_xml_size(xml_writer, env);
 		}
 		else
 			buffer_size = output_stream_size;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon Apr  2 05:30:38 2007
@@ -286,13 +286,13 @@
             mime_parser = axiom_mime_parser_create(env);
             if (mime_parser)
             {
-                binary_data_map = AXIOM_MIME_PARSER_PARSE(mime_parser, env,
+                binary_data_map = axiom_mime_parser_parse(mime_parser, env,
                         axis2_http_transport_utils_on_data_request,
                         (void *) callback_ctx, mime_boundary);
 
-                soap_body_len = AXIOM_MIME_PARSER_GET_SOAP_BODY_LENGTH(
+                soap_body_len = axiom_mime_parser_get_soap_body_len(
                             mime_parser, env);
-                soap_body_str = AXIOM_MIME_PARSER_GET_SOAP_BODY_STR(
+                soap_body_str = axiom_mime_parser_get_soap_body_str(
                             mime_parser, env);
             }
 
@@ -308,7 +308,7 @@
                 callback_ctx->content_length = soap_body_len;
                 callback_ctx->unread_len = soap_body_len;
             }
-            AXIOM_MIME_PARSER_FREE(mime_parser, env);
+            axiom_mime_parser_free(mime_parser, env);
             mime_parser = NULL;
         }
         AXIS2_FREE(env->allocator, mime_boundary);
@@ -335,7 +335,7 @@
     om_builder = axiom_stax_builder_create(env, xml_reader);
     if (! om_builder)
     {
-        AXIOM_XML_READER_FREE(xml_reader, env);
+        axiom_xml_reader_free(xml_reader, env);
         xml_reader = NULL;
         return AXIS2_FAILURE;
     }
@@ -451,7 +451,7 @@
      *               AXIS2_FAILURE);
      *   axiom_soap_envelope_free(envelope, env);
      *   envelope = NULL;
-     *   AXIOM_XML_READER_FREE(xml_reader, env);
+     *   axiom_xml_reader_free(xml_reader, env);
      *   xml_reader = NULL;
      *   axiom_stax_builder_free(om_builder, env);
      *   om_builder = NULL;
@@ -1209,13 +1209,13 @@
             mime_parser = axiom_mime_parser_create(env);
             if (mime_parser)
             {
-                binary_data_map = AXIOM_MIME_PARSER_PARSE(mime_parser, env,
+                binary_data_map = axiom_mime_parser_parse(mime_parser, env,
                         axis2_http_transport_utils_on_data_request,
                         (void *)callback_ctx, mime_boundary);
 
-                soap_body_len = AXIOM_MIME_PARSER_GET_SOAP_BODY_LENGTH(
+                soap_body_len = axiom_mime_parser_get_soap_body_len(
                             mime_parser, env);
-                soap_body_str = AXIOM_MIME_PARSER_GET_SOAP_BODY_STR(
+                soap_body_str = axiom_mime_parser_get_soap_body_str(
                             mime_parser, env);
             }
 
@@ -1229,7 +1229,7 @@
                 callback_ctx->unread_len = soap_body_len;
             }
 
-            AXIOM_MIME_PARSER_FREE(mime_parser, env);
+            axiom_mime_parser_free(mime_parser, env);
             mime_parser = NULL;
         }
     }
@@ -1251,7 +1251,7 @@
         om_builder = axiom_stax_builder_create(env, xml_reader);
         if (! om_builder)
         {
-            AXIOM_XML_READER_FREE(xml_reader, env);
+            axiom_xml_reader_free(xml_reader, env);
             xml_reader = NULL;
             return NULL;
         }
@@ -1308,7 +1308,7 @@
         om_builder = axiom_stax_builder_create(env, xml_reader);
         if (! om_builder)
         {
-            AXIOM_XML_READER_FREE(xml_reader, env);
+            axiom_xml_reader_free(xml_reader, env);
             xml_reader = NULL;
             return NULL;
         }

Added: webservices/axis2/trunk/c/modules/core/transport/transport_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/transport_receiver.c?view=auto&rev=524775
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/transport_receiver.c (added)
+++ webservices/axis2/trunk/c/modules/core/transport/transport_receiver.c Mon Apr  2 05:30:38 2007
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+#include <axis2_transport_receiver.h>
+
+AXIS2_EXTERN void AXIS2_CALL 
+axis2_transport_receiver_free(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env)
+{
+      (transport_receiver->ops)->free (transport_receiver, env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_transport_receiver_init(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env,
+    struct axis2_conf_ctx *conf_ctx,
+    struct axis2_transport_in_desc *transport_in)
+{
+      return (transport_receiver->ops)->init (transport_receiver, env, 
+          conf_ctx, transport_in);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
+axis2_transport_receiver_start(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env)
+{
+    return (transport_receiver->ops)->start (transport_receiver, env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
+axis2_transport_receiver_stop(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env)
+{
+    return (transport_receiver->ops)->stop (transport_receiver, env);
+}
+
+AXIS2_EXTERN axis2_endpoint_ref_t* AXIS2_CALL 
+axis2_transport_receiver_get_reply_to_epr(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env,
+    const axis2_char_t *svc_name)
+{
+    return (transport_receiver->ops)->get_reply_to_epr (transport_receiver, env, svc_name);
+}
+
+AXIS2_EXTERN struct axis2_conf_ctx *AXIS2_CALL 
+axis2_transport_receiver_get_conf_ctx(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env)
+{
+    return (transport_receiver)->ops->get_conf_ctx(transport_receiver, env);
+}
+
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+axis2_transport_receiver_is_running(axis2_transport_receiver_t *transport_receiver,
+    const axutil_env_t *env)
+{
+    return (transport_receiver)->ops->is_running(transport_receiver, env);
+}
+

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Mon Apr  2 05:30:38 2007
@@ -253,7 +253,7 @@
     om_output = axiom_output_create(env, xml_writer);
 
     axiom_node_serialize(add_om_node, env, om_output);
-    buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+    buffer = axiom_xml_writer_get_xml(xml_writer, env);
     printf("\nOM node in XML : %s \n",  buffer);
     AXIS2_FREE(env->allocator, buffer);
     axiom_output_free(om_output, env);
@@ -310,7 +310,7 @@
     om_output = axiom_output_create(env, xml_writer);
 
     axiom_node_serialize(add_om_node, env, om_output);
-    buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+    buffer = axiom_xml_writer_get_xml(xml_writer, env);
     printf("\nOM node in XML : %s \n",  buffer);
     AXIS2_FREE(env->allocator, buffer);
     axiom_output_free(om_output, env);

Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Mon Apr  2 05:30:38 2007
@@ -101,7 +101,7 @@
     if (ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = axiom_node_get_data_element(ret_node, env);
+        om_str = axiom_node_to_string(ret_node, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");
@@ -122,7 +122,7 @@
     if (ret_node2)
     {
         axis2_char_t *om_str = NULL;
-        om_str = axiom_node_get_data_element(ret_node2, env);
+        om_str = axiom_node_to_string(ret_node2, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");
@@ -169,7 +169,7 @@
     text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
     axiom_element_set_text(text_om_ele, env, "Hello World!", text_om_node);
 
-    om_str = axiom_node_get_data_element(echo_om_node, env);
+    om_str = axiom_node_to_string(echo_om_node, env);
     if (om_str)
     {
         printf("\nSending OM : %s\n", om_str);

Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Mon Apr  2 05:30:38 2007
@@ -123,7 +123,7 @@
         if (soap_fault)
         {
             printf("\nReturned SOAP fault: %s\n", 
-                axiom_node_get_data_element(axiom_soap_fault_get_base_node(soap_fault,env), 
+                axiom_node_to_string(axiom_soap_fault_get_base_node(soap_fault,env), 
                 env));
         }
         return -1;

Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Mon Apr  2 05:30:38 2007
@@ -97,7 +97,7 @@
             om_output = axiom_output_create(env, writer);
 
             axiom_node_serialize(ret_node, env, om_output);
-            buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, env);
+            buffer = (axis2_char_t*)axiom_xml_writer_get_xml(writer, env);
             printf("\nReceived invalid OM as result : %s\n", buffer);
             if (buffer)
             {
@@ -109,7 +109,7 @@
                 axiom_output_free(om_output, env);
                 om_output = NULL;
             }
-            AXIOM_XML_WRITER_FREE(writer, env);
+            axiom_xml_writer_free(writer, env);
         }
     }
     else
@@ -166,7 +166,7 @@
     om_output = axiom_output_create(env, xml_writer);
 
     axiom_node_serialize(math_om_node, env, om_output);
-    buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+    buffer = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n",  buffer);
     if (om_output)
     {

Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=524775&r1=524774&r2=524775
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Mon Apr  2 05:30:38 2007
@@ -113,7 +113,7 @@
     if (ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = axiom_node_get_data_element(ret_node, env);
+        om_str = axiom_node_to_string(ret_node, env);
         if (om_str)
         {
             printf("\nReceived OM : %s\n", om_str);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message