Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 35076 invoked from network); 30 Mar 2007 19:26:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Mar 2007 19:26:04 -0000 Received: (qmail 85903 invoked by uid 500); 30 Mar 2007 19:25:54 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 85644 invoked by uid 500); 30 Mar 2007 19:25:53 -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 85579 invoked by uid 500); 30 Mar 2007 19:25:52 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 85498 invoked by uid 99); 30 Mar 2007 19:25:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 12:25:52 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 12:25:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EAEE51A985D; Fri, 30 Mar 2007 12:24:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524243 [10/17] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/ guththila/samples/ guththila/src/ include/ mod... Date: Fri, 30 Mar 2007 19:24:23 -0000 To: axis2-cvs@ws.apache.org From: pini@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070330192443.EAEE51A985D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c Fri Mar 30 12:24:00 2007 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -353,13 +353,13 @@ return doc; } -axis2_qname_t* +axutil_qname_t* w2c_emitter_pick_service_name ( w2c_emitter_impl_t *emitter_impl, const axutil_env_t *env) { axutil_array_list_t *svc_list = NULL; void *svc = NULL; - axis2_qname_t *svc_qname = NULL; + axutil_qname_t *svc_qname = NULL; if (WODEN_RESOLVER_GET_SPEC( emitter_impl-> resolver,env ) == WODEN_WSDL10 ) @@ -421,13 +421,13 @@ { axutil_array_list_t *svc_list = NULL; woden_wsdl10_svc_t *svc = NULL; - axis2_qname_t* svc_qname = NULL; + axutil_qname_t* svc_qname = NULL; axutil_array_list_t *endpoint_list = NULL; woden_wsdl10_endpoint_t *endpoint = NULL; axis2_char_t *address = NULL; - axis2_qname_t *ext_type_l = NULL; - axis2_qname_t *ext_type = NULL; + axutil_qname_t *ext_type_l = NULL; + axutil_qname_t *ext_type = NULL; int size = 0; axutil_array_list_t *ext_elements = NULL; void *soap_address = NULL; @@ -445,7 +445,7 @@ int i = 0; void* interface_op = NULL; - axis2_qname_t *op_qname = NULL; + axutil_qname_t *op_qname = NULL; axis2_char_t *local_part = NULL; axis2_char_t *ns = NULL; axiom_node_t *method = NULL; @@ -470,7 +470,7 @@ } svc = axutil_array_list_get( svc_list, env, 0 ); svc_qname = WODEN_WSDL10_SVC_GET_QNAME( svc, env); - ns = axis2_qname_get_uri( svc_qname, env); + ns = axutil_qname_get_uri( svc_qname, env); w2c_xslt_utils_add_attribute (env, root, "namespace", ns); /********************************************************************** @@ -488,7 +488,7 @@ endpoint = woden_wsdl10_endpoint_to_element_extensible( endpoint, env); - ext_type_l = axis2_qname_create(env, "address", + ext_type_l = axutil_qname_create(env, "address", "http://schemas.xmlsoap.org/wsdl/soap/", NULL); ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(endpoint, env); @@ -499,8 +499,8 @@ for(j = 0; j < size; j++) { ext_element = axutil_array_list_get(ext_elements, env, j); - ext_type = (axis2_qname_t*)WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env); - if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l)) + ext_type = (axutil_qname_t*)WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env); + if(AXIS2_TRUE == axutil_qname_equals(ext_type, env, ext_type_l)) { ext_element = woden_wsdl10_soap_module_to_soap_module_element ( @@ -554,10 +554,10 @@ { method = w2c_xslt_utils_add_child_node(env, "method", root); - local_part= axis2_qname_get_localpart(op_qname, env); + local_part= axutil_qname_get_localpart(op_qname, env); given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME( emitter_impl-> qname2name_maker, env, op_qname); - qname_str = axis2_qname_to_string(op_qname, env); + qname_str = axutil_qname_to_string(op_qname, env); w2c_xslt_utils_add_attribute (env, method, "localpart", local_part); given_name = emitter_impl-> name_maker_func(given_name, env); @@ -566,7 +566,7 @@ w2c_xslt_utils_add_attribute(env, method, "qname", qname_str); AXIS2_FREE( env-> allocator, local_part); - ns = axis2_qname_get_uri(op_qname, env); + ns = axutil_qname_get_uri(op_qname, env); w2c_xslt_utils_add_attribute (env, method, "namespace", ns); /** todos */ @@ -583,7 +583,7 @@ w2c_emitter_load_operations( emitter_impl, env, method, interface_op, 1); /** get soap action */ - ext_type_l = axis2_qname_create(env, "operation", + ext_type_l = axutil_qname_create(env, "operation", "http://schemas.xmlsoap.org/wsdl/soap/", NULL); binding_op = woden_wsdl10_binding_op_to_element_extensible(binding_op, env); ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op, env); @@ -592,7 +592,7 @@ { ext_element = axutil_array_list_get(ext_elements, env, j); ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env); - if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l)) + if(AXIS2_TRUE == axutil_qname_equals(ext_type, env, ext_type_l)) { ext_element = woden_wsdl10_soap_module_to_soap_module_element ( ext_element, env); @@ -629,7 +629,7 @@ axis2_bool_t in = AXIS2_FALSE; axis2_bool_t out = AXIS2_FALSE; - axis2_qname_t *msg_qname = NULL; + axutil_qname_t *msg_qname = NULL; void* if_msg_ref_ele = NULL; void* msg_ref = NULL; woden_wsdl10_part_t *part = NULL; @@ -739,7 +739,7 @@ void* interface_op = NULL; int i = 0; - axis2_qname_t* op_qname = NULL; + axutil_qname_t* op_qname = NULL; axis2_char_t* local_part = NULL; axis2_char_t* ns = NULL; axiom_node_t* method = NULL; @@ -747,8 +747,8 @@ /*void *soap_binding_op = NULL;*/ axis2_uri_t *soap_action_uri = NULL; axis2_char_t *soap_action_str = NULL; - axis2_qname_t *ext_type_l = NULL; - axis2_qname_t *ext_type = NULL; + axutil_qname_t *ext_type_l = NULL; + axutil_qname_t *ext_type = NULL; axutil_array_list_t *ext_elements = NULL; void *ext_element = NULL; int size = 0, j = 0; @@ -816,10 +816,10 @@ { method = w2c_xslt_utils_add_child_node(env, "method", root); - local_part= axis2_qname_get_localpart(op_qname, env); + local_part= axutil_qname_get_localpart(op_qname, env); given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME( emitter_impl-> qname2name_maker, env, op_qname); - qname_str = axis2_qname_to_string(op_qname, env); + qname_str = axutil_qname_to_string(op_qname, env); w2c_xslt_utils_add_attribute (env, method, "localpart", local_part); given_name = emitter_impl-> name_maker_func(given_name, env); @@ -827,7 +827,7 @@ given_name); w2c_xslt_utils_add_attribute (env, method, "qname", qname_str); - ns = axis2_qname_get_uri(op_qname, env); + ns = axutil_qname_get_uri(op_qname, env); w2c_xslt_utils_add_attribute (env, method, "namespace", ns); /** todos */ @@ -845,7 +845,7 @@ /** get soap action */ - ext_type_l = axis2_qname_create(env, "operation", + ext_type_l = axutil_qname_create(env, "operation", "http://schemas.xmlsoap.org/wsdl/soap/", NULL); binding_op = woden_binding_op_to_element_extensible(binding_op, env); ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op, env); @@ -854,7 +854,7 @@ { ext_element = axutil_array_list_get(ext_elements, env, j); ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env); - if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l)) + if(AXIS2_TRUE == axutil_qname_equals(ext_type, env, ext_type_l)) { /*ext_element = woden_soap_module_to_soap_module_element ( ext_element, env); @@ -879,7 +879,7 @@ w2c_emitter_add_param( w2c_emitter_impl_t *emitter_impl, const axutil_env_t *env, axiom_node_t *param_direction, - axis2_qname_t *msg_qname) + axutil_qname_t *msg_qname) { axiom_node_t *param = NULL; axis2_char_t *type = NULL; @@ -907,7 +907,7 @@ } type = axis2_strdup(env, type); w2c_xslt_utils_add_attribute (env, param, "type", type); - type = axis2_string_toupper( type); + type = axutil_string_toupper( type); w2c_xslt_utils_add_attribute (env, param, "caps-type", type); name = W2C_TYPEMAPPER_GET_PARAMETER_NAME( typemapper, env, msg_qname); @@ -923,8 +923,8 @@ return axis2_strdup(env, name); } -axis2_char_t* w2c_emitter_default_qname2name( axis2_qname_t *qname, +axis2_char_t* w2c_emitter_default_qname2name( axutil_qname_t *qname, const axutil_env_t *env) { - return axis2_qname_get_localpart( qname, env); + return axutil_qname_get_localpart( qname, env); } Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include @@ -113,7 +113,7 @@ w2c_emitter_parse_wsdl( w2c_emitter_impl_t* emitter_impl, const axutil_env_t* env); -axis2_qname_t* +axutil_qname_t* w2c_emitter_pick_service_name ( w2c_emitter_impl_t* emitter_impl, const axutil_env_t* env); @@ -126,7 +126,7 @@ w2c_emitter_add_param( w2c_emitter_impl_t *emitter_impl, const axutil_env_t *env, axiom_node_t *param_direction, - axis2_qname_t *msg_qname); + axutil_qname_t *msg_qname); axis2_char_t* w2c_emitter_default_namemaker( axis2_char_t *name, const axutil_env_t *env); Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Fri Mar 30 12:24:00 2007 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c Fri Mar 30 12:24:00 2007 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -368,7 +368,7 @@ h = axutil_hash_make ( env ); } len = axis2_strlen (W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX ); - tmp_key = axis2_string_substring_starting_at ( tmp_key, len); + tmp_key = axutil_string_substring_starting_at ( tmp_key, len); axutil_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string ); axutil_array_list_free ( tmp_array, env); } Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c Fri Mar 30 12:24:00 2007 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include typedef struct w2c_c_code_indenter_ext_impl Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include typedef struct w2c_c_namemaker_ext_impl Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c Fri Mar 30 12:24:00 2007 @@ -121,7 +121,7 @@ axis2_char_t* AXIS2_CALL w2c_c_qname2name_ext_suggest_name(w2c_qname2name_maker_t *qname2name_maker, const axutil_env_t *env, - axis2_qname_t *qname) + axutil_qname_t *qname) { w2c_c_qname2name_ext_impl_t *impl = NULL; @@ -135,7 +135,7 @@ impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker); - key = axis2_qname_to_string(qname, env); + key = axutil_qname_to_string(qname, env); local = (axis2_char_t*)axutil_hash_get( impl-> qname2name, key, AXIS2_HASH_KEY_STRING ); if( local != NULL) /* key has been there somewhere */ @@ -143,7 +143,7 @@ return local; } /* otherwise */ - local = axis2_qname_get_localpart( qname, env); + local = axutil_qname_get_localpart( qname, env); counter = (int)axutil_hash_get( impl-> name2number, local, AXIS2_HASH_KEY_STRING ); if ( counter == 0 ) /** this means name doesnt exist */ Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c Fri Mar 30 12:24:00 2007 @@ -86,7 +86,7 @@ axis2_char_t* AXIS2_CALL w2c_default_qname2name_ext_suggest_name(w2c_qname2name_maker_t *qname2name_maker, const axutil_env_t *env, - axis2_qname_t *qname) + axutil_qname_t *qname) { w2c_default_qname2name_ext_impl_t *impl = NULL; @@ -95,7 +95,7 @@ impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker); /** here nothing special would be happened */ - return axis2_qname_get_localpart( qname, env); + return axutil_qname_get_localpart( qname, env); } axis2_status_t AXIS2_CALL Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include "writer_protected.h" #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h Fri Mar 30 12:24:00 2007 @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c (original) +++ webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c Fri Mar 30 12:24:00 2007 @@ -25,7 +25,7 @@ #include static void -w2c_print_message(const axutil_env_t* env, axis2_properties_t* messageh, +w2c_print_message(const axutil_env_t* env, axutil_properties_t* messageh, axis2_char_t* key); static void @@ -109,7 +109,7 @@ static void w2c_print_usage(const axutil_env_t* env) { - axis2_properties_t* props = NULL; + axutil_properties_t* props = NULL; props = w2c_messages_get_message_properties(env); w2c_print_message(env, props, "wsdl2code.arg1"); @@ -123,14 +123,14 @@ w2c_print_message(env, props, "wsdl2code.arg9"); w2c_print_message(env, props, "wsdl2code.arg10"); - axis2_properties_free(props, env); + axutil_properties_free(props, env); } static void -w2c_print_message(const axutil_env_t* env, axis2_properties_t* messageh, axis2_char_t* key) +w2c_print_message(const axutil_env_t* env, axutil_properties_t* messageh, axis2_char_t* key) { axis2_char_t* message = NULL; message = (axis2_char_t*) - axis2_properties_get_property(messageh, env, key); + axutil_properties_get_property(messageh, env, key); printf("%s\n", message); } Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c (original) +++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c (original) +++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include "w2c_writer_test.h" Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c (original) +++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c (original) +++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c Fri Mar 30 12:24:00 2007 @@ -32,7 +32,7 @@ axis2_char_t *actual; axis2_char_t *expected; w2c_typemapper_t *typemapper; - axis2_qname_t *qname; + axutil_qname_t *qname; allocator = axutil_allocator_init(NULL); env = axutil_env_create(allocator); Modified: webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h (original) +++ webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h Fri Mar 30 12:24:00 2007 @@ -19,7 +19,7 @@ #define TCPMON_ENTRY_H #include -#include +#include /** * @file tcpmon_entry.h Modified: webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h (original) +++ webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h Fri Mar 30 12:24:00 2007 @@ -20,7 +20,7 @@ #include #include -#include +#include /** * @file tcpmon_session.h Modified: webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h (original) +++ webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h Fri Mar 30 12:24:00 2007 @@ -19,7 +19,7 @@ #define TCPMON_UTIL_H #include -#include +#include /** * @file tcpmon_util.h Modified: webservices/axis2/trunk/c/tools/tcpmon/src/entry.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/entry.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/src/entry.c (original) +++ webservices/axis2/trunk/c/tools/tcpmon/src/entry.c Fri Mar 30 12:24:00 2007 @@ -18,9 +18,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "tcpmon_entry_local.h" @@ -90,12 +90,12 @@ const axutil_env_t *env); axis2_char_t* -get_current_stream_to_buffer(axis2_stream_t* stream, +get_current_stream_to_buffer(axutil_stream_t* stream, const axutil_env_t* env, int* stream_size); axis2_char_t* -read_current_stream(axis2_stream_t *stream, +read_current_stream(axutil_stream_t *stream, const axutil_env_t *env, int *stream_size, axis2_char_t** header, @@ -373,8 +373,8 @@ TCPMON_SESSION_TRANS_ERROR_FUNCT on_trans_fault_funct; TCPMON_SESSION_NEW_ENTRY_FUNCT on_new_entry; - axis2_stream_t* client_stream = NULL; - axis2_stream_t* host_stream = NULL; + axutil_stream_t* client_stream = NULL; + axutil_stream_t* host_stream = NULL; int buffer_size = 0; axis2_char_t* headers = NULL; axis2_char_t* content = NULL; @@ -409,7 +409,7 @@ if (target_port == -1 || target_host == NULL) { - axis2_network_handler_close_socket(env, client_socket); + axutil_network_handler_close_socket(env, client_socket); AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Missing target port and host" "input missing"); if (on_trans_fault_funct) @@ -419,10 +419,10 @@ } return NULL; } - client_stream = axis2_stream_create_socket(env, client_socket); + client_stream = axutil_stream_create_socket(env, client_socket); if (! client_stream) { - axis2_network_handler_close_socket(env, client_socket); + axutil_network_handler_close_socket(env, client_socket); AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error in creating client stream" "handling response"); /** call the callback */ @@ -470,12 +470,12 @@ - host_socket = axis2_network_handler_open_socket(env, target_host, target_port); + host_socket = axutil_network_handler_open_socket(env, target_host, target_port); if (-1 == host_socket) { AXIS2_STREAM_WRITE(client_stream, env, NULL, 0); AXIS2_STREAM_FREE(client_stream, env); - axis2_network_handler_close_socket(env, client_socket); + axutil_network_handler_close_socket(env, client_socket); AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error in creating host_socket" "creating socket"); /** call the callback */ @@ -487,13 +487,13 @@ return NULL; } - host_stream = axis2_stream_create_socket(env, host_socket); + host_stream = axutil_stream_create_socket(env, host_socket); if (! host_stream) { AXIS2_STREAM_WRITE(client_stream, env, NULL, 0); AXIS2_STREAM_FREE(client_stream, env); - axis2_network_handler_close_socket(env, client_socket); - axis2_network_handler_close_socket(env, host_socket); + axutil_network_handler_close_socket(env, client_socket); + axutil_network_handler_close_socket(env, host_socket); AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error in creating host stream" "handling response"); /** call the callback */ @@ -557,15 +557,15 @@ AXIS2_STREAM_FREE(client_stream, env); AXIS2_STREAM_FREE(host_stream, env); - axis2_network_handler_close_socket(env, client_socket); - axis2_network_handler_close_socket(env, host_socket); + axutil_network_handler_close_socket(env, client_socket); + axutil_network_handler_close_socket(env, host_socket); return NULL; } axis2_char_t* -read_current_stream(axis2_stream_t *stream, +read_current_stream(axutil_stream_t *stream, const axutil_env_t *env, int *stream_size, axis2_char_t **header, Modified: webservices/axis2/trunk/c/tools/tcpmon/src/session.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original) +++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Fri Mar 30 12:24:00 2007 @@ -16,12 +16,12 @@ */ #include -#include +#include #include #include #include #include -#include +#include #include #include "tcpmon_session_local.h" @@ -468,7 +468,7 @@ session_impl = thread_data -> session_impl; env = thread_data -> env; - listen_socket = axis2_network_handler_create_server_socket + listen_socket = axutil_network_handler_create_server_socket (env, session_impl->listen_port); if (-1 == listen_socket) { @@ -486,7 +486,7 @@ } while (session_impl-> is_running) { - socket = axis2_network_handler_svr_socket_accept(env, + socket = axutil_network_handler_svr_socket_accept(env, listen_socket); if (socket == -1) { @@ -523,7 +523,7 @@ AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, request_thread); } - axis2_network_handler_close_socket(env, listen_socket); + axutil_network_handler_close_socket(env, listen_socket); return NULL; } Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c (original) +++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c Fri Mar 30 12:24:00 2007 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define SIZE 1024 Modified: webservices/axis2/trunk/c/tools/tcpmon/src/util.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/util.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/src/util.c (original) +++ webservices/axis2/trunk/c/tools/tcpmon/src/util.c Fri Mar 30 12:24:00 2007 @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c (original) +++ webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c Fri Mar 30 12:24:00 2007 @@ -19,7 +19,7 @@ #include #include "tcpmon_test.h" #include -#include +#include #include Modified: webservices/axis2/trunk/c/util/include/axis2_uri.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_uri.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_uri.h (original) +++ webservices/axis2/trunk/c/util/include/axis2_uri.h Fri Mar 30 12:24:00 2007 @@ -24,7 +24,7 @@ * axis2_uri.h: External Interface of axis2_uri.c */ -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/util/include/axutil_class_loader.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_class_loader.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axutil_class_loader.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_class_loader.h Fri Mar 30 12:24:00 2007 @@ -24,11 +24,11 @@ */ #include -#include +#include #include #include #include -#include +#include #ifdef __cplusplus extern "C" @@ -49,7 +49,7 @@ AXIS2_EXTERN void * AXIS2_CALL axutil_class_loader_create_dll (const axutil_env_t *env, - axis2_param_t *impl_info_param); + axutil_param_t *impl_info_param); /** @} */ Modified: webservices/axis2/trunk/c/util/include/axutil_dir_handler.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dir_handler.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axutil_dir_handler.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_dir_handler.h Fri Mar 30 12:24:00 2007 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include Modified: webservices/axis2/trunk/c/util/include/axutil_dll_desc.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dll_desc.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axutil_dll_desc.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_dll_desc.h Fri Mar 30 12:24:00 2007 @@ -24,7 +24,7 @@ */ #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/util/include/axutil_file_handler.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_file_handler.h?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axutil_file_handler.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_file_handler.h Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #ifndef AXUTIL_FILE_HANDLER_H #define AXUTIL_FILE_HANDLER_H -#include +#include #ifdef __cplusplus extern "C" Copied: webservices/axis2/trunk/c/util/include/axutil_network_handler.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_network_handler.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_network_handler.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_network_handler.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_network_handler.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_network_handler.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_network_handler.h Fri Mar 30 12:24:00 2007 @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef AXIS2_NETWORK_HANDLER_H -#define AXIS2_NETWORK_HANDLER_H +#ifndef AXUTIL_NETWORK_HANDLER_H +#define AXUTIL_NETWORK_HANDLER_H #include #include @@ -32,7 +32,7 @@ /** - * @defgroup axis2_network_handler network handler + * @defgroup axutil_network_handler network handler * @ingroup axis2_util * @{ */ @@ -44,7 +44,7 @@ * @return opened socket */ AXIS2_EXTERN axis2_socket_t AXIS2_CALL - axis2_network_handler_open_socket(const axutil_env_t *env, + axutil_network_handler_open_socket(const axutil_env_t *env, char *server, int port); @@ -54,7 +54,7 @@ * @return creates server socket */ AXIS2_EXTERN axis2_socket_t AXIS2_CALL - axis2_network_handler_create_server_socket(const axutil_env_t *env, + axutil_network_handler_create_server_socket(const axutil_env_t *env, int port); /** @@ -63,7 +63,7 @@ * @return status code */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_network_handler_close_socket(const axutil_env_t *env, + axutil_network_handler_close_socket(const axutil_env_t *env, axis2_socket_t socket); /** @@ -74,7 +74,7 @@ * @return status of the operations as axis2_status_t */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_network_handler_set_sock_option(const axutil_env_t *env, + axutil_network_handler_set_sock_option(const axutil_env_t *env, axis2_socket_t socket, int option, int value); @@ -84,7 +84,7 @@ * @return created socket to handle the incoming client connection */ AXIS2_EXTERN axis2_socket_t AXIS2_CALL - axis2_network_handler_svr_socket_accept(const axutil_env_t *env, + axutil_network_handler_svr_socket_accept(const axutil_env_t *env, axis2_socket_t socket); /** @@ -93,11 +93,11 @@ * @return ip address asoociated with the socket or NULL */ AXIS2_EXTERN axis2_char_t * AXIS2_CALL - axis2_network_handler_get_svr_ip(const axutil_env_t *env, + axutil_network_handler_get_svr_ip(const axutil_env_t *env, axis2_socket_t socket); AXIS2_EXTERN axis2_char_t * AXIS2_CALL - axis2_network_handler_get_peer_ip(const axutil_env_t *env, + axutil_network_handler_get_peer_ip(const axutil_env_t *env, axis2_socket_t socket); /** @} */ Copied: webservices/axis2/trunk/c/util/include/axutil_param.h (from r524225, webservices/axis2/trunk/c/util/include/axis2_param.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_param.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_param.h&r1=524225&p2=webservices/axis2/trunk/c/util/include/axutil_param.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_param.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_param.h Fri Mar 30 12:24:00 2007 @@ -15,11 +15,11 @@ * limitations under the License. */ -#ifndef AXIS2_PARAM_H -#define AXIS2_PARAM_H +#ifndef AXUTIL_PARAM_H +#define AXUTIL_PARAM_H /** - * @file axis2_param.h + * @file axutil_param.h * @brief Axis2 param interface */ @@ -35,7 +35,7 @@ /** - * @defgroup axis2_param parameter + * @defgroup axutil_param parameter * @ingroup axis2_util * @{ */ @@ -50,13 +50,13 @@ */ static const int AXIS2_DOM_PARAM = 1; - typedef struct axis2_param axis2_param_t; + typedef struct axutil_param axutil_param_t; /** * creates param struct */ - AXIS2_EXTERN axis2_param_t* AXIS2_CALL - axis2_param_create(const axutil_env_t *env, + AXIS2_EXTERN axutil_param_t* AXIS2_CALL + axutil_param_create(const axutil_env_t *env, axis2_char_t *name, void *value); @@ -65,7 +65,7 @@ * @return name of the param */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_param_get_name(struct axis2_param *param, + axutil_param_get_name(struct axutil_param *param, const axutil_env_t *env); /** @@ -73,7 +73,7 @@ * @return Object */ AXIS2_EXTERN void* AXIS2_CALL - axis2_param_get_value(struct axis2_param *param, + axutil_param_get_value(struct axutil_param *param, const axutil_env_t *env); /** @@ -81,7 +81,7 @@ * @param name */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_name(struct axis2_param *param, + axutil_param_set_name(struct axutil_param *param, const axutil_env_t *env, const axis2_char_t *name); @@ -91,7 +91,7 @@ * @param value */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_value(struct axis2_param *param, + axutil_param_set_value(struct axutil_param *param, const axutil_env_t *env, const void *value); @@ -101,7 +101,7 @@ * @return boolean */ AXIS2_EXTERN axis2_bool_t AXIS2_CALL - axis2_param_is_locked(struct axis2_param *param, + axutil_param_is_locked(struct axutil_param *param, const axutil_env_t *env); /** @@ -110,7 +110,7 @@ * @param value */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_locked(struct axis2_param *param, + axutil_param_set_locked(struct axutil_param *param, const axutil_env_t *env, axis2_bool_t value); @@ -120,42 +120,42 @@ * @return int */ AXIS2_EXTERN int AXIS2_CALL - axis2_param_get_param_type(struct axis2_param *param, + axutil_param_get_param_type(struct axutil_param *param, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_param_type(struct axis2_param *param, + axutil_param_set_param_type(struct axutil_param *param, const axutil_env_t *env, int type); AXIS2_EXTERN void AXIS2_CALL - axis2_param_free(struct axis2_param *param, + axutil_param_free(struct axutil_param *param, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_attributes(struct axis2_param *param, + axutil_param_set_attributes(struct axutil_param *param, const axutil_env_t *env, axutil_hash_t *attrs); AXIS2_EXTERN axutil_hash_t* AXIS2_CALL - axis2_param_get_attributes(struct axis2_param *param, + axutil_param_get_attributes(struct axutil_param *param, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_value_list(struct axis2_param *param, + axutil_param_set_value_list(struct axutil_param *param, const axutil_env_t *env, axutil_array_list_t *value_list); AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL - axis2_param_get_value_list(struct axis2_param *param, + axutil_param_get_value_list(struct axutil_param *param, const axutil_env_t *env); AXIS2_EXTERN void AXIS2_CALL - axis2_param_value_free(void *param_value, + axutil_param_value_free(void *param_value, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_set_value_free(struct axis2_param *param, + axutil_param_set_value_free(struct axutil_param *param, const axutil_env_t *env, void *free_fn); Copied: webservices/axis2/trunk/c/util/include/axutil_param_container.h (from r524225, webservices/axis2/trunk/c/util/include/axis2_param_container.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_param_container.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_param_container.h&r1=524225&p2=webservices/axis2/trunk/c/util/include/axutil_param_container.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_param_container.h Fri Mar 30 12:24:00 2007 @@ -15,16 +15,16 @@ * limitations under the License. */ -#ifndef AXIS2_PARAM_CONTAINER_H -#define AXIS2_PARAM_CONTAINER_H +#ifndef AXUTIL_PARAM_CONTAINER_H +#define AXUTIL_PARAM_CONTAINER_H -/** @defgroup axis2_param_container Parameter Container +/** @defgroup axutil_param_container Parameter Container * @ingroup axis2_descript * @{ */ /** - * @file axis2_param_container.h + * @file axutil_param_container.h * @brief Axis2 Param container interface */ @@ -33,13 +33,13 @@ #include #include #include -#include +#include #include #include /*#include */ -#include -#include +#include +#include #ifdef __cplusplus extern "C" @@ -55,14 +55,14 @@ AXIS2_PARAM_VALUE_FREE)(void *param, const axutil_env_t *env); - typedef struct axis2_param_container axis2_param_container_t; + typedef struct axutil_param_container axutil_param_container_t; /** * Creates param container struct * @return pointer to newly created param container */ - AXIS2_EXTERN axis2_param_container_t * AXIS2_CALL - axis2_param_container_create(const axutil_env_t *env); + AXIS2_EXTERN axutil_param_container_t * AXIS2_CALL + axutil_param_container_create(const axutil_env_t *env); /** * Free param_container passed as void pointer. This will be @@ -70,14 +70,14 @@ * into the param_container structure's free method */ AXIS2_EXTERN void AXIS2_CALL - axis2_param_container_free_void_arg(void *param_container, + axutil_param_container_free_void_arg(void *param_container, const axutil_env_t *env); /** De-allocate memory * @return status code */ AXIS2_EXTERN void AXIS2_CALL - axis2_param_container_free(axis2_param_container_t *param_container, + axutil_param_container_free(axutil_param_container_t *param_container, const axutil_env_t *env); /** Add a param @@ -85,16 +85,16 @@ * @return status code */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_param_container_add_param(axis2_param_container_t *param_container, + axutil_param_container_add_param(axutil_param_container_t *param_container, const axutil_env_t *env, - axis2_param_t *param); + axutil_param_t *param); /** To get a param in a given description * @param name param name * @return param */ - AXIS2_EXTERN axis2_param_t * AXIS2_CALL - axis2_param_container_get_param(axis2_param_container_t *param_container, + AXIS2_EXTERN axutil_param_t * AXIS2_CALL + axutil_param_container_get_param(axutil_param_container_t *param_container, const axutil_env_t *env, const axis2_char_t *name); @@ -103,7 +103,7 @@ * @return all the params contained */ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL - axis2_param_container_get_params(axis2_param_container_t *param_container, + axutil_param_container_get_params(axutil_param_container_t *param_container, const axutil_env_t *env); /** To check whether the paramter is locked at any level @@ -111,7 +111,7 @@ * @return whether param is locked */ AXIS2_EXTERN axis2_bool_t AXIS2_CALL - axis2_param_container_is_param_locked(axis2_param_container_t *param_container, + axutil_param_container_is_param_locked(axutil_param_container_t *param_container, const axutil_env_t *env, const axis2_char_t *param_name) ; Copied: webservices/axis2/trunk/c/util/include/axutil_properties.h (from r524225, webservices/axis2/trunk/c/util/include/axis2_properties.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_properties.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_properties.h&r1=524225&p2=webservices/axis2/trunk/c/util/include/axutil_properties.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_properties.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_properties.h Fri Mar 30 12:24:00 2007 @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef AXIS2_PROPERTIES_H -#define AXIS2_PROPERTIES_H +#ifndef AXUTIL_PROPERTIES_H +#define AXUTIL_PROPERTIES_H #include #include @@ -30,19 +30,19 @@ #endif /** - * @defgroup axis2_properties properties + * @defgroup axutil_properties properties * @ingroup axis2_util * @{ */ - typedef struct axis2_properties axis2_properties_t; + typedef struct axutil_properties axutil_properties_t; /** * create new properties * @return properties newly created properties */ - AXIS2_EXTERN axis2_properties_t * AXIS2_CALL - axis2_properties_create(const axutil_env_t *env); + AXIS2_EXTERN axutil_properties_t * AXIS2_CALL + axutil_properties_create(const axutil_env_t *env); /** * free w2c_properties. @@ -52,7 +52,7 @@ * else AXIS2_FAILURE */ AXIS2_EXTERN void AXIS2_CALL - axis2_properties_free(axis2_properties_t *properties, + axutil_properties_free(axutil_properties_t *properties, const axutil_env_t *env); /** @@ -63,7 +63,7 @@ * @return value of the property */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_properties_get_property(axis2_properties_t *properties, + axutil_properties_get_property(axutil_properties_t *properties, const axutil_env_t *env, axis2_char_t *key); /** @@ -76,7 +76,7 @@ * else AXIS2_FAILURE */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_properties_set_property(axis2_properties_t *properties, + axutil_properties_set_property(axutil_properties_t *properties, const axutil_env_t *env, axis2_char_t *key, axis2_char_t *value); @@ -87,7 +87,7 @@ * @return hash (key,value) */ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL - axis2_properties_get_all(axis2_properties_t *properties, + axutil_properties_get_all(axutil_properties_t *properties, const axutil_env_t *env); /** @@ -99,7 +99,7 @@ * else AXIS2_FAILURE */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_properties_load(axis2_properties_t *properties, + axutil_properties_load(axutil_properties_t *properties, const axutil_env_t *env, axis2_char_t *input_filename); @@ -112,7 +112,7 @@ * else AXIS2_FAILURE */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_properties_store(axis2_properties_t *properites, + axutil_properties_store(axutil_properties_t *properites, const axutil_env_t *env, FILE *output); Copied: webservices/axis2/trunk/c/util/include/axutil_property.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_property.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_property.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_property.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_property.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_property.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_property.h Fri Mar 30 12:24:00 2007 @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef AXIS2_PROPERTY_H -#define AXIS2_PROPERTY_H +#ifndef AXUTIL_PROPERTY_H +#define AXUTIL_PROPERTY_H #include #include @@ -30,19 +30,19 @@ #endif /** - * @defgroup axis2_property property + * @defgroup axutil_property property * @ingroup axis2_util * @{ */ - typedef struct axis2_property axis2_property_t; + typedef struct axutil_property axutil_property_t; /** * create new property * @return property newly created property */ - AXIS2_EXTERN axis2_property_t * AXIS2_CALL - axis2_property_create( + AXIS2_EXTERN axutil_property_t * AXIS2_CALL + axutil_property_create( const axutil_env_t *env); /** @@ -58,8 +58,8 @@ * @param value value of the property * @return property newly created property */ - AXIS2_EXTERN axis2_property_t * AXIS2_CALL - axis2_property_create_with_args( + AXIS2_EXTERN axutil_property_t * AXIS2_CALL + axutil_property_create_with_args( const axutil_env_t *env, axis2_scope_t scope, axis2_bool_t own_value, @@ -67,40 +67,40 @@ void *value); AXIS2_EXTERN void AXIS2_CALL - axis2_property_free(axis2_property_t *property, + axutil_property_free(axutil_property_t *property, const axutil_env_t *env); /** * Default scope is AXIS2_SCOPE_REQUEST */ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_property_set_scope(axis2_property_t *property, + axutil_property_set_scope(axutil_property_t *property, const axutil_env_t *env, axis2_scope_t scope); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_property_set_free_func(axis2_property_t *property, + axutil_property_set_free_func(axutil_property_t *property, const axutil_env_t *env, AXIS2_FREE_VOID_ARG free_func); /*************************** Function macros **********************************/ AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_property_set_value(axis2_property_t *property, + axutil_property_set_value(axutil_property_t *property, const axutil_env_t *env, void *value); AXIS2_EXTERN void * AXIS2_CALL - axis2_property_get_value(axis2_property_t *property, + axutil_property_get_value(axutil_property_t *property, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_property_set_own_value( - axis2_property_t *property, + axutil_property_set_own_value( + axutil_property_t *property, const axutil_env_t *env, axis2_bool_t own_value); - AXIS2_EXTERN axis2_property_t* AXIS2_CALL - axis2_property_clone(axis2_property_t *property, + AXIS2_EXTERN axutil_property_t* AXIS2_CALL + axutil_property_clone(axutil_property_t *property, const axutil_env_t *env); Copied: webservices/axis2/trunk/c/util/include/axutil_qname.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_qname.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_qname.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_qname.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_qname.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_qname.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_qname.h Fri Mar 30 12:24:00 2007 @@ -15,18 +15,18 @@ * limitations under the License. */ -#ifndef AXIS2_QNAME_H -#define AXIS2_QNAME_H +#ifndef AXUTIL_QNAME_H +#define AXUTIL_QNAME_H /** - * @file axis2_qname.h + * @file axutil_qname.h * @brief represents a qualified name */ #include #include -#include +#include #ifdef __cplusplus extern "C" @@ -34,12 +34,12 @@ #endif /** - * @defgroup axis2_qname qname + * @defgroup axutil_qname qname * @ingroup axis2_util * @{ */ - typedef struct axis2_qname axis2_qname_t; + typedef struct axutil_qname axutil_qname_t; /** * creates a qname struct @@ -54,8 +54,8 @@ * @return a pointer to newly created qname struct */ - AXIS2_EXTERN axis2_qname_t * AXIS2_CALL - axis2_qname_create(const axutil_env_t *env, + AXIS2_EXTERN axutil_qname_t * AXIS2_CALL + axutil_qname_create(const axutil_env_t *env, const axis2_char_t * localpart, const axis2_char_t * namespace_uri, const axis2_char_t * prefix); @@ -63,12 +63,12 @@ /** * returns a newly created qname using a string genarated from - * axis2_qname_to_string method + * axutil_qname_to_string method * freeing the returned qname is users responsibility */ - AXIS2_EXTERN axis2_qname_t* AXIS2_CALL - axis2_qname_create_from_string(const axutil_env_t *env, + AXIS2_EXTERN axutil_qname_t* AXIS2_CALL + axutil_qname_create_from_string(const axutil_env_t *env, const axis2_char_t *string); /** @@ -76,7 +76,7 @@ * @return Status code */ AXIS2_EXTERN void AXIS2_CALL - axis2_qname_free(struct axis2_qname * qname, + axutil_qname_free(struct axutil_qname * qname, const axutil_env_t *env); /** @@ -87,9 +87,9 @@ */ AXIS2_EXTERN axis2_bool_t AXIS2_CALL - axis2_qname_equals(const struct axis2_qname * qname, + axutil_qname_equals(const struct axutil_qname * qname, const axutil_env_t *env, - const struct axis2_qname * qname1); + const struct axutil_qname * qname1); /** * clones a given qname * @param qname , qname struct instance to be cloned @@ -97,20 +97,20 @@ * @returns the newly cloned qname struct instance */ - AXIS2_EXTERN struct axis2_qname* AXIS2_CALL - axis2_qname_clone(struct axis2_qname *qname, + AXIS2_EXTERN struct axutil_qname* AXIS2_CALL + axutil_qname_clone(struct axutil_qname *qname, const axutil_env_t *env); AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_qname_get_uri(const struct axis2_qname *qname, + axutil_qname_get_uri(const struct axutil_qname *qname, const axutil_env_t *env); AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_qname_get_prefix(const struct axis2_qname *qname, + axutil_qname_get_prefix(const struct axutil_qname *qname, const axutil_env_t *env); AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_qname_get_localpart(const struct axis2_qname *qname, + axutil_qname_get_localpart(const struct axutil_qname *qname, const axutil_env_t *env); /** @@ -120,7 +120,7 @@ * The returned char* is freed when qname free function is called. */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_qname_to_string(struct axis2_qname *qname, + axutil_qname_to_string(struct axutil_qname *qname, const axutil_env_t *env); /** @} */ Copied: webservices/axis2/trunk/c/util/include/axutil_rand.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_rand.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_rand.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_rand.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_rand.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_rand.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_rand.h Fri Mar 30 12:24:00 2007 @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef AXIS2_RAND_H -#define AXIS2_RAND_H +#ifndef AXUTIL_RAND_H +#define AXUTIL_RAND_H #include #include @@ -28,13 +28,13 @@ #endif /** - * @defgroup axis2_rand rand + * @defgroup axutil_rand rand * @ingroup axis2_util * @{ */ /** - * @file axis2_rand.h + * @file axutil_rand.h * @brief A simple thread safe and reentrant random number generator */ @@ -46,7 +46,7 @@ * @return int int */ AXIS2_EXTERN int AXIS2_CALL -axis2_rand(unsigned int *seedp); +axutil_rand(unsigned int *seedp); /** * This is reentrant and thread safe simple random number generator @@ -59,7 +59,7 @@ * @return int If invalid range is entered -1 is returned int */ AXIS2_EXTERN int AXIS2_CALL -axis2_rand_with_range(unsigned int *seedp, +axutil_rand_with_range(unsigned int *seedp, int start, int end); @@ -67,7 +67,7 @@ * A random seed value generated based on the time */ AXIS2_EXTERN unsigned int AXIS2_CALL -axis2_rand_get_seed_value_based_on_time( +axutil_rand_get_seed_value_based_on_time( const axutil_env_t *env); /** @} */ Copied: webservices/axis2/trunk/c/util/include/axutil_stack.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_stack.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_stack.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_stack.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_stack.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_stack.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_stack.h Fri Mar 30 12:24:00 2007 @@ -15,12 +15,12 @@ * limitations under the License. */ -#ifndef AXIS2_STACK_H -#define AXIS2_STACK_H +#ifndef AXUTIL_STACK_H +#define AXUTIL_STACK_H /** -* @file axis2_stack.h +* @file axutil_stack.h * @brief represents a stack */ @@ -38,10 +38,10 @@ * @{ */ - typedef struct axis2_stack axis2_stack_t; + typedef struct axutil_stack axutil_stack_t; - AXIS2_EXTERN axis2_stack_t * AXIS2_CALL - axis2_stack_create(const axutil_env_t *env); + AXIS2_EXTERN axutil_stack_t * AXIS2_CALL + axutil_stack_create(const axutil_env_t *env); /** * Free function of the stack @@ -49,31 +49,31 @@ * @param env environemnt */ AXIS2_EXTERN void AXIS2_CALL - axis2_stack_free(axis2_stack_t *stack, + axutil_stack_free(axutil_stack_t *stack, const axutil_env_t *env); AXIS2_EXTERN void* AXIS2_CALL - axis2_stack_pop(axis2_stack_t *stack, + axutil_stack_pop(axutil_stack_t *stack, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stack_push(axis2_stack_t *stack, + axutil_stack_push(axutil_stack_t *stack, const axutil_env_t *env, void* value); AXIS2_EXTERN int AXIS2_CALL - axis2_stack_size(axis2_stack_t *stack, + axutil_stack_size(axutil_stack_t *stack, const axutil_env_t *env); /** * returns the last put value from the stack * without removing it from stack */ AXIS2_EXTERN void* AXIS2_CALL - axis2_stack_get(axis2_stack_t *stack, + axutil_stack_get(axutil_stack_t *stack, const axutil_env_t *env); AXIS2_EXTERN void* AXIS2_CALL - axis2_stack_get_at(axis2_stack_t *stack, + axutil_stack_get_at(axutil_stack_t *stack, const axutil_env_t *env, int i); Copied: webservices/axis2/trunk/c/util/include/axutil_stream.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_stream.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_stream.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_stream.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_stream.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_stream.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_stream.h Fri Mar 30 12:24:00 2007 @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef AXIS2_STREAM_H -#define AXIS2_STREAM_H +#ifndef AXUTIL_STREAM_H +#define AXUTIL_STREAM_H #include #include @@ -30,7 +30,7 @@ #define AXIS2_STREAM_DEFAULT_BUF_SIZE 2048 /** - * @defgroup axis2_stream stream + * @defgroup axutil_stream stream * @ingroup axis2_util * @{ */ @@ -41,7 +41,7 @@ * This is used to create a stream to correspond to * particular i/o mtd */ - enum axis2_stream_type + enum axutil_stream_type { AXIS2_STREAM_BASIC = 0, AXIS2_STREAM_FILE, @@ -49,12 +49,12 @@ AXIS2_STREAM_MANAGED /* Example Wrapper stream for Apache2 read mechanism */ }; - typedef enum axis2_stream_type axis2_stream_type_t; - typedef struct axis2_stream axis2_stream_t; + typedef enum axutil_stream_type axutil_stream_type_t; + typedef struct axutil_stream axutil_stream_t; - struct axis2_stream + struct axutil_stream { - axis2_stream_type_t stream_type; + axutil_stream_type_t stream_type; int len; int max_len; /* Only one of these is used for a perticlar @@ -74,7 +74,7 @@ * @return no: of bytes read */ int(AXIS2_CALL * - read)(axis2_stream_t *stream, + read)(axutil_stream_t *stream, const axutil_env_t *env, void *buffer, size_t count); @@ -86,7 +86,7 @@ * @return no: of bytes actually written */ int(AXIS2_CALL * - write)(axis2_stream_t *stream, + write)(axutil_stream_t *stream, const axutil_env_t *env, const void *buffer, size_t count); @@ -97,7 +97,7 @@ * @return no: of bytes actually skipped */ int(AXIS2_CALL * - skip)(axis2_stream_t *stream, + skip)(axutil_stream_t *stream, const axutil_env_t *env, int count); }; @@ -107,11 +107,11 @@ * @return axis2_status_t AXIS2_SUCCESS on success else AXIS2_FAILURE */ AXIS2_EXTERN void AXIS2_CALL - axis2_stream_free(axis2_stream_t *stream, + axutil_stream_free(axutil_stream_t *stream, const axutil_env_t *env); AXIS2_EXTERN void AXIS2_CALL - axis2_stream_free_void_arg(void *stream, + axutil_stream_free_void_arg(void *stream, const axutil_env_t *env); /** @@ -121,7 +121,7 @@ * @return no: of bytes read */ AXIS2_EXTERN int AXIS2_CALL - axis2_stream_read(axis2_stream_t *stream, + axutil_stream_read(axutil_stream_t *stream, const axutil_env_t *env, void *buffer, size_t count); @@ -133,7 +133,7 @@ * @return no: of bytes actually written */ AXIS2_EXTERN int AXIS2_CALL - axis2_stream_write(axis2_stream_t *stream, + axutil_stream_write(axutil_stream_t *stream, const axutil_env_t *env, const void *buffer, size_t count); @@ -144,7 +144,7 @@ * @return no: of bytes actually skipped */ AXIS2_EXTERN int AXIS2_CALL - axis2_stream_skip(axis2_stream_t *stream, + axutil_stream_skip(axutil_stream_t *stream, const axutil_env_t *env, int count); @@ -154,34 +154,34 @@ * (we can't define a length of a stream unless it is just a buffer) */ AXIS2_EXTERN int AXIS2_CALL - axis2_stream_get_len(axis2_stream_t *stream, + axutil_stream_get_len(axutil_stream_t *stream, const axutil_env_t *env); /** \brief Constructor for creating an in memory stream - * @return axis2_stream (in memory) + * @return axutil_stream (in memory) */ - AXIS2_EXTERN axis2_stream_t * AXIS2_CALL - axis2_stream_create_basic(const axutil_env_t *env); + AXIS2_EXTERN axutil_stream_t * AXIS2_CALL + axutil_stream_create_basic(const axutil_env_t *env); /** \brief Constructor for creating a file stream * @param valid file pointer (opened file) - * @return axis2_stream (file) + * @return axutil_stream (file) */ - AXIS2_EXTERN axis2_stream_t * AXIS2_CALL - axis2_stream_create_file(const axutil_env_t *env, FILE *fp); + AXIS2_EXTERN axutil_stream_t * AXIS2_CALL + axutil_stream_create_file(const axutil_env_t *env, FILE *fp); /** \brief Constructor for creating a file stream * @param valid socket (opened socket) - * @return axis2_stream (socket) + * @return axutil_stream (socket) */ - AXIS2_EXTERN axis2_stream_t * AXIS2_CALL - axis2_stream_create_socket(const axutil_env_t *env, int socket); + AXIS2_EXTERN axutil_stream_t * AXIS2_CALL + axutil_stream_create_socket(const axutil_env_t *env, int socket); /** *Free stream */ AXIS2_EXTERN void AXIS2_CALL - axis2_stream_free(axis2_stream_t *stream, const axutil_env_t *env); + axutil_stream_free(axutil_stream_t *stream, const axutil_env_t *env); /** * Free stream passed as void pointer. This will be @@ -190,64 +190,64 @@ */ AXIS2_EXTERN void AXIS2_CALL - axis2_stream_free_void_arg(void *stream, + axutil_stream_free_void_arg(void *stream, const axutil_env_t *env); /** * Gets the buffer */ AXIS2_EXTERN axis2_char_t * AXIS2_CALL - axis2_stream_get_buffer(const axis2_stream_t *stream, + axutil_stream_get_buffer(const axutil_stream_t *stream, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stream_flush_buffer(axis2_stream_t *stream, + axutil_stream_flush_buffer(axutil_stream_t *stream, const axutil_env_t *env); AXIS2_EXTERN int AXIS2_CALL - axis2_stream_peek_socket(axis2_stream_t *stream, const axutil_env_t *env, + axutil_stream_peek_socket(axutil_stream_t *stream, const axutil_env_t *env, void *buffer, size_t count); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stream_flush(axis2_stream_t *stream, + axutil_stream_flush(axutil_stream_t *stream, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stream_close(axis2_stream_t *stream, + axutil_stream_close(axutil_stream_t *stream, const axutil_env_t *env); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stream_set_read(axis2_stream_t *stream, + axutil_stream_set_read(axutil_stream_t *stream, const axutil_env_t *env, void *func); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stream_set_write(axis2_stream_t *stream, + axutil_stream_set_write(axutil_stream_t *stream, const axutil_env_t *env, void *func); AXIS2_EXTERN axis2_status_t AXIS2_CALL - axis2_stream_set_skip(axis2_stream_t *stream, + axutil_stream_set_skip(axutil_stream_t *stream, const axutil_env_t *env, void *func); -#define AXIS2_STREAM_FREE(stream, env) axis2_stream_free(stream, env) +#define AXIS2_STREAM_FREE(stream, env) axutil_stream_free(stream, env) #define AXIS2_STREAM_FREE_VOID_ARG(stream, env) \ - axis2_stream_free_void_arg(stream, env) + axutil_stream_free_void_arg(stream, env) #define AXIS2_STREAM_READ(stream, env, buffer, count) \ - axis2_stream_read(stream, env, buffer, count) + axutil_stream_read(stream, env, buffer, count) #define AXIS2_STREAM_WRITE(stream, env, buffer, count) \ - axis2_stream_write(stream, env, buffer, count) + axutil_stream_write(stream, env, buffer, count) #define AXIS2_STREAM_SKIP(stream, env, count) \ - axis2_stream_write(stream, env, count) + axutil_stream_write(stream, env, count) #define AXIS2_STREAM_BASIC_GET_LEN(stream, env) \ - axis2_stream_get_len(stream, env) + axutil_stream_get_len(stream, env) /** @} */ Copied: webservices/axis2/trunk/c/util/include/axutil_string.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_string.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_string.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_string.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_string.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_string.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_string.h Fri Mar 30 12:24:00 2007 @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef AXIS2_STRING_H -#define AXIS2_STRING_H +#ifndef AXUTIL_STRING_H +#define AXUTIL_STRING_H #include #include @@ -29,12 +29,12 @@ #endif /** - * @defgroup axis2_string string + * @defgroup axutil_string string * @ingroup axis2_util * @{ */ - typedef struct axis2_string axis2_string_t; + typedef struct axutil_string axutil_string_t; /** * Creates a string struct. @@ -43,8 +43,8 @@ * @param env pointer to environment struct * @return a pointer to newly created string struct */ - AXIS2_EXTERN axis2_string_t * AXIS2_CALL - axis2_string_create(const axutil_env_t *env, + AXIS2_EXTERN axutil_string_t * AXIS2_CALL + axutil_string_create(const axutil_env_t *env, const axis2_char_t *str); /** @@ -54,8 +54,8 @@ * @param env pointer to environment struct * @return a pointer to newly created string struct */ - AXIS2_EXTERN axis2_string_t * AXIS2_CALL - axis2_string_create_assume_ownership(const axutil_env_t *env, + AXIS2_EXTERN axutil_string_t * AXIS2_CALL + axutil_string_create_assume_ownership(const axutil_env_t *env, axis2_char_t **str); /** @@ -65,8 +65,8 @@ * @param env pointer to environment struct * @return a pointer to newly created string struct */ - AXIS2_EXTERN axis2_string_t* AXIS2_CALL - axis2_string_create_const(const axutil_env_t *env, + AXIS2_EXTERN axutil_string_t* AXIS2_CALL + axutil_string_create_const(const axutil_env_t *env, axis2_char_t **str); /** @@ -76,7 +76,7 @@ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE */ AXIS2_EXTERN void AXIS2_CALL - axis2_string_free(struct axis2_string *string, + axutil_string_free(struct axutil_string *string, const axutil_env_t *env); /** @@ -88,9 +88,9 @@ * @return AXIS2_TRUE if string equals string1, AXIS2_FALSE otherwise */ AXIS2_EXTERN axis2_bool_t AXIS2_CALL - axis2_string_equals(const struct axis2_string *string, + axutil_string_equals(const struct axutil_string *string, const axutil_env_t *env, - const struct axis2_string *string1); + const struct axutil_string *string1); /** * Clones a given string. Does not duplicate the buffer, rather @@ -100,8 +100,8 @@ * @param env pointer to environment struct * @returns pointer to cloned string struct instance */ - AXIS2_EXTERN struct axis2_string *AXIS2_CALL - axis2_string_clone(struct axis2_string *string, + AXIS2_EXTERN struct axutil_string *AXIS2_CALL + axutil_string_clone(struct axutil_string *string, const axutil_env_t *env); /** @@ -111,7 +111,7 @@ * @returns pointer to string buffer */ AXIS2_EXTERN const axis2_char_t* AXIS2_CALL - axis2_string_get_buffer(const struct axis2_string *string, + axutil_string_get_buffer(const struct axutil_string *string, const axutil_env_t *env); /** @@ -121,13 +121,13 @@ * @returns buffer length */ AXIS2_EXTERN unsigned int AXIS2_CALL - axis2_string_get_length(const struct axis2_string *string, + axutil_string_get_length(const struct axutil_string *string, const axutil_env_t *env); /** @} */ /** - * @defgroup axis2_string_utils string_utils + * @defgroup axutil_string_utils string_utils * @ingroup axis2_util * @{ */ @@ -246,7 +246,7 @@ * @return replaced string */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_string_replace(axis2_char_t *str, + axutil_string_replace(axis2_char_t *str, axis2_char_t old_char, axis2_char_t new_char); @@ -257,7 +257,7 @@ * @return substring */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_string_substring_starting_at(axis2_char_t *str, + axutil_string_substring_starting_at(axis2_char_t *str, int s); /** @@ -267,7 +267,7 @@ * @return substring */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_string_substring_ending_at(axis2_char_t *str, + axutil_string_substring_ending_at(axis2_char_t *str, int e); /** @@ -276,7 +276,7 @@ * @return string with lowercase */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_string_tolower(axis2_char_t *str); + axutil_string_tolower(axis2_char_t *str); /** * set a string to uppercase. @@ -284,7 +284,7 @@ * @return string with uppercase */ AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_string_toupper(axis2_char_t *str); + axutil_string_toupper(axis2_char_t *str); /** * Finds the first occurrence of the substring needle in the string Copied: webservices/axis2/trunk/c/util/include/axutil_string_util.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_string_util.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_string_util.h?view=diff&rev=524243&p1=webservices/axis2/trunk/c/util/include/axis2_string_util.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_string_util.h&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_string_util.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_string_util.h Fri Mar 30 12:24:00 2007 @@ -15,11 +15,11 @@ * limitations under the License. */ -#ifndef AXIS2_STRING_UTIL_H -#define AXIS2_STRING_UTIL_H +#ifndef AXUTIL_STRING_UTIL_H +#define AXUTIL_STRING_UTIL_H #include -#include +#include #ifdef __cplusplus extern "C" { Modified: webservices/axis2/trunk/c/util/src/class_loader.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/class_loader.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/class_loader.c (original) +++ webservices/axis2/trunk/c/util/src/class_loader.c Fri Mar 30 12:24:00 2007 @@ -50,7 +50,7 @@ AXIS2_EXTERN void * AXIS2_CALL axutil_class_loader_create_dll(const axutil_env_t *env, - axis2_param_t *impl_info_param) + axutil_param_t *impl_info_param) { void *obj = NULL; CREATE_FUNCT create_funct = NULL; @@ -60,7 +60,7 @@ axis2_status_t status = AXIS2_FAILURE; axutil_error_codes_t error_code = AXIS2_ERROR_NONE; - dll_desc = axis2_param_get_value(impl_info_param, env); + dll_desc = axutil_param_get_value(impl_info_param, env); if (!dll_desc) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_DLL_CREATE_FAILED, Modified: webservices/axis2/trunk/c/util/src/dir_handler.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/dir_handler.c (original) +++ webservices/axis2/trunk/c/util/src/dir_handler.c Fri Mar 30 12:24:00 2007 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #ifndef S_ISDIR # define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR) #endif Modified: webservices/axis2/trunk/c/util/src/env.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/env.c (original) +++ webservices/axis2/trunk/c/util/src/env.c Fri Mar 30 12:24:00 2007 @@ -20,7 +20,7 @@ #include #include #include -#include +#include AXIS2_EXTERN axutil_env_t * AXIS2_CALL axutil_env_create_all(const axis2_char_t *log_file, Modified: webservices/axis2/trunk/c/util/src/file.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/file.c (original) +++ webservices/axis2/trunk/c/util/src/file.c Fri Mar 30 12:24:00 2007 @@ -16,7 +16,7 @@ */ #include -#include +#include struct axutil_file { Modified: webservices/axis2/trunk/c/util/src/hash.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/hash.c (original) +++ webservices/axis2/trunk/c/util/src/hash.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include "axutil_hash.h" -#include +#include /* * The internal form of a hash table. Modified: webservices/axis2/trunk/c/util/src/minizip/archive_extract.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/archive_extract.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/minizip/archive_extract.c (original) +++ webservices/axis2/trunk/c/util/src/minizip/archive_extract.c Fri Mar 30 12:24:00 2007 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/util/src/network_handler.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/network_handler.c?view=diff&rev=524243&r1=524242&r2=524243 ============================================================================== --- webservices/axis2/trunk/c/util/src/network_handler.c (original) +++ webservices/axis2/trunk/c/util/src/network_handler.c Fri Mar 30 12:24:00 2007 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include @@ -28,7 +28,7 @@ #endif AXIS2_EXTERN axis2_socket_t AXIS2_CALL -axis2_network_handler_open_socket(const axutil_env_t *env, char *server, int port) +axutil_network_handler_open_socket(const axutil_env_t *env, char *server, int port) { axis2_socket_t sock = AXIS2_INVALID_SOCKET; struct sockaddr_in sock_addr; @@ -95,7 +95,7 @@ } AXIS2_EXTERN axis2_socket_t AXIS2_CALL -axis2_network_handler_create_server_socket(const axutil_env_t *env, int port) +axutil_network_handler_create_server_socket(const axutil_env_t *env, int port) { axis2_socket_t sock = AXIS2_INVALID_SOCKET; axis2_socket_t i = 0; @@ -145,7 +145,7 @@ } AXIS2_EXTERN axis2_status_t AXIS2_CALL -axis2_network_handler_close_socket(const axutil_env_t *env, axis2_socket_t socket) +axutil_network_handler_close_socket(const axutil_env_t *env, axis2_socket_t socket) { int i = 0; char buf[32]; @@ -157,14 +157,14 @@ return AXIS2_FAILURE; } shutdown(socket, AXIS2_SHUT_WR); - axis2_network_handler_set_sock_option(env, socket, SO_RCVTIMEO, 1); + axutil_network_handler_set_sock_option(env, socket, SO_RCVTIMEO, 1); i = recv(socket, buf, 32, 0); AXIS2_CLOSE_SOCKET(socket); return AXIS2_SUCCESS; } AXIS2_EXTERN axis2_status_t AXIS2_CALL -axis2_network_handler_set_sock_option(const axutil_env_t *env, axis2_socket_t socket, +axutil_network_handler_set_sock_option(const axutil_env_t *env, axis2_socket_t socket, int option, int value) { if (option == SO_RCVTIMEO || option == SO_SNDTIMEO) @@ -180,7 +180,7 @@ } AXIS2_EXTERN axis2_socket_t AXIS2_CALL -axis2_network_handler_svr_socket_accept(const axutil_env_t *env, +axutil_network_handler_svr_socket_accept(const axutil_env_t *env, axis2_socket_t svr_socket) { struct sockaddr cli_addr; @@ -244,7 +244,7 @@ AXIS2_EXTERN axis2_char_t* AXIS2_CALL -axis2_network_handler_get_svr_ip(const axutil_env_t *env, +axutil_network_handler_get_svr_ip(const axutil_env_t *env, axis2_socket_t socket) { struct sockaddr_in addr; @@ -261,7 +261,7 @@ } AXIS2_EXTERN axis2_char_t* AXIS2_CALL -axis2_network_handler_get_peer_ip(const axutil_env_t *env, +axutil_network_handler_get_peer_ip(const axutil_env_t *env, axis2_socket_t socket) { struct sockaddr_in addr; --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org