You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 21:24:23 UTC

svn commit: r524243 [1/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/ modu...

Author: pini
Date: Fri Mar 30 12:24:00 2007
New Revision: 524243

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

Added:
    webservices/axis2/trunk/c/util/include/axutil_network_handler.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_network_handler.h
    webservices/axis2/trunk/c/util/include/axutil_param.h
      - copied, changed from r524225, webservices/axis2/trunk/c/util/include/axis2_param.h
    webservices/axis2/trunk/c/util/include/axutil_param_container.h
      - copied, changed from r524225, webservices/axis2/trunk/c/util/include/axis2_param_container.h
    webservices/axis2/trunk/c/util/include/axutil_properties.h
      - copied, changed from r524225, webservices/axis2/trunk/c/util/include/axis2_properties.h
    webservices/axis2/trunk/c/util/include/axutil_property.h
      - copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_property.h
    webservices/axis2/trunk/c/util/include/axutil_qname.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_qname.h
    webservices/axis2/trunk/c/util/include/axutil_rand.h
      - copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_rand.h
    webservices/axis2/trunk/c/util/include/axutil_stack.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_stack.h
    webservices/axis2/trunk/c/util/include/axutil_stream.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_stream.h
    webservices/axis2/trunk/c/util/include/axutil_string.h
      - copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_string.h
    webservices/axis2/trunk/c/util/include/axutil_string_util.h
      - copied, changed from r524188, webservices/axis2/trunk/c/util/include/axis2_string_util.h
Removed:
    webservices/axis2/trunk/c/util/include/axis2_network_handler.h
    webservices/axis2/trunk/c/util/include/axis2_param.h
    webservices/axis2/trunk/c/util/include/axis2_param_container.h
    webservices/axis2/trunk/c/util/include/axis2_properties.h
    webservices/axis2/trunk/c/util/include/axis2_property.h
    webservices/axis2/trunk/c/util/include/axis2_qname.h
    webservices/axis2/trunk/c/util/include/axis2_rand.h
    webservices/axis2/trunk/c/util/include/axis2_stack.h
    webservices/axis2/trunk/c/util/include/axis2_stream.h
    webservices/axis2/trunk/c/util/include/axis2_string.h
    webservices/axis2/trunk/c/util/include/axis2_string_util.h
Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_attribute.h
    webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h
    webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h
    webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
    webservices/axis2/trunk/c/axiom/include/axiom_data_source.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_soap_header.h
    webservices/axis2/trunk/c/axiom/include/axiom_text.h
    webservices/axis2/trunk/c/axiom/include/axiom_util.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/attachments/mime_output.c
    webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
    webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
    webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_comment.c
    webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
    webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
    webservices/axis2/trunk/c/axiom/src/om/om_document.c
    webservices/axis2/trunk/c/axiom/src/om/om_element.c
    webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
    webservices/axis2/trunk/c/axiom/src/om/om_output.c
    webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
    webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
    webservices/axis2/trunk/c/axiom/src/om/om_text.c
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
    webservices/axis2/trunk/c/axiom/test/om/test_om.c
    webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
    webservices/axis2/trunk/c/guththila/include/guththila.h
    webservices/axis2/trunk/c/guththila/include/guththila_token.h
    webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h
    webservices/axis2/trunk/c/guththila/samples/guththila_main.c
    webservices/axis2/trunk/c/guththila/src/guththila_token.c
    webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
    webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
    webservices/axis2/trunk/c/include/axis2_addr_mod.h
    webservices/axis2/trunk/c/include/axis2_any_content_type.h
    webservices/axis2/trunk/c/include/axis2_conf.h
    webservices/axis2/trunk/c/include/axis2_core_utils.h
    webservices/axis2/trunk/c/include/axis2_ctx.h
    webservices/axis2/trunk/c/include/axis2_desc.h
    webservices/axis2/trunk/c/include/axis2_description.h
    webservices/axis2/trunk/c/include/axis2_disp.h
    webservices/axis2/trunk/c/include/axis2_endpoint_ref.h
    webservices/axis2/trunk/c/include/axis2_flow.h
    webservices/axis2/trunk/c/include/axis2_flow_container.h
    webservices/axis2/trunk/c/include/axis2_handler.h
    webservices/axis2/trunk/c/include/axis2_handler_desc.h
    webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
    webservices/axis2/trunk/c/include/axis2_http_response_writer.h
    webservices/axis2/trunk/c/include/axis2_http_simple_request.h
    webservices/axis2/trunk/c/include/axis2_http_simple_response.h
    webservices/axis2/trunk/c/include/axis2_http_transport_utils.h
    webservices/axis2/trunk/c/include/axis2_module.h
    webservices/axis2/trunk/c/include/axis2_module_desc.h
    webservices/axis2/trunk/c/include/axis2_msg.h
    webservices/axis2/trunk/c/include/axis2_msg_ctx.h
    webservices/axis2/trunk/c/include/axis2_op.h
    webservices/axis2/trunk/c/include/axis2_op_client.h
    webservices/axis2/trunk/c/include/axis2_options.h
    webservices/axis2/trunk/c/include/axis2_phase.h
    webservices/axis2/trunk/c/include/axis2_phase_holder.h
    webservices/axis2/trunk/c/include/axis2_phase_resolver.h
    webservices/axis2/trunk/c/include/axis2_phase_rule.h
    webservices/axis2/trunk/c/include/axis2_phases_info.h
    webservices/axis2/trunk/c/include/axis2_raw_xml_in_out_msg_recv.h
    webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h
    webservices/axis2/trunk/c/include/axis2_stub.h
    webservices/axis2/trunk/c/include/axis2_svc.h
    webservices/axis2/trunk/c/include/axis2_svc_client.h
    webservices/axis2/trunk/c/include/axis2_svc_ctx.h
    webservices/axis2/trunk/c/include/axis2_svc_grp.h
    webservices/axis2/trunk/c/include/axis2_svc_name.h
    webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
    webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
    webservices/axis2/trunk/c/include/axis2_util.h
    webservices/axis2/trunk/c/modules/core/addr/any_content_type.c
    webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
    webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
    webservices/axis2/trunk/c/modules/core/addr/relates_to.c
    webservices/axis2/trunk/c/modules/core/addr/svc_name.c
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/options.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/ctx.c
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/context/op_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
    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/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
    webservices/axis2/trunk/c/modules/core/description/desc.c
    webservices/axis2/trunk/c/modules/core/description/handler_desc.c
    webservices/axis2/trunk/c/modules/core/description/module_desc.c
    webservices/axis2/trunk/c/modules/core/description/msg.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/phase_rule.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/core/description/svc_grp.c
    webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
    webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/axis2_disp_checker.h
    webservices/axis2/trunk/c/modules/core/engine/conf.c
    webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
    webservices/axis2/trunk/c/modules/core/engine/disp.c
    webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/handler.c
    webservices/axis2/trunk/c/modules/core/engine/phase.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/phaseresolver/phase_holder.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.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_response_writer.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.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/libcurl/libcurl_stream.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
    webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.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/modules/mod_addr/addr_in_handler.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
    webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
    webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
    webservices/axis2/trunk/c/modules/mod_log/mod_log.h
    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/samples/client/dynamic_client/test.c
    webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
    webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
    webservices/axis2/trunk/c/samples/server/sg_math/add.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
    webservices/axis2/trunk/c/savan/include/mod_savan.h
    webservices/axis2/trunk/c/savan/include/savan_msg_recv.h
    webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
    webservices/axis2/trunk/c/savan/src/client/savan_client.c
    webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c
    webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
    webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
    webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
    webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
    webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
    webservices/axis2/trunk/c/savan/src/util/savan_util.c
    webservices/axis2/trunk/c/test/core/context/test_context.c
    webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
    webservices/axis2/trunk/c/test/core/description/test_description.c
    webservices/axis2/trunk/c/test/core/engine/test_engine.c
    webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
    webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.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_xslt_utils.h
    webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
    webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer_protected.h
    webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
    webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
    webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
    webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
    webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
    webservices/axis2/trunk/c/tools/codegen/src/util/messages.c
    webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
    webservices/axis2/trunk/c/tools/codegen/src/util/string.c
    webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
    webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
    webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h
    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/codegen/w2c_writer_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/include/tcpmon_entry.h
    webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h
    webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h
    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/util.c
    webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
    webservices/axis2/trunk/c/util/include/axis2_uri.h
    webservices/axis2/trunk/c/util/include/axutil_class_loader.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_file_handler.h
    webservices/axis2/trunk/c/util/src/class_loader.c
    webservices/axis2/trunk/c/util/src/dir_handler.c
    webservices/axis2/trunk/c/util/src/env.c
    webservices/axis2/trunk/c/util/src/file.c
    webservices/axis2/trunk/c/util/src/hash.c
    webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
    webservices/axis2/trunk/c/util/src/network_handler.c
    webservices/axis2/trunk/c/util/src/param.c
    webservices/axis2/trunk/c/util/src/param_container.c
    webservices/axis2/trunk/c/util/src/properties.c
    webservices/axis2/trunk/c/util/src/property.c
    webservices/axis2/trunk/c/util/src/qname.c
    webservices/axis2/trunk/c/util/src/rand.c
    webservices/axis2/trunk/c/util/src/stack.c
    webservices/axis2/trunk/c/util/src/stream.c
    webservices/axis2/trunk/c/util/src/string.c
    webservices/axis2/trunk/c/util/src/string_util.c
    webservices/axis2/trunk/c/util/src/url.c
    webservices/axis2/trunk/c/util/src/utils.c
    webservices/axis2/trunk/c/util/test/util/test_string.c
    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.h
    webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h
    webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h
    webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_binding_op.h
    webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
    webservices/axis2/trunk/c/woden/include/woden_bool_attr.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.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_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_element.h
    webservices/axis2/trunk/c/woden/include/woden_import_element.h
    webservices/axis2/trunk/c/woden/include/woden_include_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface.h
    webservices/axis2/trunk/c/woden/include/woden_interface_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_fault.h
    webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h
    webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.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_element.h
    webservices/axis2/trunk/c/woden/include/woden_qname_attr.h
    webservices/axis2/trunk/c/woden/include/woden_qname_list_attr.h
    webservices/axis2/trunk/c/woden/include/woden_qname_list_or_token_any_attr.h
    webservices/axis2/trunk/c/woden/include/woden_qname_or_token_any_attr.h
    webservices/axis2/trunk/c/woden/include/woden_qname_util.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_fault_code.h
    webservices/axis2/trunk/c/woden/include/woden_soap_fault_subcodes.h
    webservices/axis2/trunk/c/woden/include/woden_soap_header_block_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_soap_header_block_element.h
    webservices/axis2/trunk/c/woden/include/woden_soap_module_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_soap_module_element.h
    webservices/axis2/trunk/c/woden/include/woden_string_attr.h
    webservices/axis2/trunk/c/woden/include/woden_svc.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.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_binding_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_binding_op.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_binding_op_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_desc.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_desc_element.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.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.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_interface_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_msg_ref.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_part.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_part_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_element.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_svc.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_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_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/util/woden_qname_util.c
    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_binding_fault_ref.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_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_soap_fault_code.c
    webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.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/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_fault_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_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_header_block.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.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_msg_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
    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/wsdl10/woden_wsdl10_interface_fault_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.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_fault_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_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_header_block.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.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_binding_fault.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
    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/wsdl20/woden_interface_fault.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c
    webservices/axis2/trunk/c/woden/src/xml/woden_bool_attr.c
    webservices/axis2/trunk/c/woden/src/xml/woden_qname_attr.c
    webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_attr.c
    webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
    webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.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.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_data_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_element.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_identity_constraint.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_collection.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_list.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_type.h
    webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.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_complex_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.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.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_type.c
    webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_attribute.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_attribute.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_attribute.h Fri Mar 30 12:24:00 2007
@@ -23,7 +23,7 @@
 * @brief om attribute struct represents an xml attribute
 */
 #include <axutil_env.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axiom_namespace.h>
 #include <axiom_output.h>
 
@@ -85,7 +85,7 @@
       * @return returns qname for given attribute.NULL on error 
       */
 
-    AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
+    AXIS2_EXTERN axutil_qname_t * AXIS2_CALL
     axiom_attribute_get_qname(struct axiom_attribute *om_attribute,
             const axutil_env_t *env);
 
@@ -181,27 +181,27 @@
 
     AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
     axiom_attribute_create_str(const axutil_env_t *env,
-        axis2_string_t * localname,
-        axis2_string_t * value,
+        axutil_string_t * localname,
+        axutil_string_t * value,
         axiom_namespace_t * ns);
 
-    AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t* AXIS2_CALL
     axiom_attribute_get_localname_str(axiom_attribute_t *attribute,
         const axutil_env_t *env);
 
-    AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t* AXIS2_CALL
     axiom_attribute_get_value_str(axiom_attribute_t *attribute,
         const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_attribute_set_localname_str(axiom_attribute_t *attribute,
         const axutil_env_t *env,
-        axis2_string_t *localname);
+        axutil_string_t *localname);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_attribute_set_value_str(axiom_attribute_t *attribute,
         const axutil_env_t *env,
-        axis2_string_t *value);
+        axutil_string_t *value);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h Fri Mar 30 12:24:00 2007
@@ -25,7 +25,7 @@
 
 #include <axiom_node.h>
 #include <axiom_namespace.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 
 #ifdef __cplusplus
