axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524255 [1/6] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/util/ guththila/include/ include/ modules/core/clientapi/ modules/core/contex...
Date Fri, 30 Mar 2007 19:54:23 GMT
Author: pini
Date: Fri Mar 30 12:54:08 2007
New Revision: 524255

URL: http://svn.apache.org/viewvc?view=rev&rev=524255
Log:
Fixing jira issue 292

Added:
    webservices/axis2/trunk/c/util/include/axutil_thread.h
      - copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_thread.h
    webservices/axis2/trunk/c/util/include/axutil_thread_pool.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
    webservices/axis2/trunk/c/util/include/axutil_types.h
      - copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_types.h
    webservices/axis2/trunk/c/util/include/axutil_uri.h
      - copied, changed from r524243, webservices/axis2/trunk/c/util/include/axis2_uri.h
    webservices/axis2/trunk/c/util/include/axutil_url.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_url.h
    webservices/axis2/trunk/c/util/include/axutil_utils.h
      - copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_utils.h
    webservices/axis2/trunk/c/util/include/axutil_utils_defines.h
      - copied, changed from r524179, webservices/axis2/trunk/c/util/include/axis2_utils_defines.h
    webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axutil_thread_unix.h
      - copied, changed from r524179, webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h
      - copied, changed from r524179, webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h
Removed:
    webservices/axis2/trunk/c/util/include/axis2_thread.h
    webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
    webservices/axis2/trunk/c/util/include/axis2_types.h
    webservices/axis2/trunk/c/util/include/axis2_uri.h
    webservices/axis2/trunk/c/util/include/axis2_url.h
    webservices/axis2/trunk/c/util/include/axis2_utils.h
    webservices/axis2/trunk/c/util/include/axis2_utils_defines.h
    webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h
Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
    webservices/axis2/trunk/c/axiom/include/axiom_document.h
    webservices/axis2/trunk/c/axiom/include/axiom_element.h
    webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
    webservices/axis2/trunk/c/axiom/include/axiom_namespace.h
    webservices/axis2/trunk/c/axiom/include/axiom_navigator.h
    webservices/axis2/trunk/c/axiom/include/axiom_node.h
    webservices/axis2/trunk/c/axiom/include/axiom_output.h
    webservices/axis2/trunk/c/axiom/include/axiom_util.h
    webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
    webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
    webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
    webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
    webservices/axis2/trunk/c/axiom/src/om/om_output.c
    webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
    webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
    webservices/axis2/trunk/c/axiom/src/util/om_util.c
    webservices/axis2/trunk/c/guththila/include/guththila_reader.h
    webservices/axis2/trunk/c/include/axis2_conf_init.h
    webservices/axis2/trunk/c/include/axis2_const.h
    webservices/axis2/trunk/c/include/axis2_defines.h
    webservices/axis2/trunk/c/include/axis2_handler_desc.h
    webservices/axis2/trunk/c/include/axis2_http_client.h
    webservices/axis2/trunk/c/include/axis2_svc_client.h
    webservices/axis2/trunk/c/include/axis2_thread_mutex.h
    webservices/axis2/trunk/c/include/axis2_util.h
    webservices/axis2/trunk/c/modules/core/clientapi/callback.c
    webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
    webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
    webservices/axis2/trunk/c/modules/core/context/op_ctx.c
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h
    webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.h
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
    webservices/axis2/trunk/c/modules/core/util/core_utils.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h
    webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
    webservices/axis2/trunk/c/savan/include/savan_util.h
    webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c
    webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
    webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
    webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
    webservices/axis2/trunk/c/tools/codegen/include/w2c_class_loader.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_consts.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_validator.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_file_writer.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_consts.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_url_processor.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_template_processor.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h
    webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
    webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
    webservices/axis2/trunk/c/tools/tcpmon/src/session.c
    webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
    webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h
    webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
    webservices/axis2/trunk/c/util/include/axutil_allocator.h
    webservices/axis2/trunk/c/util/include/axutil_array_list.h
    webservices/axis2/trunk/c/util/include/axutil_base64.h
    webservices/axis2/trunk/c/util/include/axutil_base64_binary.h
    webservices/axis2/trunk/c/util/include/axutil_class_loader.h
    webservices/axis2/trunk/c/util/include/axutil_date_time.h
    webservices/axis2/trunk/c/util/include/axutil_date_time_util.h
    webservices/axis2/trunk/c/util/include/axutil_dir_handler.h
    webservices/axis2/trunk/c/util/include/axutil_dll_desc.h
    webservices/axis2/trunk/c/util/include/axutil_env.h
    webservices/axis2/trunk/c/util/include/axutil_error.h
    webservices/axis2/trunk/c/util/include/axutil_error_default.h
    webservices/axis2/trunk/c/util/include/axutil_file.h
    webservices/axis2/trunk/c/util/include/axutil_generic_obj.h
    webservices/axis2/trunk/c/util/include/axutil_hash.h
    webservices/axis2/trunk/c/util/include/axutil_linked_list.h
    webservices/axis2/trunk/c/util/include/axutil_network_handler.h
    webservices/axis2/trunk/c/util/include/axutil_param.h
    webservices/axis2/trunk/c/util/include/axutil_param_container.h
    webservices/axis2/trunk/c/util/include/axutil_properties.h
    webservices/axis2/trunk/c/util/include/axutil_property.h
    webservices/axis2/trunk/c/util/include/axutil_qname.h
    webservices/axis2/trunk/c/util/include/axutil_stack.h
    webservices/axis2/trunk/c/util/include/axutil_stream.h
    webservices/axis2/trunk/c/util/include/axutil_string.h
    webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axutil_date_time_util_windows.h
    webservices/axis2/trunk/c/util/src/allocator.c
    webservices/axis2/trunk/c/util/src/array_list.c
    webservices/axis2/trunk/c/util/src/base64_binary.c
    webservices/axis2/trunk/c/util/src/date_time.c
    webservices/axis2/trunk/c/util/src/env.c
    webservices/axis2/trunk/c/util/src/linked_list.c
    webservices/axis2/trunk/c/util/src/log.c
    webservices/axis2/trunk/c/util/src/param.c
    webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c
    webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
    webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c
    webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
    webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
    webservices/axis2/trunk/c/util/src/properties.c
    webservices/axis2/trunk/c/util/src/qname.c
    webservices/axis2/trunk/c/util/src/stack.c
    webservices/axis2/trunk/c/util/src/string.c
    webservices/axis2/trunk/c/util/src/string_util.c
    webservices/axis2/trunk/c/util/src/thread_pool.c
    webservices/axis2/trunk/c/util/src/types.c
    webservices/axis2/trunk/c/util/src/uri.c
    webservices/axis2/trunk/c/util/src/url.c
    webservices/axis2/trunk/c/util/src/utils.c
    webservices/axis2/trunk/c/util/src/uuid_gen.c
    webservices/axis2/trunk/c/util/test/util/test_thread.c
    webservices/axis2/trunk/c/util/test/util/test_thread.h
    webservices/axis2/trunk/c/util/test/util/test_util.c
    webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h
    webservices/axis2/trunk/c/woden/include/woden_binding.h
    webservices/axis2/trunk/c/woden/include/woden_binding_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
    webservices/axis2/trunk/c/woden/include/woden_component_exts.h
    webservices/axis2/trunk/c/woden/include/woden_configurable_component.h
    webservices/axis2/trunk/c/woden/include/woden_configurable_element.h
    webservices/axis2/trunk/c/woden/include/woden_desc_element.h
    webservices/axis2/trunk/c/woden/include/woden_direction.h
    webservices/axis2/trunk/c/woden/include/woden_documentable_element.h
    webservices/axis2/trunk/c/woden/include/woden_documentation_element.h
    webservices/axis2/trunk/c/woden/include/woden_element_decl.h
    webservices/axis2/trunk/c/woden/include/woden_element_extensible.h
    webservices/axis2/trunk/c/woden/include/woden_endpoint.h
    webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h
    webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_ext_element.h
    webservices/axis2/trunk/c/woden/include/woden_ext_registry.h
    webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_feature.h
    webservices/axis2/trunk/c/woden/include/woden_feature_element.h
    webservices/axis2/trunk/c/woden/include/woden_generic_obj.h
    webservices/axis2/trunk/c/woden/include/woden_import.h
    webservices/axis2/trunk/c/woden/include/woden_import_element.h
    webservices/axis2/trunk/c/woden/include/woden_imported_schema.h
    webservices/axis2/trunk/c/woden/include/woden_include_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_op.h
    webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h
    webservices/axis2/trunk/c/woden/include/woden_msg_label.h
    webservices/axis2/trunk/c/woden/include/woden_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_nc_name.h
    webservices/axis2/trunk/c/woden/include/woden_nested_component.h
    webservices/axis2/trunk/c/woden/include/woden_nested_element.h
    webservices/axis2/trunk/c/woden/include/woden_property.h
    webservices/axis2/trunk/c/woden/include/woden_property_element.h
    webservices/axis2/trunk/c/woden/include/woden_schema.h
    webservices/axis2/trunk/c/woden/include/woden_schema_constants.h
    webservices/axis2/trunk/c/woden/include/woden_soap_binding_exts.h
    webservices/axis2/trunk/c/woden/include/woden_soap_binding_op_exts.h
    webservices/axis2/trunk/c/woden/include/woden_soap_fault_code.h
    webservices/axis2/trunk/c/woden/include/woden_soap_fault_subcodes.h
    webservices/axis2/trunk/c/woden/include/woden_soap_header_block_element.h
    webservices/axis2/trunk/c/woden/include/woden_soap_module.h
    webservices/axis2/trunk/c/woden/include/woden_soap_module_element.h
    webservices/axis2/trunk/c/woden/include/woden_svc_element.h
    webservices/axis2/trunk/c/woden/include/woden_type_def.h
    webservices/axis2/trunk/c/woden/include/woden_types.h
    webservices/axis2/trunk/c/woden/include/woden_types_element.h
    webservices/axis2/trunk/c/woden/include/woden_uri_attr.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_binding_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_binding_op_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_desc_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_endpoint.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_endpoint_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_registry.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_interface_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_interface_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_part_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_address_exts.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_binding_exts.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_binding_op_exts.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_svc_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl_component.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl_obj.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl_ref.h
    webservices/axis2/trunk/c/woden/include/woden_xml_attr.h
    webservices/axis2/trunk/c/woden/include/woden_xml_char.h
    webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
    webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
    webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
    webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
    webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c
    webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c
    webservices/axis2/trunk/c/woden/src/schema/woden_schema.c
    webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c
    webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
    webservices/axis2/trunk/c/woden/src/util/woden_om_util.h
    webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_feature.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_import.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_constants.h
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_constants.h
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c
    webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c
    webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c
    webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_constants.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h
    webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
    webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h Fri Mar 30 12:54:08 2007
