Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 41916 invoked from network); 15 Jun 2006 11:41:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Jun 2006 11:41:20 -0000 Received: (qmail 49154 invoked by uid 500); 15 Jun 2006 11:41:14 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 48379 invoked by uid 500); 15 Jun 2006 11:41:09 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 48275 invoked by uid 500); 15 Jun 2006 11:41:09 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 48265 invoked by uid 99); 15 Jun 2006 11:41:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 04:41:08 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 04:41:05 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AD9C11A9846; Thu, 15 Jun 2006 04:40:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r414563 [3/3] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/ include/ modules/core/clientapi/ modules/core/clientapi/diclie... Date: Thu, 15 Jun 2006 11:40:36 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060615114045.AD9C11A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c (original) +++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Thu Jun 15 04:40:33 2006 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ typedef struct axis2_libxml2_writer_wrapper_impl { - axiom_writer_t writer; + axiom_xml_writer_t writer; xmlTextWriterPtr xml_writer; @@ -85,30 +85,30 @@ /*********************** function prototypes ***********************************/ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_free( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_end_start_element( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element_with_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element_with_namespace_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri, @@ -116,20 +116,20 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element_with_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element_with_namespace_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri, @@ -137,23 +137,23 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_end_element( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_end_document( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_attribute(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_attribute(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *value); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_attribute_with_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *value, @@ -161,7 +161,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_attribute_with_namespace_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *value, @@ -170,7 +170,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *prefix, axis2_char_t *namespace_uri); @@ -178,123 +178,123 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_default_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *namespace_uri); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_comment( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *value); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_processing_instruction( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *target); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_processing_instruction_data( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *target, axis2_char_t *data); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_cdata( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *data); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_dtd( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *dtd); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_entity_ref( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *name); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document_with_version( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *version); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document_with_version_encoding( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *encoding, axis2_char_t *version); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_characters( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *text); axis2_char_t* AXIS2_CALL axis2_libxml2_writer_wrapper_get_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *uri); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_set_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *prefix, axis2_char_t *uri); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_set_default_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *uri); axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_encoded( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *text, int in_attr); void* AXIS2_CALL axis2_libxml2_writer_wrapper_get_xml( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); int AXIS2_CALL axis2_libxml2_writer_wrapper_get_type( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); /*********************** static functions ************************************/ static axis2_status_t axis2_libxml2_writer_wrapper_pop_context( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); static axis2_status_t axis2_libxml2_writer_wrapper_push( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, const axis2_char_t *uri, const axis2_char_t *prefix); static axis2_bool_t axis2_libxml2_writer_wrapper_is_namespace_declared( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *key); @@ -313,7 +313,7 @@ static axis2_status_t axis2_libxml2_writer_wrapper_push_context( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); static axis2_char_t * @@ -325,12 +325,12 @@ static axis2_status_t axis2_libxml2_writer_wrapper_set_default_lang_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env); static axis2_char_t* axis2_libxml2_writer_wrapper_find_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *uri); @@ -342,15 +342,15 @@ static void axis2_libxml2_writer_wrapper_init_ops( - axiom_writer_t *writer); + axiom_xml_writer_t *writer); /**************************** end function pointers ****************************/ -AXIS2_EXTERN axiom_writer_t * AXIS2_CALL -axiom_writer_create(const axis2_env_t *env, +AXIS2_EXTERN axiom_xml_writer_t * AXIS2_CALL +axiom_xml_writer_create(const axis2_env_t *env, axis2_char_t *filename, axis2_char_t *encoding, int is_prefix_default, @@ -415,8 +415,8 @@ axis2_libxml2_writer_wrapper_set_default_lang_namespace(&(writer_impl->writer), env); - writer_impl->writer.ops = (axiom_writer_ops_t*)AXIS2_MALLOC(env->allocator, - sizeof(axiom_writer_ops_t)); + writer_impl->writer.ops = (axiom_xml_writer_ops_t*)AXIS2_MALLOC(env->allocator, + sizeof(axiom_xml_writer_ops_t)); if(!(writer_impl->writer.ops)) { @@ -431,8 +431,8 @@ /*********************** writer create func for file ***************************/ -AXIS2_EXTERN axiom_writer_t * AXIS2_CALL -axiom_writer_create_for_memory(const axis2_env_t *env, +AXIS2_EXTERN axiom_xml_writer_t * AXIS2_CALL +axiom_xml_writer_create_for_memory(const axis2_env_t *env, axis2_char_t *encoding, int is_prefix_default, int compression, @@ -519,8 +519,8 @@ axis2_libxml2_writer_wrapper_set_default_lang_namespace(&(writer_impl->writer), env); - writer_impl->writer.ops = (axiom_writer_ops_t*)AXIS2_MALLOC(env->allocator, - sizeof(axiom_writer_ops_t)); + writer_impl->writer.ops = (axiom_xml_writer_ops_t*)AXIS2_MALLOC(env->allocator, + sizeof(axiom_xml_writer_ops_t)); if(!(writer_impl->writer.ops)) { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); @@ -537,7 +537,7 @@ /*******************************************************************************/ static void -axis2_libxml2_writer_wrapper_init_ops(axiom_writer_t *writer) +axis2_libxml2_writer_wrapper_init_ops(axiom_xml_writer_t *writer) { writer->ops->free = axis2_libxml2_writer_wrapper_free; @@ -603,7 +603,7 @@ axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_free(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_free(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -650,7 +650,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname) { @@ -673,7 +673,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_end_start_element(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_end_start_element(axiom_xml_writer_t *writer, const axis2_env_t *env) { AXIS2_ENV_CHECK( env, AXIS2_FAILURE); @@ -684,7 +684,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element_with_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri) @@ -722,7 +722,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element_with_namespace_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri, @@ -781,7 +781,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname) { @@ -809,7 +809,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element_with_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri) @@ -844,7 +844,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element_with_namespace_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *namespace_uri, @@ -901,7 +901,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_end_element(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_end_element(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -927,7 +927,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_end_document(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_end_document(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -948,7 +948,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_attribute(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_attribute(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *value) @@ -974,7 +974,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_attribute_with_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *value, @@ -1018,7 +1018,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_attribute_with_namespace_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *localname, axis2_char_t *value, @@ -1074,7 +1074,7 @@ /** need to work on this */ axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_namespace(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_namespace(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *prefix, axis2_char_t *namespace_uri) @@ -1143,7 +1143,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_default_namespace - (axiom_writer_t *writer, + (axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *namespace_uri) { @@ -1184,7 +1184,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_comment(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_comment(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *value) { @@ -1208,7 +1208,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_processing_instruction( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *target) { @@ -1230,7 +1230,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_processing_instruction_data( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *target, axis2_char_t *data) @@ -1255,7 +1255,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_cdata(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_cdata(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *data) { @@ -1276,7 +1276,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_write_dtd(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_write_dtd(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *dtd) { @@ -1297,7 +1297,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_entity_ref( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *name) { @@ -1309,7 +1309,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *wrapper_impl = NULL; @@ -1329,7 +1329,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document_with_version( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *version) { @@ -1351,7 +1351,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document_with_version_encoding( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *version, axis2_char_t *encoding) @@ -1374,7 +1374,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_characters( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *text) { @@ -1397,7 +1397,7 @@ } axis2_char_t* AXIS2_CALL -axis2_libxml2_writer_wrapper_get_prefix( axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_get_prefix( axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *uri) { @@ -1411,7 +1411,7 @@ } axis2_status_t AXIS2_CALL -axis2_libxml2_writer_wrapper_set_prefix( axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_set_prefix( axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *prefix, axis2_char_t *uri) @@ -1444,7 +1444,7 @@ } axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_set_default_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *uri) { @@ -1464,7 +1464,7 @@ axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_encoded( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *text, int in_attr) @@ -1478,7 +1478,7 @@ } void* AXIS2_CALL -axis2_libxml2_writer_wrapper_get_xml(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_get_xml(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -1515,7 +1515,7 @@ } int AXIS2_CALL -axis2_libxml2_writer_wrapper_get_type(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_get_type(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -1525,7 +1525,7 @@ } static axis2_status_t -axis2_libxml2_writer_wrapper_pop_context(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_pop_context(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -1568,7 +1568,7 @@ } static axis2_status_t -axis2_libxml2_writer_wrapper_push(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_push(axiom_xml_writer_t *writer, const axis2_env_t *env, const axis2_char_t *uri, const axis2_char_t *prefix) @@ -1615,7 +1615,7 @@ } static axis2_bool_t -axis2_libxml2_writer_wrapper_is_namespace_declared(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_is_namespace_declared(axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *key) { @@ -1719,7 +1719,7 @@ } static axis2_status_t -axis2_libxml2_writer_wrapper_push_context(axiom_writer_t *writer, +axis2_libxml2_writer_wrapper_push_context(axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -1759,7 +1759,7 @@ static axis2_status_t axis2_libxml2_writer_wrapper_set_default_lang_namespace( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env) { axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL; @@ -1790,7 +1790,7 @@ static axis2_char_t* axis2_libxml2_writer_wrapper_find_prefix( - axiom_writer_t *writer, + axiom_xml_writer_t *writer, const axis2_env_t *env, axis2_char_t *uri) { Modified: webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original) +++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Thu Jun 15 04:40:33 2006 @@ -357,9 +357,9 @@ if(token == -1) return AXIS2_FAILURE; - while(token != AXIOM_READER_END_ELEMENT ) + while(token != AXIOM_XML_READER_END_ELEMENT ) { - if(token != AXIOM_READER_CHARACTER) + if(token != AXIOM_XML_READER_CHARACTER) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE, AXIS2_FAILURE); Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original) +++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Thu Jun 15 04:40:33 2006 @@ -373,8 +373,8 @@ builder_impl->done = AXIS2_TRUE; return AXIS2_FAILURE; } - if(current_event == AXIOM_READER_EMPTY_ELEMENT || - current_event == AXIOM_READER_START_ELEMENT) + if(current_event == AXIOM_XML_READER_EMPTY_ELEMENT || + current_event == AXIOM_XML_READER_START_ELEMENT) { current_node = axiom_stax_builder_get_lastnode(builder_impl->om_builder, env); if(current_node) @@ -433,7 +433,7 @@ element_level = axiom_stax_builder_get_element_level( builder_impl->om_builder, env); - if(parent_node && element_level == 1 && current_event == AXIOM_READER_EMPTY_ELEMENT) + if(parent_node && element_level == 1 && current_event == AXIOM_XML_READER_EMPTY_ELEMENT) { ret_val = axiom_soap_builder_construct_node_for_empty_element(builder, env, parent_node , current_node); } Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original) +++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Thu Jun 15 04:40:33 2006 @@ -22,9 +22,9 @@ #include #include #include -#include +#include #include -#include +#include #include /** Define the environment related variables globaly so that they are available @@ -65,15 +65,15 @@ axiom_node_t *node1 = NULL, *node2 = NULL; axiom_output_t *om_output = NULL; axiom_namespace_t* ns = NULL; - axiom_reader_t *reader = NULL; - axiom_writer_t *writer = NULL; + axiom_xml_reader_t *reader = NULL; + axiom_xml_writer_t *writer = NULL; char *buffer = NULL; f =fopen(filename, "r"); if(!f) return -1; /** create pull parser */ - reader = axiom_reader_create_for_io(environment, read_input,NULL ,NULL, NULL); + reader = axiom_xml_reader_create_for_io(environment, read_input,NULL ,NULL, NULL); if(!reader) { @@ -165,13 +165,13 @@ printf ("Serialize pulled document\n"); - writer = axiom_writer_create_for_memory(environment, NULL, AXIS2_TRUE, 0, + writer = axiom_xml_writer_create_for_memory(environment, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create (environment, writer); AXIOM_NODE_SERIALIZE (node1, environment , om_output); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(writer, environment); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, environment); AXIOM_OUTPUT_FREE(om_output, environment); if(buffer) @@ -212,7 +212,7 @@ axiom_namespace_t *ns1 = NULL, *ns2 = NULL; axiom_text_t *text1 = NULL; axiom_output_t *om_output = NULL; - axiom_writer_t *writer = NULL; + axiom_xml_writer_t *writer = NULL; axis2_char_t *output_buffer = NULL; ns1 = @@ -245,7 +245,7 @@ /* serializing stuff */ - writer = axiom_writer_create_for_memory(environment, NULL, AXIS2_TRUE, 0, + writer = axiom_xml_writer_create_for_memory(environment, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create (environment, writer); @@ -261,7 +261,7 @@ /* end serializing stuff */ AXIOM_NODE_FREE_TREE(node1,environment); - output_buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(writer, environment); + output_buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, environment); AXIOM_OUTPUT_FREE(om_output, environment); if(output_buffer) Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original) +++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Thu Jun 15 04:40:33 2006 @@ -22,9 +22,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -104,7 +104,7 @@ { axiom_stax_builder_t *om_builder = NULL; - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axiom_soap_builder_t *soap_builder = NULL; axiom_soap_envelope_t *soap_envelope = NULL; @@ -112,7 +112,7 @@ axiom_node_t *om_node = NULL; axis2_char_t *buffer = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axiom_output_t *om_output = NULL; axiom_soap_body_t *soap_body = NULL; @@ -128,7 +128,7 @@ return -1; printf(" \n\n _________ Test SOAP BUILD ___________ \n\n "); - xml_reader = axiom_reader_create_for_io(env, read_soap,close_soap ,NULL, NULL); + xml_reader = axiom_xml_reader_create_for_io(env, read_soap,close_soap ,NULL, NULL); if(!xml_reader) { printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error)); @@ -139,7 +139,7 @@ om_builder = axiom_stax_builder_create(env, xml_reader); if(!om_builder) { - AXIOM_READER_FREE(xml_reader, env); + AXIOM_XML_READER_FREE(xml_reader, env); printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error)); return AXIS2_FAILURE; } @@ -219,7 +219,7 @@ } } - xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, + xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER); if(!xml_writer) { @@ -231,14 +231,14 @@ if(!om_output) { AXIOM_SOAP_BUILDER_FREE(soap_builder, env); - AXIOM_WRITER_FREE(xml_writer, env); + AXIOM_XML_WRITER_FREE(xml_writer, env); return AXIS2_FAILURE; } AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_envelope, env, om_output, AXIS2_FALSE); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env); printf("\n\nThe serialized xml is >>>>>>>>>>>>>\n\n\n%s \n\n\n", buffer); @@ -268,7 +268,7 @@ axiom_namespace_t *test_ns = NULL; axiom_namespace_t *role_ns = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; @@ -311,14 +311,14 @@ fault_code = axiom_soap_fault_code_create_with_parent(env, soap_fault); - xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, + xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create( env, xml_writer); AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_envelope, env, om_output, AXIS2_FALSE); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env); printf("%s \n", buffer); @@ -340,7 +340,7 @@ axiom_soap_envelope_t *soap_envelope= NULL; axiom_soap_body_t *soap_body = NULL; axiom_soap_fault_t *soap_fault = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; @@ -353,11 +353,11 @@ axiom_soap_fault_detail_create_with_parent(env, soap_fault); axiom_soap_fault_role_create_with_parent(env, soap_fault); - xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, + xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create( env, xml_writer); AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_envelope, env, om_output, AXIS2_FALSE); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env); printf("%s \n", buffer); AXIS2_FREE(env->allocator, buffer); AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env); Modified: webservices/axis2/trunk/c/include/axis2_stub.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_stub.h?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_stub.h (original) +++ webservices/axis2/trunk/c/include/axis2_stub.h Thu Jun 15 04:40:33 2006 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include Modified: webservices/axis2/trunk/c/modules/core/clientapi/diclient/di_client.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/diclient/di_client.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/diclient/di_client.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/diclient/di_client.c Thu Jun 15 04:40:33 2006 @@ -24,9 +24,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -448,17 +448,17 @@ if(ret_node) { /* Get the response value from the SOAP message */ - axiom_writer_t *writer = NULL; + axiom_xml_writer_t *writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; printf("\necho stub invoke SUCCESSFUL!\n"); - writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, + writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create (env, writer); AXIOM_NODE_SERIALIZE (ret_node, env, om_output); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(writer, env); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, env); printf ("\nReceived OM node in XML : %s\n", buffer); } else Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original) +++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Thu Jun 15 04:40:33 2006 @@ -22,7 +22,7 @@ #include "listener_manager.h" #include #include "callback_recv.h" -#include +#include typedef struct axis2_op_client_impl { @@ -185,7 +185,7 @@ axis2_op_client_init_ops(&(op_client_impl->op_client)); /** initialize parser for thread safty */ - axiom_reader_init(); + axiom_xml_reader_init(); return &(op_client_impl->op_client); } @@ -590,7 +590,7 @@ AXIS2_FREE(env->allocator, op_client_impl); op_client_impl = NULL; - axiom_reader_cleanup(); + axiom_xml_reader_cleanup(); return AXIS2_SUCCESS; } /** private functions - implementation */ Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h (original) +++ webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h Thu Jun 15 04:40:33 2006 @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original) +++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Thu Jun 15 04:40:33 2006 @@ -265,7 +265,7 @@ const axis2_env_t *env) { axis2_desc_builder_impl_t *desc_builder_impl = NULL; - axiom_reader_t *reader = NULL; + axiom_xml_reader_t *reader = NULL; axiom_document_t *document = NULL; axiom_node_t *root = NULL; @@ -279,7 +279,7 @@ return NULL; } /** create pull parser using the file path to configuration file */ - reader = axiom_reader_create_for_file(env, desc_builder_impl->file_name, + reader = axiom_xml_reader_create_for_file(env, desc_builder_impl->file_name, NULL); if(!reader) Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original) +++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Jun 15 04:40:33 2006 @@ -296,7 +296,7 @@ { axiom_element_t *desc_value_element = NULL; axiom_node_t *desc_value_node = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axiom_output_t *om_output = NULL; desc_value_element = AXIOM_ELEMENT_GET_FIRST_ELEMENT(desc_element, @@ -305,7 +305,7 @@ { axis2_char_t *svc_name = NULL; - xml_writer = axiom_writer_create_for_memory(env, NULL, + xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSERT_TYPE_BUFFER); om_output = axiom_output_create(env, xml_writer); status = AXIOM_NODE_SERIALIZE(desc_value_node, env, om_output); @@ -313,7 +313,7 @@ { return AXIS2_FAILURE; } - svc_name = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env); + svc_name = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env); AXIS2_SVC_SET_NAME(builder_impl->svc, env, svc_name); AXIOM_OUTPUT_FREE(om_output, env); Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Thu Jun 15 04:40:33 2006 @@ -130,7 +130,7 @@ axiom_soap_builder_t *soap_builder = NULL; axiom_stax_builder_t *om_builder = NULL; axis2_bool_t is_soap11 = AXIS2_FALSE; - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axis2_char_t *char_set = NULL; /*axis2_char_t *xml_char_set = NULL;*/ axis2_conf_ctx_t *conf_ctx = NULL; @@ -255,7 +255,7 @@ AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE); char_set = axis2_http_transport_utils_get_charset_enc(env,content_type); - xml_reader = axiom_reader_create_for_io(env, + xml_reader = axiom_xml_reader_create_for_io(env, axis2_http_transport_utils_on_data_request,NULL, (void *)&callback_ctx, char_set); @@ -273,7 +273,7 @@ om_builder = axiom_stax_builder_create(env, xml_reader); if(NULL == om_builder) { - AXIOM_READER_FREE(xml_reader, env); + AXIOM_XML_READER_FREE(xml_reader, env); xml_reader = NULL; return AXIS2_FAILURE; } @@ -372,7 +372,7 @@ * AXIS2_FAILURE); * AXIOM_SOAP_ENVELOPE_FREE(envelope, env); * envelope = NULL; - * AXIOM_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; @@ -1080,12 +1080,12 @@ } else if(AXIS2_TRUE != AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env)) { - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_soap_builder_t *soap_builder = NULL; axiom_soap_envelope_t *soap_envelope = NULL; - xml_reader = axiom_reader_create_for_io(env, + xml_reader = axiom_xml_reader_create_for_io(env, axis2_http_transport_utils_on_data_request,NULL, (void *)callback_ctx, char_set_enc); if(NULL == xml_reader) @@ -1095,7 +1095,7 @@ om_builder = axiom_stax_builder_create(env, xml_reader); if(NULL == om_builder) { - AXIOM_READER_FREE(xml_reader, env); + AXIOM_XML_READER_FREE(xml_reader, env); xml_reader = NULL; return NULL; } @@ -1115,14 +1115,14 @@ } else { - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_soap_envelope_t *soap_envelope = NULL; axiom_soap_body_t *def_body = NULL; axiom_document_t *om_doc = NULL; axiom_node_t *root_node = NULL; - xml_reader = axiom_reader_create_for_io(env, + xml_reader = axiom_xml_reader_create_for_io(env, axis2_http_transport_utils_on_data_request,NULL, (void *)callback_ctx, char_set_enc); if(NULL == xml_reader) @@ -1132,7 +1132,7 @@ om_builder = axiom_stax_builder_create(env, xml_reader); if(NULL == om_builder) { - AXIOM_READER_FREE(xml_reader, env); + AXIOM_XML_READER_FREE(xml_reader, env); xml_reader = NULL; return NULL; } Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Thu Jun 15 04:40:33 2006 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include @@ -342,7 +342,7 @@ #endif } axis2_env_free_masked(thread_env, 0x2); - /*axiom_reader_cleanup();*/ + /*axiom_xml_reader_cleanup();*/ #ifdef AXIS2_SVR_MULTI_THREADED AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd); #endif 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?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- 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 Thu Jun 15 04:40:33 2006 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -155,7 +155,7 @@ const axis2_char_t *char_set_enc = NULL; axis2_endpoint_ref_t *epr = NULL; axis2_char_t *transport_url = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; axiom_soap_envelope_t *soap_data_out = NULL; @@ -240,7 +240,7 @@ AXIS2_ERROR_GET_MESSAGE(env->error)); return AXIS2_FAILURE; } - xml_writer = axiom_writer_create_for_memory(env, NULL, + xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER); if(NULL == xml_writer) { @@ -249,7 +249,7 @@ om_output = axiom_output_create(env, xml_writer); if(NULL == om_output) { - AXIOM_WRITER_FREE(xml_writer, env); + AXIOM_XML_WRITER_FREE(xml_writer, env); xml_writer = NULL; return AXIS2_FAILURE; } @@ -362,13 +362,13 @@ return AXIS2_FAILURE; } AXIOM_NODE_SERIALIZE(data_out, env, om_output); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env); } else { AXIOM_SOAP_ENVELOPE_SERIALIZE (soap_data_out, env, om_output, AXIS2_FALSE); - buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env); } AXIS2_STREAM_WRITE(out_stream, env, buffer, AXIS2_STRLEN(buffer)); AXIS2_FREE(env->allocator, buffer); Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c Thu Jun 15 04:40:33 2006 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -164,7 +164,7 @@ axis2_http_request_line_t *request_line = NULL; axis2_url_t *url = NULL; axis2_rest_sender_impl_t *sender_impl = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axis2_char_t *buffer = NULL; const axis2_char_t *char_set_enc = NULL; int status_code = -1; @@ -230,7 +230,7 @@ * AXIS2_MSG_CTX_GET_IS_DOING_MTOM(msg_ctx, env); */ AXIOM_NODE_SERIALIZE (out, env, sender_impl->om_output); - buffer = AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env); if(NULL == buffer) { Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Thu Jun 15 04:40:33 2006 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -187,7 +187,7 @@ axis2_http_request_line_t *request_line = NULL; axis2_url_t *url = NULL; axiom_soap_over_http_sender_impl_t *sender_impl = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axis2_char_t *buffer = NULL; const axis2_char_t *char_set_enc = NULL; int status_code = -1; @@ -272,7 +272,7 @@ } else { - buffer = AXIOM_WRITER_GET_XML(xml_writer, env); + buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env); } if(NULL == buffer && !doing_mtom) Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c Thu Jun 15 04:40:33 2006 @@ -24,7 +24,7 @@ #include #include #include -#include +#include /* Configuration structure populated by apache2.conf */ typedef struct axis2_config_rec @@ -80,7 +80,7 @@ conf->log_level = AXIS2_LOG_LEVEL_DEBUG; /* We need to init xml readers before we go into threaded env */ - axiom_reader_init(); + axiom_xml_reader_init(); return conf; } Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c Thu Jun 15 04:40:33 2006 @@ -25,7 +25,7 @@ #include #include #include -#include +#include axis2_env_t *system_env = NULL; axis2_transport_receiver_t *server = NULL; @@ -45,7 +45,7 @@ /* We need to init the parser in main thread before spawning child * threads */ - axiom_reader_init(); + axiom_xml_reader_init(); return axis2_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool); } @@ -63,7 +63,7 @@ axis2_env_free(env); } axis2_allocator_free(allocator); - axiom_reader_cleanup(); + axiom_xml_reader_cleanup(); _exit(status); } 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?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/samples/client/math/math_client.c (original) +++ webservices/axis2/trunk/c/samples/client/math/math_client.c Thu Jun 15 04:40:33 2006 @@ -88,15 +88,15 @@ } else { - axiom_writer_t *writer = NULL; + axiom_xml_writer_t *writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; - writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, + writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create (env, writer); AXIOM_NODE_SERIALIZE (ret_node, env, om_output); - buffer = (axis2_char_t*)AXIOM_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(NULL != buffer) { @@ -138,7 +138,7 @@ axiom_namespace_t *ns1 = NULL; - axiom_writer_t *xml_writer = NULL; + axiom_xml_writer_t *xml_writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; @@ -152,12 +152,12 @@ text_om_ele = axiom_element_create(env, math_om_node, "param2", NULL, &text_om_node); AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, param2, text_om_node); - xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, + xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create( env, xml_writer); AXIOM_NODE_SERIALIZE(math_om_node, env, om_output); - buffer = (axis2_char_t*)AXIOM_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(NULL != buffer) { Modified: webservices/axis2/trunk/c/samples/server/echo/echo.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/samples/server/echo/echo.c (original) +++ webservices/axis2/trunk/c/samples/server/echo/echo.c Thu Jun 15 04:40:33 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ #include "echo.h" -#include +#include #include axiom_node_t * @@ -42,16 +42,16 @@ } else { - axiom_writer_t *writer = NULL; + axiom_xml_writer_t *writer = NULL; axiom_output_t *om_output = NULL; axis2_char_t *buffer = NULL; - writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, + writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER); om_output = axiom_output_create (env, writer); AXIOM_NODE_SERIALIZE (node, env, om_output); - buffer = AXIOM_WRITER_GET_XML(writer, env); + buffer = AXIOM_XML_WRITER_GET_XML(writer, env); printf("buffer = %s \n", buffer); } Modified: webservices/axis2/trunk/c/util/include/axis2_error.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_error.h?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_error.h (original) +++ webservices/axis2/trunk/c/util/include/axis2_error.h Thu Jun 15 04:40:33 2006 @@ -390,9 +390,9 @@ /** remove method has alread been called once so cann't remove till next method is called valid for any om children iterator*/ AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED, - /** axiom_reader returned NULL element */ + /** axiom_xml_reader returned NULL element */ AXIS2_ERROR_XML_READER_ELEMENT_NULL, - /** axiom_reader returned NULL value */ + /** axiom_xml_reader returned NULL value */ AXIS2_ERROR_XML_READER_VALUE_NULL, /* * Group - xml:parser Modified: webservices/axis2/trunk/c/util/src/error.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/error.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/error.c (original) +++ webservices/axis2/trunk/c/util/src/error.c Thu Jun 15 04:40:33 2006 @@ -333,9 +333,9 @@ axis2_error_messages[AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED] = "Document root is NULL, when it is not supposed to be NULL"; axis2_error_messages[AXIS2_ERROR_XML_READER_ELEMENT_NULL] = - "axiom_reader returned NULL element"; + "axiom_xml_reader returned NULL element"; axis2_error_messages[AXIS2_ERROR_XML_READER_VALUE_NULL] = - "axiom_reader returned NULL value"; + "axiom_xml_reader returned NULL value"; /* xml:parser */ axis2_error_messages[AXIS2_ERROR_CREATING_XML_STREAM_READER] = "error occured creating xml stream writer"; Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original) +++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Thu Jun 15 04:40:33 2006 @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -74,11 +74,11 @@ const axis2_env_t *env, axis2_char_t *filename) { - axiom_reader_t *reader = NULL; + axiom_xml_reader_t *reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_document_t *doc = NULL; - reader = axiom_reader_create_for_file(env, filename, NULL); + reader = axiom_xml_reader_create_for_file(env, filename, NULL); om_builder = axiom_stax_builder_create(env, reader); doc = axiom_document_create(env, NULL, om_builder); AXIOM_DOCUMENT_BUILD_ALL(doc, env); Modified: webservices/axis2/trunk/c/woden/src/builder/reader.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/reader.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/builder/reader.c (original) +++ webservices/axis2/trunk/c/woden/src/builder/reader.c Thu Jun 15 04:40:33 2006 @@ -112,7 +112,7 @@ #include #include #include -#include +#include #include #include #include @@ -1244,7 +1244,7 @@ { /* Not previously imported, so retrieve it now. */ xml_schema_collection_t *schema_col = NULL; - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axiom_document_t *imported_schema_doc = NULL; axiom_stax_builder_t *xml_builder = NULL; @@ -1252,7 +1252,7 @@ /* TODO Temporarily assume that imported schemas are stored as files * with the url as file name */ - xml_reader = axiom_reader_create_for_file(env, schema_uri, NULL); + xml_reader = axiom_xml_reader_create_for_file(env, schema_uri, NULL); xml_builder = axiom_stax_builder_create(env, reader); imported_schema_doc = axiom_document_create(env, NULL, xml_builder); schema_def = XML_SCHEMA_COLLECTION_READ_DOCUMENT(schema_col, @@ -3863,7 +3863,7 @@ axis2_qname_t *qname = NULL; schema_col = xml_schema_collection_create(env); - xml_reader = axiom_reader_create_for_file(env, location_str, NULL); + xml_reader = axiom_xml_reader_create_for_file(env, location_str, NULL); builder = axiom_stax_builder_create(env, xml_reader); doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env); doc_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env); Modified: webservices/axis2/trunk/c/woden/test/woden_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/test/woden_test.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/test/woden_test.c (original) +++ webservices/axis2/trunk/c/woden/test/woden_test.c Thu Jun 15 04:40:33 2006 @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -84,11 +84,11 @@ const axis2_env_t *env, axis2_char_t *filename) { - axiom_reader_t *reader = NULL; + axiom_xml_reader_t *reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_document_t *doc = NULL; - reader = axiom_reader_create_for_file(env, filename, NULL); + reader = axiom_xml_reader_create_for_file(env, filename, NULL); om_builder = axiom_stax_builder_create(env, reader); doc = axiom_document_create(env, NULL, om_builder); AXIOM_DOCUMENT_BUILD_ALL(doc, env); Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h Thu Jun 15 04:40:33 2006 @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #ifdef __cplusplus @@ -83,7 +83,7 @@ read_with_reader)( xml_schema_collection_t* collection, const axis2_env_t *env, - axiom_reader_t *reader); + axiom_xml_reader_t *reader); struct xml_schema *(AXIS2_CALL * Modified: webservices/axis2/trunk/c/xml_schema/samples/test_schema.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/samples/test_schema.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/samples/test_schema.c (original) +++ webservices/axis2/trunk/c/xml_schema/samples/test_schema.c Thu Jun 15 04:40:33 2006 @@ -24,14 +24,14 @@ axis2_env_t *env, axis2_char_t *filename) { - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_document_t *om_doc = NULL; xml_schema_collection_t *schema_collection = NULL; xml_schema_t *schema = NULL; xml_reader = - axiom_reader_create_for_file(env, filename, NULL); + axiom_xml_reader_create_for_file(env, filename, NULL); if(!xml_reader) return AXIS2_FAILURE; Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Thu Jun 15 04:40:33 2006 @@ -4036,7 +4036,7 @@ axis2_char_t *schema_location, axis2_char_t *base_uri) { - axiom_reader_t *xml_reader = NULL; + axiom_xml_reader_t *xml_reader = NULL; axiom_document_t *om_doc = NULL; axiom_stax_builder_t *om_builder = NULL; xml_schema_t *schema = NULL; @@ -4070,7 +4070,7 @@ return schema; } - xml_reader = axiom_reader_create_for_file(env, system_id, NULL); + xml_reader = axiom_xml_reader_create_for_file(env, system_id, NULL); if(!xml_reader) return NULL; om_builder = axiom_stax_builder_create(env, xml_reader); Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Thu Jun 15 04:40:33 2006 @@ -72,7 +72,7 @@ xml_schema_collection_read_with_reader( xml_schema_collection_t* collection, const axis2_env_t *env, - axiom_reader_t *reader); + axiom_xml_reader_t *reader); xml_schema_t * AXIS2_CALL xml_schema_collection_read_document( @@ -425,7 +425,7 @@ xml_schema_collection_read_with_reader( xml_schema_collection_t* collection, const axis2_env_t *env, - axiom_reader_t *reader) + axiom_xml_reader_t *reader) { xml_schema_builder_t *sch_builder = NULL; axiom_document_t *om_doc = NULL; Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?rev=414563&r1=414562&r2=414563&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original) +++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Thu Jun 15 04:40:33 2006 @@ -487,7 +487,7 @@ xml_schema_collection_t *sch_collection = NULL; xml_schema_t *schema = NULL; axis2_char_t *xml = NULL; - axiom_reader_t *reader = NULL; + axiom_xml_reader_t *reader = NULL; axiom_stax_builder_t *builder = NULL; xml = "\n" @@ -513,7 +513,7 @@ env = axis2_env_create_all("test.log", 1); - reader = axiom_reader_create_for_memory(env, xml, AXIS2_STRLEN(xml), NULL, + reader = axiom_xml_reader_create_for_memory(env, xml, AXIS2_STRLEN(xml), NULL, AXIS2_XML_PARSER_TYPE_BUFFER); builder = axiom_stax_builder_create(env, reader); @@ -643,10 +643,10 @@ get_document_from_filename(const axis2_env_t *env, axis2_char_t *filename) { - axiom_reader_t *reader = NULL; + axiom_xml_reader_t *reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_document_t *doc = NULL; - reader = axiom_reader_create_for_file(env, filename, NULL); + reader = axiom_xml_reader_create_for_file(env, filename, NULL); om_builder = axiom_stax_builder_create(env, reader); doc = axiom_document_create(env, NULL, om_builder); AXIOM_DOCUMENT_BUILD_ALL(doc, env); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org