@@ -44,7 +44,7 @@
     AXIS2_EXTERN axiom_children_qname_iterator_t * AXIS2_CALL
     axiom_children_qname_iterator_create(const axutil_env_t *env,
             axiom_node_t *current_child,
-            axis2_qname_t *given_qname);
+            axutil_qname_t *given_qname);
 
     /**
      * free om_children_qname_iterator struct 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h Fri Mar 30 12:24:00 2007
@@ -25,7 +25,7 @@
 
 #include <axiom_node.h>
 #include <axiom_text.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 
 #ifdef __cplusplus
@@ -88,7 +88,7 @@
     axiom_children_with_specific_attribute_iterator_create(
         const axutil_env_t *env,
         axiom_node_t *current_child,
-        axis2_qname_t *attr_qname,
+        axutil_qname_t *attr_qname,
         axis2_char_t *attr_value,
         axis2_bool_t detach);
 

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=524243&r1=524242&r2=524243
==============================================================================
--- 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:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_array_list.h>
 
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_data_source.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_data_source.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_data_source.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_source.h Fri Mar 30 12:24:00 2007
@@ -26,7 +26,7 @@
 #include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_output.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -94,7 +94,7 @@
      * @return status of the op. AXIS2_SUCCESS on success,
      *           AXIS2_FAILURE on error.   
      */
