You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 19:26:54 UTC

svn commit: r524188 [11/42] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ guththila/include/ gu...

Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Fri Mar 30 10:26:22 2007
@@ -32,13 +32,13 @@
 static axis2_status_t AXIS2_CALL
 axis2_callback_recv_receive(
     axis2_msg_recv_t *msg_recv,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     void *callback_recv_param);
     
 AXIS2_EXTERN axis2_callback_recv_t *AXIS2_CALL
 axis2_callback_recv_create(
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_callback_recv_t *callback_recv = NULL;
 
@@ -82,7 +82,7 @@
 AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
 axis2_callback_recv_get_base(
     axis2_callback_recv_t *callback_recv,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     callback_recv->base_deep_copy = AXIS2_FALSE;
     return callback_recv->base;
@@ -91,7 +91,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_callback_recv_free(
     axis2_callback_recv_t *callback_recv,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -134,7 +134,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_callback_recv_add_callback(
     axis2_callback_recv_t *callback_recv,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *msg_id,
     axis2_callback_t *callback)
 {
@@ -152,7 +152,7 @@
 static axis2_status_t AXIS2_CALL
 axis2_callback_recv_receive(
     axis2_msg_recv_t *msg_recv,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     void *callback_recv_param)
 {

Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Fri Mar 30 10:26:22 2007
@@ -42,7 +42,7 @@
 
 typedef struct axis2_listener_manager_worker_func_args
 {
-    const axis2_env_t *env;
+    const axutil_env_t *env;
     axis2_listener_manager_t *listner_manager;
     axis2_transport_receiver_t *listener;
 }axis2_listener_manager_worker_func_args_t;
@@ -52,7 +52,7 @@
     void *data);
 
 AXIS2_EXTERN axis2_listener_manager_t *AXIS2_CALL
-axis2_listener_manager_create(const axis2_env_t *env)
+axis2_listener_manager_create(const axutil_env_t *env)
 {
     axis2_listener_manager_t *listener_manager = NULL;
     int i = 0;
@@ -80,7 +80,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_listener_manager_make_sure_started(axis2_listener_manager_t *listener_manager,
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     const AXIS2_TRANSPORT_ENUMS transport,
     axis2_conf_ctx_t *conf_ctx)
 {
@@ -188,7 +188,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_listener_manager_stop(axis2_listener_manager_t *listener_manager,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const AXIS2_TRANSPORT_ENUMS transport)
 {
     axis2_transport_listener_state_t *tl_state = NULL;
@@ -216,7 +216,7 @@
 
 AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
 axis2_listener_manager_get_reply_to_epr(const axis2_listener_manager_t *listener_manager,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_name,
     const AXIS2_TRANSPORT_ENUMS transport)
 {
@@ -234,7 +234,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_listener_manager_free(axis2_listener_manager_t *listener_manager,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int i = 0;
 
@@ -253,7 +253,7 @@
 
 AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL
 axis2_listener_manager_get_conf_ctx(const axis2_listener_manager_t *listener_manager,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return listener_manager->conf_ctx;
 }
@@ -263,7 +263,7 @@
     void *data)
 {
     axis2_listener_manager_worker_func_args_t *args_list = NULL;
-    const axis2_env_t *th_env = NULL;
+    const axutil_env_t *th_env = NULL;
 
     args_list = (axis2_listener_manager_worker_func_args_t *) data;
     if (!args_list)

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Fri Mar 30 10:26:22 2007
@@ -59,7 +59,7 @@
 
 typedef struct axis2_op_client_worker_func_args
 {
-    const axis2_env_t *env;
+    const axutil_env_t *env;
     axis2_op_client_t *op_client;
     axis2_callback_t *callback;
     axis2_op_t *op;
@@ -75,10 +75,10 @@
 static axis2_char_t *AXIS2_CALL
 axis2_get_transport_from_url(
     const axis2_char_t *url,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_op_client_t *AXIS2_CALL
-axis2_op_client_create(const axis2_env_t *env, axis2_op_t *op,
+axis2_op_client_create(const axutil_env_t *env, axis2_op_t *op,
     axis2_svc_ctx_t *svc_ctx,
     axis2_options_t *options)
 {
@@ -150,7 +150,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_set_options(axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_options_t *options)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -166,7 +166,7 @@
 
 AXIS2_EXTERN const axis2_options_t *AXIS2_CALL
 axis2_op_client_get_options(const axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -175,7 +175,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_add_msg_ctx(axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *mc)
 {
     axis2_msg_ctx_t *out_msg_ctx = NULL, *in_msg_ctx = NULL;
@@ -238,7 +238,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_add_out_msg_ctx(axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *mc)
 {
     axis2_msg_ctx_t **msg_ctx_map = NULL;
@@ -256,7 +256,7 @@
 
 AXIS2_EXTERN const axis2_msg_ctx_t *AXIS2_CALL
 axis2_op_client_get_msg_ctx(const axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_wsdl_msg_labels_t message_label)
 {
     return  axis2_op_ctx_get_msg_ctx(op_client->op_ctx, env, message_label);
@@ -264,7 +264,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_set_callback(axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_callback_t *callback)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -280,7 +280,7 @@
 
 AXIS2_EXTERN axis2_callback_t *AXIS2_CALL
 axis2_op_client_get_callback(axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_client->callback;
 }
@@ -288,7 +288,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_execute(axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_bool_t block)
 {
     axis2_conf_ctx_t *conf_ctx = NULL;
@@ -501,7 +501,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_reset(axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -517,7 +517,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_complete(axis2_op_client_t *op_client,
-    const axis2_env_t *env, axis2_msg_ctx_t *mc)
+    const axutil_env_t *env, axis2_msg_ctx_t *mc)
 {
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_listener_manager_t *listener_manager = NULL;
@@ -541,14 +541,14 @@
 
 AXIS2_EXTERN axis2_op_ctx_t *AXIS2_CALL
 axis2_op_client_get_operation_context(const axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_client->op_ctx;
 }
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_op_client_free(axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -581,7 +581,7 @@
     axis2_op_client_worker_func_args_t *args_list = NULL;
     axis2_op_ctx_t *op_ctx = NULL;
     axis2_msg_ctx_t *response = NULL;
-    axis2_env_t *th_env = NULL;
+    axutil_env_t *th_env = NULL;
     axis2_thread_pool_t *th_pool = NULL;
 
     args_list = (axis2_op_client_worker_func_args_t *) data;
@@ -629,7 +629,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_set_callback_recv(axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_callback_recv_t *callback_recv)
 {
     op_client->callback_recv = callback_recv;
@@ -640,7 +640,7 @@
 AXIS2_EXTERN axis2_string_t *AXIS2_CALL
 axis2_op_client_get_soap_action(
     const axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_client->soap_action;
 }
@@ -648,7 +648,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_prepare_invocation(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_op_t *op,
     axis2_msg_ctx_t *msg_ctx)
 {
@@ -709,7 +709,7 @@
 AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
 axis2_op_client_prepare_soap_envelope(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *to_send)
 {
     axis2_msg_ctx_t *msg_ctx = NULL;
@@ -768,7 +768,7 @@
 AXIS2_EXTERN axis2_transport_out_desc_t *AXIS2_CALL
 axis2_op_client_infer_transport(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *epr)
 {
     axis2_char_t *transport = NULL;
@@ -821,7 +821,7 @@
 AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_op_client_create_default_soap_envelope(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_soap_envelope_t *envelope = NULL;
 
@@ -842,7 +842,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_engage_module(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *qname)
 {
     axis2_conf_ctx_t *conf_ctx = NULL;
@@ -873,7 +873,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_set_soap_version_uri(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *soap_version_uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -900,7 +900,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_set_soap_action(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *soap_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -927,7 +927,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_client_set_wsa_action(
     axis2_op_client_t *op_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *wsa_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -954,7 +954,7 @@
 static axis2_char_t *AXIS2_CALL
 axis2_get_transport_from_url(
     const axis2_char_t *url,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_char_t *transport = NULL;
     const axis2_char_t *start = NULL;
@@ -986,7 +986,7 @@
 AXIS2_EXTERN axis2_svc_ctx_t *AXIS2_CALL
 axis2_op_client_get_svc_ctx(
     const axis2_op_client_t *op_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_client->svc_ctx;
 }
@@ -994,7 +994,7 @@
 
 AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
 axis2_op_client_two_way_send(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_engine_t *engine = NULL;
@@ -1156,7 +1156,7 @@
 
 AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
 axis2_op_client_receive(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_engine_t *engine = NULL;

Modified: webservices/axis2/trunk/c/modules/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/options.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Fri Mar 30 10:26:22 2007
@@ -58,7 +58,7 @@
 };
 
 AXIS2_EXTERN axis2_options_t *AXIS2_CALL
-axis2_options_create(const axis2_env_t *env)
+axis2_options_create(const axutil_env_t *env)
 {
     axis2_options_t *options = NULL;
 
@@ -106,7 +106,7 @@
 }
 
 AXIS2_EXTERN axis2_options_t *AXIS2_CALL
-axis2_options_create_with_parent(const axis2_env_t *env,
+axis2_options_create_with_parent(const axutil_env_t *env,
     axis2_options_t *parent)
 {
 
@@ -123,7 +123,7 @@
 
 AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
 axis2_options_get_action(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     const axis2_char_t *action = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -140,7 +140,7 @@
 
 AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
 axis2_options_get_fault_to(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_endpoint_ref_t *fault_to = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -158,7 +158,7 @@
 
 AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
 axis2_options_get_from(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_endpoint_ref_t *from = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -175,7 +175,7 @@
 
 AXIS2_EXTERN axis2_transport_receiver_t *AXIS2_CALL
 axis2_options_get_transport_receiver(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -189,7 +189,7 @@
 
 AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
 axis2_options_get_transport_in(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -203,7 +203,7 @@
 
 AXIS2_EXTERN AXIS2_TRANSPORT_ENUMS AXIS2_CALL
 axis2_options_get_transport_in_protocol(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -217,7 +217,7 @@
 
 AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
 axis2_options_get_message_id(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     const axis2_char_t *message_id = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -234,7 +234,7 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_options_get_properties(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -248,7 +248,7 @@
 
 AXIS2_EXTERN void *AXIS2_CALL
 axis2_options_get_property(const axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *key)
 {
     void *property = NULL;
@@ -266,7 +266,7 @@
 
 AXIS2_EXTERN axis2_relates_to_t *AXIS2_CALL
 axis2_options_get_relates_to(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_relates_to_t *relates_to = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -283,7 +283,7 @@
 
 AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
 axis2_options_get_reply_to(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_endpoint_ref_t *reply_to = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -300,7 +300,7 @@
 
 AXIS2_EXTERN axis2_transport_out_desc_t *AXIS2_CALL
 axis2_options_get_transport_out(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -314,7 +314,7 @@
 
 AXIS2_EXTERN AXIS2_TRANSPORT_ENUMS AXIS2_CALL
 axis2_options_get_sender_transport_protocol(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -329,7 +329,7 @@
 
 AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
 axis2_options_get_soap_version_uri(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -348,7 +348,7 @@
 
 AXIS2_EXTERN long AXIS2_CALL
 axis2_options_get_timeout_in_milli_seconds(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (options->timeout_in_milli_seconds == -1 && options->parent)
     {
@@ -366,7 +366,7 @@
 
 AXIS2_EXTERN axis2_endpoint_ref_t* AXIS2_CALL
 axis2_options_get_to(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_endpoint_ref_t *to = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -384,7 +384,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_options_get_use_separate_listener(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (options->use_separate_listener == -1 && options->parent)
     {
@@ -401,14 +401,14 @@
 
 AXIS2_EXTERN axis2_options_t *AXIS2_CALL
 axis2_options_get_parent(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return options->parent;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_parent(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_options_t *parent)
 {
     options->parent = (axis2_options_t *)parent;
@@ -417,7 +417,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_action(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *action)
 {
     axis2_msg_info_headers_set_action(options->msg_info_headers, env, action);
@@ -426,7 +426,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_fault_to(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *fault_to)
 {
     axis2_msg_info_headers_set_fault_to(options->msg_info_headers, env, fault_to);
@@ -435,7 +435,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_from(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *from)
 {
     axis2_msg_info_headers_set_from(options->msg_info_headers, env, from);
@@ -444,7 +444,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_to(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *to)
 {
     axis2_msg_info_headers_set_to(options->msg_info_headers, env, to);
@@ -453,7 +453,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_transport_receiver(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_transport_receiver_t *receiver)
 {
     options->receiver = receiver;
@@ -462,7 +462,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_transport_in(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_transport_in_desc_t *transport_in)
 {
     options->transport_in = transport_in;
@@ -471,7 +471,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_transport_in_protocol(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const AXIS2_TRANSPORT_ENUMS transport_in_protocol)
 {
     options->transport_in_protocol = transport_in_protocol;
@@ -480,7 +480,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_message_id(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *message_id)
 {
     axis2_msg_info_headers_set_message_id(options->msg_info_headers, env, message_id);
@@ -489,7 +489,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_properties(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_hash_t *properties)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -504,7 +504,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_property(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *property_key,
     const void *property)
 {
@@ -515,7 +515,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_relates_to(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_relates_to_t *relates_to)
 {
     axis2_msg_info_headers_set_relates_to(options->msg_info_headers, env, relates_to);
@@ -524,7 +524,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_reply_to(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *reply_to)
 {
     axis2_msg_info_headers_set_reply_to(options->msg_info_headers, env, reply_to);
@@ -533,7 +533,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_transport_out(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_transport_out_desc_t *transport_out)
 {
     options->transport_out = transport_out;
@@ -542,7 +542,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_sender_transport(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const AXIS2_TRANSPORT_ENUMS sender_transport,
     axis2_conf_t *conf)
 {
@@ -560,7 +560,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_soap_version_uri(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *soap_version_uri)
 {
     if (options->soap_version_uri)
@@ -579,7 +579,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_timeout_in_milli_seconds(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     long timeout_in_milli_seconds)
 {
     options->timeout_in_milli_seconds = timeout_in_milli_seconds;
@@ -588,7 +588,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_transport_info(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const AXIS2_TRANSPORT_ENUMS sender_transport,
     const AXIS2_TRANSPORT_ENUMS receiver_transport,
     const axis2_bool_t use_separate_listener)
@@ -620,7 +620,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_use_separate_listener(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t use_separate_listener)
 {
     options->use_separate_listener = use_separate_listener;
@@ -629,7 +629,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_add_reference_parameter(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *reference_parameter)
 {
     axis2_msg_info_headers_add_ref_param(options->msg_info_headers,
@@ -640,7 +640,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_manage_session(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t manage_session)
 {
     options->manage_session = manage_session;
@@ -649,7 +649,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_options_get_manage_session(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
 
@@ -668,7 +668,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_msg_info_headers(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_info_headers_t *msg_info_headers)
 {
     options->msg_info_headers = msg_info_headers;
@@ -677,7 +677,7 @@
 
 AXIS2_EXTERN axis2_msg_info_headers_t *AXIS2_CALL
 axis2_options_get_msg_info_headers(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -686,7 +686,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_options_free(axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -733,7 +733,7 @@
 
 AXIS2_EXTERN int AXIS2_CALL
 axis2_options_get_soap_version(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return options->soap_version;
 
@@ -741,7 +741,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_soap_version(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int soap_version)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -763,7 +763,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_options_set_enable_mtom(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t enable_mtom)
 {
     options->enable_mtom = enable_mtom;
@@ -783,14 +783,14 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_options_get_enable_mtom(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return options->enable_mtom;
 }
 
 AXIS2_EXTERN axis2_string_t *AXIS2_CALL
 axis2_options_get_soap_action(const axis2_options_t *options,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -799,7 +799,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_options_set_soap_action(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *soap_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -820,14 +820,14 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_options_get_xml_parser_reset(const axis2_options_t *options,
-	const axis2_env_t *env)
+	const axutil_env_t *env)
 {
     return options->xml_parser_reset;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_options_set_xml_parser_reset(axis2_options_t *options,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_bool_t xml_parser_reset)
 {
     options->xml_parser_reset = xml_parser_reset;

Modified: webservices/axis2/trunk/c/modules/core/clientapi/stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/stub.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/stub.c Fri Mar 30 10:26:22 2007
@@ -25,7 +25,7 @@
 
 
 AXIS2_EXTERN axis2_stub_t *AXIS2_CALL
-axis2_stub_create(const axis2_env_t *env)
+axis2_stub_create(const axutil_env_t *env)
 {
     axis2_stub_t *stub = NULL;
 
@@ -45,7 +45,7 @@
 }
 
 AXIS2_EXTERN axis2_stub_t *AXIS2_CALL
-axis2_stub_create_with_endpoint_ref_and_client_home(const axis2_env_t *env,
+axis2_stub_create_with_endpoint_ref_and_client_home(const axutil_env_t *env,
     axis2_endpoint_ref_t *endpoint_ref,
     const axis2_char_t *client_home)
 {
@@ -86,7 +86,7 @@
 }
 
 AXIS2_EXTERN axis2_stub_t *AXIS2_CALL
-axis2_stub_create_with_endpoint_uri_and_client_home(const axis2_env_t *env,
+axis2_stub_create_with_endpoint_uri_and_client_home(const axutil_env_t *env,
     const axis2_char_t *endpoint_uri,
     const axis2_char_t *client_home)
 {
@@ -117,7 +117,7 @@
 
 void AXIS2_CALL
 axis2_stub_free(axis2_stub_t *stub,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -136,7 +136,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_stub_set_endpoint_ref(axis2_stub_t *stub,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *endpoint_ref)
 {
     AXIS2_PARAM_CHECK(env->error, endpoint_ref, AXIS2_FAILURE);
@@ -146,7 +146,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_stub_set_endpoint_uri(axis2_stub_t *stub,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *endpoint_uri)
 {
     axis2_endpoint_ref_t *endpoint_ref = NULL;
@@ -166,7 +166,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_stub_set_use_separate_listener(axis2_stub_t *stub,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_bool_t use_separate_listener)
 {
     return axis2_options_set_use_separate_listener(stub-> options, env,
@@ -175,7 +175,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_stub_engage_module(axis2_stub_t *stub,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *module_name)
 {
     AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
@@ -185,7 +185,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_stub_set_soap_version(axis2_stub_t *stub,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int soap_version)
 {
     if (!stub-> options)
@@ -197,7 +197,7 @@
 
 const axis2_char_t *AXIS2_CALL
 axis2_stub_get_svc_ctx_id(const axis2_stub_t *stub,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     const axis2_svc_ctx_t *svc_ctx = NULL;
     const axis2_char_t *svc_ctx_id = NULL;
@@ -209,14 +209,14 @@
 
 axis2_svc_client_t *AXIS2_CALL
 axis2_stub_get_svc_client(const axis2_stub_t *stub,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return stub->svc_client;
 }
 
 axis2_options_t *AXIS2_CALL
 axis2_stub_get_options(const axis2_stub_t *stub,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return stub->options;
 }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Fri Mar 30 10:26:22 2007
@@ -63,26 +63,26 @@
 
 static axis2_svc_t *
 axis2_svc_client_create_annonymous_svc(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 static axis2_bool_t
-axis2_svc_client_init_transports_from_conf_ctx(const axis2_env_t *env,
+axis2_svc_client_init_transports_from_conf_ctx(const axutil_env_t *env,
     axis2_svc_client_t *svc_client,
     axis2_conf_ctx_t *conf_ctx,
     const axis2_char_t *client_home);
 
 static axis2_bool_t
-axis2_svc_client_init_data(const axis2_env_t *env,
+axis2_svc_client_init_data(const axutil_env_t *env,
     axis2_svc_client_t *svc_client);
 
 static axis2_bool_t
-axis2_svc_client_fill_soap_envelope(const axis2_env_t *env,
+axis2_svc_client_fill_soap_envelope(const axutil_env_t *env,
     axis2_svc_client_t *svc_client,
     axis2_msg_ctx_t *msg_ctx,
     const axiom_node_t *payload);
     
 AXIS2_EXTERN axis2_svc_client_t *AXIS2_CALL
-axis2_svc_client_create(const axis2_env_t *env,
+axis2_svc_client_create(const axutil_env_t *env,
     const axis2_char_t *client_home)
 {
     axis2_svc_client_t *svc_client = NULL;
@@ -100,7 +100,7 @@
 }
 
 AXIS2_EXTERN axis2_svc_client_t *AXIS2_CALL
-axis2_svc_client_create_for_dynamic_invocation(const axis2_env_t *env,
+axis2_svc_client_create_for_dynamic_invocation(const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
     const axis2_uri_t *wsdl_uri,
     const axis2_qname_t *wsdl_svc_qname,
@@ -218,7 +218,7 @@
 }
 
 AXIS2_EXTERN axis2_svc_client_t *AXIS2_CALL
-axis2_svc_client_create_with_conf_ctx_and_svc(const axis2_env_t *env,
+axis2_svc_client_create_with_conf_ctx_and_svc(const axutil_env_t *env,
     const axis2_char_t *client_home,
     axis2_conf_ctx_t *conf_ctx,
     axis2_svc_t *svc)
@@ -321,14 +321,14 @@
 
 AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
 axis2_svc_client_get_svc(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_client->svc;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_set_options(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_options_t *options)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -343,14 +343,14 @@
 
 AXIS2_EXTERN const axis2_options_t *AXIS2_CALL
 axis2_svc_client_get_options(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_client->options;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_set_override_options(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_options_t *override_options)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -367,14 +367,14 @@
 
 AXIS2_EXTERN const axis2_options_t *AXIS2_CALL
 axis2_svc_client_get_override_options(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_client->override_options;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_engage_module(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *module_name)
 {
     axis2_module_desc_t *module = NULL;
@@ -407,7 +407,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_disengage_module(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *module_name)
 {
     axis2_module_desc_t *module = NULL;
@@ -434,7 +434,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_add_header(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *header)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -455,7 +455,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_remove_all_headers(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int i = 0, size = 0;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -483,7 +483,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_send_robust_with_op_qname(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *op_qname,
     const axiom_node_t *payload)
 {
@@ -524,7 +524,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_send_robust(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axiom_node_t *payload)
 {
     return axis2_svc_client_send_robust_with_op_qname(svc_client, env, NULL, payload);
@@ -532,7 +532,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_fire_and_forget_with_op_qname(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *op_qname,
     const axiom_node_t *payload)
 {
@@ -576,7 +576,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_fire_and_forget(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axiom_node_t *payload)
 {
     return axis2_svc_client_fire_and_forget_with_op_qname(svc_client, env, NULL,
@@ -585,7 +585,7 @@
 
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axis2_svc_client_send_receive_with_op_qname(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *op_qname,
     const axiom_node_t *payload)
 {
@@ -777,7 +777,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axis2_svc_client_send_receive(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axiom_node_t *payload)
 {
     return axis2_svc_client_send_receive_with_op_qname(svc_client, env, NULL,
@@ -786,7 +786,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_send_receive_non_blocking_with_op_qname(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *op_qname,
     const axiom_node_t *payload,
     axis2_callback_t *callback)
@@ -849,7 +849,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_send_receive_non_blocking(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axiom_node_t *payload,
     axis2_callback_t *callback)
 {
@@ -859,7 +859,7 @@
 
 AXIS2_EXTERN axis2_op_client_t *AXIS2_CALL
 axis2_svc_client_create_op_client(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *op_qname)
 {
     axis2_op_t *op = NULL;
@@ -898,7 +898,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_finalize_invoke(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_TRANSPORT_ENUMS transport_in_protocol;
 
@@ -918,7 +918,7 @@
 
 AXIS2_EXTERN const axis2_endpoint_ref_t *AXIS2_CALL
 axis2_svc_client_get_own_endpoint_ref(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *transport)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -930,7 +930,7 @@
 
 AXIS2_EXTERN const axis2_endpoint_ref_t *AXIS2_CALL
 axis2_svc_client_get_target_endpoint_ref(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -941,7 +941,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_set_target_endpoint_ref(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *target_endpoint_ref)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -953,7 +953,7 @@
 
 AXIS2_EXTERN axis2_svc_ctx_t *AXIS2_CALL
 axis2_svc_client_get_svc_ctx(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -961,7 +961,7 @@
 }
 
 static axis2_bool_t
-axis2_svc_client_init_transports_from_conf_ctx(const axis2_env_t *env,
+axis2_svc_client_init_transports_from_conf_ctx(const axutil_env_t *env,
     axis2_svc_client_t *svc_client,
     axis2_conf_ctx_t *conf_ctx,
     const axis2_char_t *client_home)
@@ -993,7 +993,7 @@
 }
 
 static axis2_bool_t
-axis2_svc_client_init_data(const axis2_env_t *env,
+axis2_svc_client_init_data(const axutil_env_t *env,
     axis2_svc_client_t *svc_client)
 {
     svc_client->svc = NULL;
@@ -1031,7 +1031,7 @@
 
 static axis2_svc_t *
 axis2_svc_client_create_annonymous_svc(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     /**
      now add anonymous operations to the axis2 service for use with the
@@ -1128,7 +1128,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_free(axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -1168,7 +1168,7 @@
 }
 
 static axis2_bool_t
-axis2_svc_client_fill_soap_envelope(const axis2_env_t *env,
+axis2_svc_client_fill_soap_envelope(const axutil_env_t *env,
     axis2_svc_client_t *svc_client,
     axis2_msg_ctx_t *msg_ctx,
     const axiom_node_t *payload)
@@ -1251,21 +1251,21 @@
 
 AXIS2_EXTERN axis2_op_client_t *AXIS2_CALL
 axis2_svc_client_get_op_client(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_client->op_client;
 }
 
 AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_svc_client_get_last_response_soap_envelope(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_client->last_response_soap_envelope;
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_svc_client_get_last_response_has_fault(const axis2_svc_client_t *svc_client,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_client->last_response_has_fault;
 }

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Fri Mar 30 10:26:22 2007
@@ -45,7 +45,7 @@
 
 AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL
 axis2_conf_ctx_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_t *conf)
 {
     axis2_conf_ctx_t *conf_ctx = NULL;
@@ -110,7 +110,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_conf_ctx_set_conf(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_t *conf)
 {
     conf_ctx->conf = conf; /* we just maintain a shallow copy here */
@@ -120,7 +120,7 @@
 AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL
 axis2_conf_ctx_get_base(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return conf_ctx->base;
 }
@@ -128,7 +128,7 @@
 AXIS2_EXTERN axis2_conf_t *AXIS2_CALL
 axis2_conf_ctx_get_conf(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return conf_ctx->conf;
 }
@@ -136,7 +136,7 @@
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_conf_ctx_get_op_ctx_map(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return conf_ctx->op_ctx_map;
 }
@@ -144,7 +144,7 @@
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_conf_ctx_get_svc_ctx_map(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return conf_ctx->svc_ctx_map;
 }
@@ -152,7 +152,7 @@
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_conf_ctx_get_svc_grp_ctx_map(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return conf_ctx->svc_grp_ctx_map;
 }
@@ -160,7 +160,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_conf_ctx_register_op_ctx(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *message_id,
     axis2_op_ctx_t *op_ctx)
 {
@@ -177,7 +177,7 @@
 AXIS2_EXTERN axis2_op_ctx_t *AXIS2_CALL
 axis2_conf_ctx_get_op_ctx(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *message_id)
 {
     axis2_op_ctx_t *rv = NULL;
@@ -198,7 +198,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_conf_ctx_register_svc_ctx(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_id,
     axis2_svc_ctx_t *svc_ctx)
 {
@@ -215,7 +215,7 @@
 AXIS2_EXTERN axis2_svc_ctx_t *AXIS2_CALL
 axis2_conf_ctx_get_svc_ctx(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_id)
 {
     axis2_svc_ctx_t *rv = NULL;
@@ -233,7 +233,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_conf_ctx_register_svc_grp_ctx(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_grp_id,
     axis2_svc_grp_ctx_t *svc_grp_ctx)
 {
@@ -250,7 +250,7 @@
 AXIS2_EXTERN axis2_svc_grp_ctx_t *AXIS2_CALL
 axis2_conf_ctx_get_svc_grp_ctx(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_grp_id)
 {
     axis2_svc_grp_ctx_t *rv = NULL;
@@ -267,7 +267,7 @@
 AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
 axis2_conf_ctx_get_root_dir(
     const axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_char_t *rv = NULL;
     axis2_thread_mutex_lock(conf_ctx->mutex);
@@ -279,7 +279,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_conf_ctx_set_root_dir(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *path)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -308,7 +308,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_conf_ctx_init(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_t *conf)
 {
     axis2_hash_index_t *hi = NULL;
@@ -358,7 +358,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_conf_ctx_free(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -442,7 +442,7 @@
 AXIS2_EXTERN axis2_svc_grp_ctx_t *AXIS2_CALL
 axis2_conf_ctx_fill_ctxs(
     axis2_conf_ctx_t *conf_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_char_t *svc_grp_ctx_id = NULL;

Modified: webservices/axis2/trunk/c/modules/core/context/ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/ctx.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/ctx.c Fri Mar 30 10:26:22 2007
@@ -28,7 +28,7 @@
 };
 
 AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL
-axis2_ctx_create(const axis2_env_t *env)
+axis2_ctx_create(const axutil_env_t *env)
 {
     axis2_ctx_t *ctx = NULL;
 
@@ -56,7 +56,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_ctx_set_property(struct axis2_ctx *ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *key,
     axis2_property_t *value)
 {
@@ -90,7 +90,7 @@
 
 AXIS2_EXTERN axis2_property_t *AXIS2_CALL
 axis2_ctx_get_property(const axis2_ctx_t *ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *key)
 {
     axis2_property_t *ret = NULL;
@@ -110,7 +110,7 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_ctx_get_all_properties(const axis2_ctx_t *ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return ctx->property_map;
 }
@@ -118,14 +118,14 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_ctx_get_property_map(const axis2_ctx_t *ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return ctx->property_map;
 }
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_ctx_free(struct axis2_ctx *ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -157,7 +157,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_ctx_set_property_map(struct axis2_ctx *ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_hash_t *map)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Fri Mar 30 10:26:22 2007
@@ -129,7 +129,7 @@
      */
     struct axis2_svc *(AXIS2_CALL *
             find_svc)(axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env);
+                const axutil_env_t *env);
     /**
      * Finds the operation to be invoked in the given service. This function 
      * is used by dispatchers to locate the operation to be invoked.
@@ -140,7 +140,7 @@
      */
     struct axis2_op *(AXIS2_CALL *
             find_op)( axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env,
+                const axutil_env_t *env,
                 struct axis2_svc *svc);
 
     axis2_string_t *charset_encoding;
@@ -153,7 +153,7 @@
 
 AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
 axis2_msg_ctx_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_conf_ctx *conf_ctx,
     struct axis2_transport_in_desc *transport_in_desc,
     struct axis2_transport_out_desc *transport_out_desc)
@@ -254,7 +254,7 @@
 struct axis2_ctx *AXIS2_CALL
             axis2_msg_ctx_get_base(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->base;
 }
@@ -263,7 +263,7 @@
 struct axis2_op_ctx *AXIS2_CALL
             axis2_msg_ctx_get_parent(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->parent;
 }
@@ -271,7 +271,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_parent(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_op_ctx *parent)
 {
     if (parent)
@@ -285,7 +285,7 @@
 void AXIS2_CALL
 axis2_msg_ctx_free(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -366,7 +366,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_init(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_conf *conf)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -403,7 +403,7 @@
 axis2_endpoint_ref_t *AXIS2_CALL
 axis2_msg_ctx_get_fault_to(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -419,7 +419,7 @@
 axis2_endpoint_ref_t *AXIS2_CALL
 axis2_msg_ctx_get_from(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -434,7 +434,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_in_fault_flow(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->in_fault_flow;
 }
@@ -442,7 +442,7 @@
 axiom_soap_envelope_t *AXIS2_CALL
 axis2_msg_ctx_get_soap_envelope(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->soap_envelope;
 }
@@ -450,7 +450,7 @@
 axiom_soap_envelope_t *AXIS2_CALL
 axis2_msg_ctx_get_response_soap_envelope(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->response_soap_envelope;
 }
@@ -458,7 +458,7 @@
 axiom_soap_envelope_t *AXIS2_CALL
 axis2_msg_ctx_get_fault_soap_envelope(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->fault_soap_envelope;
 }
@@ -466,7 +466,7 @@
 const axis2_char_t *AXIS2_CALL
 axis2_msg_ctx_get_msg_id(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -482,7 +482,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_msg_id(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *msg_id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -499,7 +499,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_process_fault(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->process_fault;
 }
@@ -507,7 +507,7 @@
 axis2_relates_to_t *AXIS2_CALL
 axis2_msg_ctx_get_relates_to(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -522,7 +522,7 @@
 axis2_endpoint_ref_t *AXIS2_CALL
 axis2_msg_ctx_get_reply_to(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -537,7 +537,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_server_side(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->server_side;
 }
@@ -545,7 +545,7 @@
 axis2_endpoint_ref_t *AXIS2_CALL
 axis2_msg_ctx_get_to(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -561,7 +561,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_fault_to(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *reference)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -578,7 +578,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_from(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *reference)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -596,7 +596,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_in_fault_flow(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t in_fault_flow)
 {
     msg_ctx->in_fault_flow = in_fault_flow;
@@ -606,7 +606,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_soap_envelope(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_soap_envelope_t *soap_envelope)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -630,7 +630,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_response_soap_envelope(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_soap_envelope_t *soap_envelope)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -651,7 +651,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_fault_soap_envelope(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_soap_envelope_t *soap_envelope)
 {
     msg_ctx->fault_soap_envelope  = soap_envelope ;
@@ -661,7 +661,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_message_id(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *message_id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -679,7 +679,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_process_fault(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t process_fault)
 {
     msg_ctx->process_fault  = process_fault;
@@ -689,7 +689,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_relates_to(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_relates_to_t *reference)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -707,7 +707,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_reply_to(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *reference)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -724,7 +724,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_server_side(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t server_side)
 {
     msg_ctx->server_side = server_side;
@@ -734,7 +734,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_to(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_endpoint_ref_t *reference)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -751,7 +751,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_new_thread_required(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->new_thread_required;
 }
@@ -759,7 +759,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_new_thread_required(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t new_thread_required)
 {
     msg_ctx->new_thread_required = new_thread_required;
@@ -769,7 +769,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_wsa_action(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *action_uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -786,7 +786,7 @@
 const axis2_char_t *AXIS2_CALL
 axis2_msg_ctx_get_wsa_action(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -802,7 +802,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_wsa_message_id(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *message_id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -819,7 +819,7 @@
 const axis2_char_t *AXIS2_CALL
 axis2_msg_ctx_get_wsa_message_id(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -836,7 +836,7 @@
 axis2_msg_info_headers_t *AXIS2_CALL
 axis2_msg_ctx_get_msg_info_headers(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->msg_info_headers;
 }
@@ -844,7 +844,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_paused(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->paused;
 }
@@ -852,7 +852,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_paused(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t paused)
 {
     msg_ctx->paused = paused;
@@ -863,7 +863,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_keep_alive(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t keep_alive)
 {
     msg_ctx->keep_alive = keep_alive;
@@ -873,7 +873,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_is_keep_alive(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->keep_alive;
 }
@@ -881,7 +881,7 @@
 struct axis2_transport_in_desc *AXIS2_CALL
             axis2_msg_ctx_get_transport_in_desc(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->transport_in_desc;
 }
@@ -889,7 +889,7 @@
 struct axis2_transport_out_desc *AXIS2_CALL
             axis2_msg_ctx_get_transport_out_desc(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->transport_out_desc;
 }
@@ -897,7 +897,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transport_in_desc(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_transport_in_desc *transport_in_desc)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -915,7 +915,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transport_out_desc(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_transport_out_desc *transport_out_desc)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -933,7 +933,7 @@
 struct axis2_op_ctx *AXIS2_CALL
             axis2_msg_ctx_get_op_ctx(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->op_ctx;
 }
@@ -941,7 +941,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_op_ctx(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_op_ctx *op_ctx)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -967,7 +967,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_output_written(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->output_written;
 }
@@ -975,7 +975,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_output_written(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t output_written)
 {
     msg_ctx->output_written = output_written;
@@ -985,7 +985,7 @@
 const axis2_char_t *AXIS2_CALL
 axis2_msg_ctx_get_svc_ctx_id(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->svc_ctx_id;
 }
@@ -993,7 +993,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_svc_ctx_id(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_ctx_id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1019,7 +1019,7 @@
 struct axis2_conf_ctx *AXIS2_CALL
             axis2_msg_ctx_get_conf_ctx(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->conf_ctx;
 }
@@ -1027,7 +1027,7 @@
 struct axis2_svc_ctx *AXIS2_CALL
             axis2_msg_ctx_get_svc_ctx(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->svc_ctx;
 }
@@ -1035,7 +1035,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_conf_ctx(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_conf_ctx *conf_ctx)
 {
     if (conf_ctx)
@@ -1049,7 +1049,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_svc_ctx(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_svc_ctx *svc_ctx)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1072,7 +1072,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_msg_info_headers(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_info_headers_t *msg_info_headers)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1096,7 +1096,7 @@
 axis2_param_t *AXIS2_CALL
 axis2_msg_ctx_get_parameter(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *key)
 {
     axis2_param_t *param = NULL;
@@ -1142,7 +1142,7 @@
 axis2_property_t *AXIS2_CALL
 axis2_msg_ctx_get_property(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *key)
 {
     void *obj = NULL;
@@ -1215,7 +1215,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_property(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *key,
     axis2_property_t *value)
 {
@@ -1227,7 +1227,7 @@
 const axis2_string_t *AXIS2_CALL
 axis2_msg_ctx_get_paused_handler_name(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->paused_handler_name;
 }
@@ -1235,7 +1235,7 @@
 const axis2_char_t *AXIS2_CALL
 axis2_msg_ctx_get_paused_phase_name(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->paused_phase_name;
 }
@@ -1243,7 +1243,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_paused_phase_name(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *paused_phase_name)
 {
     /* a shallow copy is sufficient as phase lives beyond message */
@@ -1254,7 +1254,7 @@
 axis2_string_t *AXIS2_CALL
   axis2_msg_ctx_get_soap_action(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->soap_action;
 }
@@ -1262,7 +1262,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_soap_action(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *soap_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1287,7 +1287,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_doing_mtom(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -1303,7 +1303,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_doing_mtom(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t doing_mtom)
 {
     msg_ctx->doing_mtom = doing_mtom;
@@ -1313,7 +1313,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_doing_rest(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->doing_rest;
 }
@@ -1321,7 +1321,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_doing_rest(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t doing_rest)
 {
     msg_ctx->doing_rest = doing_rest;
@@ -1331,7 +1331,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_do_rest_through_post(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t do_rest_through_post)
 {
     msg_ctx->do_rest_through_post = do_rest_through_post;
@@ -1341,7 +1341,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_do_rest_through_post(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->do_rest_through_post;
 }
@@ -1349,7 +1349,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_is_soap_11(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->is_soap_11;
 }
@@ -1357,7 +1357,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_is_soap_11(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t is_soap11)
 {
     msg_ctx->is_soap_11 = is_soap11;
@@ -1367,7 +1367,7 @@
 struct axis2_svc_grp_ctx *AXIS2_CALL
             axis2_msg_ctx_get_svc_grp_ctx(
                 const axis2_msg_ctx_t *msg_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return msg_ctx->svc_grp_ctx;
 }
@@ -1375,7 +1375,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_svc_grp_ctx(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_svc_grp_ctx *svc_grp_ctx)
 {
 
@@ -1390,7 +1390,7 @@
 axis2_op_t *AXIS2_CALL
 axis2_msg_ctx_get_op(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->op;
 }
@@ -1398,7 +1398,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_op(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_op_t *op)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1415,7 +1415,7 @@
 axis2_svc_t *AXIS2_CALL
 axis2_msg_ctx_get_svc(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->svc;
 }
@@ -1423,7 +1423,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_svc(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_svc_t *svc)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1449,7 +1449,7 @@
 axis2_svc_grp_t *AXIS2_CALL
  axis2_msg_ctx_get_svc_grp(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->svc_grp;
 }
@@ -1457,7 +1457,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_svc_grp(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_svc_grp_t *svc_grp)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1475,7 +1475,7 @@
 const axis2_string_t *AXIS2_CALL
 axis2_msg_ctx_get_svc_grp_ctx_id(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->svc_grp_ctx_id;
 }
@@ -1483,7 +1483,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_svc_grp_ctx_id(
     struct axis2_msg_ctx *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *svc_grp_ctx_id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1504,7 +1504,7 @@
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_is_paused(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->paused;
 }
@@ -1512,7 +1512,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_find_svc(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     void *func)
 {
     msg_ctx->find_svc = func;
@@ -1522,7 +1522,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_find_op(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *func)
 {
     msg_ctx->find_op = func;
@@ -1532,7 +1532,7 @@
 axis2_options_t *AXIS2_CALL
 axis2_msg_ctx_get_options(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_options_t *options = NULL;
     axis2_hash_t *properties = NULL;
@@ -1550,7 +1550,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_options(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_options_t *options)
 {
     axis2_property_t *rest_val = NULL;
@@ -1603,7 +1603,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_flow(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int flow)
 {
     msg_ctx->flow = flow;
@@ -1613,7 +1613,7 @@
 int AXIS2_CALL
 axis2_msg_ctx_get_flow(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->flow;
 }
@@ -1622,7 +1622,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_execution_chain(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axutil_array_list_t *execution_chain)
 {
     msg_ctx->execution_chain = execution_chain;
@@ -1635,7 +1635,7 @@
 axutil_array_list_t *AXIS2_CALL
 axis2_msg_ctx_get_execution_chain(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->execution_chain;
 }
@@ -1643,7 +1643,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_current_handler_index(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const int index)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1665,14 +1665,14 @@
 int AXIS2_CALL
 axis2_msg_ctx_get_current_handler_index(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->current_handler_index;
 }
 
 int AXIS2_CALL
 axis2_msg_ctx_get_paused_handler_index(const axis2_msg_ctx_t *msg_ctx,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return msg_ctx->paused_handler_index;
 }
@@ -1681,7 +1681,7 @@
 axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_current_phase_index(
     axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const int index)
 {
     msg_ctx->current_phase_index = index;
@@ -1692,7 +1692,7 @@
 int AXIS2_CALL
 axis2_msg_ctx_get_current_phase_index(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->current_phase_index;
 }
@@ -1700,21 +1700,21 @@
 int AXIS2_CALL
 axis2_msg_ctx_get_paused_phase_index(
     const axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->paused_phase_index;
 }
 
 AXIS2_EXTERN axis2_svc_t * AXIS2_CALL
 axis2_msg_ctx_find_svc(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return msg_ctx->find_svc(msg_ctx, env);
 }
 
 AXIS2_EXTERN axis2_op_t * AXIS2_CALL
 axis2_msg_ctx_find_op(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_svc_t *svc)
 {
     return msg_ctx->find_op(msg_ctx, env, svc);
@@ -1723,7 +1723,7 @@
 
 AXIS2_EXTERN axis2_string_t* AXIS2_CALL
 axis2_msg_ctx_get_charset_encoding(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {    
     if (msg_ctx)
         return msg_ctx->charset_encoding;
@@ -1733,7 +1733,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_charset_encoding(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *str)
 {    
     if (msg_ctx)
@@ -1758,7 +1758,7 @@
 
 AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
 axis2_msg_ctx_get_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (msg_ctx)
     {
@@ -1772,7 +1772,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_stream_t *stream)
 {
     if (msg_ctx)
@@ -1794,7 +1794,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_reset_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (msg_ctx)
     {
@@ -1810,7 +1810,7 @@
 
 AXIS2_EXTERN axis2_http_out_transport_info_t *AXIS2_CALL
 axis2_msg_ctx_get_http_out_transport_info(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (msg_ctx)
     {
@@ -1824,7 +1824,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_http_out_transport_info(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_http_out_transport_info_t *http_out_transport_info)
 {
     if (msg_ctx)
@@ -1846,7 +1846,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_reset_http_out_transport_info(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (msg_ctx)
     {
@@ -1862,7 +1862,7 @@
    
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_msg_ctx_get_transport_headers(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (msg_ctx)
     {
@@ -1877,7 +1877,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transport_headers(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_hash_t *transport_headers)
 {
     if (msg_ctx)
@@ -1899,7 +1899,7 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_msg_ctx_get_transfer_encoding(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {    
     if (msg_ctx)
         return msg_ctx->transfer_encoding;
@@ -1909,7 +1909,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transfer_encoding(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *str)
 {    
     if (msg_ctx)
@@ -1934,7 +1934,7 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_msg_ctx_get_transport_url(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {    
     if (msg_ctx)
         return msg_ctx->transport_url;
@@ -1944,7 +1944,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transport_url(axis2_msg_ctx_t *msg_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *str)
 {    
     if (msg_ctx)

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Fri Mar 30 10:26:22 2007
@@ -52,7 +52,7 @@
 };
 
 AXIS2_EXTERN axis2_op_ctx_t *AXIS2_CALL
-axis2_op_ctx_create(const axis2_env_t *env,
+axis2_op_ctx_create(const axutil_env_t *env,
     axis2_op_t *op,
     struct axis2_svc_ctx *svc_ctx)
 {
@@ -117,7 +117,7 @@
 AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL
 axis2_op_ctx_get_base(
     const axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_ctx->base;
 }
@@ -126,7 +126,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_op_ctx_free(
     struct axis2_op_ctx *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int i = 0;
     AXIS2_ENV_CHECK(env, void);
@@ -158,7 +158,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_ctx_init(
     struct axis2_op_ctx *op_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_conf *conf)
 {
     int i = 0;
@@ -198,7 +198,7 @@
 AXIS2_EXTERN axis2_op_t *AXIS2_CALL
 axis2_op_ctx_get_op(
     const axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_ctx->op;
 }
@@ -206,7 +206,7 @@
 AXIS2_EXTERN struct axis2_svc_ctx *AXIS2_CALL
             axis2_op_ctx_get_parent(
                 const axis2_op_ctx_t *op_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return op_ctx->parent;
 }
@@ -214,7 +214,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_ctx_add_msg_ctx(
     struct axis2_op_ctx *op_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_msg_ctx_t *out_msg_ctx = NULL;
@@ -249,7 +249,7 @@
 AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
 axis2_op_ctx_get_msg_ctx(
     const axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_wsdl_msg_labels_t message_id)
 {
     axis2_thread_mutex_lock(op_ctx->mutex);
@@ -267,7 +267,7 @@
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_op_ctx_get_is_complete(
     const axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return op_ctx->is_complete;
 }
@@ -275,7 +275,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_ctx_set_complete(
     struct axis2_op_ctx *op_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t is_complete)
 {
     op_ctx->is_complete = is_complete;
@@ -285,7 +285,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_ctx_cleanup(
     struct axis2_op_ctx *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int i = 0;
 
@@ -306,7 +306,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_ctx_set_parent(
     struct axis2_op_ctx *op_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axis2_svc_ctx *svc_ctx)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -335,14 +335,14 @@
 AXIS2_EXTERN axis2_msg_ctx_t **AXIS2_CALL
 axis2_op_ctx_get_msg_ctx_map(
     const axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return (axis2_msg_ctx_t **)(op_ctx->msg_ctx_array);
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_op_ctx_get_response_written(const axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (op_ctx)
         return op_ctx->response_written;
@@ -353,7 +353,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_op_ctx_set_response_written(axis2_op_ctx_t *op_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_bool_t written)
 {
     if (op_ctx)

Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Fri Mar 30 10:26:22 2007
@@ -36,7 +36,7 @@
 
 AXIS2_EXTERN axis2_svc_ctx_t *AXIS2_CALL
 axis2_svc_ctx_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_svc_t *svc,
     struct axis2_svc_grp_ctx *svc_grp_ctx)
 {
@@ -85,7 +85,7 @@
 axis2_ctx_t *AXIS2_CALL
 axis2_svc_ctx_get_base(
     const axis2_svc_ctx_t *svc_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_ctx->base;
 }
@@ -94,7 +94,7 @@
 struct axis2_svc_grp_ctx *AXIS2_CALL
             axis2_svc_ctx_get_parent(
                 const axis2_svc_ctx_t *svc_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return svc_ctx->parent;
 }
@@ -102,7 +102,7 @@
 axis2_status_t AXIS2_CALL
             axis2_svc_ctx_set_parent(
                 axis2_svc_ctx_t *svc_ctx,
-                const axis2_env_t *env,
+                const axutil_env_t *env,
                 axis2_svc_grp_ctx_t *parent)
 {
     svc_ctx->parent = parent;
@@ -112,7 +112,7 @@
 void AXIS2_CALL
 axis2_svc_ctx_free(
     struct axis2_svc_ctx *svc_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -128,7 +128,7 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_ctx_init(
     struct axis2_svc_ctx *svc_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_t *conf)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -145,7 +145,7 @@
 const axis2_char_t *AXIS2_CALL
 axis2_svc_ctx_get_svc_id(
     const axis2_svc_ctx_t *svc_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_ctx->svc_id;
 }
@@ -154,7 +154,7 @@
 axis2_svc_t *AXIS2_CALL
 axis2_svc_ctx_get_svc(
     const axis2_svc_ctx_t *svc_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_ctx->svc;
 }
@@ -162,7 +162,7 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_ctx_set_svc(
     axis2_svc_ctx_t *svc_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_svc_t *svc)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -181,7 +181,7 @@
 struct axis2_conf_ctx *AXIS2_CALL
             axis2_svc_ctx_get_conf_ctx(
                 const axis2_svc_ctx_t *svc_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return  axis2_svc_grp_ctx_get_parent(svc_ctx->parent, env);
@@ -190,7 +190,7 @@
 axis2_op_ctx_t *AXIS2_CALL
 axis2_svc_ctx_create_op_ctx(
     struct axis2_svc_ctx *svc_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *qname)
 {
     axis2_op_t *op = NULL;

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Fri Mar 30 10:26:22 2007
@@ -38,7 +38,7 @@
 
 AXIS2_EXTERN axis2_svc_grp_ctx_t *AXIS2_CALL
 axis2_svc_grp_ctx_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_svc_grp_t *svc_grp,
     struct axis2_conf_ctx *conf_ctx)
 {
@@ -94,7 +94,7 @@
 AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL
 axis2_svc_grp_ctx_get_base(
     const axis2_svc_grp_ctx_t *svc_grp_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_grp_ctx->base;
 }
@@ -102,7 +102,7 @@
 AXIS2_EXTERN struct axis2_conf_ctx *AXIS2_CALL
             axis2_svc_grp_ctx_get_parent(
                 const axis2_svc_grp_ctx_t *svc_grp_ctx,
-                const axis2_env_t *env)
+                const axutil_env_t *env)
 {
     return svc_grp_ctx->parent;
 }
@@ -110,7 +110,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_grp_ctx_free(
     struct axis2_svc_grp_ctx *svc_grp_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -152,7 +152,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_grp_ctx_init(
     struct axis2_svc_grp_ctx *svc_grp_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_t *conf)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -169,7 +169,7 @@
 AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
 axis2_svc_grp_ctx_get_id(
     const axis2_svc_grp_ctx_t *svc_grp_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_grp_ctx->id;
 }
@@ -177,7 +177,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_grp_ctx_set_id(
     struct axis2_svc_grp_ctx *svc_grp_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -199,7 +199,7 @@
 AXIS2_EXTERN axis2_svc_ctx_t *AXIS2_CALL
 axis2_svc_grp_ctx_get_svc_ctx(
     const axis2_svc_grp_ctx_t *svc_grp_ctx,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *svc_name)
 {
     return (axis2_svc_ctx_t *) axis2_hash_get(svc_grp_ctx->svc_ctx_map, svc_name, AXIS2_HASH_KEY_STRING);
@@ -208,7 +208,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_grp_ctx_fill_svc_ctx_map(
     struct axis2_svc_grp_ctx *svc_grp_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_hash_index_t *hi = NULL;
     void *next_svc = NULL;
@@ -244,7 +244,7 @@
 AXIS2_EXTERN axis2_svc_grp_t *AXIS2_CALL
 axis2_svc_grp_ctx_get_svc_grp(
     const axis2_svc_grp_ctx_t *svc_grp_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_grp_ctx->svc_grp;
 }
@@ -252,7 +252,7 @@
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_svc_grp_ctx_get_svc_ctx_map(
     const axis2_svc_grp_ctx_t *svc_grp_ctx,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return svc_grp_ctx->svc_ctx_map;
 }



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