@@ -23,9 +23,9 @@
  * @brief axis2 data_handler interface
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axutil_string.h>

Modified: webservices/axis2/trunk/c/axiom/include/axiom_document.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_document.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_document.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_document.h Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
 
 #include <axutil_env.h>
 #include <axiom_node.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axiom_output.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_element.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_element.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_element.h Fri Mar 30 12:54:08 2007
@@ -26,7 +26,7 @@
 #include <axiom_children_qname_iterator.h>
 #include <axiom_child_element_iterator.h>
 #include <axutil_hash.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h Fri Mar 30 12:54:08 2007
@@ -23,9 +23,9 @@
  * @brief axis2 mime_parser interface
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axutil_string.h>

Modified: webservices/axis2/trunk/c/axiom/include/axiom_namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_namespace.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_namespace.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_namespace.h Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #ifndef AXIOM_NAMESPACE_H
 #define AXIOM_NAMESPACE_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axiom_output.h>
 #include <axutil_string.h>

Modified: webservices/axis2/trunk/c/axiom/include/axiom_navigator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_navigator.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_navigator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_navigator.h Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #ifndef AXIOM_NAVIGATOR_H
 #define AXIOM_NAVIGATOR_H
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_env.h>
 #include <axiom_node.h>
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_node.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_node.h Fri Mar 30 12:54:08 2007
@@ -36,7 +36,7 @@
  * @brief defines axiom_node struct and its ops
  */
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_output.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_output.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_output.h Fri Mar 30 12:54:08 2007
@@ -18,8 +18,8 @@
 #ifndef AXIOM_OUTPUT_H
 #define AXIOM_OUTPUT_H
 
-#include <axis2_utils_defines.h>
-#include <axis2_utils.h>
+#include <axutil_utils_defines.h>
+#include <axutil_utils.h>
 #include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_xml_writer.h>