-    AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
+    AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
     axiom_data_source_get_stream(struct axiom_data_source *om_data_source,
             const axutil_env_t *env);
 

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_element.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_element.h Fri Mar 30 12:24:00 2007
@@ -73,7 +73,7 @@
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_element_create_with_qname(const axutil_env_t *env,
             axiom_node_t *parent,
-            const axis2_qname_t *qname,
+            const axutil_qname_t *qname,
             axiom_node_t ** node);
     /*
      * Find a namespace in the scope of the document.
@@ -127,7 +127,7 @@
     axiom_element_find_namespace_with_qname(axiom_element_t *om_element,
             const axutil_env_t *env,
             axiom_node_t *node,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     /**
       * Adds an attribute to current element
@@ -154,7 +154,7 @@
     AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
     axiom_element_get_attribute(axiom_element_t *om_element,
             const axutil_env_t *env,
-            axis2_qname_t * qname);
+            axutil_qname_t * qname);
 
     /**
     * Gets (finds) the attribute value with the given qname
@@ -167,7 +167,7 @@
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axiom_element_get_attribute_value(axiom_element_t *om_element,
             const axutil_env_t *env,
-            axis2_qname_t * qname);
+            axutil_qname_t * qname);
 
     /**
       * Frees given element 
@@ -296,9 +296,9 @@
      * the returned qname should not be externaly freed
      * when om_element struct is freed qname is also
      * freed 
-     * @returns axis2_qname_t struct , NULL on failure
+     * @returns axutil_qname_t struct , NULL on failure
      */
-    AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
+    AXIS2_EXTERN axutil_qname_t* AXIS2_CALL
     axiom_element_get_qname(axiom_element_t *om_element,
             const axutil_env_t *env,
             axiom_node_t *ele_node);
@@ -326,7 +326,7 @@
     AXIS2_EXTERN axiom_children_qname_iterator_t * AXIS2_CALL
     axiom_element_get_children_with_qname(axiom_element_t *om_element,
             const axutil_env_t *env,
-            axis2_qname_t *element_qname,
+            axutil_qname_t *element_qname,
             axiom_node_t* element_node);
     /**
      * returns the om_element corresponding to element_qname
@@ -335,7 +335,7 @@
     AXIS2_EXTERN axiom_element_t* AXIS2_CALL
     axiom_element_get_first_child_with_qname(axiom_element_t *om_element,
             const axutil_env_t *env,
-            axis2_qname_t *element_qname,
+            axutil_qname_t *element_qname,
             axiom_node_t* element_node,
             axiom_node_t **child_node);
     /**
@@ -488,18 +488,18 @@
     AXIS2_EXTERN axiom_element_t *AXIS2_CALL
     axiom_element_create_str(const axutil_env_t *env,
         axiom_node_t *parent,
-        axis2_string_t *localname,
+        axutil_string_t *localname,
         axiom_namespace_t *ns,
         axiom_node_t **node);
 
-    AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t* AXIS2_CALL
     axiom_element_get_localname_str(axiom_element_t *om_element,
         const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_element_set_localname_str(axiom_element_t *om_element,
         const axutil_env_t *env,
-        axis2_string_t *localname);
+        axutil_string_t *localname);
 
 
     /** @} */

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=524243&r1=524242&r2=524243
==============================================================================
--- 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:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_hash.h>
 #include <axiom_mime_const.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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_namespace.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_namespace.h Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
 #include <axis2_utils_defines.h>
 #include <axutil_env.h>
 #include <axiom_output.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -127,19 +127,19 @@
 
     AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
     axiom_namespace_create_str(const axutil_env_t *env,
-        axis2_string_t * uri,
-        axis2_string_t * prefix);
+        axutil_string_t * uri,
+        axutil_string_t * prefix);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_namespace_set_uri_str(axiom_namespace_t *om_namespace,
         const axutil_env_t *env,
-        axis2_string_t *uri);
+        axutil_string_t *uri);
 
-    AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t *AXIS2_CALL
     axiom_namespace_get_uri_str(axiom_namespace_t *om_namespace,
         const axutil_env_t *env);
 
