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:54:23 UTC

svn commit: r524255 [2/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...

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Fri Mar 30 12:54:08 2007
@@ -26,7 +26,7 @@
 #include <axis2_http_transport.h>
 #include <axis2_http_sender.h>
 #include <axiom_soap_body.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 
 
 /**

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Fri Mar 30 12:54:08 2007
@@ -10,7 +10,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>

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h Fri Mar 30 12:54:08 2007
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <axis2_http_sender.h>
 #include <axutil_string.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 #include <axutil_generic_obj.h>
 #include <axis2_const.h>
 #include <axis2_util.h>

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c Fri Mar 30 12:54:08 2007
@@ -9,7 +9,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>
 
 void

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Fri Mar 30 12:54:08 2007
@@ -24,9 +24,9 @@
 #include <axis2_http_transport_utils.h>
 #include <axis2_op_ctx.h>
 #include <axis2_engine.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 #include <axis2_conf_init.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 
 #include "axis2_iis_out_transport_info.h"
 #include "axis2_iis_stream.h"
@@ -171,7 +171,7 @@
     axis2_char_t *body_string = NULL;
     int send_status = -1;
     axutil_property_t *property = NULL;
-    axis2_url_t *url = NULL;
+    axutil_url_t *url = NULL;
     axis2_http_out_transport_info_t *iis_out_transport_info = NULL;
     axutil_qname_t *transport_qname = NULL;
     axis2_char_t *ctx_uuid = NULL;
@@ -241,7 +241,7 @@
 
 	axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
 
-	ctx_uuid = axis2_uuid_gen(env);
+	ctx_uuid = axutil_uuid_gen(env);
 	if (ctx_uuid)
 	{
         axutil_string_t *uuid_str = axutil_string_create_assume_ownership(env, &ctx_uuid);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c Fri Mar 30 12:54:08 2007
@@ -25,7 +25,7 @@
 /* Axis headers */
 #include <axutil_error_default.h>
 #include <axutil_log_default.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 #include <axiom_xml_reader.h>
 #include <axutil_log.h>
 
@@ -119,7 +119,7 @@
 	*/		
     axutil_error_t *error = NULL;
     axutil_log_t *axutil_logger = NULL;
-    axis2_thread_pool_t *thread_pool = NULL;
+    axutil_thread_pool_t *thread_pool = NULL;
 	axis2_status_t status = FALSE;	
     // We need to init xml readers before we go into threaded env     
 	axiom_xml_reader_init();		

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.h Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #ifndef	AXIS2_ISAPI_PLUGIN_H
 #define AXIS2_ISAPI_PLUGIN_H
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #ifdef __cplusplus
 extern "C"
 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Fri Mar 30 12:54:08 2007
@@ -24,10 +24,10 @@
 #include <axis2_http_transport_utils.h>
 #include <axis2_op_ctx.h>
 #include <axis2_engine.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 #include <axis2_conf_init.h>
 #include "axis2_apache2_out_transport_info.h"
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <http_core.h>
 #include <http_protocol.h>
 
@@ -198,7 +198,7 @@
 
     axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
 
-    ctx_uuid = axis2_uuid_gen(env);
+    ctx_uuid = axutil_uuid_gen(env);
     if (ctx_uuid)
     {
         axutil_string_t *uuid_str = axutil_string_create_assume_ownership(env, &ctx_uuid);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c Fri Mar 30 12:54:08 2007
@@ -25,7 +25,7 @@
 #include "axis2_apache2_worker.h"
 #include <axutil_error_default.h>
 #include <axutil_log_default.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 #include <axiom_xml_reader.h>
 
 /* Configuration structure populated by apache2.conf */
@@ -272,7 +272,7 @@
     axutil_allocator_t *allocator = NULL;
     axutil_error_t *error = NULL;
     axutil_log_t *axutil_logger = NULL;
-    axis2_thread_pool_t *thread_pool = NULL;
+    axutil_thread_pool_t *thread_pool = NULL;
     axis2_config_rec_t *conf = (axis2_config_rec_t*)ap_get_module_config(
                 svr_rec->module_config, &axis2_module);
 
@@ -328,7 +328,7 @@
                      "[Axis2] Error creating mod_axis2 log structure");
         exit(APEXIT_CHILDFATAL);
     }