Modified: webservices/axis2/trunk/c/axiom/include/axiom_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_util.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_util.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_util.h Fri Mar 30 12:54:08 2007
@@ -21,7 +21,7 @@
 #include <axutil_array_list.h>
 #include <axutil_string.h>
 #include <axiom.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -185,7 +185,7 @@
     AXIS2_EXTERN axiom_document_t* AXIS2_CALL
     axiom_util_new_document(
         const axutil_env_t *env,
-        const axis2_uri_t *uri);
+        const axutil_uri_t *uri);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h Fri Mar 30 12:54:08 2007
@@ -23,9 +23,9 @@
  * @brief axis2 mime_body_part interface
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axutil_string.h>

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h Fri Mar 30 12:54:08 2007
@@ -23,9 +23,9 @@
  * @brief axis2 mime_output interface
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axutil_string.h>
@@ -37,7 +37,7 @@
 {
 #endif
 
-/* This should be moved to header file later axis2_utils_defines.h*/    
+/* This should be moved to header file later axutil_utils_defines.h*/    
 #define axis2_byte_t char
    
 typedef struct axiom_mime_output axiom_mime_output_t;   

Modified: webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <axiom_attribute.h>
 #include <string.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 
 struct axiom_attribute
 {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Fri Mar 30 12:54:08 2007
@@ -22,7 +22,7 @@
 #include <axiom_text.h>
 #include <axiom_soap_const.h>
 #include <axutil_array_list.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 #include <axiom_mime_output.h>
 
 #define AXIS2_DEFAULT_CHAR_SET_ENCODING  "UTF-8"
@@ -322,7 +322,7 @@
         om_output->next_content_id = NULL;
     }
 
-    uuid = axis2_uuid_gen(env);
+    uuid = axutil_uuid_gen(env);
     if (!uuid)
     {
         return NULL;
@@ -360,7 +360,7 @@
     
     if (!om_output->root_content_id)
     {
-        uuid = axis2_uuid_gen(env);
+        uuid = axutil_uuid_gen(env);
 
         temp_str = axis2_stracat(env, "0.", uuid);
 
@@ -389,7 +389,7 @@
     axis2_char_t *uuid = NULL;
     if (!om_output->mime_boundary)
     {
-        uuid = axis2_uuid_gen(env);
+        uuid = axutil_uuid_gen(env);
 
         om_output->mime_boundary = axis2_stracat(env, "MIMEBoundary", uuid);
         if (uuid)

Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 
 #include <axiom_xml_reader.h>
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <guththila.h>
 
 /**************** function prototypes ******************************************/

Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 
 #include <guththila_xml_writer.h>
 #include <guththila.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_env.h>
 #include <axiom_xml_writer.h>
 

Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Fri Mar 30 12:54:08 2007
@@ -18,8 +18,8 @@
 #include <axiom_xml_reader.h>
 #include <libxml/xmlreader.h>
 #include <libxml/parser.h>
-#include <axis2_utils_defines.h>
-#include <axis2_utils.h>
+#include <axutil_utils_defines.h>
+#include <axutil_utils.h>
 #include <string.h>
 #include <axutil_string.h>
 

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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- 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 Fri Mar 30 12:54:08 2007
@@ -16,8 +16,8 @@
  */
 
 #include <libxml/xmlwriter.h>
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axiom_xml_writer.h>
 #include <axutil_string.h>

Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Fri Mar 30 12:54:08 2007
@@ -19,7 +19,7 @@
 #include <axiom_element.h>
 #include <axiom_document.h>
 #include <axutil_array_list.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axiom_util.h>
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
@@ -1041,7 +1041,7 @@
 
 AXIS2_EXTERN axiom_document_t *AXIS2_CALL
 axiom_util_new_document(const axutil_env_t *env,
-    const axis2_uri_t *uri)
+    const axutil_uri_t *uri)
 {
     axis2_char_t *path = NULL;
     axiom_xml_reader_t *reader = NULL;
@@ -1054,7 +1054,7 @@
      */
     if (uri)
     {
-        path = axis2_uri_get_path((axis2_uri_t *) uri, env);
+        path = axutil_uri_get_path((axutil_uri_t *) uri, env);
     }
     else
     {

Modified: webservices/axis2/trunk/c/guththila/include/guththila_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_reader.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_reader.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_reader.h Fri Mar 30 12:54:08 2007
@@ -27,7 +27,7 @@
 #include "guththila_defines.h"
 #include <axutil_env.h>
 #include "guththila_error.h"
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef enum guththila_reader_types
   {

Modified: webservices/axis2/trunk/c/include/axis2_conf_init.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf_init.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf_init.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf_init.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axutil_env.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axis2_conf_ctx.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/include/axis2_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_defines.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_defines.h (original)
+++ webservices/axis2/trunk/c/include/axis2_defines.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  */
 
 #include <stddef.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler_desc.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Fri Mar 30 12:54:08 2007
@@ -33,7 +33,7 @@
  * @file axis2_handler_desc.h
  */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_qname.h>
 #include <axutil_param.h>
 #include <axutil_param_container.h>

Modified: webservices/axis2/trunk/c/include/axis2_http_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_client.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_client.h Fri Mar 30 12:54:08 2007
@@ -35,7 +35,7 @@
 #include <axutil_env.h>
 #include <axis2_http_simple_response.h>
 #include <axis2_http_simple_request.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -83,13 +83,13 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_url(axis2_http_client_t *client,
         const axutil_env_t *env,
-        axis2_url_t *url);
+        axutil_url_t *url);
 
     /**
      * @param client pointer to client
      * @param env pointer to environment struct
      */
-    AXIS2_EXTERN axis2_url_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_url_t *AXIS2_CALL
     axis2_http_client_get_url(const axis2_http_client_t *client,
         const axutil_env_t *env);
 
@@ -192,7 +192,7 @@
      */
     AXIS2_EXTERN axis2_http_client_t *AXIS2_CALL
     axis2_http_client_create (const axutil_env_t *env,
-        axis2_url_t *url);
+        axutil_url_t *url);
 
     /**
      * Free http_client passed as void pointer. This will be

Modified: webservices/axis2/trunk/c/include/axis2_svc_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_client.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_client.h Fri Mar 30 12:54:08 2007
@@ -42,7 +42,7 @@
 
 #include <axis2_defines.h>
 #include <axutil_env.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axis2_svc.h>
 #include <axis2_options.h>
 #include <axutil_qname.h>
@@ -464,7 +464,7 @@
     AXIS2_EXTERN axis2_svc_client_t* AXIS2_CALL
     axis2_svc_client_create_for_dynamic_invocation(const axutil_env_t *env,
         axis2_conf_ctx_t *conf_ctx,
-        const axis2_uri_t *wsdl_uri,
+        const axutil_uri_t *wsdl_uri,
         const axutil_qname_t *wsdl_svc_qname,
         const axis2_char_t *endpoint_name,
         const axis2_char_t *client_home);

Modified: webservices/axis2/trunk/c/include/axis2_thread_mutex.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_thread_mutex.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_thread_mutex.h (original)
+++ webservices/axis2/trunk/c/include/axis2_thread_mutex.h Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
 #define AXIS2_THREAD_MUTEX_H
 
 /**
- * @file axis2_thread_mutex.h
+ * @file axutil_thread_mutex.h
  * @brief AXIS2 Thread Mutex Routines
  */
 
@@ -39,7 +39,7 @@
  */
 
 /** Opaque thread-local mutex structure */
-typedef struct axis2_thread_mutex_t axis2_thread_mutex_t;
+typedef struct axutil_thread_mutex_t axutil_thread_mutex_t;
 
 #define AXIS2_THREAD_MUTEX_DEFAULT  0x0   /**< platform-optimal lock behavior */
 #define AXIS2_THREAD_MUTEX_NESTED   0x1   /**< enable nested (recursive) locks */
@@ -61,8 +61,8 @@
  * most optimial mutex based on a given platform's performance charateristics,
  * it will behave as either a nested or an unnested lock.
  */
-AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL 
-axis2_thread_mutex_create(axutil_allocator_t *allocator,
+AXIS2_EXTERN axutil_thread_mutex_t * AXIS2_CALL 
+axutil_thread_mutex_create(axutil_allocator_t *allocator,
                           unsigned int flags);
 /**
  * Acquire the lock for the given mutex. If the mutex is already locked,
@@ -70,7 +70,7 @@
  * @param mutex the mutex on which to acquire the lock.
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex);
+axutil_thread_mutex_lock(axutil_thread_mutex_t *mutex);
 
 /**
  * Attempt to acquire the lock for the given mutex. If the mutex has already
@@ -78,21 +78,21 @@
  * @param mutex the mutex on which to attempt the lock acquiring.
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex);
+axutil_thread_mutex_trylock(axutil_thread_mutex_t *mutex);
 
 /**
  * Release the lock for the given mutex.
  * @param mutex the mutex from which to release the lock.
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-axis2_thread_mutex_unlock(axis2_thread_mutex_t *mutex);
+axutil_thread_mutex_unlock(axutil_thread_mutex_t *mutex);
 
 /**
  * Destroy the mutex and free the memory associated with the lock.
  * @param mutex the mutex to destroy.
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex);
+axutil_thread_mutex_destroy(axutil_thread_mutex_t *mutex);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_util.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Fri Mar 30 12:54:08 2007
@@ -39,11 +39,11 @@
 #include <axutil_stream.h>
 #include <axutil_string.h>
 #include <axutil_string_util.h>
-#include <axis2_thread_pool.h>
-#include <axis2_types.h>
-#include <axis2_url.h>
-#include <axis2_utils.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_thread_pool.h>
+#include <axutil_types.h>
+#include <axutil_url.h>
+#include <axutil_utils.h>
+#include <axutil_uuid_gen.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback.c Fri Mar 30 12:54:08 2007
@@ -29,7 +29,7 @@
     int error;
     /** to store callback specific data */
     void *data;
-    axis2_thread_mutex_t *mutex;
+    axutil_thread_mutex_t *mutex;
 
     /**
      * This function is called by invoke_on_complete.
@@ -89,7 +89,7 @@
     callback->on_complete = axis2_callback_on_complete;
     callback->on_error = axis2_callback_on_error;
 
-    callback->mutex = axis2_thread_mutex_create(env->allocator,
+    callback->mutex = axutil_thread_mutex_create(env->allocator,
                                  AXIS2_THREAD_MUTEX_DEFAULT);
     return callback;
 }
@@ -175,7 +175,7 @@
 
     if(callback->mutex)
     {
-        axis2_thread_mutex_destroy(callback->mutex);
+        axutil_thread_mutex_destroy(callback->mutex);
     }
 
     AXIS2_FREE(env->allocator, callback);

Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Fri Mar 30 12:54:08 2007
@@ -26,7 +26,7 @@
     axis2_bool_t base_deep_copy;
     /** callback map */
     axutil_hash_t *callback_map;
-    axis2_thread_mutex_t *mutex;
+    axutil_thread_mutex_t *mutex;
 };
 
 static axis2_status_t AXIS2_CALL
@@ -74,7 +74,7 @@
         return NULL;
     }
 
-    callback_recv->mutex = axis2_thread_mutex_create(env->allocator,
+    callback_recv->mutex = axutil_thread_mutex_create(env->allocator,
                                  AXIS2_THREAD_MUTEX_DEFAULT);
     return callback_recv;
 }
@@ -97,7 +97,7 @@
 
     if(callback_recv->mutex)
     {
-        axis2_thread_mutex_destroy(callback_recv->mutex);
+        axutil_thread_mutex_destroy(callback_recv->mutex);
     }
 
     if (callback_recv->callback_map)

Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Fri Mar 30 12:54:08 2007
@@ -48,7 +48,7 @@
 }axis2_listener_manager_worker_func_args_t;
 
 void *AXIS2_THREAD_FUNC
-axis2_listener_manager_worker_func(axis2_thread_t *thd,
+axis2_listener_manager_worker_func(axutil_thread_t *thd,
     void *data);
 
 AXIS2_EXTERN axis2_listener_manager_t *AXIS2_CALL
@@ -122,7 +122,7 @@
                 listener = axis2_transport_in_desc_get_recv(transport_in, env);
                 if (listener)
                 {
-                    axis2_thread_t *worker_thread = NULL;
+                    axutil_thread_t *worker_thread = NULL;
                     axis2_listener_manager_worker_func_args_t *arg_list = NULL;
                     arg_list = AXIS2_MALLOC(env->allocator,
                             sizeof(axis2_listener_manager_worker_func_args_t));
@@ -259,7 +259,7 @@
 }
 
 void *AXIS2_THREAD_FUNC
-axis2_listener_manager_worker_func(axis2_thread_t *thd,
+axis2_listener_manager_worker_func(axutil_thread_t *thd,
     void *data)
 {
     axis2_listener_manager_worker_func_args_t *args_list = NULL;

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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #include <axis2_op_client.h>
 #include <axis2_const.h>
 #include <axutil_hash.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 #include <axis2_listener_manager.h>
 #include <axis2_engine.h>
 #include "axis2_callback_recv.h"
@@ -27,7 +27,7 @@
 #include <axiom_soap_envelope.h>
 #include <axiom_soap_const.h>
 #include <axiom_soap_body.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 struct axis2_op_client
@@ -69,7 +69,7 @@
 
 void *AXIS2_THREAD_FUNC
 axis2_op_client_worker_func(
-    axis2_thread_t *thd,
+    axutil_thread_t *thd,
     void *data);
 
 static axis2_char_t *AXIS2_CALL
@@ -392,7 +392,7 @@
     {
         return AXIS2_FAILURE;
     }
-    msg_id = (axis2_char_t*)axis2_uuid_gen(env);
+    msg_id = (axis2_char_t*)axutil_uuid_gen(env);
      axis2_msg_ctx_set_message_id(msg_ctx, env, msg_id);
     if(msg_id)
     {
@@ -460,7 +460,7 @@
         }
         else
         {
-            axis2_thread_t *worker_thread = NULL;
+            axutil_thread_t *worker_thread = NULL;
             axis2_op_client_worker_func_args_t *arg_list = NULL;
             arg_list = AXIS2_MALLOC(env->allocator,
                 sizeof(axis2_op_client_worker_func_args_t));
@@ -575,14 +575,14 @@
 
 
 void *AXIS2_THREAD_FUNC
-axis2_op_client_worker_func(axis2_thread_t *thd,
+axis2_op_client_worker_func(axutil_thread_t *thd,
     void *data)
 {
     axis2_op_client_worker_func_args_t *args_list = NULL;
     axis2_op_ctx_t *op_ctx = NULL;
     axis2_msg_ctx_t *response = NULL;
     axutil_env_t *th_env = NULL;
-    axis2_thread_pool_t *th_pool = NULL;
+    axutil_thread_pool_t *th_pool = NULL;
 
     args_list = (axis2_op_client_worker_func_args_t *) data;
     if(!args_list)

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Fri Mar 30 12:54:08 2007
@@ -19,7 +19,7 @@
 #include <axis2_phases_info.h>
 #include <axis2_const.h>
 #include <axutil_hash.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include "axis2_callback_recv.h"
 #include <axiom_soap_const.h>
 #include <axiom_soap_body.h>
@@ -102,7 +102,7 @@
 AXIS2_EXTERN axis2_svc_client_t *AXIS2_CALL
 axis2_svc_client_create_for_dynamic_invocation(const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_uri_t *wsdl_uri,
+    const axutil_uri_t *wsdl_uri,
     const axutil_qname_t *wsdl_svc_qname,
     const axis2_char_t *endpoint_name,
     const axis2_char_t *client_home)
@@ -594,7 +594,7 @@
     axiom_node_t *soap_node = NULL;
     axis2_op_t *op = NULL;
     axutil_param_t *param = NULL;
-    axis2_uri_t *action_uri = NULL;
+    axutil_uri_t *action_uri = NULL;
     axis2_char_t *action_str = NULL;
     axis2_bool_t qname_free_flag = AXIS2_FALSE;
 
@@ -609,8 +609,8 @@
         param = axis2_op_get_param(op, env, AXIS2_SOAP_ACTION);
         if (param)
         {
-            action_uri = (axis2_uri_t *) axutil_param_get_value(param, env);
-            action_str = axis2_uri_to_string(action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+            action_uri = (axutil_uri_t *) axutil_param_get_value(param, env);
+            action_str = axutil_uri_to_string(action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
             axis2_options_set_action(svc_client->options, env, action_str);
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #include <axis2_conf_ctx.h>
 #include <axis2_svc_grp.h>
 #include <axis2_const.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 
 struct axis2_conf_ctx
 {
@@ -40,7 +40,7 @@
     axutil_hash_t *svc_grp_ctx_map;
 
     /* Mutex to synchronize the read/write operations */
-    axis2_thread_mutex_t *mutex;
+    axutil_thread_mutex_t *mutex;
 };
 
 AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL
@@ -65,7 +65,7 @@
     conf_ctx->op_ctx_map = NULL;
     conf_ctx->svc_ctx_map = NULL;
     conf_ctx->svc_grp_ctx_map = NULL;
-    conf_ctx->mutex = axis2_thread_mutex_create(env->allocator,
+    conf_ctx->mutex = axutil_thread_mutex_create(env->allocator,
             AXIS2_THREAD_MUTEX_DEFAULT);
     if (!conf_ctx->mutex)
     {
@@ -164,13 +164,13 @@
     const axis2_char_t *message_id,
     axis2_op_ctx_t *op_ctx)
 {
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->op_ctx_map)
     {
         axutil_hash_set(conf_ctx->op_ctx_map,
                 message_id, AXIS2_HASH_KEY_STRING, op_ctx);
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return AXIS2_SUCCESS;
 }
 
@@ -185,13 +185,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, message_id, NULL);
 
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->op_ctx_map)
     {
         rv = (axis2_op_ctx_t*)axutil_hash_get(conf_ctx->op_ctx_map,
                 message_id, AXIS2_HASH_KEY_STRING);
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return rv;
 }
 
@@ -202,13 +202,13 @@
     const axis2_char_t *svc_id,
     axis2_svc_ctx_t *svc_ctx)
 {
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->svc_ctx_map)
     {
         axutil_hash_set(conf_ctx->svc_ctx_map,
                 svc_id, AXIS2_HASH_KEY_STRING, svc_ctx);
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return AXIS2_SUCCESS;
 }
 
@@ -220,13 +220,13 @@
 {
     axis2_svc_ctx_t *rv = NULL;
 
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->svc_ctx_map)
     {
         rv = (axis2_svc_ctx_t*)axutil_hash_get(conf_ctx->svc_ctx_map,
                 svc_id, AXIS2_HASH_KEY_STRING);
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return rv;
 }
 
@@ -237,13 +237,13 @@
     const axis2_char_t *svc_grp_id,
     axis2_svc_grp_ctx_t *svc_grp_ctx)
 {
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->svc_grp_ctx_map)
     {
         axutil_hash_set(conf_ctx->svc_grp_ctx_map,
                 svc_grp_id, AXIS2_HASH_KEY_STRING, svc_grp_ctx);
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return AXIS2_SUCCESS;
 }
 
@@ -254,13 +254,13 @@
     const axis2_char_t *svc_grp_id)
 {
     axis2_svc_grp_ctx_t *rv = NULL;
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->svc_grp_ctx_map)
     {
         rv = (axis2_svc_grp_ctx_t*)axutil_hash_get(conf_ctx->svc_grp_ctx_map, 
             svc_grp_id, AXIS2_HASH_KEY_STRING);
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return rv;
 }
 
@@ -270,9 +270,9 @@
     const axutil_env_t *env)
 {
     axis2_char_t *rv = NULL;
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     rv = conf_ctx->root_dir;
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return rv;
 }
 
@@ -284,7 +284,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     if (conf_ctx->root_dir)
     {
         AXIS2_FREE(env->allocator, conf_ctx->root_dir);
@@ -297,11 +297,11 @@
         if (!(conf_ctx->root_dir))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-            axis2_thread_mutex_unlock(conf_ctx->mutex);
+            axutil_thread_mutex_unlock(conf_ctx->mutex);
             return AXIS2_FAILURE;
         }
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return AXIS2_SUCCESS;
 }
 
@@ -316,7 +316,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    axis2_thread_mutex_lock(conf_ctx->mutex);
+    axutil_thread_mutex_lock(conf_ctx->mutex);
     conf_ctx->conf = conf;
 
     for (hi = axutil_hash_first(conf_ctx->op_ctx_map, env);
@@ -351,7 +351,7 @@
              axis2_svc_grp_ctx_init(svc_grp_ctx, env, conf);
         }
     }
-    axis2_thread_mutex_unlock(conf_ctx->mutex);
+    axutil_thread_mutex_unlock(conf_ctx->mutex);
     return AXIS2_SUCCESS;
 }
 
@@ -431,7 +431,7 @@
     }
     if (conf_ctx->mutex)
     {
-        axis2_thread_mutex_destroy(conf_ctx->mutex);
+        axutil_thread_mutex_destroy(conf_ctx->mutex);
     }
 
     AXIS2_FREE(env->allocator, conf_ctx);
@@ -516,7 +516,7 @@
 
     if (!svc_grp_ctx_id)
     {
-        svc_grp_ctx_id = axis2_uuid_gen(env);
+        svc_grp_ctx_id = axutil_uuid_gen(env);
         if (svc_grp_ctx_id)
         {
             axutil_string_t *svc_grp_ctx_id_str = 

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Fri Mar 30 12:54:08 2007
@@ -47,7 +47,7 @@
     /** service qname */
     axutil_qname_t *svc_qname;
     /* mutex to synchronize the read/write operations */
-    axis2_thread_mutex_t *mutex;
+    axutil_thread_mutex_t *mutex;
     axis2_bool_t response_written;
 };
 
@@ -77,7 +77,7 @@
     op_ctx->op_qname = NULL;
     op_ctx->svc_qname = NULL;
     op_ctx->response_written = AXIS2_FALSE;
-    op_ctx->mutex = axis2_thread_mutex_create(env->allocator,
+    op_ctx->mutex = axutil_thread_mutex_create(env->allocator,
             AXIS2_THREAD_MUTEX_DEFAULT);
 
     if (!op_ctx->mutex)
@@ -147,7 +147,7 @@
 
     if (op_ctx->mutex)
     {
-        axis2_thread_mutex_destroy(op_ctx->mutex);
+        axutil_thread_mutex_destroy(op_ctx->mutex);
     }
 
     AXIS2_FREE(env->allocator, op_ctx);
@@ -221,7 +221,7 @@
     axis2_msg_ctx_t *in_msg_ctx = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    axis2_thread_mutex_lock(op_ctx->mutex);
+    axutil_thread_mutex_lock(op_ctx->mutex);
 
     out_msg_ctx = op_ctx->msg_ctx_array[AXIS2_WSDL_MESSAGE_LABEL_OUT];
     in_msg_ctx = op_ctx->msg_ctx_array[AXIS2_WSDL_MESSAGE_LABEL_IN];
@@ -229,7 +229,7 @@
     if (out_msg_ctx && in_msg_ctx)
     {
         /*TODO:error - completed*/
-        axis2_thread_mutex_unlock(op_ctx->mutex);
+        axutil_thread_mutex_unlock(op_ctx->mutex);
         return AXIS2_FAILURE;
     }
 
@@ -242,7 +242,7 @@
         op_ctx->msg_ctx_array[AXIS2_WSDL_MESSAGE_LABEL_IN] = msg_ctx;
     }
 
-    axis2_thread_mutex_unlock(op_ctx->mutex);
+    axutil_thread_mutex_unlock(op_ctx->mutex);
     return AXIS2_SUCCESS;
 }
 
@@ -252,15 +252,15 @@
     const axutil_env_t *env,
     const axis2_wsdl_msg_labels_t message_id)
 {
-    axis2_thread_mutex_lock(op_ctx->mutex);
+    axutil_thread_mutex_lock(op_ctx->mutex);
     if (op_ctx->msg_ctx_array)
     {
         axis2_msg_ctx_t *rv = NULL;
         rv = op_ctx->msg_ctx_array[message_id];
-        axis2_thread_mutex_unlock(op_ctx->mutex);
+        axutil_thread_mutex_unlock(op_ctx->mutex);
         return rv;
     }
-    axis2_thread_mutex_unlock(op_ctx->mutex);
+    axutil_thread_mutex_unlock(op_ctx->mutex);
     return NULL;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Fri Mar 30 12:54:08 2007
@@ -21,7 +21,7 @@
 #include <axutil_class_loader.h>
 #include <axis2_transport_in_desc.h>
 #include <axis2_transport_out_desc.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axis2_transport_receiver.h>
 
 struct axis2_conf_builder

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Mar 30 12:54:08 2007
@@ -28,7 +28,7 @@
 #include <axiom_node.h>
 #include <axutil_class_loader.h>
 #include <axutil_string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axis2_core_utils.h>
 #include <axis2_module.h>
 

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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #include <axis2_desc_builder.h>
 #include <axutil_string.h>
 #include <axutil_class_loader.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_generic_obj.h>
 #include <axis2_raw_xml_in_out_msg_recv.h>
 

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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <axis2_svc_builder.h>
 #include <axutil_class_loader.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_property.h>
 
 struct axis2_svc_builder

Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
 #include <axis2_const.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_addr.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 const axis2_char_t *AXIS2_ADDR_DISP_NAME = "addressing_based_dispatcher";
 

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Fri Mar 30 12:54:08 2007
@@ -27,7 +27,7 @@
 #include <axis2_transport_sender.h>
 #include <axis2_http_transport.h>
 #include <axis2_addr.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 
 struct axis2_engine
 {
@@ -499,7 +499,7 @@
      axis2_msg_ctx_set_relates_to(fault_ctx, env, relates_to);
 
     /* set msg id */
-    msg_uuid =  axis2_uuid_gen(env);
+    msg_uuid =  axutil_uuid_gen(env);
     axis2_msg_ctx_set_message_id(fault_ctx, env, msg_uuid);
     if (msg_uuid)
     {

Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
 #include <axis2_const.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_addr.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 const axis2_char_t *AXIS2_REQ_URI_DISP_NAME = "request_uri_based_dispatcher";
 

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
 #include <axis2_const.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_addr.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 const axis2_char_t *AXIS2_SOAP_ACTION_DISP_NAME = "soap_action_based_dispatcher";
 

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Fri Mar 30 12:54:08 2007
@@ -22,7 +22,7 @@
 #include <axis2_svc.h>
 #include <axis2_const.h>
 #include <axis2_conf_ctx.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axiom_soap_envelope.h>
 #include <axiom_soap_body.h>
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
 #include <axis2_http_transport.h>
 #include <axutil_string.h>
 #include <string.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 
 struct axis2_http_simple_request
 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c Fri Mar 30 12:54:08 2007
@@ -19,7 +19,7 @@
 #include <axutil_string.h>
 #include <stdio.h>
 #include <string.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 
 #define AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE 2048
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c Fri Mar 30 12:54:08 2007
@@ -19,7 +19,7 @@
 #include <axutil_string.h>
 #include <axis2_http_transport.h>
 #include <string.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 
 struct axis2_http_status_line
 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Fri Mar 30 12:54:08 2007
@@ -27,8 +27,8 @@
 #include <axis2_http_transport_utils.h>
 #include <axis2_op_ctx.h>
 #include <axis2_engine.h>
-#include <axis2_uuid_gen.h>
-#include <axis2_url.h>
+#include <axutil_uuid_gen.h>
+#include <axutil_url.h>
 #include <axutil_property.h>
 
 struct axis2_http_worker
@@ -119,7 +119,7 @@
     axis2_op_ctx_t *op_ctx = NULL;
     axis2_char_t *svr_ip = NULL;
     axis2_char_t *peer_ip = NULL;
-    axis2_url_t *request_url = NULL;
+    axutil_url_t *request_url = NULL;
     axis2_http_out_transport_info_t *http_out_transport_info = NULL;
     axutil_hash_t *headers = NULL;
     axis2_char_t *url_external_form = NULL;
@@ -212,18 +212,18 @@
 	AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
 	    simple_request, env), env);
 
-    request_url = axis2_url_create(env, "http", svr_ip,
+    request_url = axutil_url_create(env, "http", svr_ip,
 				   http_worker->svr_port,
 				   path);
 
-	url_external_form = axis2_url_to_external_form(request_url, env);
+	url_external_form = axutil_url_to_external_form(request_url, env);
     
     axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
 
     headers = axis2_http_worker_get_headers(http_worker, env, simple_request);
     axis2_msg_ctx_set_transport_headers(msg_ctx, env, headers);
 
-    svc_grp_uuid = axis2_uuid_gen(env);
+    svc_grp_uuid = axutil_uuid_gen(env);
     if (svc_grp_uuid)
     {
         axutil_string_t *svc_grp_uuid_str = axutil_string_create_assume_ownership(env, &svc_grp_uuid);
@@ -251,7 +251,7 @@
                 (env, msg_ctx, request_body, out_stream,
                         AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
                             simple_request, env) , soap_action_str,
-                        axis2_url_to_external_form(request_url, env),
+                        axutil_url_to_external_form(request_url, env),
                         conf_ctx,
                         axis2_http_transport_utils_get_request_params(env,
                                 AXIS2_HTTP_REQUEST_LINE_GET_URI(
@@ -407,7 +407,7 @@
     } /* Done freeing message contexts */
     
     msg_ctx = NULL;
-    axis2_url_free(request_url, env);
+    axutil_url_free(request_url, env);
     axutil_string_free(soap_action_str, env);
     request_url = NULL;
     return status;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Fri Mar 30 12:54:08 2007
@@ -22,7 +22,7 @@
 #include <axis2_http_server.h>
 #include <axis2_transport_in_desc.h>
 #include <axutil_param_container.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <axis2_conf_init.h>
 
 /**
@@ -273,21 +273,21 @@
     axis2_endpoint_ref_t *epr = NULL;
     const axis2_char_t *host_address = NULL;
     axis2_char_t *svc_path = NULL;
-    axis2_url_t *url = NULL;
+    axutil_url_t *url = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
 
     host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
     svc_path = axis2_stracat(env, "/axis2/services/", svc_name);
-    url = axis2_url_create(env, "http", host_address,
+    url = axutil_url_create(env, "http", host_address,
             AXIS2_INTF_TO_IMPL(server)->port, svc_path);
     AXIS2_FREE(env->allocator, svc_path);
     if (! url)
     {
         return NULL;
     }
-    epr = axis2_endpoint_ref_create(env, axis2_url_to_external_form(url, env));
-    axis2_url_free(url, env);
+    epr = axis2_endpoint_ref_create(env, axutil_url_to_external_form(url, env));
+    axutil_url_free(url, env);
     return epr;
 }
 

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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- 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 Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
 #include <axutil_network_handler.h>
 #include <axis2_http_simple_request.h>
 #include <axis2_simple_http_svr_conn.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <axutil_error_default.h>
 #include <axiom_xml_reader.h>
 #include <signal.h>
@@ -50,7 +50,7 @@
     axutil_env_t *env;
     axis2_socket_t socket;
     axis2_http_worker_t *worker;
-    axis2_thread_t *thread;
+    axutil_thread_t *thread;
 }
 axis2_http_svr_thd_args_t;
 
@@ -97,7 +97,7 @@
 
 void *AXIS2_THREAD_FUNC
 axis2_svr_thread_worker_func(
-    axis2_thread_t *thd,
+    axutil_thread_t *thd,
     void *data);
 
 /***************************** End of function headers ************************/
@@ -199,7 +199,7 @@
     {
         int socket = -1;
         axis2_http_svr_thd_args_t *arg_list = NULL;
-        axis2_thread_t *worker_thread = NULL;
+        axutil_thread_t *worker_thread = NULL;
 
         socket = axutil_network_handler_svr_socket_accept(env,
                 svr_thread_impl->listen_socket);
@@ -300,7 +300,7 @@
  */
 void *AXIS2_THREAD_FUNC
 axis2_svr_thread_worker_func (
-    axis2_thread_t *thd,
+    axutil_thread_t *thd,
     void *data)
 {
     struct AXIS2_PLATFORM_TIMEB t1, t2;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h Fri Mar 30 12:54:08 2007
@@ -29,7 +29,7 @@
 #include <axiom_xml_writer.h>
 #include <axutil_property.h>
 #include <axutil_param.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 #include <axutil_generic_obj.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Fri Mar 30 12:54:08 2007
@@ -35,7 +35,7 @@
 {
     int sockfd;
     axutil_stream_t *data_stream;
-    axis2_url_t *url;
+    axutil_url_t *url;
     axis2_http_simple_response_t *response;
     axis2_bool_t request_sent;
     int timeout;
@@ -51,7 +51,7 @@
 AXIS2_EXTERN axis2_http_client_t *AXIS2_CALL
 axis2_http_client_create(
     const axutil_env_t *env,
-    axis2_url_t *url)
+    axutil_url_t *url)
 {
     axis2_http_client_t *http_client = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -92,7 +92,7 @@
 
     if (http_client->url)
     {
-        axis2_url_free(http_client->url, env);
+        axutil_url_free(http_client->url, env);
     }
     if (http_client->response)
     {
@@ -168,8 +168,8 @@
     else
     {
         client->sockfd = axutil_network_handler_open_socket(env,
-                axis2_url_get_server(client->url, env),
-                axis2_url_get_port(client->url, env));
+                axutil_url_get_server(client->url, env),
+                axutil_url_get_port(client->url, env));
     }
     if (client->sockfd < 0)
     {
@@ -191,15 +191,15 @@
         axutil_network_handler_set_sock_option(env, client->sockfd,
                 SO_SNDTIMEO, client->timeout);
     }
-    if (0 == axis2_strcasecmp(axis2_url_get_protocol(client->url, env),
+    if (0 == axis2_strcasecmp(axutil_url_get_protocol(client->url, env),
             "HTTPS"))
     {
 #ifdef AXIS2_SSL_ENABLED
         if (AXIS2_TRUE == client->proxy_enabled)
         {
             if (AXIS2_SUCCESS != axis2_http_client_connect_ssl_host(client, env,
-                    axis2_url_get_server(client->url, env),
-                    axis2_url_get_port(client->url, env)))
+                    axutil_url_get_server(client->url, env),
+                    axutil_url_get_port(client->url, env)))
             {
                 return AXIS2_FAILURE;
             }
@@ -273,7 +273,7 @@
          * POST http://host:port/path HTTP/1.x if we have enabled proxies
          */
         axis2_char_t *host_port_str = NULL;
-        axis2_char_t *server = axis2_url_get_server(client->url, env);
+        axis2_char_t *server = axutil_url_get_server(client->url, env);
         axis2_http_request_line_t *request_line =
             AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(request, env);
         axis2_char_t *path = AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env);
@@ -287,7 +287,7 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
             return AXIS2_FAILURE;
         }
-        sprintf(host_port_str, "http://%s:%d%s", server, axis2_url_get_port(
+        sprintf(host_port_str, "http://%s:%d%s", server, axutil_url_get_port(
                     client->url, env), path);
         str_request_line = AXIS2_MALLOC(env->allocator,
                 axis2_strlen(host_port_str) + 20 * sizeof(axis2_char_t));
@@ -517,20 +517,20 @@
 axis2_http_client_set_url(
     axis2_http_client_t *client,
     const axutil_env_t *env,
-    axis2_url_t *url)
+    axutil_url_t *url)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, url, AXIS2_FAILURE);
     if (client->url)
     {
-        axis2_url_free(client->url, env);
+        axutil_url_free(client->url, env);
         client->url = NULL;
     }
     client->url = url;
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_url_t *AXIS2_CALL
+AXIS2_EXTERN axutil_url_t *AXIS2_CALL
 axis2_http_client_get_url(
     const axis2_http_client_t *client,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Fri Mar 30 12:54:08 2007
@@ -27,7 +27,7 @@
 #include <axiom_xml_writer.h>
 #include <axutil_property.h>
 #include <axutil_param.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 #include <axutil_generic_obj.h>
 #include <axis2_const.h>
 #include <axis2_util.h>
@@ -50,7 +50,7 @@
 };
 
 static axis2_char_t *
-axis2_url_encode (
+axutil_url_encode (
 	const axutil_env_t *env, 
 	axis2_char_t *dest, 
 	axis2_char_t *buff, 
@@ -144,7 +144,7 @@
 
     axis2_http_simple_request_t *request = NULL;
     axis2_http_request_line_t *request_line = NULL;
-    axis2_url_t *url = NULL;
+    axutil_url_t *url = NULL;
     axiom_xml_writer_t *xml_writer = NULL;
     axis2_char_t *buffer = NULL;
     unsigned int buffer_size = 0;
@@ -182,7 +182,7 @@
 	else
 		is_soap = AXIS2_TRUE;
 
-    url = axis2_url_parse_string(env, str_url);
+    url = axutil_url_parse_string(env, str_url);
 
 	if (!is_soap)
 	{
@@ -311,7 +311,7 @@
 		}
 
 		request_line = axis2_http_request_line_create(env, "POST",
-													  axis2_url_get_path(url, env),
+													  axutil_url_get_path(url, env),
 													  sender->http_version);
 	}
 	else
@@ -320,7 +320,7 @@
         axis2_char_t *path = NULL;
 
         request_params = axis2_http_sender_get_param_string( sender, env, msg_ctx);
-        path = axis2_strcat(env, axis2_url_get_path(url, env), "?",
+        path = axis2_strcat(env, axutil_url_get_path(url, env), "?",
 							request_params, NULL);
         request_line = axis2_http_request_line_create(env, "GET", path,
 													  sender->http_version);
@@ -465,10 +465,10 @@
     {
         axis2_char_t *header = NULL;
         header = AXIS2_MALLOC(env->allocator, axis2_strlen(
-								  axis2_url_get_server(url, env)) + 10 * sizeof(
+								  axutil_url_get_server(url, env)) + 10 * sizeof(
 									  axis2_char_t));
-        sprintf(header, "%s:%d", axis2_url_get_server(url, env),
-                axis2_url_get_port(url, env));
+        sprintf(header, "%s:%d", axutil_url_get_server(url, env),
+                axutil_url_get_port(url, env));
 		axis2_http_sender_util_add_header (env, request, AXIS2_HTTP_HEADER_HOST, header);
         AXIS2_FREE(env->allocator, header);
         header = NULL;
@@ -1036,7 +1036,7 @@
 			if(value){
 				encoded_value = (axis2_char_t *) AXIS2_MALLOC (env->allocator, strlen (value));
 				memset (encoded_value, 0, strlen (value));
-				encoded_value = axis2_url_encode (env, encoded_value, value, strlen (value));
+				encoded_value = axutil_url_encode (env, encoded_value, value, strlen (value));
 
 				axutil_array_list_add(param_list, env, axis2_strcat(env, name, "=",
 																   encoded_value, NULL));
@@ -1067,7 +1067,7 @@
 }
 
 static axis2_char_t *
-axis2_url_encode (
+axutil_url_encode (
 	const axutil_env_t *env, 
 	axis2_char_t *dest, 
 	axis2_char_t *buff, 



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


Mime
View raw message