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 19:26:54 UTC

svn commit: r524188 [15/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/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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -53,26 +53,26 @@
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_invoke(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx);
 
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_clean_up(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx);
 
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_init(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
     axis2_transport_out_desc_t *out_desc);
 
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_write_message(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_endpoint_ref_t *epr,
     axiom_soap_envelope_t *out,
@@ -81,11 +81,11 @@
 void AXIS2_CALL
 axis2_http_transport_sender_free(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_transport_sender_t *AXIS2_CALL
 axis2_http_transport_sender_create(
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_http_transport_sender_impl_t *transport_sender_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -130,7 +130,7 @@
 void AXIS2_CALL
 axis2_http_transport_sender_free(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_http_transport_sender_impl_t *transport_sender_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -153,7 +153,7 @@
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_invoke(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     const axis2_char_t *char_set_enc = NULL;
@@ -416,7 +416,7 @@
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_clean_up(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -432,7 +432,7 @@
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_init(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
     axis2_transport_out_desc_t *out_desc)
 {
@@ -529,7 +529,7 @@
 axis2_status_t AXIS2_CALL
 axis2_http_transport_sender_write_message(
     axis2_transport_sender_t *transport_sender,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_endpoint_ref_t *epr,
     axiom_soap_envelope_t *out,
@@ -638,7 +638,7 @@
 axis2_http_transport_sender_get_instance(
 #endif
     struct axis2_transport_sender **inst,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     *inst = axis2_http_transport_sender_create(env);
     if (!(*inst))
@@ -656,7 +656,7 @@
 axis2_http_transport_sender_remove_instance(
 #endif
     axis2_transport_sender_t *inst,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (inst)
     {

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -27,7 +27,7 @@
 	axis2_char_t *memory;
 	axutil_array_list_t *alist;
 	unsigned int size;
-	const axis2_env_t *env;
+	const axutil_env_t *env;
 }axis2_libcurl_t;
 
 size_t 
@@ -46,19 +46,19 @@
 
 axis2_libcurl_t *
 axis2_libcurl_create (
-	const axis2_env_t *env);
+	const axutil_env_t *env);
 
 void
 axis2_libcurl_free (
 	void *curl,
-	const axis2_env_t *env);
+	const axutil_env_t *env);
 
 
 
 axis2_status_t AXIS2_CALL
 axis2_libcurl_send (
     axiom_output_t *om_output,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
 	axiom_soap_envelope_t *out,
     const axis2_char_t *str_url,
@@ -352,7 +352,7 @@
 }
 
 axis2_libcurl_t *
-axis2_libcurl_create (const axis2_env_t *env)
+axis2_libcurl_create (const axutil_env_t *env)
 {
 	axis2_libcurl_t *curl = NULL;
 	curl = (axis2_libcurl_t *) AXIS2_MALLOC (env->allocator, sizeof (axis2_libcurl_t));
@@ -363,7 +363,7 @@
 }
 
 void
-axis2_libcurl_free (void *curl, const axis2_env_t *env)
+axis2_libcurl_free (void *curl, const axutil_env_t *env)
 {
 	AXIS2_FREE (env->allocator, curl);
 /* 	curl_slist_free_all (headers); */

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -14,7 +14,7 @@
 axis2_status_t AXIS2_CALL
 axis2_libcurl_send (
     axiom_output_t *om_output,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
 	axiom_soap_envelope_t *out,
     const axis2_char_t *str_url,

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c Fri Mar 30 10:26:22 2007
@@ -17,37 +17,37 @@
 axis2_status_t AXIS2_CALL
 libcurl_stream_free(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_stream_type_t AXIS2_CALL
 libcurl_stream_get_type(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 int AXIS2_CALL
 libcurl_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer,
     size_t count);
 
 int AXIS2_CALL
 libcurl_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count);
 
 int AXIS2_CALL
 libcurl_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count);
 
 int AXIS2_CALL
 libcurl_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 /************************* End of function headers ****************************/
 /*
@@ -55,7 +55,7 @@
  */
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_libcurl(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *buffer,
 	unsigned int size)
 {
@@ -88,7 +88,7 @@
 void AXIS2_CALL
 libcurl_stream_free(
     axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     libcurl_stream_impl_t *stream_impl = NULL;
     AXIS2_ENV_CHECK(env, void);
@@ -106,7 +106,7 @@
 int AXIS2_CALL
 libcurl_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count)
 {
@@ -154,7 +154,7 @@
 int AXIS2_CALL
 libcurl_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer,
     size_t count)
 {
@@ -165,7 +165,7 @@
 int AXIS2_CALL
 libcurl_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count)
 {
 	return 0;
@@ -174,7 +174,7 @@
 int AXIS2_CALL
 libcurl_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
 	return 0;
 }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h Fri Mar 30 10:26:22 2007
@@ -3,7 +3,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stream.h>
 
 #ifdef __cplusplus
@@ -16,7 +16,7 @@
   * @return axis2_stream (libcurl)
   */
 	AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_libcurl
-	(const axis2_env_t *env, axis2_char_t *buffer, unsigned int size);
+	(const axutil_env_t *env, axis2_char_t *buffer, unsigned int size);
 
 /** @} */
     

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -13,7 +13,7 @@
 #include <axis2_generic_obj.h>
 
 void
-axis2_http_sender_util_add_header (const axis2_env_t *env,
+axis2_http_sender_util_add_header (const axutil_env_t *env,
 				   axis2_http_simple_request_t *request,
 				   axis2_char_t *header_name,
 				   const axis2_char_t *header_value)

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c Fri Mar 30 10:26:22 2007
@@ -41,19 +41,19 @@
 void AXIS2_CALL
 axis2_ssl_stream_free(
     axis2_stream_t *stream, 
-    const axis2_env_t *env
+    const axutil_env_t *env
     );
 
 axis2_stream_type_t AXIS2_CALL
 axis2_ssl_stream_get_type(
     axis2_stream_t *stream, 
-    const axis2_env_t *env
+    const axutil_env_t *env
     );
 
 int AXIS2_CALL
 axis2_ssl_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer,
     size_t count
     );
@@ -61,7 +61,7 @@
 int AXIS2_CALL
 axis2_ssl_stream_read(
     axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count
     );
@@ -69,20 +69,20 @@
 int AXIS2_CALL
 axis2_ssl_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count
     );
 
 int AXIS2_CALL
 axis2_ssl_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env
+    const axutil_env_t *env
     );
 
 
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_ssl(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_socket_t socket,
     axis2_char_t *server_cert,
     axis2_char_t *key_file,
@@ -132,7 +132,7 @@
 
 void AXIS2_CALL
 axis2_ssl_stream_free(axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     ssl_stream_impl_t *stream_impl = NULL;
     AXIS2_ENV_CHECK(env, void);
@@ -151,7 +151,7 @@
 int AXIS2_CALL
 axis2_ssl_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count
     )
@@ -188,7 +188,7 @@
 int AXIS2_CALL
 axis2_ssl_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buf,
     size_t count
     )
@@ -217,7 +217,7 @@
 int AXIS2_CALL
 axis2_ssl_stream_skip(
     axis2_stream_t *stream, 
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     int count
     )
 {
@@ -243,7 +243,7 @@
 int AXIS2_CALL
 axis2_ssl_stream_get_char(
     axis2_stream_t *stream, 
-    const axis2_env_t *env
+    const axutil_env_t *env
     )
 {
     int ret = -1;
@@ -256,7 +256,7 @@
 axis2_stream_type_t AXIS2_CALL
 axis2_ssl_stream_get_type(
     axis2_stream_t *stream,
-    const axis2_env_t *env
+    const axutil_env_t *env
     )
 {
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stream.h>
 #include <platforms/axis2_platform_auto_sense.h>
 #include <openssl/ssl.h>
@@ -35,7 +35,7 @@
   */
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL 
 axis2_stream_create_ssl(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_socket_t socket,
     axis2_char_t *server_cert,
     axis2_char_t *key_file,

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
 
 AXIS2_EXTERN SSL_CTX* AXIS2_CALL
 axis2_ssl_utils_initialize_ctx(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *server_cert,
     axis2_char_t *key_file,
     axis2_char_t *ssl_pp
@@ -106,7 +106,7 @@
 
 AXIS2_EXTERN SSL* AXIS2_CALL
 axis2_ssl_utils_initialize_ssl(
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     SSL_CTX *ctx,
     axis2_socket_t socket
     )
@@ -139,7 +139,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_ssl_utils_cleanup_ssl(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     SSL_CTX *ctx,
     SSL *ssl
     )

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h Fri Mar 30 10:26:22 2007
@@ -32,7 +32,7 @@
 
 AXIS2_EXTERN SSL_CTX* AXIS2_CALL
 axis2_ssl_utils_initialize_ctx(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *server_cert,
     axis2_char_t *key_file,
     axis2_char_t *ssl_pp
@@ -40,14 +40,14 @@
 
 AXIS2_EXTERN SSL* AXIS2_CALL
 axis2_ssl_utils_initialize_ssl(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     SSL_CTX *ctx,
     axis2_socket_t socket
     );
                         
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_ssl_utils_cleanup_ssl(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     SSL_CTX *ctx,
     SSL *ssl
     );

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c Fri Mar 30 10:26:22 2007
@@ -40,7 +40,7 @@
 void AXIS2_CALL
 axis2_iis_out_transport_info_free(
     axis2_http_out_transport_info_t *out_transport_info,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_iis_out_transport_info_t *info = NULL;
     AXIS2_ENV_CHECK(env, void);
@@ -60,7 +60,7 @@
 void AXIS2_CALL
 axis2_iis_out_transport_info_free_void_arg(
     void *transport_info,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_http_out_transport_info_t *transport_info_l = NULL;
 
@@ -73,7 +73,7 @@
 axis2_status_t AXIS2_CALL
 axis2_iis_out_transport_info_set_content_type(
     axis2_http_out_transport_info_t *info,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *content_type)
 {
 	int temp = 0;
@@ -96,7 +96,7 @@
 axis2_status_t AXIS2_CALL
 axis2_iis_out_transport_info_set_char_encoding(
     axis2_http_out_transport_info_t *info,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *encoding)
 {
     axis2_iis_out_transport_info_t *info_impl = NULL;
@@ -115,7 +115,7 @@
 }
 axis2_http_out_transport_info_t *AXIS2_CALL
 axis2_iis_out_transport_info_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
 	LPEXTENSION_CONTROL_BLOCK lpECB)
 {
     axis2_iis_out_transport_info_t *info = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h Fri Mar 30 10:26:22 2007
@@ -37,7 +37,7 @@
 
 axis2_http_out_transport_info_t *AXIS2_CALL 
 axis2_iis_out_transport_info_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
 	LPEXTENSION_CONTROL_BLOCK lpECB);
 
 /**
@@ -48,7 +48,7 @@
 void AXIS2_CALL 
 axis2_iis_out_transport_info_free_void_arg(
     void *transport_info,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_char_t *axis2_iis_out_transport_get_content(axis2_http_out_transport_info_t *out_transport_info);
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c Fri Mar 30 10:26:22 2007
@@ -41,37 +41,37 @@
 axis2_stream_type_t AXIS2_CALL
 iis_stream_get_type(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 int AXIS2_CALL
 iis_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer,
     size_t count);
 
 int AXIS2_CALL
 iis_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count);
 
 int AXIS2_CALL
 iis_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count);
 
 int AXIS2_CALL
 iis_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 
 axis2_stream_t * AXIS2_CALL
 axis2_stream_create_iis(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     LPEXTENSION_CONTROL_BLOCK lpECB)
 {
     iis_stream_impl_t *stream_impl = NULL;
@@ -101,7 +101,7 @@
 int AXIS2_CALL
 iis_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count)
 {
@@ -172,7 +172,7 @@
 int AXIS2_CALL
 iis_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buf,
     size_t count)
 {
@@ -200,7 +200,7 @@
 int AXIS2_CALL
 iis_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count)
 {
 	DWORD ret_val = TRUE;	
@@ -269,7 +269,7 @@
 int AXIS2_CALL
 iis_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int ret = -1;
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
@@ -280,7 +280,7 @@
 axis2_stream_type_t AXIS2_CALL
 iis_stream_get_type(
     axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
     return AXIS2_INTF_TO_IMPL(stream)->stream_type;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stream.h>
 #include <httpext.h>
 
@@ -34,7 +34,7 @@
   * @return axis2_stream (IIS)
   */
 axis2_stream_t * AXIS2_CALL axis2_stream_create_iis
-                        (const axis2_env_t *env, 
+                        (const axutil_env_t *env, 
 						LPEXTENSION_CONTROL_BLOCK lpECB);
     
 #ifdef __cplusplus

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -62,18 +62,18 @@
 int AXIS2_CALL
 axis2_iis_worker_process_request(
     axis2_iis_worker_t *iis_worker,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     LPEXTENSION_CONTROL_BLOCK lpECB);
 
 axis2_char_t *AXIS2_CALL
 axis2_iis_worker_get_bytes(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_stream_t *stream);
 
 void AXIS2_CALL
 axis2_iis_worker_free(
     axis2_iis_worker_t *iis_worker,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t axis2_worker_get_original_url(char url[], char ret_url[]);
 axis2_status_t write_response(LPEXTENSION_CONTROL_BLOCK lpECB, const void *b, unsigned int l);
@@ -87,7 +87,7 @@
 
 axis2_iis_worker_t * AXIS2_CALL
 axis2_iis_worker_create(
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     axis2_char_t *repo_path)
 {
     axis2_iis_worker_impl_t *iis_worker_impl = NULL;
@@ -131,7 +131,7 @@
 void AXIS2_CALL
 axis2_iis_worker_free(
     axis2_iis_worker_t *iis_worker,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_iis_worker_impl_t *worker_impl = NULL;
     AXIS2_ENV_CHECK(env, void);
@@ -154,7 +154,7 @@
 int AXIS2_CALL
 axis2_iis_worker_process_request(
     axis2_iis_worker_t *iis_worker,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     LPEXTENSION_CONTROL_BLOCK lpECB)
 {
 	axis2_iis_worker_impl_t *iis_worker_impl = NULL;
@@ -560,7 +560,7 @@
 
 axis2_char_t *AXIS2_CALL
 axis2_iis_worker_get_bytes(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_stream_t *stream)
 {
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_conf_ctx.h>
 
 #ifdef __cplusplus
@@ -35,12 +35,12 @@
 {
     int (AXIS2_CALL *process_request)(
                 axis2_iis_worker_t *iis_worker,
-                const axis2_env_t *env, 
+                const axutil_env_t *env, 
                 void *r);
 
     axis2_status_t (AXIS2_CALL *free)(
                 axis2_iis_worker_t *iis_worker,
-                const axis2_env_t *env);
+                const axutil_env_t *env);
 };
 
 
@@ -52,7 +52,7 @@
 
 axis2_iis_worker_t * AXIS2_CALL
 axis2_iis_worker_create(
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     axis2_char_t *repo_path);
 
 

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -54,7 +54,7 @@
 static int is_inited = FALSE;
 
 static axis2_iis_worker_t*	axis2_worker = NULL;
-static const axis2_env_t*	axis2_env = NULL;
+static const axutil_env_t*	axutil_env = NULL;
 static axis2_char_t			repo_path[MAX_FILE_PATH] = "c:\\axis2c";
 static axis2_char_t			log_file[MAX_FILE_PATH] = "axis2.log";
 static axis2_log_levels_t	log_level = AXIS2_LOG_LEVEL_CRITICAL;
@@ -101,7 +101,7 @@
     lpECB->dwHttpStatusCode = HTTP_INTERNAL_SERVER_ERROR;
 
 	if (axis2_worker)
-		AXIS2_IIS_WORKER_PROCESS_REQUEST(axis2_worker, axis2_env, lpECB);
+		AXIS2_IIS_WORKER_PROCESS_REQUEST(axis2_worker, axutil_env, lpECB);
 	else
 		return HSE_STATUS_ERROR;
 
@@ -128,12 +128,12 @@
  
 	axis2_error_init();
 
-	axis2_env = axis2_env_create_all(log_file, log_level);
-	if (axis2_env == NULL){
+	axutil_env = axutil_env_create_all(log_file, log_level);
+	if (axutil_env == NULL){
 		return FALSE;
 	}
 	
-	axis2_worker = axis2_iis_worker_create(axis2_env, repo_path);
+	axis2_worker = axis2_iis_worker_create(axutil_env, repo_path);
 	if (axis2_worker == NULL){
 		return FALSE;
 	}	
@@ -150,9 +150,9 @@
 {
 //	axiom_xml_reader_cleanup();
 
-//	AXIS2_IIS_WORKER_FREE(axis2_worker, axis2_env);
+//	AXIS2_IIS_WORKER_FREE(axis2_worker, axutil_env);
 
-//	axis2_env_free(axis2_env);
+//	axutil_env_free(axutil_env);
 	return TRUE;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c Fri Mar 30 10:26:22 2007
@@ -34,7 +34,7 @@
 void AXIS2_CALL
 axis2_apache2_out_transport_info_free_void_arg(
     void *transport_info,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_http_out_transport_info_t *transport_info_l = NULL;
 
@@ -47,7 +47,7 @@
 axis2_status_t AXIS2_CALL
 axis2_apache_out_transport_info_free(
     axis2_http_out_transport_info_t *out_transport_info,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_apache2_out_transport_info_t *info = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -68,7 +68,7 @@
 axis2_status_t AXIS2_CALL
 axis2_apache_out_transport_info_set_content_type(
     axis2_http_out_transport_info_t *out_transport_info,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *content_type)
 {
     axis2_apache2_out_transport_info_t *info = NULL;
@@ -102,7 +102,7 @@
 axis2_status_t AXIS2_CALL
 axis2_apache_out_transport_info_set_char_encoding(
     axis2_http_out_transport_info_t *info,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *encoding)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -122,7 +122,7 @@
 
 axis2_http_out_transport_info_t *AXIS2_CALL
 axis2_apache2_out_transport_info_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     request_rec *request)
 {
     axis2_apache2_out_transport_info_t *info = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c Fri Mar 30 10:26:22 2007
@@ -32,36 +32,36 @@
 axis2_stream_type_t AXIS2_CALL
 apache2_stream_get_type(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 int AXIS2_CALL
 apache2_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer,
     size_t count);
 
 int AXIS2_CALL
 apache2_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count);
 
 int AXIS2_CALL
 apache2_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count);
 
 int AXIS2_CALL
 apache2_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_apache2(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     request_rec *request)
 {
     apache2_stream_impl_t *stream_impl = NULL;
@@ -90,7 +90,7 @@
 int AXIS2_CALL
 apache2_stream_read(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count)
 {
@@ -104,7 +104,7 @@
 int AXIS2_CALL
 apache2_stream_write(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buf,
     size_t count)
 {
@@ -126,7 +126,7 @@
 int AXIS2_CALL
 apache2_stream_skip(
     axis2_stream_t *stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count)
 {
     apache2_stream_impl_t *stream_impl = NULL;
@@ -151,7 +151,7 @@
 int AXIS2_CALL
 apache2_stream_get_char(
     axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int ret = -1;
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
@@ -163,7 +163,7 @@
 axis2_stream_type_t AXIS2_CALL
 apache2_stream_get_type(
     axis2_stream_t *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
     return AXIS2_INTF_TO_IMPL(stream)->stream_type;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stream.h>
 #include <httpd.h>
 
@@ -33,7 +33,7 @@
   * @return axis2_stream (apache2)
   */
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_apache2
-                        (const axis2_env_t *env, request_rec *req);
+                        (const axutil_env_t *env, request_rec *req);
 
 /** @} */
     

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -47,22 +47,22 @@
 int AXIS2_CALL
 axis2_apache2_worker_process_request(
     axis2_apache2_worker_t *apache2_worker,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     request_rec *req);
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_apache2_worker_get_bytes(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_stream_t *stream);
 
 void AXIS2_CALL
 axis2_apache2_worker_free(
     axis2_apache2_worker_t *apache2_worker,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_apache2_worker_t *AXIS2_CALL
 axis2_apache2_worker_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *repo_path)
 {
     axis2_apache2_worker_impl_t *apache2_worker_impl = NULL;
@@ -104,7 +104,7 @@
 void AXIS2_CALL
 axis2_apache2_worker_free(
     axis2_apache2_worker_t *apache2_worker,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_apache2_worker_impl_t *worker_impl = NULL;
     AXIS2_ENV_CHECK(env, void);
@@ -127,7 +127,7 @@
 int AXIS2_CALL
 axis2_apache2_worker_process_request(
     axis2_apache2_worker_t *apache2_worker,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     request_rec *request)
 {
     axis2_apache2_worker_impl_t *apache2_worker_impl = NULL;
@@ -308,7 +308,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_apache2_worker_get_bytes(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_stream_t *stream)
 {
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h Fri Mar 30 10:26:22 2007
@@ -38,7 +38,7 @@
 
 AXIS2_EXTERN axis2_http_out_transport_info_t *AXIS2_CALL 
 axis2_apache2_out_transport_info_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     request_rec *r);
 
 /**
@@ -49,7 +49,7 @@
 AXIS2_EXTERN void AXIS2_CALL 
 axis2_apache2_out_transport_info_free_void_arg(
     void *transport_info,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_conf_ctx.h>
 #include "apache2_stream.h"
 
@@ -55,13 +55,13 @@
         int (AXIS2_CALL *
                 process_request)(
                     axis2_apache2_worker_t *apache2_worker,
-                    const axis2_env_t *env, 
+                    const axutil_env_t *env, 
                     request_rec *r);
 
         void (AXIS2_CALL *
                 free)(
                     axis2_apache2_worker_t *apache2_worker,
-                    const axis2_env_t *env);
+                    const axutil_env_t *env);
     };
 
     /**
@@ -76,7 +76,7 @@
 
     AXIS2_EXTERN axis2_apache2_worker_t * AXIS2_CALL
     axis2_apache2_worker_create(
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         axis2_char_t *repo_path);
 
 /************************** Start of function macros **************************/

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -38,7 +38,7 @@
 axis2_config_rec_t;
 
 axis2_apache2_worker_t *axis2_worker = NULL;
-const axis2_env_t *axis2_env = NULL;
+const axutil_env_t *axutil_env = NULL;
 
 /******************************Function Headers********************************/
 static void *
@@ -231,8 +231,8 @@
     }
     ap_should_client_block(req);
 
-    axis2_env->allocator->current_pool = (void*) req->pool;
-    rv = AXIS2_APACHE2_WORKER_PROCESS_REQUEST(axis2_worker, axis2_env, req);
+    axutil_env->allocator->current_pool = (void*) req->pool;
+    rv = AXIS2_APACHE2_WORKER_PROCESS_REQUEST(axis2_worker, axutil_env, req);
 
     if (AXIS2_CRITICAL_FAILURE == rv)
     {
@@ -335,9 +335,9 @@
                      "[Axis2] Error initializing mod_axis2 thread pool");
         exit(APEXIT_CHILDFATAL);
     }
-    axis2_env = axis2_env_create_with_error_log_thread_pool(allocator, error,
+    axutil_env = axutil_env_create_with_error_log_thread_pool(allocator, error,
             axis2_logger, thread_pool);
-    if (! axis2_env)
+    if (! axutil_env)
     {
         ap_log_error(APLOG_MARK, APLOG_EMERG, APR_EGENERAL, svr_rec,
                      "[Axis2] Error creating mod_axis2 environment");
@@ -347,10 +347,10 @@
     {
 
         axis2_logger->level = conf->log_level;
-        AXIS2_LOG_INFO(axis2_env->log, "Starting log with log level %d",
+        AXIS2_LOG_INFO(axutil_env->log, "Starting log with log level %d",
                 conf->log_level);
     }
-    axis2_worker = axis2_apache2_worker_create(axis2_env,
+    axis2_worker = axis2_apache2_worker_create(axutil_env,
             conf->axis2_repo_path);
     if (! axis2_worker)
     {

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -28,16 +28,16 @@
 #include <ctype.h>
 #include <axiom_xml_reader.h>
 
-axis2_env_t *system_env = NULL;
+axutil_env_t *system_env = NULL;
 axis2_transport_receiver_t *server = NULL;
 /***************************** Function headers *******************************/
-axis2_env_t *
+axutil_env_t *
 init_syetem_env(
     axutil_allocator_t *allocator,
     const axis2_char_t *log_file);
 
 void system_exit(
-    axis2_env_t *env,
+    axutil_env_t *env,
     int status);
 
 void usage(
@@ -47,7 +47,7 @@
     int signal);
 
 /***************************** End of function headers ************************/
-axis2_env_t *
+axutil_env_t *
 init_syetem_env(
     axutil_allocator_t *allocator,
     const axis2_char_t *log_file)
@@ -61,12 +61,12 @@
      * threads
      */
     axiom_xml_reader_init();
-    return axis2_env_create_with_error_log_thread_pool(allocator, error, log,
+    return axutil_env_create_with_error_log_thread_pool(allocator, error, log,
             thread_pool);
 }
 
 void system_exit(
-    axis2_env_t *env,
+    axutil_env_t *env,
     int status)
 {
     axutil_allocator_t *allocator = NULL;
@@ -77,7 +77,7 @@
     if (env)
     {
         allocator = env->allocator;
-        axis2_env_free(env);
+        axutil_env_free(env);
     }
     /*axutil_allocator_free(allocator);*/
     axiom_xml_reader_cleanup();
@@ -89,7 +89,7 @@
     char *argv[])
 {
     axutil_allocator_t *allocator = NULL;
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     extern char *optarg;
     extern int optopt;
     int c;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c Fri Mar 30 10:26:22 2007
@@ -33,11 +33,11 @@
 static axis2_status_t
 axis2_http_chunked_stream_start_chunk(
     axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_http_chunked_stream_t *AXIS2_CALL
 axis2_http_chunked_stream_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_stream_t *stream)
 {
     axis2_http_chunked_stream_t *chunked_stream = NULL;
@@ -65,7 +65,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_http_chunked_stream_free(
     axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -76,7 +76,7 @@
 AXIS2_EXTERN int AXIS2_CALL
 axis2_http_chunked_stream_read(
     axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer,
     size_t count)
 {
@@ -133,7 +133,7 @@
 AXIS2_EXTERN int AXIS2_CALL
 axis2_http_chunked_stream_write(
     axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer,
     size_t count)
 {
@@ -163,7 +163,7 @@
 AXIS2_EXTERN int AXIS2_CALL
 axis2_http_chunked_stream_get_current_chunk_size(
     const axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return chunked_stream->current_chunk_size;
 }
@@ -172,7 +172,7 @@
 static axis2_status_t
 axis2_http_chunked_stream_start_chunk(
     axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_char_t tmp_buf[3] = "";
     axis2_char_t str_chunk_len[512] = "";
@@ -223,7 +223,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_chunked_stream_write_last_chunk(
     axis2_http_chunked_stream_t *chunked_stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_stream_t *stream = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -44,7 +44,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_process_http_post_request(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_stream_t *in_stream,
     axis2_stream_t *out_stream,
@@ -55,7 +55,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_http_transport_utils_process_http_get_request(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_stream_t *in_stream,
     axis2_stream_t *out_stream,
@@ -67,7 +67,7 @@
 
 AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
 axis2_http_transport_utils_select_builder_for_mime(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *request_uri,
     axis2_msg_ctx_t *msg_ctx,
     axis2_stream_t *in_stream,
@@ -75,27 +75,27 @@
 
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL
 axis2_http_transport_utils_is_optimized(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_element_t *om_element);
 
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL
 axis2_http_transport_utils_do_write_mtom(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx);
 
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL
 axis2_http_transport_utils_is_doing_rest(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx);
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_http_transport_utils_is_doing_rest_through_post(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_strdecode(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *dest,
     axis2_char_t *src);
 
@@ -105,12 +105,12 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_http_transport_utils_get_services_html(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx);
 
 AXIS2_EXTERN axis2_string_t *AXIS2_CALL
 axis2_http_transport_utils_get_charset_enc(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *content_type);
 
 int AXIS2_CALL
@@ -121,24 +121,24 @@
 
 AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_http_transport_utils_create_soap_msg(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     const axis2_char_t *soap_ns_uri);
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_http_transport_utils_get_value_from_content_type(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *content_type,
     const axis2_char_t *key);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_dispatch_and_verify(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx);
 
 /*AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_http_transport_utils_handle_media_type_url_encoded(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_hash_t *param_map,
     axis2_char_t *method,
@@ -146,7 +146,7 @@
 
 AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_http_transport_utils_handle_media_type_url_encoded(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_hash_t *param_map,
     axis2_char_t *method);
@@ -155,7 +155,7 @@
 
 AXIS2_EXTERN axis2_status_t  AXIS2_CALL
 axis2_http_transport_utils_process_http_post_request(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_stream_t *in_stream,
     axis2_stream_t *out_stream,
@@ -512,7 +512,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_http_transport_utils_process_http_get_request(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_stream_t *in_stream,
     axis2_stream_t *out_stream,
@@ -570,7 +570,7 @@
 
 AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
 axis2_http_transport_utils_select_builder_for_mime(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *request_uri,
     axis2_msg_ctx_t *msg_ctx,
     axis2_stream_t *in_stream,
@@ -584,7 +584,7 @@
 
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL
 axis2_http_transport_utils_is_optimized(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_element_t *om_element)
 {
     /*
@@ -595,7 +595,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_http_transport_utils_do_write_mtom(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     /*axis2_property_t *property = NULL;
@@ -625,7 +625,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_http_transport_utils_is_doing_rest(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     /*
@@ -637,7 +637,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_http_transport_utils_is_doing_rest_through_post(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     /*
@@ -648,7 +648,7 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axis2_http_transport_utils_get_request_params(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *request_uri)
 {
 
@@ -712,7 +712,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_strdecode(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *dest,
     axis2_char_t *src)
 {
@@ -760,7 +760,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_http_transport_utils_get_services_html(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx)
 {
     axis2_hash_t *services_map = NULL;
@@ -885,7 +885,7 @@
 
 AXIS2_EXTERN axis2_string_t *AXIS2_CALL
 axis2_http_transport_utils_get_charset_enc(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *content_type)
 {
     axis2_char_t *tmp = NULL;
@@ -960,7 +960,7 @@
     int size,
     void *ctx)
 {
-    const axis2_env_t *env = NULL;
+    const axutil_env_t *env = NULL;
     int len = -1;
     axis2_callback_info_t *cb_ctx = (axis2_callback_info_t *)ctx;
 
@@ -1020,7 +1020,7 @@
 
 AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_http_transport_utils_create_soap_msg(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     const axis2_char_t *soap_ns_uri)
 {
@@ -1256,7 +1256,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_http_transport_utils_get_value_from_content_type(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *content_type,
     const axis2_char_t *key)
 {
@@ -1306,7 +1306,7 @@
 
 /*AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_http_transport_utils_handle_media_type_url_encoded(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_hash_t *param_map,
     axis2_char_t *method,
@@ -1436,7 +1436,7 @@
 
 AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
 axis2_http_transport_utils_handle_media_type_url_encoded(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
     axis2_hash_t *param_map,
     axis2_char_t *method)
@@ -1489,7 +1489,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_dispatch_and_verify(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_disp_t *req_uri_disp = NULL;

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=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Fri Mar 30 10:26:22 2007
@@ -27,7 +27,7 @@
 
 AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
 axis2_core_utils_create_out_msg_ctx(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_msg_ctx_t *in_msg_ctx)
 {
     axis2_ctx_t *ctx = NULL;
@@ -149,7 +149,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_core_utils_reset_out_msg_ctx(const axis2_env_t *env,
+axis2_core_utils_reset_out_msg_ctx(const axutil_env_t *env,
         axis2_msg_ctx_t *out_msg_ctx)
 {
     axis2_msg_info_headers_t *msg_info_headers = NULL;
@@ -175,7 +175,7 @@
 }
 
 AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
-axis2_core_utils_get_module_qname(const axis2_env_t *env,
+axis2_core_utils_get_module_qname(const axutil_env_t *env,
         const axis2_char_t *name,
         const axis2_char_t *version)
 {
@@ -209,7 +209,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_core_utils_calculate_default_module_version(const axis2_env_t *env,
+axis2_core_utils_calculate_default_module_version(const axutil_env_t *env,
         axis2_hash_t *modules_map, axis2_conf_t *axis_conf)
 {
     axis2_hash_t *default_modules = NULL;
@@ -320,7 +320,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_core_utils_get_module_name(const axis2_env_t *env, axis2_char_t *module_name)
+axis2_core_utils_get_module_name(const axutil_env_t *env, axis2_char_t *module_name)
 {
     axis2_char_t version_seperator = '-';
     axis2_char_t *name = NULL;
@@ -343,7 +343,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_core_utils_get_module_version(const axis2_env_t *env, axis2_char_t *module_name)
+axis2_core_utils_get_module_version(const axutil_env_t *env, axis2_char_t *module_name)
 {
     axis2_char_t version_seperator = '-';
     axis2_char_t *version_sep_loc = NULL;
@@ -360,7 +360,7 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_core_utils_is_latest_mod_ver(const axis2_env_t *env,
+axis2_core_utils_is_latest_mod_ver(const axutil_env_t *env,
         axis2_char_t *module_ver, axis2_char_t *current_def_ver)
 {
     double cur_ver = 0.0;

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Fri Mar 30 10:26:22 2007
@@ -31,25 +31,25 @@
 
 axis2_status_t AXIS2_CALL
 axis2_addr_in_handler_invoke(struct axis2_handler *handler,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_msg_ctx *msg_ctx);
 
 axis2_bool_t
-axis2_addr_in_check_element(const axis2_env_t *env, axis2_qname_t *expected_qname,
+axis2_addr_in_check_element(const axutil_env_t *env, axis2_qname_t *expected_qname,
         axis2_qname_t *actual_qname);
 
 axis2_status_t
-axis2_addr_in_extract_svc_grp_ctx_id(const axis2_env_t *env,
+axis2_addr_in_extract_svc_grp_ctx_id(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_ctx_t *msg_ctx);
 
 axis2_status_t
-axis2_addr_in_extract_ref_params(const axis2_env_t *env,
+axis2_addr_in_extract_ref_params(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t *msg_info_headers);
 
 axis2_status_t
-axis2_addr_in_extract_addr_final_info(const axis2_env_t *env,
+axis2_addr_in_extract_addr_final_info(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t **msg_info_headers,
         axutil_array_list_t *addr_headers,
@@ -57,33 +57,33 @@
 
 
 axis2_status_t
-axis2_addr_in_extract_to_epr_ref_params(const axis2_env_t *env,
+axis2_addr_in_extract_to_epr_ref_params(const axutil_env_t *env,
         axis2_endpoint_ref_t * to_epr,
         axiom_soap_header_t *soap_header,
         const axis2_char_t *addr_ns);
 
 axis2_status_t
-axis2_addr_in_extract_epr_information(const axis2_env_t *env,
+axis2_addr_in_extract_epr_information(const axutil_env_t *env,
         axiom_soap_header_block_t *soap_header_block,
         axis2_endpoint_ref_t *endpoint_ref,
         const axis2_char_t *addr_ns);
 
 axis2_status_t
-axis2_addr_in_extract_addr_params(const axis2_env_t *env,
+axis2_addr_in_extract_addr_params(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t **msg_info_headers,
         axutil_array_list_t *addr_headers,
         const axis2_char_t *addr_ns,
         axis2_msg_ctx_t *msg_ctx);
 
-axis2_status_t axis2_addr_in_extract_addr_submission_info(const axis2_env_t *env,
+axis2_status_t axis2_addr_in_extract_addr_submission_info(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t **msg_info_headers,
         axutil_array_list_t *addr_headers,
         axis2_msg_ctx_t *msg_ctx);
 
 void
-axis2_addr_in_create_fault_envelope(const axis2_env_t *env,
+axis2_addr_in_create_fault_envelope(const axutil_env_t *env,
         const axis2_char_t *header_name,
         const axis2_char_t *addr_ns_str,
         axis2_msg_ctx_t *msg_ctx);
@@ -91,7 +91,7 @@
 /******************************************************************************/
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-axis2_addr_in_handler_create(const axis2_env_t *env,
+axis2_addr_in_handler_create(const axutil_env_t *env,
         axis2_string_t *name)
 {
     axis2_handler_t *handler = NULL;
@@ -116,7 +116,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_addr_in_handler_invoke(struct axis2_handler *handler,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_msg_ctx *msg_ctx)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;
@@ -194,7 +194,7 @@
 }
 
 axis2_status_t
-axis2_addr_in_extract_svc_grp_ctx_id(const axis2_env_t *env,
+axis2_addr_in_extract_svc_grp_ctx_id(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_ctx_t *msg_ctx)
 {
@@ -245,7 +245,7 @@
 
 
 axis2_status_t
-axis2_addr_in_extract_addr_final_info(const axis2_env_t *env,
+axis2_addr_in_extract_addr_final_info(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t **msg_info_headers,
         axutil_array_list_t *addr_headers,
@@ -259,7 +259,7 @@
             msg_ctx);
 }
 
-axis2_status_t axis2_addr_in_extract_addr_submission_info(const axis2_env_t *env,
+axis2_status_t axis2_addr_in_extract_addr_submission_info(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t **msg_info_headers,
         axutil_array_list_t *addr_headers,
@@ -274,7 +274,7 @@
 }
 
 axis2_status_t
-axis2_addr_in_extract_addr_params(const axis2_env_t *env,
+axis2_addr_in_extract_addr_params(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t **msg_info_headers_p,
         axutil_array_list_t *addr_headers,
@@ -499,7 +499,7 @@
 }
 
 axis2_status_t
-axis2_addr_in_extract_epr_information(const axis2_env_t *env,
+axis2_addr_in_extract_epr_information(const axutil_env_t *env,
         axiom_soap_header_block_t *soap_header_block,
         axis2_endpoint_ref_t *endpoint_ref,
         const axis2_char_t *addr_ns_str)
@@ -567,7 +567,7 @@
 }
 
 axis2_status_t
-axis2_addr_in_extract_ref_params(const axis2_env_t *env,
+axis2_addr_in_extract_ref_params(const axutil_env_t *env,
         axiom_soap_header_t *soap_header,
         axis2_msg_info_headers_t* msg_info_headers)
 {
@@ -623,7 +623,7 @@
 
 
 axis2_status_t
-axis2_addr_in_extract_to_epr_ref_params(const axis2_env_t *env,
+axis2_addr_in_extract_to_epr_ref_params(const axutil_env_t *env,
         axis2_endpoint_ref_t * to_epr,
         axiom_soap_header_t *soap_header,
         const axis2_char_t *addr_ns_str)
@@ -680,7 +680,7 @@
 
 
 axis2_bool_t
-axis2_addr_in_check_element(const axis2_env_t *env,
+axis2_addr_in_check_element(const axutil_env_t *env,
         axis2_qname_t *expected_qname,
         axis2_qname_t *actual_qname)
 {
@@ -704,7 +704,7 @@
 }
 
 void
-axis2_addr_in_create_fault_envelope(const axis2_env_t *env,
+axis2_addr_in_create_fault_envelope(const axutil_env_t *env,
         const axis2_char_t *header_name,
         const axis2_char_t *addr_ns_str,
         axis2_msg_ctx_t *msg_ctx)

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Fri Mar 30 10:26:22 2007
@@ -28,12 +28,12 @@
 
 axis2_status_t AXIS2_CALL
 axis2_addr_out_handler_invoke(struct axis2_handler *handler,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_msg_ctx *msg_ctx);
 
 
 axis2_status_t
-axis2_addr_out_handler_add_to_soap_header(const axis2_env_t *env,
+axis2_addr_out_handler_add_to_soap_header(const axutil_env_t *env,
         axis2_endpoint_ref_t *
         endpoint_ref,
         const axis2_char_t * type,
@@ -42,20 +42,20 @@
 
 
 axis2_status_t
-axis2_addr_out_handler_add_to_header(const axis2_env_t *env,
+axis2_addr_out_handler_add_to_header(const axutil_env_t *env,
         axis2_endpoint_ref_t * epr,
         axiom_node_t ** parent_node,
         const axis2_char_t * addr_ns);
 
 axis2_status_t
-axis2_addr_out_handler_process_any_content_type(const axis2_env_t *env,
+axis2_addr_out_handler_process_any_content_type(const axutil_env_t *env,
         axis2_any_content_type_t *
         reference_values,
         axiom_node_t *
         parent_ele_node,
         const axis2_char_t * addr_ns);
 
-axiom_node_t *axis2_addr_out_handler_process_string_info(const axis2_env_t *env,
+axiom_node_t *axis2_addr_out_handler_process_string_info(const axutil_env_t *env,
         const axis2_char_t *value,
         const axis2_char_t *type,
         axiom_soap_header_t **soap_header,
@@ -63,7 +63,7 @@
 
 
 AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
-axis2_addr_out_handler_create(const axis2_env_t *env, axis2_string_t * name)
+axis2_addr_out_handler_create(const axutil_env_t *env, axis2_string_t * name)
 {
     axis2_handler_t *handler = NULL;
     /*axis2_qname_t *handler_qname = NULL;*/
@@ -109,7 +109,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_addr_out_handler_invoke(struct axis2_handler * handler,
-        const axis2_env_t *env, axis2_msg_ctx_t * msg_ctx)
+        const axutil_env_t *env, axis2_msg_ctx_t * msg_ctx)
 {
     axis2_char_t *addressing_version_from_msg_ctx = NULL;
     const axis2_char_t *addr_ns = NULL;
@@ -467,7 +467,7 @@
 
 
 axiom_node_t *
-axis2_addr_out_handler_process_string_info(const axis2_env_t *env,
+axis2_addr_out_handler_process_string_info(const axutil_env_t *env,
         const axis2_char_t * value,
         const axis2_char_t * type,
         axiom_soap_header_t **
@@ -519,7 +519,7 @@
 }
 
 axis2_status_t
-axis2_addr_out_handler_add_to_soap_header(const axis2_env_t *env,
+axis2_addr_out_handler_add_to_soap_header(const axutil_env_t *env,
         axis2_endpoint_ref_t *
         endpoint_ref,
         const axis2_char_t * type,
@@ -691,7 +691,7 @@
 }
 
 axis2_status_t
-axis2_addr_out_handler_add_to_header(const axis2_env_t *env,
+axis2_addr_out_handler_add_to_header(const axutil_env_t *env,
         axis2_endpoint_ref_t * epr,
         axiom_node_t ** parent_node_p,
         const axis2_char_t * addr_ns)
@@ -765,7 +765,7 @@
 
 
 axis2_status_t
-axis2_addr_out_handler_process_any_content_type(const axis2_env_t *env,
+axis2_addr_out_handler_process_any_content_type(const axutil_env_t *env,
         axis2_any_content_type_t *
         reference_values,
         axiom_node_t *

Modified: webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c Fri Mar 30 10:26:22 2007
@@ -20,21 +20,21 @@
 
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_shutdown(axis2_module_t *module,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_init(
     axis2_module_t *module,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
     axis2_module_desc_t *module_desc);
 
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_fill_handler_create_func_map(axis2_module_t *module,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_module_t *
-axis2_mod_addr_create(const axis2_env_t *env)
+axis2_mod_addr_create(const axutil_env_t *env)
 {
     axis2_module_t *module = NULL;
     module = AXIS2_MALLOC(env->allocator,
@@ -55,7 +55,7 @@
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_init(
     axis2_module_t *module,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
     axis2_module_desc_t *module_desc)
 {
@@ -65,7 +65,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_shutdown(axis2_module_t *module,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     if (module->ops)
     {
@@ -92,7 +92,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_fill_handler_create_func_map(axis2_module_t *module,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -118,7 +118,7 @@
 
 AXIS2_EXPORT int
 axis2_get_instance(axis2_module_t **inst,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     *inst = axis2_mod_addr_create(env);
     if (!(*inst))
@@ -131,7 +131,7 @@
 
 AXIS2_EXPORT int
 axis2_remove_instance(axis2_module_t *inst,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     axis2_status_t status = AXIS2_FAILURE;
     if (inst)

Modified: webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c Fri Mar 30 10:26:22 2007
@@ -33,11 +33,11 @@
 
 axis2_status_t AXIS2_CALL
 axis2_log_in_handler_invoke(struct axis2_handler *handler, 
-                         const axis2_env_t *env,
+                         const axutil_env_t *env,
                          struct axis2_msg_ctx *msg_ctx);
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-axis2_log_in_handler_create(const axis2_env_t *env, 
+axis2_log_in_handler_create(const axutil_env_t *env, 
                          axis2_string_t *name) 
 {
     axis2_handler_t *handler = NULL;
@@ -62,7 +62,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_log_in_handler_invoke(struct axis2_handler *handler, 
-                         const axis2_env_t *env,
+                         const axutil_env_t *env,
                          struct axis2_msg_ctx *msg_ctx)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;

Modified: webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c Fri Mar 30 10:26:22 2007
@@ -33,11 +33,11 @@
 
 axis2_status_t AXIS2_CALL
 axis2_log_out_handler_invoke(struct axis2_handler *handler, 
-                         const axis2_env_t *env,
+                         const axutil_env_t *env,
                          struct axis2_msg_ctx *msg_ctx);
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-axis2_log_out_handler_create(const axis2_env_t *env, 
+axis2_log_out_handler_create(const axutil_env_t *env, 
                          axis2_string_t *name) 
 {
     axis2_handler_t *handler = NULL;
@@ -62,7 +62,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_log_out_handler_invoke(struct axis2_handler *handler, 
-                         const axis2_env_t *env,
+                         const axutil_env_t *env,
                          struct axis2_msg_ctx *msg_ctx)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;

Modified: webservices/axis2/trunk/c/modules/mod_log/mod_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/mod_log.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/mod_log.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/mod_log.c Fri Mar 30 10:26:22 2007
@@ -21,21 +21,21 @@
 
 axis2_status_t AXIS2_CALL
 axis2_mod_log_shutdown(axis2_module_t *module,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 axis2_mod_log_init(
         axis2_module_t *module,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_conf_ctx_t *conf_ctx,
         axis2_module_desc_t *module_desc);
 
 axis2_status_t AXIS2_CALL
 axis2_mod_log_fill_handler_create_func_map(axis2_module_t *module,
-                                            const axis2_env_t *env);
+                                            const axutil_env_t *env);
 
 axis2_module_t *
-axis2_mod_log_create(const axis2_env_t *env)
+axis2_mod_log_create(const axutil_env_t *env)
 {
     axis2_module_t *module = NULL;
     module = AXIS2_MALLOC(env->allocator, 
@@ -56,7 +56,7 @@
 axis2_status_t AXIS2_CALL
 axis2_mod_log_init(
         axis2_module_t *module,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_conf_ctx_t *conf_ctx,
         axis2_module_desc_t *module_desc)
 {
@@ -66,7 +66,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_mod_log_shutdown(axis2_module_t *module,
-                        const axis2_env_t *env)
+                        const axutil_env_t *env)
 {
     if(module->ops)
     {
@@ -93,7 +93,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_mod_log_fill_handler_create_func_map(axis2_module_t *module,
-                                            const axis2_env_t *env)
+                                            const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -120,7 +120,7 @@
 
 AXIS2_EXPORT int 
 axis2_get_instance(axis2_module_t **inst,
-                   const axis2_env_t *env)
+                   const axutil_env_t *env)
 {
    *inst = axis2_mod_log_create(env);
     if(!(*inst))
@@ -133,7 +133,7 @@
 
 AXIS2_EXPORT int 
 axis2_remove_instance(axis2_module_t *inst,
-                      const axis2_env_t *env)
+                      const axutil_env_t *env)
 {
     axis2_status_t status = AXIS2_FAILURE;
    if (inst)

Modified: webservices/axis2/trunk/c/modules/mod_log/mod_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/mod_log.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/mod_log.h (original)
+++ webservices/axis2/trunk/c/modules/mod_log/mod_log.h Fri Mar 30 10:26:22 2007
@@ -31,11 +31,11 @@
 #endif
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL 
-axis2_log_in_handler_create(const axis2_env_t *env, 
+axis2_log_in_handler_create(const axutil_env_t *env, 
                      axis2_string_t *name);
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL 
-axis2_log_out_handler_create(const axis2_env_t *env, 
+axis2_log_out_handler_create(const axutil_env_t *env, 
                        axis2_string_t *name);
     
 /** @} */

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -26,7 +26,7 @@
 #include <axis2_const.h>
 #include <axis2_error.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_qname.h>
 
@@ -49,7 +49,7 @@
      * @return axis2_svc pointer to newly created service
      */
     AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
-    axis2_client_utils_create_axis2_svc(const axis2_env_t *env,
+    axis2_client_utils_create_axis2_svc(const axutil_env_t *env,
         const axis2_uri_t *wsdl_uri,
         const axis2_qname_t *wsdl_svc_qname,
         const axis2_char_t *ep_name,

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -46,7 +46,7 @@
 #include <woden_ext_element.h>
 
 AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
-axis2_client_utils_create_axis2_svc(const axis2_env_t *env,
+axis2_client_utils_create_axis2_svc(const axutil_env_t *env,
     const axis2_uri_t *wsdl_uri,
     const axis2_qname_t *wsdl_svc_qname,
     const axis2_char_t *ep_name,

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=524188&r1=524187&r2=524188
==============================================================================
--- 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 10:26:22 2007
@@ -27,25 +27,25 @@
 
 static axiom_node_t *
 build_om_programatically_for_wsdl1(
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 static axiom_node_t *
 build_om_programatically_for_wsdl2(
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 static int
 process_for_wsdl1(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *wsdl_uri_str);
 
 static int
 process_for_wsdl2(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *wsdl_uri_str);
 
 int main(int argc, char** argv)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
     axutil_allocator_t *allocator = NULL;
@@ -55,7 +55,7 @@
     allocator = axutil_allocator_init(NULL);
     error = axis2_error_create(allocator);
     log = axis2_log_create(allocator, NULL, "addr_echo.log");
-    env = axis2_env_create_with_error_log(allocator, error, log);
+    env = axutil_env_create_with_error_log(allocator, error, log);
     env->log->level = AXIS2_LOG_LEVEL_TRACE;
     axis2_error_init();
 
@@ -80,7 +80,7 @@
 
 static int
 process_for_wsdl1(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *wsdl_uri_str)
 {
     axiom_node_t *payload = NULL;
@@ -143,7 +143,7 @@
 
 static int
 process_for_wsdl2(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *wsdl_uri_str)
 {
     axiom_node_t *payload = NULL;
@@ -207,7 +207,7 @@
 /* build SOAP request message content using OM */
 static axiom_node_t *
 build_om_programatically_for_wsdl1(
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *add_om_node = NULL;
     axiom_element_t* add_om_ele = NULL;
@@ -264,7 +264,7 @@
 /* build SOAP request message content using OM */
 static axiom_node_t *
 build_om_programatically_for_wsdl2(
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *add_om_node = NULL;
     axiom_element_t* add_om_ele = NULL;

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/test.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/test.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/test.c Fri Mar 30 10:26:22 2007
@@ -25,11 +25,11 @@
 #include <stdio.h>
 
 axiom_node_t *
-build_om_programatically(axis2_env_t *env);
+build_om_programatically(axutil_env_t *env);
 
 int main(int argc, char** argv)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
     axutil_allocator_t *allocator = NULL;
@@ -38,7 +38,7 @@
     allocator = axutil_allocator_init(NULL);
     error = axis2_error_create(allocator);
     log = axis2_log_create(allocator, NULL, "addr_echo.log");
-    env = axis2_env_create_with_error_log(allocator, error, log);
+    env = axutil_env_create_with_error_log(allocator, error, log);
     env->log->level = AXIS2_LOG_LEVEL_TRACE;
     axis2_error_init();
 
@@ -49,7 +49,7 @@
 
 /* build SOAP request message content using OM */
 axiom_node_t *
-build_om_programatically(axis2_env_t *env)
+build_om_programatically(axutil_env_t *env)
 {
     axiom_node_t *add_om_node = NULL;
     axiom_element_t* add_om_ele = NULL;

Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Fri Mar 30 10:26:22 2007
@@ -22,12 +22,12 @@
 #include <axis2_client.h>
 
 axiom_node_t *
-build_om_payload_for_echo_svc(const axis2_env_t *env);
+build_om_payload_for_echo_svc(const axutil_env_t *env);
 
 
 int main(int argc, char** argv)
 {
-    const axis2_env_t *env = NULL;
+    const axutil_env_t *env = NULL;
     const axis2_char_t *address = NULL;
     axis2_endpoint_ref_t* endpoint_ref = NULL;
     axis2_options_t *options = NULL;
@@ -40,7 +40,7 @@
     /*axutil_allocator_t *allocator = NULL;*/
 
     /* Set up the environment */
-    env = axis2_env_create_all("echo.log", AXIS2_LOG_LEVEL_TRACE);
+    env = axutil_env_create_all("echo.log", AXIS2_LOG_LEVEL_TRACE);
 
     /* Set end point reference of echo service */
     address = "http://localhost:9090/axis2/services/echo";
@@ -145,7 +145,7 @@
 
     if (env)
     {
-        axis2_env_free((axis2_env_t *) env);
+        axutil_env_free((axutil_env_t *) env);
         env = NULL;
     }
 
@@ -154,7 +154,7 @@
 
 /* build SOAP request message content using OM */
 axiom_node_t *
-build_om_payload_for_echo_svc(const axis2_env_t *env)
+build_om_payload_for_echo_svc(const axutil_env_t *env)
 {
     axiom_node_t *echo_om_node = NULL;
     axiom_element_t* echo_om_ele = NULL;

Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Fri Mar 30 10:26:22 2007
@@ -22,16 +22,16 @@
 #include <axis2_client.h>
 
 axiom_node_t *
-build_soap_body_content(const axis2_env_t *env,
+build_soap_body_content(const axutil_env_t *env,
         const axis2_char_t *operation,
         const axis2_char_t *google_key,
         const axis2_char_t *word_to_spell);
 
-void print_invalid_om(const axis2_env_t *env, axiom_node_t *ret_node);
+void print_invalid_om(const axutil_env_t *env, axiom_node_t *ret_node);
 
 int main(int argc, char** argv)
 {
-    const axis2_env_t *env = NULL;
+    const axutil_env_t *env = NULL;
     const axis2_char_t *address = NULL;
     axis2_endpoint_ref_t* endpoint_ref = NULL;
     axis2_options_t *options = NULL;
@@ -49,7 +49,7 @@
     word_to_spell = "salvasion";
 
     /* Set up the environment */
-    env = axis2_env_create_all("google_client.log", AXIS2_LOG_LEVEL_TRACE);
+    env = axutil_env_create_all("google_client.log", AXIS2_LOG_LEVEL_TRACE);
 
     /* Set end point reference of google service */
     address = "http://api.google.com/search/beta2";
@@ -178,7 +178,7 @@
 }
 
 axiom_node_t *
-build_soap_body_content(const axis2_env_t *env,
+build_soap_body_content(const axutil_env_t *env,
         const axis2_char_t *operation,
         const axis2_char_t *google_key,
         const axis2_char_t *word_to_spell)
@@ -218,7 +218,7 @@
     return google_om_node;
 }
 
-void print_invalid_om(const axis2_env_t *env, axiom_node_t *ret_node)
+void print_invalid_om(const axutil_env_t *env, axiom_node_t *ret_node)
 {
     axis2_char_t *buffer = NULL;
     buffer = AXIOM_NODE_TO_STRING(ret_node, env);

Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 
 axis2_stub_t *
-axis2_math_stub_create_with_endpoint_ref_and_client_home(const axis2_env_t *env,
+axis2_math_stub_create_with_endpoint_ref_and_client_home(const axutil_env_t *env,
         axis2_endpoint_ref_t *endpoint_ref,
         axis2_char_t *client_home)
 {
@@ -39,7 +39,7 @@
     return stub;
 }
 
-void axis2_populate_axis_service(axis2_stub_t* stub, const axis2_env_t *env)
+void axis2_populate_axis_service(axis2_stub_t* stub, const axutil_env_t *env)
 {
     axis2_svc_client_t* svc_client = NULL;
     axis2_qname_t *op_qname =  NULL;
@@ -78,7 +78,7 @@
 }
 
 axis2_stub_t *
-axis2_math_stub_create_with_endpoint_uri_and_client_home(const axis2_env_t *env,
+axis2_math_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)
 {
@@ -104,7 +104,7 @@
 
 axiom_node_t *
 axis2_math_stub_add(axis2_stub_t *stub,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *node)
 {
     axis2_svc_client_t *svc_client = NULL;
@@ -123,7 +123,7 @@
 
 axiom_node_t *
 axis2_math_stub_sub(axis2_stub_t *stub,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *node)
 {
     axis2_svc_client_t *svc_client = NULL;
@@ -141,7 +141,7 @@
 
 axiom_node_t *
 axis2_math_stub_mul(axis2_stub_t *stub,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *node)
 {
     axis2_svc_client_t *svc_client = NULL;
@@ -159,7 +159,7 @@
 
 axiom_node_t *
 axis2_math_stub_div(axis2_stub_t *stub,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *node)
 {
     axis2_svc_client_t *svc_client = NULL;

Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h Fri Mar 30 10:26:22 2007
@@ -32,27 +32,27 @@
 
 axiom_node_t *
 axis2_math_stub_add(axis2_stub_t *stub,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axiom_node_t *node);
 
 axiom_node_t *
 axis2_math_stub_sub(axis2_stub_t *stub,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axiom_node_t *node);
 
 axiom_node_t *
 axis2_math_stub_mul(axis2_stub_t *stub,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axiom_node_t *node);
 
 axiom_node_t *
 axis2_math_stub_div(axis2_stub_t *stub,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axiom_node_t *node);
 /**
  * populate services
  */
-void axis2_populate_axis_service( axis2_stub_t* stub, const axis2_env_t *env);
+void axis2_populate_axis_service( axis2_stub_t* stub, const axutil_env_t *env);
 
 /**
  * Creates axis2_stub struct
@@ -60,7 +60,7 @@
  * @return pointer to newly created axis2_stub struct
  */
 axis2_stub_t *
-axis2_math_stub_create_with_endpoint_ref_and_client_home(const axis2_env_t *env,
+axis2_math_stub_create_with_endpoint_ref_and_client_home(const axutil_env_t *env,
                                             axis2_endpoint_ref_t *endpoint_ref,
                                             axis2_char_t *client_home);
 
@@ -70,7 +70,7 @@
  * @return pointer to newly created axis2_stub struct
  */
 axis2_stub_t *
-axis2_math_stub_create_with_endpoint_uri_and_client_home(const axis2_env_t *env,
+axis2_math_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);
 /** @} */



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