-    AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t *AXIS2_CALL
     axiom_namespace_get_prefix_str(axiom_namespace_t *om_namespace,
         const axutil_env_t *env);
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h Fri Mar 30 12:24:00 2007
@@ -161,7 +161,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_remove_header_block(axiom_soap_header_t *header,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_text.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_text.h Fri Mar 30 12:24:00 2007
@@ -68,7 +68,7 @@
     AXIS2_EXTERN axiom_text_t *AXIS2_CALL
     axiom_text_create_str(const axutil_env_t *env,
         axiom_node_t *parent,
-        axis2_string_t *value,
+        axutil_string_t *value,
         axiom_node_t ** node);
 
     /**
@@ -146,7 +146,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_text_set_value_str(struct axiom_text *om_text,
         const axutil_env_t *env,
-        axis2_string_t *value);
+        axutil_string_t *value);
 
    /**
      * Gets text value 
@@ -154,7 +154,7 @@
      * @param env environment.
      * @return text valu stringe , NULL is returned if there is no text value.
      */
-    AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t *AXIS2_CALL
     axiom_text_get_value_str(struct axiom_text *om_text,
         const axutil_env_t *env);
 

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_util.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_util.h Fri Mar 30 12:24:00 2007
@@ -19,7 +19,7 @@
 #define AXIOM_UTIL_H
 
 #include <axutil_array_list.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axiom.h>
 #include <axis2_uri.h>
 

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=524243&r1=524242&r2=524243
==============================================================================
--- 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:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_array_list.h>
 #include <axiom_data_handler.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=524243&r1=524242&r2=524243
==============================================================================
--- 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:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_array_list.h>
 
 

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Fri Mar 30 12:24:00 2007
@@ -19,7 +19,7 @@
 #include "axiom_mime_output.h"
 #include "axiom_data_handler.h"
 #include "axiom_mime_body_part.h"
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axiom_text.h>
 #include <axiom_mime_const.h>
 

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axiom_mime_parser.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axiom_data_handler.h>
 #include <stdio.h>
 

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=524243&r1=524242&r2=524243
==============================================================================
--- 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:24:00 2007
@@ -22,13 +22,13 @@
 struct axiom_attribute
 {
     /** localname of this attribute  */
-    axis2_string_t *localname;
+    axutil_string_t *localname;
     /** value of this attribute */
-    axis2_string_t *value;
+    axutil_string_t *value;
     /** attribute namespace */
     axiom_namespace_t *ns;
     /** store qname here */
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
     int ref;
 };
 
@@ -57,7 +57,7 @@
     attribute->ns        = NULL;
     attribute->qname = NULL;
 
-    attribute->localname = axis2_string_create(env, localname);
+    attribute->localname = axutil_string_create(env, localname);
     if (!(attribute->localname))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -66,11 +66,11 @@
     }
     if (value)
     {
-        attribute->value = axis2_string_create(env, value);
+        attribute->value = axutil_string_create(env, value);
         if (!(attribute->value))
         {
             AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-            axis2_string_free(attribute->localname, env);
+            axutil_string_free(attribute->localname, env);
             AXIS2_FREE(env->allocator, attribute);
             return NULL;
         }
@@ -96,15 +96,15 @@
 
     if (attribute->localname)
     {
-        axis2_string_free(attribute->localname, env);
+        axutil_string_free(attribute->localname, env);
     }
     if (attribute->value)
     {
-        axis2_string_free(attribute->value, env);
+        axutil_string_free(attribute->value, env);
     }
     if (attribute->qname)
     {
-        axis2_qname_free(attribute->qname, env);
+        axutil_qname_free(attribute->qname, env);
     }
     
     AXIS2_FREE(env->allocator, attribute);
@@ -124,25 +124,25 @@
     return;
 }
 
-AXIS2_EXTERN axis2_qname_t *AXIS2_CALL
+AXIS2_EXTERN axutil_qname_t *AXIS2_CALL
 axiom_attribute_get_qname(axiom_attribute_t *attribute,
     const axutil_env_t *env)
 {
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     if (!(attribute->qname))
     {
         if (attribute->ns)
         {
-            qname = axis2_qname_create(env,
-                axis2_string_get_buffer(attribute->localname, env),
+            qname = axutil_qname_create(env,
+                axutil_string_get_buffer(attribute->localname, env),
                 axiom_namespace_get_uri(attribute->ns, env),
                 axiom_namespace_get_prefix(attribute->ns, env));
         }
         else
         {
-            qname = axis2_qname_create(env, 
-                axis2_string_get_buffer(attribute->localname, env),
+            qname = axutil_qname_create(env, 
+                axutil_string_get_buffer(attribute->localname, env),
                 NULL,  NULL);
         }
         attribute->qname = qname;
@@ -172,23 +172,23 @@
         if ((uri) && (NULL != prefix) && (axis2_strcmp(prefix, "") != 0))
         {
             status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 4,
-                axis2_string_get_buffer(attribute->localname, env),
-                axis2_string_get_buffer(attribute->value, env),
+                axutil_string_get_buffer(attribute->localname, env),
+                axutil_string_get_buffer(attribute->value, env),
                 uri , prefix);
         }
         else if (uri)
         {
             status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 3,
-                axis2_string_get_buffer(attribute->localname, env), 
-                axis2_string_get_buffer(attribute->value, env),
+                axutil_string_get_buffer(attribute->localname, env), 
+                axutil_string_get_buffer(attribute->value, env),
                 uri);
         }
     }
     else
     {
         status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 2,
-            axis2_string_get_buffer(attribute->localname, env), 
-            axis2_string_get_buffer(attribute->value, env));
+            axutil_string_get_buffer(attribute->localname, env), 
+            axutil_string_get_buffer(attribute->value, env));
     }
     return status;
 }
@@ -199,7 +199,7 @@
 {
     if (attribute->localname)
     {
-        return (axis2_char_t *)axis2_string_get_buffer(attribute->localname, env);
+        return (axis2_char_t *)axutil_string_get_buffer(attribute->localname, env);
     }
     return NULL;
 }
@@ -210,7 +210,7 @@
 {
     if (attribute->value)
     {
-        return (axis2_char_t *)axis2_string_get_buffer(attribute->value, env);
+        return (axis2_char_t *)axutil_string_get_buffer(attribute->value, env);
     }
     return NULL;
 }
@@ -233,11 +233,11 @@
 
     if (attribute->localname)
     {
-        axis2_string_free(attribute->localname, env);
+        axutil_string_free(attribute->localname, env);
         attribute->localname = NULL;
     }
 