-    thread_pool = axis2_thread_pool_init(allocator);
+    thread_pool = axutil_thread_pool_init(allocator);
     if (! thread_pool)
     {
         ap_log_error(APLOG_MARK, APLOG_EMERG, APR_EGENERAL, svr_rec,

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c Fri Mar 30 12:54:08 2007
@@ -22,9 +22,9 @@
 #include <stdlib.h>
 #include <axutil_error_default.h>
 #include <axutil_log_default.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 #include <signal.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
 #include <ctype.h>
 #include <axiom_xml_reader.h>
 
@@ -56,7 +56,7 @@
     axutil_log_t *log = axutil_log_create(allocator, NULL, log_file);
 	 /* if (!log) */
 /* 		  log = axutil_log_create_default (allocator); */
-    axis2_thread_pool_t *thread_pool = axis2_thread_pool_init(allocator);
+    axutil_thread_pool_t *thread_pool = axutil_thread_pool_init(allocator);
     /* We need to init the parser in main thread before spawning child
      * threads
      */

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Fri Mar 30 12:54:08 2007
@@ -25,14 +25,14 @@
 #include <axiom_soap_builder.h>
 #include <axis2_engine.h>
 #include <axiom_soap_body.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axiom_namespace.h>
 #include <axiom_node.h>
 #include <axutil_hash.h>
 #include <axiom_soap_const.h>
 #include <axis2_http_header.h>
 #include <axutil_property.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axiom_mime_parser.h>
 #include <axis2_disp.h>
 #include <axis2_msg.h>

Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Fri Mar 30 12:54:08 2007
@@ -21,7 +21,7 @@
 #include <axis2_relates_to.h>
 #include <axis2_addr.h>
 #include <axis2_http_transport.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 #include <axutil_property.h>
 #include <axis2_conf_ctx.h>
 
@@ -78,7 +78,7 @@
          axis2_msg_ctx_set_msg_info_headers(new_msg_ctx, env, msg_info_headers);
     }
 
-    msg_uuid =  axis2_uuid_gen(env);
+    msg_uuid =  axutil_uuid_gen(env);
     axis2_msg_info_headers_set_message_id(msg_info_headers, env, msg_uuid);
     if (msg_uuid)
     {

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h Fri Mar 30 12:54:08 2007
@@ -50,7 +50,7 @@
      */
     AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
     axis2_client_utils_create_axis2_svc(const axutil_env_t *env,
-        const axis2_uri_t *wsdl_uri,
+        const axutil_uri_t *wsdl_uri,
         const axutil_qname_t *wsdl_svc_qname,
         const axis2_char_t *ep_name,
         const axis2_char_t *doc_base_uri,

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c Fri Mar 30 12:54:08 2007
@@ -16,8 +16,8 @@
  */
 
 #include <axutil_string.h>
-#include <axis2_url.h>
-#include <axis2_uri.h>
+#include <axutil_url.h>
+#include <axutil_uri.h>
 #include <axutil_qname.h>
 #include <axis2_options.h>
 #include <axiom_util.h>
@@ -47,7 +47,7 @@
 
 AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
 axis2_client_utils_create_axis2_svc(const axutil_env_t *env,
-    const axis2_uri_t *wsdl_uri,
+    const axutil_uri_t *wsdl_uri,
     const axutil_qname_t *wsdl_svc_qname,
     const axis2_char_t *ep_name,
     const axis2_char_t *doc_base_uri,
@@ -163,14 +163,14 @@
         }
         if (AXIS2_TRUE == endpoint_found)
         {
-            axis2_uri_t *soap_address = NULL;
+            axutil_uri_t *soap_address = NULL;
             axis2_endpoint_ref_t *endpoint_ref = NULL;
             axis2_char_t *address = NULL;
 
             soap_address = WODEN_ENDPOINT_GET_ADDRESS(endpoint, env);
             if (soap_address)
             {
-                address = axis2_uri_to_string(soap_address, env,
+                address = axutil_uri_to_string(soap_address, env,
                     AXIS2_URI_UNP_OMITUSERINFO);
                 endpoint_ref = axis2_endpoint_ref_create(env, address);
                 if (options)
@@ -203,7 +203,7 @@
             axis2_bool_t in = AXIS2_FALSE;
             axis2_bool_t out = AXIS2_FALSE;
             axutil_qname_t *op_qname = NULL;
-            axis2_uri_t *mep_uri = NULL;
+            axutil_uri_t *mep_uri = NULL;
             axis2_char_t *mep_str = NULL;
 
             binding_op = axutil_array_list_get(binding_ops, env, i);
@@ -248,7 +248,7 @@
                 env);
             if (mep_uri)
             {
-                mep_str = axis2_uri_to_string(mep_uri, env,
+                mep_str = axutil_uri_to_string(mep_uri, env,
                     AXIS2_URI_UNP_OMITUSERINFO);
                 axis2_op_set_msg_exchange_pattern(axis2_op, env, mep_str);
             }
@@ -351,7 +351,7 @@
             axutil_qname_t *ext_type = NULL;
             int j = 0, size = 0;
             axutil_array_list_t *ext_elements = NULL;
-            axis2_uri_t *soap_address_uri = NULL;
+            axutil_uri_t *soap_address_uri = NULL;
 
             endpoint = woden_wsdl10_endpoint_to_element_extensible(
                 endpoint, env);
@@ -386,7 +386,7 @@
 
             if (soap_address_uri)
             {
-                address = axis2_uri_to_string(soap_address_uri, env,
+                address = axutil_uri_to_string(soap_address_uri, env,
                     AXIS2_URI_UNP_OMITUSERINFO);
                 endpoint_ref = axis2_endpoint_ref_create(env, address);
                 if (options)
@@ -421,7 +421,7 @@
             axutil_qname_t *ext_type = NULL;
             axutil_qname_t *ext_type_l = NULL;
             axutil_param_t *param = NULL;
-            axis2_uri_t *mep_uri = NULL;
+            axutil_uri_t *mep_uri = NULL;
             axis2_char_t *mep_str = NULL;
 
             binding_op = axutil_array_list_get(binding_ops, env, i);
@@ -461,7 +461,7 @@
                 env);
             if (mep_uri)
             {
-                mep_str = axis2_uri_to_string(mep_uri, env,
+                mep_str = axutil_uri_to_string(mep_uri, env,
                     AXIS2_URI_UNP_OMITUSERINFO);
                 axis2_op_set_msg_exchange_pattern(axis2_op, env, mep_str);
             }
@@ -484,7 +484,7 @@
                 if (AXIS2_TRUE == axutil_qname_equals(ext_type, env, ext_type_l))
                 {
                     void *soap_binding_op = NULL;
-                    axis2_uri_t *soap_action_uri = NULL;
+                    axutil_uri_t *soap_action_uri = NULL;
 
                     ext_element =
                         woden_wsdl10_soap_module_to_soap_module_element(ext_element, env);

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Fri Mar 30 12:54:08 2007
@@ -85,7 +85,7 @@
 {
     axiom_node_t *payload = NULL;
     axiom_node_t *response = NULL;
-    axis2_uri_t *wsdl_uri = NULL;
+    axutil_uri_t *wsdl_uri = NULL;
     axutil_qname_t *op_qname = NULL;
     axis2_svc_client_t *svc_client = NULL;
     const axis2_char_t *client_home = NULL;
@@ -106,7 +106,7 @@
 
     wsdl_svc_qname = axutil_qname_create(env, "Calculator",
             "http://localhost/axis/Calculator", NULL);
-    wsdl_uri = axis2_uri_parse_string(env, wsdl_uri_str);
+    wsdl_uri = axutil_uri_parse_string(env, wsdl_uri_str);
     svc_client =
         axis2_svc_client_create_for_dynamic_invocation(
             env, NULL, wsdl_uri, wsdl_svc_qname, "Calculator", client_home);
@@ -148,7 +148,7 @@
 {
     axiom_node_t *payload = NULL;
     axiom_node_t *response = NULL;
-    axis2_uri_t *wsdl_uri = NULL;
+    axutil_uri_t *wsdl_uri = NULL;
     axutil_qname_t *op_qname = NULL;
     axis2_svc_client_t *svc_client = NULL;
     const axis2_char_t *client_home = NULL;
@@ -168,7 +168,7 @@
 
     wsdl_svc_qname = axutil_qname_create(env, "reservationService",
             "http://greath.example.com/2004/wsdl/resSvc", NULL);
-    wsdl_uri = axis2_uri_parse_string(env, wsdl_uri_str);
+    wsdl_uri = axutil_uri_parse_string(env, wsdl_uri_str);
     svc_client =
         axis2_svc_client_create_for_dynamic_invocation(
             env, NULL, wsdl_uri, wsdl_svc_qname, "reservationService", client_home);

Modified: webservices/axis2/trunk/c/savan/include/savan_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/include/savan_util.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/savan/include/savan_util.h (original)
+++ webservices/axis2/trunk/c/savan/include/savan_util.h Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
 #include <axis2_const.h>
 #include <axutil_error.h>
 #include <axis2_defines.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_msg_ctx.h>

Modified: webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
 #include <axis2_engine.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_conf_init.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 #include <axis2_util.h>
 #include <axis2_svc_client.h>
 #include <axis2_options.h>

Modified: webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
 #include <axis2_engine.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_conf_init.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 #include <axis2_util.h>
 #include <axis2_svc_client.h>
 #include <axis2_options.h>
@@ -70,7 +70,7 @@
 
 static void * AXIS2_THREAD_FUNC
 publisher_worker_func(
-    axis2_thread_t *thrd,
+    axutil_thread_t *thrd,
     void* data);
     
 /*Create function */
@@ -130,7 +130,7 @@
             axis2_msg_ctx_t *msg_ctx)
 {
 
-	axis2_thread_t *worker_thread = NULL;
+	axutil_thread_t *worker_thread = NULL;
 	publisher_data_t *data = NULL;
 
     printf("publisher invoke called.\n");
@@ -208,7 +208,7 @@
 
 static void * AXIS2_THREAD_FUNC
 publisher_worker_func(
-    axis2_thread_t *thrd,
+    axutil_thread_t *thrd,
     void* data)
 {
     axutil_env_t *main_env = NULL;

Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
 #include <axiom_node.h>
 #include <axiom_soap_envelope.h>
 #include <axiom_soap_body.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
 
 #include <savan_sub_processor.h>
 #include <savan_constants.h>
@@ -355,7 +355,7 @@
     }
     
     /* Assign a unique id to subscriber */
-    sub_id = axis2_uuid_gen(env);
+    sub_id = axutil_uuid_gen(env);
     if (sub_id)
     {
         savan_subscriber_set_id(subscriber, env, sub_id);

Modified: webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
 #include <axis2_http_status_line.h>
 #include <axis2_http_header.h>
 #include <axutil_error_default.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <axis2_http_client.h>
 
 typedef struct a
@@ -95,7 +95,7 @@
 void test_url(const axutil_env_t *env)
 {
     const axis2_char_t *str_url = "http://ws.apache.org/axis2/";
-    axis2_url_t *url = axis2_url_parse_string(env, str_url);
+    axutil_url_t *url = axutil_url_parse_string(env, str_url);
     if (! url)
     {
         printf("URL is NULL\n");
@@ -103,10 +103,10 @@
     }
     printf("Starting URL Test ....\n");
     printf("Parsed URL : \n Protocol :%s|\n Server :%s|\n Port :%d|\n Path : %s|\n",
-            axis2_url_get_protocol(url, env), axis2_url_get_server(url, env),
-            axis2_url_get_port(url, env), axis2_url_get_path(url, env));
+            axutil_url_get_protocol(url, env), axutil_url_get_server(url, env),
+            axutil_url_get_port(url, env), axutil_url_get_path(url, env));
     printf("End of URL Test ... \n");
-    axis2_url_free(url, env);
+    axutil_url_free(url, env);
 }
 
 void test_http_client(const axutil_env_t *env)
@@ -114,7 +114,7 @@
     axis2_http_client_t *client = NULL;
     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;
     axis2_http_header_t *header = NULL;
     axutil_stream_t *request_body = NULL;
     axis2_http_simple_response_t *response = NULL;
@@ -128,9 +128,9 @@
     request_body = axutil_stream_create_basic(env);
     request = axis2_http_simple_request_create(env, request_line,
             NULL, 0, NULL);
-    url = axis2_url_create(env, "http", "localhost", 80,
+    url = axutil_url_create(env, "http", "localhost", 80,
             NULL);
-    header = axis2_http_header_create(env, "Host", axis2_url_get_server(url, env));
+    header = axis2_http_header_create(env, "Host", axutil_url_get_server(url, env));
     AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
     client = axis2_http_client_create(env, url);
 
@@ -175,7 +175,7 @@
     axis2_http_client_t *client = NULL;
     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;
     axis2_http_header_t *header = NULL;
     axutil_stream_t *request_body = NULL;
     axis2_http_simple_response_t *response = NULL;
@@ -189,11 +189,11 @@
     request_body = axutil_stream_create_basic(env);
     request = axis2_http_simple_request_create(env, request_line,
             NULL, 0, NULL);
-    url = axis2_url_create(env, "https", "localhost", 9090,
+    url = axutil_url_create(env, "https", "localhost", 9090,
             NULL);
     /* Add an ssl certificate variable */
     /*setenv("AXIS2_SSL_CA_FILE", "cert.pem", 1);*/
-    header = axis2_http_header_create(env, "Host", axis2_url_get_server(url, env));
+    header = axis2_http_header_create(env, "Host", axutil_url_get_server(url, env));
     AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
     client = axis2_http_client_create(env, url);
 

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_array_list.h>
 
 #ifdef __cplusplus

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief parse command line options
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_hash.h>
 #include <axutil_array_list.h>
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_validator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_validator.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_validator.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_validator.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief handles Axis2/C w2c command line option validation
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_cmdline_option.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_engine_configuration.h>
 #include <w2c_config_property_loader.h>
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_cmdline_option_parser.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief handles Axis2/C w2c config loading
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_hash.h>
 #include <w2c_engine_configuration.h>
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 #include <w2c_typemapper.h>

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_engine_configuration.h>
 
 #ifdef __cplusplus

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief handles Axis2/C w2c messages
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_hash.h>
 #include <axutil_properties.h>
 

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_qname.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_schema_compiler_options.h>
 #include <xml_schema.h>
 #include <w2c_typemapper.h>

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_hash.h>
 #include <w2c_engine_configuration.h>
 #include <w2c_qname2name_maker.h>

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_schema_writer.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_hash.h>
 #include <w2c_schema_compiler_options.h>
 #include <xml_schema_element.h>

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_engine_configuration.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  */
 
 #include <stdio.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_string.h>
 #include <axutil_qname.h>
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 #include <axutil_qname.h>

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represent command line option
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axiom.h>
 #include <w2c_config_property_loader.h>
 #include <w2c_engine_configuration.h>

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

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h Fri Mar 30 12:54:08 2007
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <axutil_stream.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axiom.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
  
 #include <w2c_url_processor.h>
 #include <w2c_string.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <ctype.h>
 
 
@@ -42,7 +42,7 @@
     const axutil_env_t *env,
     axis2_char_t *namespace)
 {
-    axis2_url_t *url = NULL;
+    axutil_url_t *url = NULL;
     axis2_char_t *host_name = NULL;
     axis2_char_t *path = NULL;
     int index = 0;
@@ -52,13 +52,13 @@
     axis2_char_t *long_path_rev = NULL;
     axis2_char_t *ptr = NULL;
 
-    url = axis2_url_parse_string (env, namespace );
+    url = axutil_url_parse_string (env, namespace );
     if ( ! url )
     {
         return axis2_strdup(env, namespace);
     }
-    host_name = axis2_url_get_server ( url, env );
-    path = axis2_url_get_path ( url, env );
+    host_name = axutil_url_get_server ( url, env );
+    path = axutil_url_get_path ( url, env );
 
     if ( ! host_name )
     {

Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c Fri Mar 30 12:54:08 2007
@@ -431,7 +431,7 @@
     int size = 0;
     axutil_array_list_t *ext_elements = NULL;
     void *soap_address = NULL;
-    axis2_uri_t *soap_address_uri = NULL;
+    axutil_uri_t *soap_address_uri = NULL;
     axiom_node_t *endpoint_node = NULL;
     void *ext_element = NULL;
     
@@ -451,7 +451,7 @@
     axiom_node_t *method = NULL;
     
     void *soap_binding_op = NULL;
-    axis2_uri_t *soap_action_uri = NULL;
+    axutil_uri_t *soap_action_uri = NULL;
     axis2_char_t *soap_action_str = NULL;
    
     axis2_char_t *given_name = NULL;
@@ -517,7 +517,7 @@
 
     if(soap_address_uri)
     {
-        address = axis2_uri_to_string(soap_address_uri, env,
+        address = axutil_uri_to_string(soap_address_uri, env,
                 AXIS2_URI_UNP_OMITUSERINFO);
         endpoint_node = w2c_xslt_utils_add_child_node(env, "endpoint",
                                                         root);
@@ -602,7 +602,7 @@
                 soap_action_uri = 
                         WODEN_WSDL10_SOAP_BINDING_OP_EXTS_GET_SOAP_ACTION
                                                            (soap_binding_op, env);
-                soap_action_str = axis2_uri_to_string 
+                soap_action_str = axutil_uri_to_string 
                                   ( soap_action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
                 w2c_xslt_utils_add_attribute (env, method, "soapaction", soap_action_str);
             }
@@ -726,7 +726,7 @@
 
     axutil_array_list_t* endpoint_list = NULL;
     woden_endpoint_t * endpoint = NULL;
-    axis2_uri_t* endpoint_uri = NULL;
+    axutil_uri_t* endpoint_uri = NULL;
     axis2_char_t* endpoint_uri_str = NULL;
     axiom_node_t* endpoint_node = NULL;
     
@@ -745,7 +745,7 @@
     axiom_node_t* method = NULL;
   
     /*void *soap_binding_op = NULL;*/
-    axis2_uri_t *soap_action_uri = NULL;
+    axutil_uri_t *soap_action_uri = NULL;
     axis2_char_t *soap_action_str = NULL;
     axutil_qname_t *ext_type_l = NULL;
     axutil_qname_t *ext_type = NULL;
@@ -781,7 +781,7 @@
     }
     endpoint = axutil_array_list_get( endpoint_list, env, 0 );
     endpoint_uri = WODEN_ENDPOINT_GET_ADDRESS( endpoint, env);
-    endpoint_uri_str = axis2_uri_to_string ( endpoint_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+    endpoint_uri_str = axutil_uri_to_string ( endpoint_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
     endpoint_node = w2c_xslt_utils_add_child_node(env, "endpoint",
                                                     root);
     /** here the endpoint adding */
@@ -864,7 +864,7 @@
                 soap_action_uri = 
                         WODEN_SOAP_BINDING_OP_EXTS_GET_SOAP_ACTION
                                                            (soap_binding_op, env); */
-                soap_action_str = axis2_uri_to_string 
+                soap_action_str = axutil_uri_to_string 
                                   ( soap_action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
                 w2c_xslt_utils_add_attribute (env, method, "soapaction", soap_action_str);
             }

Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <w2c_cmdline_option_parser.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 #include <w2c_cmdline_option.h>

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <CuTest.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_string.h>
 #include <w2c_cmdline_option.h>
 #include <w2c_cmdline_option_parser.h>

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <CuTest.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_string.h>
 #include <w2c_cmdline_option.h>
 #include <w2c_cmdline_option_parser.h>

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <CuTest.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <w2c_url_processor.h>
 #include <w2c_xslt_template_processor.h>
 #include "w2c_util_test.h"

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/entry.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/entry.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/entry.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <stdio.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error.h>
 #include <axutil_string.h>
 #include <axutil_network_handler.h>
@@ -363,7 +363,7 @@
 /** implimentations for protected methods */
 
 /** executes as new entry arises */
-void* AXIS2_CALL tcpmon_entry_new_entry_funct(axis2_thread_t *thd, void* data)
+void* AXIS2_CALL tcpmon_entry_new_entry_funct(axutil_thread_t *thd, void* data)
 {
 	 tcpmon_entry_request_data_t* req_data = data;
 	 const axutil_env_t* env = NULL;

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/session.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Fri Mar 30 12:54:08 2007
@@ -17,10 +17,10 @@
 
 #include <stdio.h>
 #include <axutil_string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error.h>
 #include <tcpmon_util.h>
-#include <axis2_thread.h>
+#include <axutil_thread.h>
 #include <axutil_network_handler.h>
 #include <axutil_array_list.h>
 
@@ -128,7 +128,7 @@
 /** internal implementations */
 
 void * AXIS2_THREAD_FUNC
-server_funct(axis2_thread_t *thd, void *data);
+server_funct(axutil_thread_t *thd, void *data);
 
 /************************** End of function prototypes ************************/
 
@@ -377,7 +377,7 @@
         const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
-    axis2_thread_t* server_thread = NULL;
+    axutil_thread_t* server_thread = NULL;
     tcpmon_session_server_thread_data_t* thread_data = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -455,14 +455,14 @@
 
 /** internal implementations */
 void * AXIS2_THREAD_FUNC
-server_funct(axis2_thread_t *thd, void *data)
+server_funct(axutil_thread_t *thd, void *data)
 {
     tcpmon_session_server_thread_data_t* thread_data = data;
     tcpmon_session_impl_t *session_impl = NULL;
     const axutil_env_t* env = NULL;
     int listen_socket = -1;
     int socket = -1;
-    axis2_thread_t* request_thread = NULL;
+    axutil_thread_t* request_thread = NULL;
     tcpmon_entry_request_data_t* request_thread_data = NULL;
 
     session_impl = thread_data -> session_impl;

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c Fri Mar 30 12:54:08 2007
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_error_default.h>
 #include <axutil_log_default.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 #include <tcpmon_session.h>
 #include <tcpmon_entry.h>
 #include <tcpmon_util.h>
@@ -39,7 +39,7 @@
 		axutil_allocator_t* allocator = NULL;
 		axutil_error_t *error = NULL;
 		axutil_log_t *log = NULL;
-		axis2_thread_pool_t *thread_pool = NULL;
+		axutil_thread_pool_t *thread_pool = NULL;
 		tcpmon_session_t* session = NULL;
 		int c;
 		int listen_port = 0, target_port = 0;
@@ -52,7 +52,7 @@
 
 		error = axutil_error_create(allocator);
 		log = axutil_log_create(allocator, NULL, "axis2_tcpmon.log");
-		thread_pool = axis2_thread_pool_init(allocator);
+		thread_pool = axutil_thread_pool_init(allocator);
 
 		env = axutil_env_create_with_error_log_thread_pool(allocator, error, log,
 																		  thread_pool);

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h Fri Mar 30 12:54:08 2007
@@ -9,5 +9,5 @@
     tcpmon_session_t* session;
 } tcpmon_entry_request_data_t;
 
-void* AXIS2_CALL tcpmon_entry_new_entry_funct(axis2_thread_t *thd, void* data);
+void* AXIS2_CALL tcpmon_entry_new_entry_funct(axutil_thread_t *thd, void* data);
 

Modified: webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <CuTest.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include "tcpmon_test.h"
 #include <stdlib.h>
 #include <axutil_string.h>

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

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

Modified: webservices/axis2/trunk/c/util/include/axutil_base64.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_base64.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_base64.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_base64.h Fri Mar 30 12:54:08 2007
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 /*
  * @file axutil_base64.h
  * @brief AXIS2-UTIL Base64 Encoding

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

Modified: webservices/axis2/trunk/c/util/include/axutil_class_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_class_loader.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_class_loader.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_class_loader.h Fri Mar 30 12:54:08 2007
@@ -23,10 +23,10 @@
   * @brief axis2 class loader interface
   */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_qname.h>
 #include <axutil_error.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_dll_desc.h>
 #include <axutil_param.h>
 

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

Modified: webservices/axis2/trunk/c/util/include/axutil_date_time_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_date_time_util.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_date_time_util.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_date_time_util.h Fri Mar 30 12:54:08 2007
@@ -17,8 +17,8 @@
 #ifndef AXUTIL_DATE_TIME_UTIL_H
 #define AXUTIL_DATE_TIME_UTIL_H
 
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
@@ -30,7 +30,7 @@
 
 
 /**
- * @defgroup axis2_uuid_gen UUID generator
+ * @defgroup axutil_uuid_gen UUID generator
  * @ingroup axis2_util 
  * @{
  */

Modified: webservices/axis2/trunk/c/util/include/axutil_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dir_handler.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dir_handler.h Fri Mar 30 12:54:08 2007
@@ -18,12 +18,12 @@
 #ifndef AXUTIL_DIR_HANDLER_H
 #define AXUTIL_DIR_HANDLER_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 #include <axutil_env.h>
 #include <axutil_string.h>
 #include <axutil_array_list.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/axutil_dll_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dll_desc.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dll_desc.h Fri Mar 30 12:54:08 2007
@@ -23,10 +23,10 @@
  * @brief Axis2 dll_desc interface
  */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_qname.h>
 #include <axutil_error.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/axutil_env.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_env.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_env.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_env.h Fri Mar 30 12:54:08 2007
@@ -27,7 +27,7 @@
 #include <axutil_allocator.h>
 #include <axutil_error.h>
 #include <axutil_log.h>
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -67,7 +67,7 @@
         /** This flag indicate whether logging is enabled or not */
         axis2_bool_t log_enabled;
         /** Thread pooling routines */
-        axis2_thread_pool_t *thread_pool;
+        axutil_thread_pool_t *thread_pool;
     }
     axutil_env_t;
 
@@ -128,7 +128,7 @@
     axutil_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator, 
         axutil_error_t *error, 
         axutil_log_t *log, 
-        axis2_thread_pool_t *pool);
+        axutil_thread_pool_t *pool);
 
     /**
       * Creates an environment struct

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

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

Modified: webservices/axis2/trunk/c/util/include/axutil_file.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_file.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_file.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_file.h Fri Mar 30 12:54:08 2007
@@ -18,10 +18,10 @@
 #ifndef AXUTIL_FILE_H
 #define AXUTIL_FILE_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 

Modified: webservices/axis2/trunk/c/util/include/axutil_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_generic_obj.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_generic_obj.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_generic_obj.h Fri Mar 30 12:54:08 2007
@@ -18,10 +18,10 @@
 #ifndef AXUTIL_GENERIC_OBJ_H
 #define AXUTIL_GENERIC_OBJ_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 #ifdef __cplusplus

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

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

Modified: webservices/axis2/trunk/c/util/include/axutil_network_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_network_handler.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_network_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_network_handler.h Fri Mar 30 12:54:08 2007
@@ -17,8 +17,8 @@
 #ifndef AXUTIL_NETWORK_HANDLER_H
 #define AXUTIL_NETWORK_HANDLER_H
 
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <sys/types.h>
 #include <platforms/axis2_platform_auto_sense.h>

Modified: webservices/axis2/trunk/c/util/include/axutil_param.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_param.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_param.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief Axis2 param interface
  */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <axutil_hash.h>
 #include <axutil_array_list.h>

Modified: webservices/axis2/trunk/c/util/include/axutil_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_param_container.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_param_container.h Fri Mar 30 12:54:08 2007
@@ -28,9 +28,9 @@
  * @brief Axis2 Param container 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/util/include/axutil_properties.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_properties.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_properties.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_properties.h Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #ifndef AXUTIL_PROPERTIES_H
 #define AXUTIL_PROPERTIES_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 #include <axutil_env.h>
 #include <axutil_hash.h>

Modified: webservices/axis2/trunk/c/util/include/axutil_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_property.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_property.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_property.h Fri Mar 30 12:54:08 2007
@@ -18,10 +18,10 @@
 #ifndef AXUTIL_PROPERTY_H
 #define AXUTIL_PROPERTY_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 #include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/axutil_qname.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_qname.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_qname.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_qname.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief represents a qualified name
  */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_env.h>
 
 #include <axutil_string.h>

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

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

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

Copied: webservices/axis2/trunk/c/util/include/axutil_thread.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_thread.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_thread.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_thread.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_thread.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_thread.h Fri Mar 30 12:54:08 2007
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_THREAD_H
-#define AXIS2_THREAD_H
+#ifndef AXUTIL_THREAD_H
+#define AXUTIL_THREAD_H
 
 
 /**
-  * @file axis2_thread.h
+  * @file axutil_thread.h
   * @brief axis2 thread api
   */
 
 #include <axutil_allocator.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 
 
@@ -36,7 +36,7 @@
 #endif
 
     /**
-     * @defgroup axis2_thread thread
+     * @defgroup axutil_thread thread
      * @ingroup axis2_util
      * @{
      */
@@ -48,21 +48,21 @@
     /*#define AXIS2_THREAD_FUNC*/
 
     /** Thread structure. */
-    typedef struct axis2_thread_t           axis2_thread_t;
+    typedef struct axutil_thread_t           axutil_thread_t;
 
     /** Thread attributes structure. */
-    typedef struct axis2_threadattr_t       axis2_threadattr_t;
+    typedef struct axutil_threadattr_t       axutil_threadattr_t;
 
     /** Control variable for one-time atomic variables.  */
-    typedef struct axis2_thread_once_t      axis2_thread_once_t;
+    typedef struct axutil_thread_once_t      axutil_thread_once_t;
 
     /**
      * The prototype for any AXIS2 thread worker functions.
      */
-    typedef void *(AXIS2_THREAD_FUNC *axis2_thread_start_t)(axis2_thread_t*, void*);
+    typedef void *(AXIS2_THREAD_FUNC *axutil_thread_start_t)(axutil_thread_t*, void*);
 
     /** Thread private address space. */
-    typedef struct axis2_threadkey_t        axis2_threadkey_t;
+    typedef struct axutil_threadkey_t        axutil_threadkey_t;
 
     /* Thread Function definitions */
 
@@ -71,8 +71,8 @@
      * @param cont The pool to use
      * @return Newly created thread attribute
      */
-    AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-    axis2_threadattr_create(axutil_allocator_t *allocator);
+    AXIS2_EXTERN axutil_threadattr_t* AXIS2_CALL
+    axutil_threadattr_create(axutil_allocator_t *allocator);
 
     /**
      * Set if newly created threads should be created in detached state.
@@ -81,7 +81,7 @@
      * @return The status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_threadattr_detach_set(axis2_threadattr_t *attr, 
+    axutil_threadattr_detach_set(axutil_threadattr_t *attr, 
         axis2_bool_t detached);
 
     /**
@@ -91,7 +91,7 @@
      * if threads are to be joinable.
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-    axis2_threadattr_is_detach(axis2_threadattr_t *attr, 
+    axutil_threadattr_is_detach(axutil_threadattr_t *attr, 
         axutil_allocator_t *allocator);
 
 
@@ -103,10 +103,10 @@
      * @param cont The pool to use
      * @return The newly created thread handle.
      */
-    AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-    axis2_thread_create(axutil_allocator_t *allocator, 
-        axis2_threadattr_t *attr,
-        axis2_thread_start_t func, void *data);
+    AXIS2_EXTERN axutil_thread_t* AXIS2_CALL
+    axutil_thread_create(axutil_allocator_t *allocator, 
+        axutil_threadattr_t *attr,
+        axutil_thread_start_t func, void *data);
 
     /**
      * Stop the current thread
@@ -114,7 +114,7 @@
      * @return The status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_exit(axis2_thread_t *thd, 
+    axutil_thread_exit(axutil_thread_t *thd, 
         axutil_allocator_t *allocator);
 
     /**
@@ -123,21 +123,21 @@
      * @return The status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_join(axis2_thread_t *thd);
+    axutil_thread_join(axutil_thread_t *thd);
 
     /**
      * force the current thread to yield the processor
      */
     AXIS2_EXTERN void AXIS2_CALL
-    axis2_thread_yield();
+    axutil_thread_yield();
 
     /**
-     * Initialize the control variable for axis2_thread_once.
+     * Initialize the control variable for axutil_thread_once.
      * @param control The control variable to initialize
      * @return The status of the operation
      */
-    AXIS2_EXTERN axis2_thread_once_t* AXIS2_CALL
-    axis2_thread_once_init(axutil_allocator_t *allocator);
+    AXIS2_EXTERN axutil_thread_once_t* AXIS2_CALL
+    axutil_thread_once_init(axutil_allocator_t *allocator);
 
     /**
      * Run the specified function one time, regardless of how many threads
@@ -150,7 +150,7 @@
      * @return The status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_once(axis2_thread_once_t *control, 
+    axutil_thread_once(axutil_thread_once_t *control, 
         void(*func)(void));
 
     /**
@@ -159,12 +159,12 @@
      * @return The status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_detach(axis2_thread_t *thd);
+    axutil_thread_detach(axutil_thread_t *thd);
 
     /*************************Thread locking functions*****************************/
 
     /** 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 */
@@ -177,8 +177,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,
@@ -186,7 +186,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
@@ -194,21 +194,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);
 
     /** @} */
 #ifdef __cplusplus

Copied: webservices/axis2/trunk/c/util/include/axutil_thread_pool.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_thread_pool.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_thread_pool.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_thread_pool.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_thread_pool.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_thread_pool.h Fri Mar 30 12:54:08 2007
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_THREAD_POOL_H
-#define AXIS2_THREAD_POOL_H
+#ifndef AXUTIL_THREAD_POOL_H
+#define AXUTIL_THREAD_POOL_H
 
 /**
- * @file axis2_thread_pool.h
+ * @file axutil_thread_pool.h
  * @brief Axis2 thread pool interface
  */
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_allocator.h>
-#include <axis2_thread.h>
+#include <axutil_thread.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -33,12 +33,12 @@
 #endif
 
     /**
-     * @defgroup axis2_thread_pool thread pool
+     * @defgroup axutil_thread_pool thread pool
      * @ingroup axis2_util
      * @{
      */
 
-    typedef struct axis2_thread_pool axis2_thread_pool_t;
+    typedef struct axutil_thread_pool axutil_thread_pool_t;
     struct axutil_env;
 
     /**
@@ -47,9 +47,9 @@
      * @param data arguments to be passed to the function
      * @return pointer to a thread in ready state.
      */
-    AXIS2_EXTERN axis2_thread_t *AXIS2_CALL
-    axis2_thread_pool_get_thread(axis2_thread_pool_t *pool,
-            axis2_thread_start_t func,
+    AXIS2_EXTERN axutil_thread_t *AXIS2_CALL
+    axutil_thread_pool_get_thread(axutil_thread_pool_t *pool,
+            axutil_thread_start_t func,
             void *data);
     /**
      * Blocks until the desired thread stops executing.
@@ -57,8 +57,8 @@
      * @return status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_pool_join_thread(axis2_thread_pool_t *pool,
-            axis2_thread_t *thd);
+    axutil_thread_pool_join_thread(axutil_thread_pool_t *pool,
+            axutil_thread_t *thd);
 
     /**
      * Stop the execution of current thread
@@ -66,8 +66,8 @@
      * @return status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_pool_exit_thread(axis2_thread_pool_t *pool,
-            axis2_thread_t *thd);
+    axutil_thread_pool_exit_thread(axutil_thread_pool_t *pool,
+            axutil_thread_t *thd);
     
     /**
      * Detaches a thread
@@ -75,23 +75,23 @@
      * @return status of the operation
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_thread_pool_thread_detach(axis2_thread_pool_t *pool,
-            axis2_thread_t *thd);
+    axutil_thread_pool_thread_detach(axutil_thread_pool_t *pool,
+            axutil_thread_t *thd);
 
     /**
      * Frees resources used by thread_pool
      * @param pool thread_pool to be freed
      */
     AXIS2_EXTERN void AXIS2_CALL
-    axis2_thread_pool_free(axis2_thread_pool_t *pool);
+    axutil_thread_pool_free(axutil_thread_pool_t *pool);
 
     /**
     * Initializes (creates) an thread_pool.
     * @param allocator user defined allocator for the memory allocation.
     * @return initialized thread_pool. NULL on error.
     */
-    AXIS2_EXTERN axis2_thread_pool_t * AXIS2_CALL 
-    axis2_thread_pool_init(axutil_allocator_t *allocator);
+    AXIS2_EXTERN axutil_thread_pool_t * AXIS2_CALL 
+    axutil_thread_pool_init(axutil_allocator_t *allocator);
 
     /**
      * This function can be used to initialize the environment in case of
@@ -108,19 +108,19 @@
     axis2_free_thread_env(struct axutil_env *thread_env);
 
 #define AXIS2_THREAD_POOL_GET_THREAD(thread_pool, func, data) \
-      axis2_thread_pool_get_thread(thread_pool, func, data)
+      axutil_thread_pool_get_thread(thread_pool, func, data)
 
 #define AXIS2_THREAD_POOL_JOIN_THREAD(thread_pool, thd) \
-      axis2_thread_pool_join_thread(thread_pool, thd)
+      axutil_thread_pool_join_thread(thread_pool, thd)
 
 #define AXIS2_THREAD_POOL_EXIT_THREAD(thread_pool, thd) \
-      axis2_thread_pool_exit_thread(thread_pool, thd)
+      axutil_thread_pool_exit_thread(thread_pool, thd)
 
 #define AXIS2_THREAD_POOL_THREAD_DETACH(thread_pool, thd) \
-      axis2_thread_pool_thread_detach(thread_pool, thd)
+      axutil_thread_pool_thread_detach(thread_pool, thd)
 
 #define AXIS2_THREAD_POOL_FREE(thread_pool) \
-      axis2_thread_pool_free(thread_pool)
+      axutil_thread_pool_free(thread_pool)
 
     /** @} */
 

Copied: webservices/axis2/trunk/c/util/include/axutil_types.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_types.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_types.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_types.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_types.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_types.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_types.h Fri Mar 30 12:54:08 2007
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_TYPES_H
-#define AXIS2_TYPES_H
+#ifndef AXUTIL_TYPES_H
+#define AXUTIL_TYPES_H
 
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_error.h>
 #include <axutil_env.h>
 
@@ -28,7 +28,7 @@
 #endif
 
     /**
-     * @defgroup axis2_types type convertors
+     * @defgroup axutil_types type convertors
      * @ingroup axis2_util
      * @{
      */



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