-    attribute->localname = axis2_string_create(env, localname);
+    attribute->localname = axutil_string_create(env, localname);
 
     if (!(attribute->localname))
     {
@@ -258,11 +258,11 @@
 
     if (attribute->value)
     {
-        axis2_string_free(attribute->value, env);
+        axutil_string_free(attribute->value, env);
         attribute->value = NULL;
     }
 
-    attribute->value = axis2_string_create(env, value);
+    attribute->value = axutil_string_create(env, value);
     if (!(attribute->value))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -313,8 +313,8 @@
 
 AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
 axiom_attribute_create_str(const axutil_env_t *env,
-    axis2_string_t * localname,
-    axis2_string_t * value,
+    axutil_string_t * localname,
+    axutil_string_t * value,
     axiom_namespace_t * ns)
 {
     axiom_attribute_t *attribute = NULL;
@@ -336,7 +336,7 @@
     attribute->ns        = NULL;
     attribute->qname = NULL;
 
-    attribute->localname = axis2_string_clone(localname, env);
+    attribute->localname = axutil_string_clone(localname, env);
     if (!(attribute->localname))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -345,11 +345,11 @@
     }
     if (value)
     {
-        attribute->value = axis2_string_clone(value, env);
+        attribute->value = axutil_string_clone(value, env);
         if (!(attribute->value))
         {
             AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-            axis2_string_free(attribute->localname, env);
+            axutil_string_free(attribute->localname, env);
             AXIS2_FREE(env->allocator, attribute);
             return NULL;
         }
@@ -361,14 +361,14 @@
     return attribute;
 }
 
-AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+AXIS2_EXTERN axutil_string_t* AXIS2_CALL
 axiom_attribute_get_localname_str(axiom_attribute_t *attribute,
     const axutil_env_t *env)
 {
     return attribute->localname;
 }
 
-AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+AXIS2_EXTERN axutil_string_t* AXIS2_CALL
 axiom_attribute_get_value_str(axiom_attribute_t *attribute,
     const axutil_env_t *env)
 {
@@ -378,18 +378,18 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_localname_str(axiom_attribute_t *attribute,
     const axutil_env_t *env,
-    axis2_string_t *localname)
+    axutil_string_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
 
     if (attribute->localname)
     {
-        axis2_string_free(attribute->localname, env);
+        axutil_string_free(attribute->localname, env);
         attribute->localname = NULL;
     }
 
-    attribute->localname = axis2_string_clone(localname, env);
+    attribute->localname = axutil_string_clone(localname, env);
 
     return AXIS2_SUCCESS;
 }
@@ -397,18 +397,18 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_value_str(axiom_attribute_t *attribute,
     const axutil_env_t *env,
-    axis2_string_t *value)
+    axutil_string_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
 
     if (attribute->value)
     {
-        axis2_string_free(attribute->value, env);
+        axutil_string_free(attribute->value, env);
         attribute->value = NULL;
     }
 
-    attribute->value = axis2_string_clone(value, env);
+    attribute->value = axutil_string_clone(value, env);
     if (!(attribute->value))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Fri Mar 30 12:24:00 2007
@@ -24,7 +24,7 @@
     axiom_node_t *last_child;
     axis2_bool_t next_called;
     axis2_bool_t remove_called;
-    axis2_qname_t *given_qname;
+    axutil_qname_t *given_qname;
     axis2_bool_t need_to_move_forward;
     axis2_bool_t matching_node_found;
 
@@ -32,7 +32,7 @@
 
 AXIS2_EXTERN axiom_children_qname_iterator_t *AXIS2_CALL
 axiom_children_qname_iterator_create(const axutil_env_t *env,
-    axiom_node_t *current_child, axis2_qname_t *given_qname)
+    axiom_node_t *current_child, axutil_qname_t *given_qname)
 {
     axiom_children_qname_iterator_t *iterator = NULL;
 
@@ -59,7 +59,7 @@
     iterator->current_child = current_child;
     if (given_qname)
     {
-        iterator->given_qname = axis2_qname_clone(given_qname, env);
+        iterator->given_qname = axutil_qname_clone(given_qname, env);
         if (!(iterator->given_qname))
         {
             axiom_children_qname_iterator_free(iterator, env);
@@ -78,7 +78,7 @@
 
     if (iterator->given_qname)
     {
-        axis2_qname_free(iterator->given_qname, env);
+        axutil_qname_free(iterator->given_qname, env);
     }
     AXIS2_FREE(env->allocator, iterator);
     return;
@@ -133,7 +133,7 @@
             }
 
             if (om_element &&
-                axis2_qname_equals(
+                axutil_qname_equals(
                     axiom_element_get_qname(om_element, env, iterator->current_child),
                     env, iterator->given_qname))
             {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Fri Mar 30 12:24:00 2007
@@ -25,7 +25,7 @@
     axiom_node_t *last_child;
     axis2_bool_t next_called;
     axis2_bool_t remove_called;
-    axis2_qname_t *attr_qname;
+    axutil_qname_t *attr_qname;
     axis2_char_t *attr_value;
     axis2_bool_t detach;
 };
@@ -34,7 +34,7 @@
 axiom_children_with_specific_attribute_iterator_create(
     const axutil_env_t *env,
     axiom_node_t *current_child,
-    axis2_qname_t *attr_qname,
+    axutil_qname_t *attr_qname,
     axis2_char_t *attr_value,
     axis2_bool_t detach)
 {
@@ -59,7 +59,7 @@
     iterator->next_called = AXIS2_FALSE;
     iterator->remove_called = AXIS2_FALSE;
 
-    iterator->attr_qname = axis2_qname_clone(attr_qname, env);
+    iterator->attr_qname = axutil_qname_clone(attr_qname, env);
     iterator->attr_value = attr_value;
     iterator->detach = detach;
 
@@ -75,7 +75,7 @@
     AXIS2_ENV_CHECK(env, void);
     if (iterator->attr_qname)
     {
-        axis2_qname_free(iterator->attr_qname, env);
+        axutil_qname_free(iterator->attr_qname, env);
     }
     AXIS2_FREE(env->allocator, iterator);
     return;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_comment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_comment.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_comment.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
 
 #include <axiom_comment.h>
 #include "axiom_node_internal.h"
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 struct axiom_comment
 {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_data_source.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_data_source.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_data_source.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
 
 #include <axiom_data_source.h>
 #include <axiom_output.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include "axiom_node_internal.h"
 #include <axiom_xml_writer.h>
 #include <axiom_output.h>
@@ -31,7 +31,7 @@
 struct axiom_data_source
 {
     /** stream holding serialized XML string */
-    axis2_stream_t *stream;
+    axutil_stream_t *stream;
 };
 
 AXIS2_EXTERN axiom_data_source_t *AXIS2_CALL
@@ -66,7 +66,7 @@
 
     data_source->stream = NULL;
     
-    data_source->stream = axis2_stream_create_basic(env);
+    data_source->stream = axutil_stream_create_basic(env);
     if (!(data_source->stream))
     {
         AXIS2_FREE(env->allocator, *node);
@@ -112,7 +112,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
 
-    data = axis2_stream_get_buffer(data_source->stream, env);
+    data = axutil_stream_get_buffer(data_source->stream, env);
     data_len = AXIS2_STREAM_BASIC_GET_LEN(data_source->stream, env);
     if (data)
     {
@@ -123,7 +123,7 @@
     return status;
 }
 
-AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
 axiom_data_source_get_stream(axiom_data_source_t *data_source,
     const axutil_env_t *env)
 {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_doctype.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_doctype.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axiom_doctype.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include "axiom_node_internal.h"
 
 struct axiom_doctype

Modified: webservices/axis2/trunk/c/axiom/src/om/om_document.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_document.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
 
 #include <axiom_document.h>
 #include <axiom_stax_builder.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 struct axiom_document
 {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Fri Mar 30 12:24:00 2007
@@ -29,13 +29,13 @@
     /** Element's namespace */
     axiom_namespace_t *ns;
     /** Element's local name */
-    axis2_string_t *localname;
+    axutil_string_t *localname;
     /** List of attributes */
     axutil_hash_t *attributes;
     /** List of namespaces */
     axutil_hash_t *namespaces;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 
     axiom_child_element_iterator_t *child_ele_iter;
 
@@ -91,7 +91,7 @@
     element->text_value = NULL;
     element->next_ns_prefix_number = 0;
 
-    element->localname = axis2_string_create(env, localname);
+    element->localname = axutil_string_create(env, localname);
     if (!element->localname)
     {
         AXIS2_FREE(env->allocator, element);
@@ -137,7 +137,7 @@
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_create_with_qname(const axutil_env_t *env,
     axiom_node_t *parent,
-    const axis2_qname_t *qname,
+    const axutil_qname_t *qname,
     axiom_node_t ** node)
 {
     axiom_element_t *element = NULL;
@@ -149,7 +149,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
         return NULL;
     }
-    localpart = axis2_qname_get_localpart(qname, env);
+    localpart = axutil_qname_get_localpart(qname, env);
     if (!localpart)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -169,8 +169,8 @@
         axiom_namespace_t *ns  = NULL;
 
         om_element = ((axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT((*node), env));
-        temp_nsuri = axis2_qname_get_uri(qname, env);
-        temp_prefix = axis2_qname_get_prefix(qname, env);
+        temp_nsuri = axutil_qname_get_uri(qname, env);
+        temp_prefix = axutil_qname_get_prefix(qname, env);
         if (!om_element)
         {
             return NULL;
@@ -495,7 +495,7 @@
 axiom_element_find_namespace_with_qname(axiom_element_t *element,
     const axutil_env_t *env,
     axiom_node_t *node,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     AXIS2_ENV_CHECK(env, NULL);
     if (!element || !node || !qname)
@@ -504,11 +504,11 @@
         return NULL;
     }
 
-    if (axis2_qname_get_uri(qname, env))
+    if (axutil_qname_get_uri(qname, env))
     {
         return axiom_element_find_namespace(element, env, node,
-        axis2_qname_get_uri(qname, env),
-        axis2_qname_get_prefix(qname, env));
+        axutil_qname_get_uri(qname, env),
+        axutil_qname_get_prefix(qname, env));
     }
     else
     {
@@ -523,7 +523,7 @@
     axiom_node_t *element_node)
 {
 
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     axiom_namespace_t *om_namespace = NULL;
     axiom_namespace_t *temp_ns = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -562,7 +562,7 @@
     qname = axiom_attribute_get_qname(attribute, env);
     if (qname)
     {
-        axis2_char_t *name = axis2_qname_to_string(qname, env);
+        axis2_char_t *name = axutil_qname_to_string(qname, env);
         axutil_hash_set(om_element->attributes,
             name, AXIS2_HASH_KEY_STRING,
             attribute);
@@ -574,14 +574,14 @@
 AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
 axiom_element_get_attribute(axiom_element_t *om_element,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     axis2_char_t *name = NULL;
     axiom_attribute_t *attr = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
 
-    name = axis2_qname_to_string(qname, env);
+    name = axutil_qname_to_string(qname, env);
 
     if ((om_element->attributes) && name)
     {
@@ -603,7 +603,7 @@
 
     if (om_element->localname)
     {
-        axis2_string_free(om_element->localname, env);
+        axutil_string_free(om_element->localname, env);
     }
     if (om_element->ns)
     {
@@ -644,7 +644,7 @@
     }
     if (om_element->qname)
     {
-        axis2_qname_free(om_element->qname, env);
+        axutil_qname_free(om_element->qname, env);
     }
     if (om_element->children_iter)
     {
@@ -689,19 +689,19 @@
         if ((uri) && (prefix) && (axis2_strcmp(prefix, "") != 0))
         {
             status = axiom_output_write(om_output, env,
-                AXIOM_ELEMENT, 3, axis2_string_get_buffer(om_element->localname, env),
+                AXIOM_ELEMENT, 3, axutil_string_get_buffer(om_element->localname, env),
                 uri, prefix);
         }
         else if (uri)
         {
             status = axiom_output_write(om_output, env,
-                AXIOM_ELEMENT, 2, axis2_string_get_buffer(om_element->localname, env), uri);
+                AXIOM_ELEMENT, 2, axutil_string_get_buffer(om_element->localname, env), uri);
         }
     }
     else
     {
         status = axiom_output_write(om_output, env,
-            AXIOM_ELEMENT, 1, axis2_string_get_buffer(om_element->localname, env));
+            AXIOM_ELEMENT, 1, axutil_string_get_buffer(om_element->localname, env));
     }
     if (om_element->attributes)
     {
@@ -768,7 +768,7 @@
     const axutil_env_t *env)
 {
     if (om_element->localname)
-        return (axis2_char_t *)axis2_string_get_buffer(om_element->localname, env);
+        return (axis2_char_t *)axutil_string_get_buffer(om_element->localname, env);
     else
         return NULL;
 }
@@ -782,10 +782,10 @@
     AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
     if (om_element->localname)
     {
-        axis2_string_free(om_element->localname, env);
+        axutil_string_free(om_element->localname, env);
         om_element->localname = NULL;
     }
-    om_element->localname = axis2_string_create(env, localname);
+    om_element->localname = axutil_string_create(env, localname);
     if (!(om_element->localname))
     {
         return AXIS2_FAILURE;
@@ -869,7 +869,7 @@
     return om_element->namespaces;
 }
 
-AXIS2_EXTERN axis2_qname_t *AXIS2_CALL
+AXIS2_EXTERN axutil_qname_t *AXIS2_CALL
 axiom_element_get_qname(axiom_element_t *om_element,
     const axutil_env_t *env,
     axiom_node_t *ele_node)
@@ -888,23 +888,23 @@
         {
             if (axiom_namespace_get_prefix(ns, env))
             {
-                om_element->qname = axis2_qname_create(env ,
-                    axis2_string_get_buffer(om_element->localname, env),
+                om_element->qname = axutil_qname_create(env ,
+                    axutil_string_get_buffer(om_element->localname, env),
                     axiom_namespace_get_uri(ns, env),
                     axiom_namespace_get_prefix(ns, env));
             }
             else
             {
-                om_element->qname = axis2_qname_create(env,
-                    axis2_string_get_buffer(om_element->localname, env),
+                om_element->qname = axutil_qname_create(env,
+                    axutil_string_get_buffer(om_element->localname, env),
                     axiom_namespace_get_uri(ns, env),
                     NULL);
             }
         }
         else
         {
-            om_element->qname = axis2_qname_create(env,
-                axis2_string_get_buffer(om_element->localname, env),
+            om_element->qname = axutil_qname_create(env,
+                axutil_string_get_buffer(om_element->localname, env),
                 NULL,  NULL);
         }
     }
@@ -933,7 +933,7 @@
 AXIS2_EXTERN axiom_children_qname_iterator_t *AXIS2_CALL
 axiom_element_get_children_with_qname(axiom_element_t *om_element,
     const axutil_env_t *env,
-    axis2_qname_t *element_qname,
+    axutil_qname_t *element_qname,
     axiom_node_t *element_node)
 {
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
@@ -951,7 +951,7 @@
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_get_first_child_with_qname(axiom_element_t *om_element,
     const axutil_env_t *env,
-    axis2_qname_t *element_qname,
+    axutil_qname_t *element_qname,
     axiom_node_t *element_node,
     axiom_node_t **child_node)
 {
@@ -996,7 +996,7 @@
     const axutil_env_t *env,
     axiom_attribute_t *om_attribute)
 {
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, om_attribute, AXIS2_FAILURE);
 
@@ -1004,7 +1004,7 @@
     if (qname && (om_element->attributes))
     {
         axis2_char_t *name = NULL;
-        name = axis2_qname_to_string(qname, env);
+        name = axutil_qname_to_string(qname, env);
         if (name)
         {
             axutil_hash_set(om_element->attributes, name,
@@ -1344,14 +1344,14 @@
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_get_attribute_value(axiom_element_t *om_element,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     axis2_char_t *name = NULL;
     axiom_attribute_t *attr = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
 
-    name = axis2_qname_to_string(qname, env);
+    name = axutil_qname_to_string(qname, env);
 
     if ((om_element->attributes) && (NULL != name))
     {
@@ -1392,7 +1392,7 @@
     axiom_namespace_t *cloned_ns = NULL;
 
     axis2_char_t *key = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
 
     AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
     if (!om_element->attributes)
@@ -1423,7 +1423,7 @@
                 axiom_attribute_set_namespace(cloned_attr, env, cloned_ns);
             }
             qn = axiom_attribute_get_qname(cloned_attr, env);
-            key = axis2_qname_to_string(qn, env);
+            key = axutil_qname_to_string(qn, env);
             axutil_hash_set(ht_cloned, key, AXIS2_HASH_KEY_STRING, cloned_attr);
         }
         val = NULL;
@@ -1505,7 +1505,7 @@
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_create_str(const axutil_env_t *env,
     axiom_node_t *parent,
-    axis2_string_t *localname,
+    axutil_string_t *localname,
     axiom_namespace_t *ns,
     axiom_node_t **node)
 {
@@ -1544,7 +1544,7 @@
     element->text_value = NULL;
     element->next_ns_prefix_number = 0;
 
-    element->localname = axis2_string_clone(localname, env);
+    element->localname = axutil_string_clone(localname, env);
     if (!element->localname)
     {
         AXIS2_FREE(env->allocator, element);
@@ -1587,7 +1587,7 @@
     return element;
 }
 
-AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+AXIS2_EXTERN axutil_string_t* AXIS2_CALL
 axiom_element_get_localname_str(axiom_element_t *om_element,
     const axutil_env_t *env)
 {
@@ -1597,18 +1597,18 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_localname_str(axiom_element_t *om_element,
     const axutil_env_t *env,
-    axis2_string_t *localname)
+    axutil_string_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
     
     if (om_element->localname)
     {
-        axis2_string_free(om_element->localname, env);
+        axutil_string_free(om_element->localname, env);
         om_element->localname = NULL;
     }
     
-    om_element->localname = axis2_string_clone(localname, env);
+    om_element->localname = axutil_string_clone(localname, env);
 
     if (!(om_element->localname))
     {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_namespace.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_namespace.c Fri Mar 30 12:24:00 2007
@@ -16,15 +16,15 @@
  */
 
 #include <axiom_namespace.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include "axiom_namespace_internal.h"
 
 struct axiom_namespace
 {
     /** namespace URI */
-    axis2_string_t *uri;
+    axutil_string_t *uri;
     /** namespace prefix  */
-    axis2_string_t *prefix;
+    axutil_string_t *prefix;
 
     axis2_char_t *key;
 
@@ -57,7 +57,7 @@
     om_namespace->uri = NULL;
     om_namespace->key = NULL;
 
-    om_namespace->uri = axis2_string_create(env, uri);
+    om_namespace->uri = axutil_string_create(env, uri);
     if (!om_namespace->uri)
     {
         AXIS2_FREE(env->allocator, om_namespace);
@@ -67,7 +67,7 @@
 
     if (prefix)
     {
-        om_namespace->prefix = axis2_string_create(env, prefix);
+        om_namespace->prefix = axutil_string_create(env, prefix);
         if (!om_namespace->prefix)
         {
             AXIS2_FREE(env->allocator, om_namespace);
@@ -93,12 +93,12 @@
 
     if (om_namespace->prefix)
     {
-        axis2_string_free(om_namespace->prefix, env);
+        axutil_string_free(om_namespace->prefix, env);
     }
 
     if (om_namespace->uri)
     {
-        axis2_string_free(om_namespace->uri, env);
+        axutil_string_free(om_namespace->uri, env);
     }
 
     if (om_namespace->key)
@@ -130,8 +130,8 @@
 
     if (om_namespace->uri && om_namespace1->uri)
     {
-        uris_differ = axis2_strcmp(axis2_string_get_buffer(om_namespace->uri, env), 
-            axis2_string_get_buffer(om_namespace1->uri, env));
+        uris_differ = axis2_strcmp(axutil_string_get_buffer(om_namespace->uri, env), 
+            axutil_string_get_buffer(om_namespace1->uri, env));
     }
     else
     {
@@ -141,8 +141,8 @@
     if (om_namespace->prefix && om_namespace1->prefix)
     {
         prefixes_differ =
-            axis2_strcmp(axis2_string_get_buffer(om_namespace->prefix, env), 
-            axis2_string_get_buffer(om_namespace1->prefix, env));
+            axis2_strcmp(axutil_string_get_buffer(om_namespace->prefix, env), 
+            axutil_string_get_buffer(om_namespace1->prefix, env));
     }
     else
     {
@@ -167,16 +167,16 @@
     AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
 
     if (om_namespace->uri && NULL != om_namespace->prefix &&
-        axis2_strcmp(axis2_string_get_buffer(om_namespace->prefix, env), "") != 0)
+        axis2_strcmp(axutil_string_get_buffer(om_namespace->prefix, env), "") != 0)
     {
         status = axiom_output_write(om_output, env, AXIOM_NAMESPACE,
-            2, axis2_string_get_buffer(om_namespace->prefix, env),
-            axis2_string_get_buffer(om_namespace->uri, env));
+            2, axutil_string_get_buffer(om_namespace->prefix, env),
+            axutil_string_get_buffer(om_namespace->uri, env));
     }
     else if (om_namespace->uri)
     {
         status = axiom_output_write(om_output, env, AXIOM_NAMESPACE,
-            2, NULL, axis2_string_get_buffer(om_namespace->uri, env));
+            2, NULL, axutil_string_get_buffer(om_namespace->uri, env));
     }
     return status;
 }
@@ -187,7 +187,7 @@
 {
     if (om_namespace->uri)
     {
-        return (axis2_char_t *)axis2_string_get_buffer(om_namespace->uri, env);
+        return (axis2_char_t *)axutil_string_get_buffer(om_namespace->uri, env);
     }
     return NULL;
 }
@@ -199,7 +199,7 @@
 {
     if (om_namespace->prefix)
     {
-        return (axis2_char_t *)axis2_string_get_buffer(om_namespace->prefix, env);
+        return (axis2_char_t *)axutil_string_get_buffer(om_namespace->prefix, env);
     }
     return NULL;
 }
@@ -234,10 +234,10 @@
     }
     if ((om_namespace->uri) && (NULL != om_namespace->prefix))
     {
-        temp_str = axis2_stracat(env, axis2_string_get_buffer(om_namespace->uri, env), "|");
+        temp_str = axis2_stracat(env, axutil_string_get_buffer(om_namespace->uri, env), "|");
         om_namespace->key = axis2_stracat(env,
 			temp_str, 
-            axis2_string_get_buffer(om_namespace->prefix, env));
+            axutil_string_get_buffer(om_namespace->prefix, env));
         if (temp_str)
         {
             AXIS2_FREE(env->allocator, temp_str);
@@ -246,7 +246,7 @@
     }
     else if ((om_namespace->uri) && !(om_namespace->prefix))
     {
-        om_namespace->key = axis2_strdup(env, axis2_string_get_buffer(om_namespace->uri, env));
+        om_namespace->key = axis2_strdup(env, axutil_string_get_buffer(om_namespace->uri, env));
         if (!(om_namespace->key))
         {
             return NULL;
@@ -266,11 +266,11 @@
 
     if (om_namespace->uri)
     {
-        axis2_string_free(om_namespace->uri, env);
+        axutil_string_free(om_namespace->uri, env);
         om_namespace->uri = NULL;
     }
 
-    om_namespace->uri = axis2_string_create(env, uri);
+    om_namespace->uri = axutil_string_create(env, uri);
     if (!(om_namespace->uri))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -290,15 +290,15 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_namespace_create_str(const axutil_env_t *env,
-    axis2_string_t * uri,
-    axis2_string_t * prefix)
+    axutil_string_t * uri,
+    axutil_string_t * prefix)
 {
     axiom_namespace_t *om_namespace = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     if (!uri)
     {
-      uri = axis2_string_create(env, "");
+      uri = axutil_string_create(env, "");
     }
 
     om_namespace = (axiom_namespace_t *) AXIS2_MALLOC(env->allocator,
@@ -314,7 +314,7 @@
     om_namespace->uri = NULL;
     om_namespace->key = NULL;
 
-    om_namespace->uri = axis2_string_clone(uri, env);
+    om_namespace->uri = axutil_string_clone(uri, env);
     if (!om_namespace->uri)
     {
         AXIS2_FREE(env->allocator, om_namespace);
@@ -324,7 +324,7 @@
 
     if (prefix)
     {
-        om_namespace->prefix = axis2_string_clone(prefix, env);
+        om_namespace->prefix = axutil_string_clone(prefix, env);
         if (!om_namespace->prefix)
         {
             AXIS2_FREE(env->allocator, om_namespace);
@@ -340,18 +340,18 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_namespace_set_uri_str(axiom_namespace_t *om_namespace,
     const axutil_env_t *env,
-    axis2_string_t *uri)
+    axutil_string_t *uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
 
     if (om_namespace->uri)
     {
-        axis2_string_free(om_namespace->uri, env);
+        axutil_string_free(om_namespace->uri, env);
         om_namespace->uri = NULL;
     }
 
-    om_namespace->uri = axis2_string_clone(uri, env);
+    om_namespace->uri = axutil_string_clone(uri, env);
     if (!(om_namespace->uri))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -361,14 +361,14 @@
 
 }
 
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
 axiom_namespace_get_uri_str(axiom_namespace_t *om_namespace,
     const axutil_env_t *env)
 {
     return om_namespace->uri;
 }
 
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
 axiom_namespace_get_prefix_str(axiom_namespace_t *om_namespace,
     const axutil_env_t *env)
 {

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=524243&r1=524242&r2=524243
==============================================================================
--- 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:24:00 2007
@@ -17,7 +17,7 @@
 
 #include <axiom_output.h>
 #include <stdarg.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axiom_xml_writer.h>
 #include <axiom_text.h>
 #include <axiom_soap_const.h>



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