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 [23/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/tools/tcpmon/src/session.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Fri Mar 30 10:26:22 2007
@@ -49,7 +49,7 @@
 typedef struct tcpmon_session_server_thread_data
 {
     tcpmon_session_impl_t* session_impl;
-    const axis2_env_t* env;
+    const axutil_env_t* env;
 }
 tcpmon_session_server_thread_data_t;
 
@@ -60,69 +60,69 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_free(tcpmon_session_t *session,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_listen_port(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int listen_port);
 
 int AXIS2_CALL
 tcpmon_session_get_listen_port(tcpmon_session_t *session,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_target_port(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int target_port);
 
 int AXIS2_CALL
 tcpmon_session_get_target_port(tcpmon_session_t *session,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_target_host(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t* target_host);
 
 axis2_char_t* AXIS2_CALL
 tcpmon_session_get_target_host(tcpmon_session_t *session,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_start(tcpmon_session_t *session,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_stop(tcpmon_session_t *session,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_on_new_entry(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         TCPMON_SESSION_NEW_ENTRY_FUNCT on_new_entry_funct);
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_on_trans_fault(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         TCPMON_SESSION_TRANS_ERROR_FUNCT on_trans_fault_funct);
 
 int AXIS2_CALL
 tcpmon_session_get_test_bit (tcpmon_session_t *session,
-									  const axis2_env_t *env);
+									  const axutil_env_t *env);
 
 int AXIS2_CALL
 tcpmon_session_set_test_bit (tcpmon_session_t *session,
-									  const axis2_env_t *env,
+									  const axutil_env_t *env,
 									  int test_bit);
 
 int AXIS2_CALL
 tcpmon_session_get_format_bit (tcpmon_session_t *session,
-                                      const axis2_env_t *env);
+                                      const axutil_env_t *env);
                                       
 int AXIS2_CALL 
 tcpmon_session_set_format_bit(tcpmon_session_t *session,
-                                      const axis2_env_t *env,
+                                      const axutil_env_t *env,
                                       int format_bit);
 
 /** internal implementations */
@@ -133,7 +133,7 @@
 /************************** End of function prototypes ************************/
 
 tcpmon_session_t * AXIS2_CALL
-tcpmon_session_create(const axis2_env_t *env)
+tcpmon_session_create(const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -192,7 +192,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_free(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
     int entries_size = 0;
@@ -233,7 +233,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_test_bit (tcpmon_session_t *session,
-									  const axis2_env_t *env,
+									  const axutil_env_t *env,
 									  int test_bit)
 {
 	 tcpmon_session_impl_t *session_impl = NULL;
@@ -248,7 +248,7 @@
 
 int AXIS2_CALL
 tcpmon_session_get_test_bit (tcpmon_session_t *session,
-									  const axis2_env_t *env)
+									  const axutil_env_t *env)
 {
 	 tcpmon_session_impl_t *session_impl = NULL;
 
@@ -261,7 +261,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_format_bit (tcpmon_session_t *session,
-                                     const axis2_env_t *env,
+                                     const axutil_env_t *env,
                                      int format_bit)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -277,7 +277,7 @@
 
 int AXIS2_CALL
 tcpmon_session_get_format_bit (tcpmon_session_t *session,
-                                     const axis2_env_t *env)
+                                     const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -290,7 +290,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_listen_port(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int listen_port)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -305,7 +305,7 @@
 
 int AXIS2_CALL
 tcpmon_session_get_listen_port(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -318,7 +318,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_target_port(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int target_port)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -333,7 +333,7 @@
 
 int AXIS2_CALL
 tcpmon_session_get_target_port(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -346,7 +346,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_set_target_host(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t* target_host)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -361,7 +361,7 @@
 
 axis2_char_t* AXIS2_CALL
 tcpmon_session_get_target_host(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -374,7 +374,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_start(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
     axis2_thread_t* server_thread = NULL;
@@ -409,7 +409,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_stop(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -423,7 +423,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_on_new_entry(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         TCPMON_SESSION_NEW_ENTRY_FUNCT on_new_entry_funct)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -439,7 +439,7 @@
 
 axis2_status_t AXIS2_CALL
 tcpmon_session_on_trans_fault(tcpmon_session_t *session,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         TCPMON_SESSION_TRANS_ERROR_FUNCT on_trans_fault_funct)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -459,7 +459,7 @@
 {
     tcpmon_session_server_thread_data_t* thread_data = data;
     tcpmon_session_impl_t *session_impl = NULL;
-    const axis2_env_t* env = NULL;
+    const axutil_env_t* env = NULL;
     int listen_socket = -1;
     int socket = -1;
     axis2_thread_t* request_thread = NULL;
@@ -533,7 +533,7 @@
 
 axis2_status_t
 tcpmon_session_add_new_entry(tcpmon_session_t* session,
-        const axis2_env_t* env,
+        const axutil_env_t* env,
         tcpmon_entry_t* entry)
 {
     tcpmon_session_impl_t *session_impl = NULL;
@@ -551,7 +551,7 @@
 
 TCPMON_SESSION_TRANS_ERROR_FUNCT
 tcpmon_session_get_on_trans_fault(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 
@@ -564,7 +564,7 @@
 
 TCPMON_SESSION_NEW_ENTRY_FUNCT
 tcpmon_session_get_on_new_entry(tcpmon_session_t *session,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     tcpmon_session_impl_t *session_impl = NULL;
 

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c Fri Mar 30 10:26:22 2007
@@ -27,15 +27,15 @@
 
 #define SIZE 1024
 
-int on_new_entry(const axis2_env_t *env,
+int on_new_entry(const axutil_env_t *env,
 					  tcpmon_entry_t* entry,
 					  int status);
-int on_error_func(const axis2_env_t *env,
+int on_error_func(const axutil_env_t *env,
 						char* error_message);
 
 int main(int argc, char** argv)
 {
-		axis2_env_t* env = NULL;
+		axutil_env_t* env = NULL;
 		axutil_allocator_t* allocator = NULL;
 		axis2_error_t *error = NULL;
 		axis2_log_t *log = NULL;
@@ -54,7 +54,7 @@
 		log = axis2_log_create(allocator, NULL, "axis2_tcpmon.log");
 		thread_pool = axis2_thread_pool_init(allocator);
 
-		env = axis2_env_create_with_error_log_thread_pool(allocator, error, log,
+		env = axutil_env_create_with_error_log_thread_pool(allocator, error, log,
 																		  thread_pool);
 
 		if (argc < 2 || !axis2_strcmp(argv[1], "-h"))
@@ -140,11 +140,11 @@
 		TCPMON_SESSION_FREE(session, env);
 		AXIS2_FREE(env-> allocator, target_host);
 		axutil_allocator_free(allocator);
-		axis2_env_free(env);
+		axutil_env_free(env);
 		return 0;
 }
 
-int on_new_entry(const axis2_env_t *env,
+int on_new_entry(const axutil_env_t *env,
 					  tcpmon_entry_t* entry,
 					  int status)
 {
@@ -196,7 +196,7 @@
 		return 0;
 }
 
-int on_error_func(const axis2_env_t *env,
+int on_error_func(const axutil_env_t *env,
 						char* error_message)
 {
 		fprintf(stderr, "ERROR: %s\n", error_message);

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h Fri Mar 30 10:26:22 2007
@@ -1,10 +1,10 @@
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include "tcpmon_entry.h"
 #include "tcpmon_session_local.h"
 
 typedef struct tcpmon_entry_request_data
 {
-    const axis2_env_t* env;
+    const axutil_env_t* env;
     int socket;
     tcpmon_session_t* session;
 } tcpmon_entry_request_data_t;

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_session_local.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_session_local.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_session_local.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_session_local.h Fri Mar 30 10:26:22 2007
@@ -3,12 +3,12 @@
 
 axis2_status_t
 tcpmon_session_add_new_entry( tcpmon_session_t* session,
-                              const axis2_env_t* env, tcpmon_entry_t* entry);
+                              const axutil_env_t* env, tcpmon_entry_t* entry);
 
 TCPMON_SESSION_TRANS_ERROR_FUNCT
 tcpmon_session_get_on_trans_fault (tcpmon_session_t *session,
-                        const axis2_env_t *env );
+                        const axutil_env_t *env );
 
 TCPMON_SESSION_NEW_ENTRY_FUNCT
 tcpmon_session_get_on_new_entry (tcpmon_session_t *session,
-                        const axis2_env_t *env );
+                        const axutil_env_t *env );

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/util.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/util.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/util.c Fri Mar 30 10:26:22 2007
@@ -36,19 +36,19 @@
 }
 tcpmon_util_allocator_t;
 
-axis2_char_t* tcpmon_strcat(char *dest, char *source, int *cur_buf_s, const axis2_env_t *env);
+axis2_char_t* tcpmon_strcat(char *dest, char *source, int *cur_buf_s, const axutil_env_t *env);
 
-static void add_string(const axis2_env_t* env,
+static void add_string(const axutil_env_t* env,
 		       tcpmon_util_allocator_t* allocator,
 		       axis2_char_t* string);
 
-static void add_axis2_char_t(const axis2_env_t* env,
+static void add_axis2_char_t(const axutil_env_t* env,
 			     tcpmon_util_allocator_t* allocator,
 			     axis2_char_t c,
 			     int turns);
 
 axis2_char_t* 
-tcpmon_util_format_as_xml(const axis2_env_t* env, axis2_char_t* data, int format)
+tcpmon_util_format_as_xml(const axutil_env_t* env, axis2_char_t* data, int format)
 {
     if(format)
     {
@@ -337,7 +337,7 @@
     return data;
 }
 
-void add_string(const axis2_env_t* env,
+void add_string(const axutil_env_t* env,
 		tcpmon_util_allocator_t* allocator,
 		axis2_char_t* string)
 {
@@ -372,7 +372,7 @@
   allocator-> index += count - 1;
 }
 
-void add_axis2_char_t(const axis2_env_t* env,
+void add_axis2_char_t(const axutil_env_t* env,
 		      tcpmon_util_allocator_t* allocator,
 		      axis2_char_t c,
 		      int turns)
@@ -403,7 +403,7 @@
 
 }
 
-axis2_char_t* tcpmon_strcat(axis2_char_t *dest, axis2_char_t *source, int *buff_size, const axis2_env_t* env)
+axis2_char_t* tcpmon_strcat(axis2_char_t *dest, axis2_char_t *source, int *buff_size, const axutil_env_t* env)
 {
     int cur_len = 0;
     int source_len = 0;

Modified: webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c Fri Mar 30 10:26:22 2007
@@ -25,14 +25,14 @@
 
 void test_format_xml(CuTest *tc)
 {
-    axis2_env_t *env;
+    axutil_env_t *env;
     axutil_allocator_t *allocator;
     axis2_char_t* input;
     axis2_char_t* actual;
     axis2_char_t* expected;
 
     allocator = axutil_allocator_init(NULL);
-    env = axis2_env_create(allocator);
+    env = axutil_env_create(allocator);
 
     input = (char*)axis2_strdup(env, "<input>check for one step</input>");
     actual =

Modified: webservices/axis2/trunk/c/util/include/axis2_file.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_file.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_file.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
@@ -43,45 +43,45 @@
      * @return file newly created file
      */
     AXIS2_EXTERN axis2_file_t * AXIS2_CALL
-    axis2_file_create(const axis2_env_t *env);
+    axis2_file_create(const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_file_free(axis2_file_t *file,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_file_set_name(axis2_file_t *file,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *name);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_file_get_name(axis2_file_t *file,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_file_set_path(axis2_file_t *file,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *path);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_file_get_path(axis2_file_t *file,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_file_set_timestamp(axis2_file_t *file,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_TIME_T timestamp);
 
     AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
     axis2_file_get_timestamp(axis2_file_t *file,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * create a newly allocated clone of the argument file
      */
     AXIS2_EXTERN axis2_file_t * AXIS2_CALL
     axis2_file_clone(axis2_file_t *file,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_generic_obj.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_generic_obj.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_generic_obj.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 
 
@@ -42,34 +42,34 @@
      * @return generic_obj newly created generic_obj
      */
     AXIS2_EXTERN axis2_generic_obj_t * AXIS2_CALL
-    axis2_generic_obj_create(const axis2_env_t *env);
+    axis2_generic_obj_create(const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_generic_obj_free(axis2_generic_obj_t *generic_obj,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_generic_obj_set_free_func(axis2_generic_obj_t *generic_obj,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_FREE_VOID_ARG free_func);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_generic_obj_set_value(axis2_generic_obj_t *generic_obj,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *value);
 
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_generic_obj_get_value(axis2_generic_obj_t *generic_obj,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_generic_obj_set_type(axis2_generic_obj_t *generic_obj,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int type);
 
     AXIS2_EXTERN int AXIS2_CALL
     axis2_generic_obj_get_type(axis2_generic_obj_t *generic_obj,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/axis2_hash.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_hash.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_hash.h Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -79,7 +79,7 @@
      * @return The hash table just created
       */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL 
-    axis2_hash_make(const axis2_env_t *env);
+    axis2_hash_make(const axutil_env_t *env);
 
     /**
      * Create a hash table with a custom hash function
@@ -88,7 +88,7 @@
      * @return The hash table just created
       */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL 
-    axis2_hash_make_custom(const axis2_env_t *env,
+    axis2_hash_make_custom(const axutil_env_t *env,
         axis2_hashfunc_t hash_func);
 
     /**
@@ -100,7 +100,7 @@
      */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL 
     axis2_hash_copy(const axis2_hash_t *ht,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Associate a value with a key in a hash table.
@@ -143,7 +143,7 @@
     /**
      * <PRE>
      *
-     * int sum_values(const axis2_env_t *env, axis2_hash_t *ht)
+     * int sum_values(const axutil_env_t *env, axis2_hash_t *ht)
      * {
      *     axis2_hash_index_t *hi;
      *     void *val;
@@ -158,7 +158,7 @@
      */
     AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL 
     axis2_hash_first(axis2_hash_t *ht,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Continue iterating over the entries in a hash table.
@@ -167,7 +167,7 @@
      *         entries.
      */
     AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL 
-    axis2_hash_next(const axis2_env_t *env,
+    axis2_hash_next(const axutil_env_t *env,
         axis2_hash_index_t *hi);
 
     /**
@@ -204,7 +204,7 @@
      */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL 
     axis2_hash_overlay(const axis2_hash_t *overlay,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         const axis2_hash_t *base);
 
     /**
@@ -223,9 +223,9 @@
      */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL 
     axis2_hash_merge(const axis2_hash_t *h1,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         const axis2_hash_t *h2,
-        void *(*merger)(const axis2_env_t *env, 
+        void *(*merger)(const axutil_env_t *env, 
             const void *key,
             axis2_ssize_t klen, 
             const void *h1_val, 
@@ -242,7 +242,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_hash_contains_key(axis2_hash_t *ht,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key);
 
     /**
@@ -254,7 +254,7 @@
 
     AXIS2_EXTERN void AXIS2_CALL 
     axis2_hash_free(axis2_hash_t *ht,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Free a hash table with hash table given as void
@@ -265,7 +265,7 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_hash_free_void_arg(void *ht_void, 
-        const axis2_env_t* env);
+        const axutil_env_t* env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/util/include/axis2_linked_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_linked_list.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_linked_list.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_linked_list.h Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -60,11 +60,11 @@
     * Create an empty linked list.
     */
     AXIS2_EXTERN axis2_linked_list_t* AXIS2_CALL 
-    axis2_linked_list_create(const axis2_env_t *env);
+    axis2_linked_list_create(const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_linked_list_free(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Obtain the Entry at a given position in a list. This method of course
@@ -80,7 +80,7 @@
     */
     AXIS2_EXTERN entry_t * AXIS2_CALL
     axis2_linked_list_get_entry(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int n);
 
     /**
@@ -91,7 +91,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_linked_list_remove_entry(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         entry_t *e);
 
 
@@ -102,7 +102,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_linked_list_check_bounds_inclusive(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -112,7 +112,7 @@
     */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_linked_list_check_bounds_exclusive(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -122,7 +122,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_get_first(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Returns the last element in the list.
@@ -131,7 +131,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_get_last(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Remove and return the first element in the list.
@@ -140,7 +140,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_remove_first(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Remove and return the last element in the list.
@@ -149,7 +149,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_remove_last(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Insert an element at the first of the list.
@@ -158,7 +158,7 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_linked_list_add_first(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -168,7 +168,7 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_linked_list_add_last(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -180,7 +180,7 @@
     */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_linked_list_contains(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -190,7 +190,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_linked_list_size(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Adds an element to the end of the list.
@@ -200,7 +200,7 @@
     */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_linked_list_add(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -212,7 +212,7 @@
     */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_linked_list_remove(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -220,7 +220,7 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_linked_list_clear(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * Return the element at index.
@@ -230,7 +230,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_get(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -242,7 +242,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_set(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index, 
         void *o);
 
@@ -254,7 +254,7 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_linked_list_add_at_index(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index,
         void *o);
 
@@ -266,7 +266,7 @@
     */
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_linked_list_remove_at_index(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -277,7 +277,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_linked_list_index_of(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -288,7 +288,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_linked_list_last_index_of(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *o);
 
     /**
@@ -298,7 +298,7 @@
     */
     AXIS2_EXTERN void ** AXIS2_CALL
     axis2_linked_list_to_array(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/util/include/axis2_network_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_network_handler.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_network_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_network_handler.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <sys/types.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
@@ -44,7 +44,7 @@
      * @return opened socket
      */
     AXIS2_EXTERN axis2_socket_t AXIS2_CALL
-    axis2_network_handler_open_socket(const axis2_env_t *env,
+    axis2_network_handler_open_socket(const axutil_env_t *env,
             char *server,
             int port);
 
@@ -54,7 +54,7 @@
      * @return creates server socket
      */
     AXIS2_EXTERN axis2_socket_t AXIS2_CALL
-    axis2_network_handler_create_server_socket(const axis2_env_t *env,
+    axis2_network_handler_create_server_socket(const axutil_env_t *env,
             int port);
 
     /**
@@ -63,7 +63,7 @@
      * @return status code
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_network_handler_close_socket(const axis2_env_t *env,
+    axis2_network_handler_close_socket(const axutil_env_t *env,
             axis2_socket_t socket);
 
     /**
@@ -74,7 +74,7 @@
      * @return status of the operations as axis2_status_t
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_network_handler_set_sock_option(const axis2_env_t *env,
+    axis2_network_handler_set_sock_option(const axutil_env_t *env,
             axis2_socket_t socket,
             int option,
             int value);
@@ -84,7 +84,7 @@
      * @return created socket to handle the incoming client connection
      */
     AXIS2_EXTERN axis2_socket_t AXIS2_CALL
-    axis2_network_handler_svr_socket_accept(const axis2_env_t *env,
+    axis2_network_handler_svr_socket_accept(const axutil_env_t *env,
             axis2_socket_t socket);
 
     /**
@@ -93,11 +93,11 @@
      * @return ip address asoociated with the socket or NULL
      */
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-    axis2_network_handler_get_svr_ip(const axis2_env_t *env,
+    axis2_network_handler_get_svr_ip(const axutil_env_t *env,
             axis2_socket_t socket);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-    axis2_network_handler_get_peer_ip(const axis2_env_t *env,
+    axis2_network_handler_get_peer_ip(const axutil_env_t *env,
             axis2_socket_t socket);
 
     /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_param.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param.h Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_hash.h>
 #include <axutil_array_list.h>
 
@@ -56,7 +56,7 @@
      * creates param struct
      */
     AXIS2_EXTERN axis2_param_t* AXIS2_CALL
-    axis2_param_create(const axis2_env_t *env,
+    axis2_param_create(const axutil_env_t *env,
         axis2_char_t *name,
         void *value);
 
@@ -66,7 +66,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_param_get_name(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Parameter value accessor
@@ -74,7 +74,7 @@
      */
     AXIS2_EXTERN void* AXIS2_CALL
     axis2_param_get_value(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * param name mutator
@@ -82,7 +82,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_name(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *name);
 
     /**
@@ -92,7 +92,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_value(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const void *value);
 
     /**
@@ -102,7 +102,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_param_is_locked(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Method setLocked
@@ -111,7 +111,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_locked(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t value);
 
     /**
@@ -121,42 +121,42 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_param_get_param_type(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_param_type(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int type);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_param_free(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_attributes(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_hash_t *attrs);
 
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
     axis2_param_get_attributes(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_value_list(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axutil_array_list_t *value_list);
 
     AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL
     axis2_param_get_value_list(struct axis2_param *param,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_param_value_free(void *param_value,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_set_value_free(struct axis2_param *param,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *free_fn);
 
     /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
 #include <axis2_utils.h>
 #include <axis2_error.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_string.h>
 #include <axutil_array_list.h>
@@ -53,7 +53,7 @@
      */
     typedef void (AXIS2_CALL *
     AXIS2_PARAM_VALUE_FREE)(void *param, 
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     typedef struct axis2_param_container axis2_param_container_t;
 
@@ -62,7 +62,7 @@
      * @return pointer to newly created param container
      */
     AXIS2_EXTERN axis2_param_container_t * AXIS2_CALL
-    axis2_param_container_create(const axis2_env_t *env);
+    axis2_param_container_create(const axutil_env_t *env);
 
     /**
      * Free param_container passed as void pointer. This will be
@@ -71,14 +71,14 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_param_container_free_void_arg(void *param_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** De-allocate memory
        * @return status code
        */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_param_container_free(axis2_param_container_t *param_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** Add a param
       * @param param param to be added
@@ -86,7 +86,7 @@
       */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_param_container_add_param(axis2_param_container_t *param_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_param_t *param);
 
     /** To get a param in a given description
@@ -95,7 +95,7 @@
       */
     AXIS2_EXTERN axis2_param_t * AXIS2_CALL
     axis2_param_container_get_param(axis2_param_container_t *param_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *name);
 
 
@@ -104,7 +104,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
     axis2_param_container_get_params(axis2_param_container_t *param_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** To check whether the paramter is locked at any level
      * @param param_name name of the param
@@ -112,7 +112,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_param_container_is_param_locked(axis2_param_container_t *param_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *param_name) ;
 
 

Modified: webservices/axis2/trunk/c/util/include/axis2_properties.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_properties.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_properties.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_properties.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_hash.h>
 #include <stdio.h>
 
@@ -42,7 +42,7 @@
      * @return properties newly created properties
      */
     AXIS2_EXTERN axis2_properties_t * AXIS2_CALL
-    axis2_properties_create(const axis2_env_t *env);
+    axis2_properties_create(const axutil_env_t *env);
 
     /**
      * free w2c_properties.
@@ -53,7 +53,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_properties_free(axis2_properties_t *properties,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * get string value for property with specified key.
@@ -64,7 +64,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_properties_get_property(axis2_properties_t *properties,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *key);
     /**
      * set a property ( key, value) pair.
@@ -77,7 +77,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_properties_set_property(axis2_properties_t *properties,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *key,
         axis2_char_t *value);
     /**
@@ -88,7 +88,7 @@
      */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
     axis2_properties_get_all(axis2_properties_t *properties,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * load properties
@@ -100,7 +100,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_properties_load(axis2_properties_t *properties,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *input_filename);
 
     /**
@@ -113,7 +113,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_properties_store(axis2_properties_t *properites,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         FILE *output);
     
     /*************************** End of function macros ***************************/

Modified: webservices/axis2/trunk/c/util/include/axis2_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_property.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_property.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_property.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 
 
@@ -43,7 +43,7 @@
      */
     AXIS2_EXTERN axis2_property_t * AXIS2_CALL
     axis2_property_create(
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * create new property
@@ -60,7 +60,7 @@
      */
     AXIS2_EXTERN axis2_property_t * AXIS2_CALL
     axis2_property_create_with_args(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_scope_t scope,
         axis2_bool_t own_value,
         AXIS2_FREE_VOID_ARG free_func,
@@ -68,40 +68,40 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_property_free(axis2_property_t *property,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Default scope is AXIS2_SCOPE_REQUEST
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_property_set_scope(axis2_property_t *property,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_scope_t scope);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_property_set_free_func(axis2_property_t *property,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_FREE_VOID_ARG free_func);
 
 /*************************** Function macros **********************************/
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_property_set_value(axis2_property_t *property,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *value);
         
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_property_get_value(axis2_property_t *property,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_property_set_own_value(
         axis2_property_t *property,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t own_value);
 
     AXIS2_EXTERN axis2_property_t* AXIS2_CALL
     axis2_property_clone(axis2_property_t *property,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 /*************************** End of function macros ***************************/

Modified: webservices/axis2/trunk/c/util/include/axis2_qname.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_qname.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_qname.h Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #include <axis2_string.h>
 
@@ -55,7 +55,7 @@
      */
 
     AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
-    axis2_qname_create(const axis2_env_t *env,
+    axis2_qname_create(const axutil_env_t *env,
         const axis2_char_t * localpart,
         const axis2_char_t * namespace_uri,
         const axis2_char_t * prefix);
@@ -68,7 +68,7 @@
      */
 
     AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
-    axis2_qname_create_from_string(const axis2_env_t *env,
+    axis2_qname_create_from_string(const axutil_env_t *env,
         const axis2_char_t *string);
 
     /**
@@ -77,7 +77,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_qname_free(struct axis2_qname * qname,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Compare two qnames
@@ -88,7 +88,7 @@
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_qname_equals(const struct axis2_qname * qname,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const struct axis2_qname * qname1);
     /**
     * clones a given qname
@@ -99,19 +99,19 @@
 
     AXIS2_EXTERN struct axis2_qname* AXIS2_CALL
     axis2_qname_clone(struct axis2_qname *qname,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_qname_get_uri(const struct axis2_qname *qname,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_qname_get_prefix(const struct axis2_qname *qname,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_qname_get_localpart(const struct axis2_qname *qname,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * returns a unique string created by concatanting namespace uri 
@@ -121,7 +121,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_qname_to_string(struct axis2_qname *qname,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/util/include/axis2_rand.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_rand.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_rand.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_rand.h Fri Mar 30 10:26:22 2007
@@ -18,7 +18,7 @@
 #define AXIS2_RAND_H
 
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_date_time.h>
 #include <axutil_base64_binary.h>
 
@@ -68,7 +68,7 @@
  */
 AXIS2_EXTERN unsigned int AXIS2_CALL
 axis2_rand_get_seed_value_based_on_time(
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/util/include/axis2_stack.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stack.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stack.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stack.h Fri Mar 30 10:26:22 2007
@@ -25,7 +25,7 @@
 */
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -41,7 +41,7 @@
     typedef struct axis2_stack axis2_stack_t;
 
     AXIS2_EXTERN axis2_stack_t * AXIS2_CALL
-    axis2_stack_create(const axis2_env_t *env);
+    axis2_stack_create(const axutil_env_t *env);
 
     /**
      * Free function of the stack
@@ -50,31 +50,31 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_stack_free(axis2_stack_t *stack,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void* AXIS2_CALL
     axis2_stack_pop(axis2_stack_t *stack,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stack_push(axis2_stack_t *stack,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void* value);
 
     AXIS2_EXTERN int AXIS2_CALL
     axis2_stack_size(axis2_stack_t *stack,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     /**
      * returns the last put value from the stack
      * without removing it from stack
      */
     AXIS2_EXTERN void* AXIS2_CALL
     axis2_stack_get(axis2_stack_t *stack,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void* AXIS2_CALL
     axis2_stack_get_at(axis2_stack_t *stack,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int i);
 
     /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stream.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stream.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <stdio.h>
 
 #ifdef __cplusplus
@@ -75,7 +75,7 @@
         */
         int(AXIS2_CALL *
         read)(axis2_stream_t *stream,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             void *buffer,
             size_t count);
 
@@ -87,7 +87,7 @@
          */
         int(AXIS2_CALL *
         write)(axis2_stream_t *stream,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             const void *buffer,
             size_t count);
 
@@ -98,7 +98,7 @@
         */
         int(AXIS2_CALL *
         skip)(axis2_stream_t *stream,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             int count);
     };
 
@@ -108,11 +108,11 @@
     */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_stream_free(axis2_stream_t *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void  AXIS2_CALL
     axis2_stream_free_void_arg(void *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * reads from stream
@@ -122,7 +122,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_stream_read(axis2_stream_t *stream,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *buffer,
         size_t count);
 
@@ -134,7 +134,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_stream_write(axis2_stream_t *stream,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const void *buffer,
         size_t count);
 
@@ -145,7 +145,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_stream_skip(axis2_stream_t *stream,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int count);
 
     /**
@@ -155,33 +155,33 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_stream_get_len(axis2_stream_t *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** \brief Constructor for creating an in memory stream
       * @return axis2_stream (in memory)
       */
     AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-    axis2_stream_create_basic(const axis2_env_t *env);
+    axis2_stream_create_basic(const axutil_env_t *env);
 
     /** \brief Constructor for creating a file stream
       * @param valid file pointer (opened file)
       * @return axis2_stream (file)
       */
     AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-    axis2_stream_create_file(const axis2_env_t *env, FILE *fp);
+    axis2_stream_create_file(const axutil_env_t *env, FILE *fp);
 
     /** \brief Constructor for creating a file stream
       * @param valid socket (opened socket)
       * @return axis2_stream (socket)
       */
     AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-    axis2_stream_create_socket(const axis2_env_t *env, int socket);
+    axis2_stream_create_socket(const axutil_env_t *env, int socket);
 
     /**
 	 *Free stream
 	 */
 	AXIS2_EXTERN void AXIS2_CALL
-	axis2_stream_free(axis2_stream_t *stream, const axis2_env_t *env);	
+	axis2_stream_free(axis2_stream_t *stream, const axutil_env_t *env);	
 	
 	/**
      * Free stream passed as void pointer. This will be
@@ -191,44 +191,44 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_stream_free_void_arg(void *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the buffer
      */
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_stream_get_buffer(const axis2_stream_t *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stream_flush_buffer(axis2_stream_t *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN int AXIS2_CALL
-    axis2_stream_peek_socket(axis2_stream_t *stream, const axis2_env_t *env,
+    axis2_stream_peek_socket(axis2_stream_t *stream, const axutil_env_t *env,
         void *buffer, size_t count);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stream_flush(axis2_stream_t *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stream_close(axis2_stream_t *stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stream_set_read(axis2_stream_t *stream,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         void *func);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stream_set_write(axis2_stream_t *stream,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         void *func);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_stream_set_skip(axis2_stream_t *stream,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         void *func);
 
 

Modified: webservices/axis2/trunk/c/util/include/axis2_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <string.h>
 
 #ifdef __cplusplus
@@ -44,7 +44,7 @@
      * @return a pointer to newly created string struct
      */
     AXIS2_EXTERN axis2_string_t * AXIS2_CALL
-    axis2_string_create(const axis2_env_t *env,
+    axis2_string_create(const axutil_env_t *env,
         const axis2_char_t *str);
     
     /**
@@ -55,7 +55,7 @@
      * @return a pointer to newly created string struct
      */
     AXIS2_EXTERN axis2_string_t * AXIS2_CALL
-    axis2_string_create_assume_ownership(const axis2_env_t *env,
+    axis2_string_create_assume_ownership(const axutil_env_t *env,
         axis2_char_t **str);
 
     /**
@@ -66,7 +66,7 @@
      * @return a pointer to newly created string struct     
      */
     AXIS2_EXTERN axis2_string_t* AXIS2_CALL
-    axis2_string_create_const(const axis2_env_t *env,
+    axis2_string_create_const(const axutil_env_t *env,
         axis2_char_t **str);
 
     /**
@@ -77,7 +77,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_string_free(struct axis2_string *string,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Compares two strings. Checks if the two strings point to the same buffer.
@@ -89,7 +89,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_string_equals(const struct axis2_string *string,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const struct axis2_string *string1);
 
     /**
@@ -102,7 +102,7 @@
      */
     AXIS2_EXTERN struct axis2_string *AXIS2_CALL
     axis2_string_clone(struct axis2_string *string,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets string buffer.
@@ -112,7 +112,7 @@
      */
     AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
     axis2_string_get_buffer(const struct axis2_string *string,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets string length.
@@ -122,7 +122,7 @@
      */
     AXIS2_EXTERN unsigned int AXIS2_CALL
     axis2_string_get_length(const struct axis2_string *string,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     
     /** @} */
 
@@ -133,7 +133,7 @@
      */
 
     AXIS2_EXTERN void* AXIS2_CALL
-    axis2_strdup(const axis2_env_t *env,
+    axis2_strdup(const axutil_env_t *env,
 	    const void *ptr);
 
     /**
@@ -144,7 +144,7 @@
      * @return The new string
      */
     AXIS2_EXTERN void* AXIS2_CALL
-    axis2_strndup(const axis2_env_t *env,
+    axis2_strndup(const axutil_env_t *env,
 	    const void *ptr,
         int n);
 
@@ -162,7 +162,7 @@
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_strmemdup(const void *ptr,
         size_t n,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void * AXIS2_CALL
     axis2_memchr(const void *ptr,
@@ -196,7 +196,7 @@
      * memory for the return value
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-    axis2_stracat(const axis2_env_t *env,
+    axis2_stracat(const axutil_env_t *env,
 	    const axis2_char_t *s1,
         const axis2_char_t *s2);
 
@@ -206,7 +206,7 @@
      * @return The new string
      */
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-    axis2_strcat(const axis2_env_t *env, ...);
+    axis2_strcat(const axutil_env_t *env, ...);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_strstr(const axis2_char_t *heystack,
@@ -218,23 +218,23 @@
 
     /* replaces s1 with s2 */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-    axis2_replace(const axis2_env_t *env,
+    axis2_replace(const axutil_env_t *env,
         axis2_char_t *str,
         int s1,
         int s2);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-    axis2_strltrim(const axis2_env_t *env,
+    axis2_strltrim(const axutil_env_t *env,
         const axis2_char_t *_s,
         const axis2_char_t *_trim);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-    axis2_strrtrim(const axis2_env_t *env,
+    axis2_strrtrim(const axutil_env_t *env,
         const axis2_char_t *_s,
         const axis2_char_t *_trim);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-    axis2_strtrim(const axis2_env_t *env,
+    axis2_strtrim(const axutil_env_t *env,
         const axis2_char_t *_s,
         const axis2_char_t *_trim);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_string_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string_util.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string_util.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string_util.h Fri Mar 30 10:26:22 2007
@@ -26,17 +26,17 @@
 #endif
 
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-    axis2_tokenize(const axis2_env_t *env,
+    axis2_tokenize(const axutil_env_t *env,
         axis2_char_t *in,
         int delim);
 
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-    axis2_first_token(const axis2_env_t *env,
+    axis2_first_token(const axutil_env_t *env,
         axis2_char_t *in,
         int delim);
 
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-    axis2_last_token(const axis2_env_t *env,
+    axis2_last_token(const axutil_env_t *env,
         axis2_char_t *in,
         int delim);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread_pool.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread_pool.h Fri Mar 30 10:26:22 2007
@@ -39,7 +39,7 @@
      */
 
     typedef struct axis2_thread_pool axis2_thread_pool_t;
-    struct axis2_env;
+    struct axutil_env;
 
     /**
      * Retrives a thread from the thread pool
@@ -97,15 +97,15 @@
      * This function can be used to initialize the environment in case of
      * spawning a new thread via a thread function
      */
-    AXIS2_EXTERN struct axis2_env * AXIS2_CALL
-    axis2_init_thread_env(const struct axis2_env *system_env);
+    AXIS2_EXTERN struct axutil_env * AXIS2_CALL
+    axis2_init_thread_env(const struct axutil_env *system_env);
 
     /**
      * This function can be used to free the environment that was used
      * in a thread function
      */
     AXIS2_EXTERN void AXIS2_CALL
-    axis2_free_thread_env(struct axis2_env *thread_env);
+    axis2_free_thread_env(struct axutil_env *thread_env);
 
 #define AXIS2_THREAD_POOL_GET_THREAD(thread_pool, func, data) \
       axis2_thread_pool_get_thread(thread_pool, func, data)

Modified: webservices/axis2/trunk/c/util/include/axis2_types.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_types.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_types.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_types.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/util/include/axis2_uri.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_uri.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uri.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_uri.h Fri Mar 30 10:26:22 2007
@@ -27,7 +27,7 @@
 #include <axis2_string.h>
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -102,7 +102,7 @@
      */
     AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
     axis2_uri_parse_string(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *uri);
 
     /**
@@ -113,13 +113,13 @@
      */
     AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
     axis2_uri_parse_hostinfo(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *hostinfo);
 
     /** Resolve relative to a base.  This means host/etc, and (crucially) path */
     AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
     axis2_uri_resolve_relative(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_uri_t* base,
         axis2_uri_t* uptr);
 
@@ -137,13 +137,13 @@
      */
     AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
     axis2_uri_parse_relative(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_uri_t* base,
         const char* uri);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_uri_free(axis2_uri_t *uri,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * Unparse a axis2_uri_t structure to an URI string.  Optionally 
@@ -163,28 +163,28 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_uri_to_string(const axis2_uri_t *uri,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             unsigned flags);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_uri_get_protocol(axis2_uri_t *uri,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_uri_get_server(axis2_uri_t *uri,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_port_t AXIS2_CALL
     axis2_uri_get_port(axis2_uri_t *uri,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_uri_get_path(axis2_uri_t *uri,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_uri_t* AXIS2_CALL
     axis2_uri_clone(const axis2_uri_t *uri,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
 
     /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_url.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_url.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_url.h Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_uri.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 
     AXIS2_EXTERN axis2_url_t * AXIS2_CALL
     axis2_url_create(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *protocol,
         const axis2_char_t *server,
         const int port,
@@ -51,61 +51,61 @@
 
     AXIS2_EXTERN axis2_url_t * AXIS2_CALL
     axis2_url_parse_string(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *str_url);
 
     AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
     axis2_url_to_uri(
         axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_url_to_external_form(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_url_set_protocol(axis2_url_t *url,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *protocol);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_url_get_protocol(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_url_set_server(axis2_url_t *url,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *server);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_url_get_server(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_url_set_port(axis2_url_t *url,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int port);
 
     AXIS2_EXTERN int AXIS2_CALL
     axis2_url_get_port(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_url_set_path(axis2_url_t *url,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *path);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_url_get_path(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_url_t* AXIS2_CALL
     axis2_url_clone(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axis2_url_free(axis2_url_t *url,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/axis2_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_utils.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_utils.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_date_time.h>
 #include <axutil_base64_binary.h>
 
@@ -105,7 +105,7 @@
 #define AXIS2_DELETE_FUNCTION "axis2_remove_instance"
 
 typedef void (AXIS2_CALL *AXIS2_FREE_VOID_ARG) (void *obj_to_be_freed, 
-    const axis2_env_t *env);
+    const axutil_env_t *env);
     
 /* Function pointer typedef for read callback */
 typedef int (AXIS2_CALL *AXIS2_READ_INPUT_CALLBACK)(char *buffer, int size, 
@@ -142,7 +142,7 @@
      * @return axis2_char_t ** <code>axis2_char_t **<code>
      */
     AXIS2_EXTERN axis2_char_t** AXIS2_CALL
-    axis2_parse_request_url_for_svc_and_op(const axis2_env_t *env, const axis2_char_t *request);
+    axis2_parse_request_url_for_svc_and_op(const axutil_env_t *env, const axis2_char_t *request);
     
 /** @} */
     

Modified: webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 
@@ -40,7 +40,7 @@
      * @return generated uuid as a string
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-    axis2_uuid_gen(const axis2_env_t *env);
+    axis2_uuid_gen(const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/util/include/axutil_array_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_array_list.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_array_list.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_array_list.h Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
  */
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -52,7 +52,7 @@
      * @param capacity initial capacity of this array_list
      */
     AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL axutil_array_list_create(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int capacity);
 
     /**
@@ -63,7 +63,7 @@
     AXIS2_EXTERN void AXIS2_CALL
     axutil_array_list_free_void_arg(
         void *array_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Guarantees that this list will have at least enough capacity to
@@ -77,7 +77,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_array_list_ensure_capacity(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int min_capacity);
 
     /**
@@ -89,7 +89,7 @@
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_array_list_size(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Checks if the list is empty.
@@ -100,7 +100,7 @@
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
     axutil_array_list_is_empty(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Returns true iff element is in this array_list.
@@ -112,7 +112,7 @@
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
     axutil_array_list_contains(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *e);
 
     /**
@@ -127,7 +127,7 @@
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_array_list_index_of(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *e);
 
     /**
@@ -139,7 +139,7 @@
      */
     AXIS2_EXTERN void* AXIS2_CALL 
     axutil_array_list_get(struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -154,7 +154,7 @@
     AXIS2_EXTERN void* AXIS2_CALL 
     axutil_array_list_set(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index,
         void* e);
 
@@ -169,7 +169,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_array_list_add(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const void* e);
 
     /**
@@ -185,7 +185,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_array_list_add_at(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const int index,
         const void* e);
 
@@ -198,7 +198,7 @@
      */
     AXIS2_EXTERN void* AXIS2_CALL 
     axutil_array_list_remove(struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -211,7 +211,7 @@
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
     axutil_array_list_check_bound_inclusive(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -224,7 +224,7 @@
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
     axutil_array_list_check_bound_exclusive(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int index);
 
     /**
@@ -235,7 +235,7 @@
     AXIS2_EXTERN void AXIS2_CALL 
     axutil_array_list_free(
         struct axutil_array_list *array_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/util/include/axutil_base64_binary.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_base64_binary.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_base64_binary.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_base64_binary.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axutil_base64.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 /**
  * @defgroup axutil_base64_binary encoding holder
@@ -48,7 +48,7 @@
      */
     AXIS2_EXTERN axutil_base64_binary_t* AXIS2_CALL
     axutil_base64_binary_create(
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Creates axutil_base64_binary struct
@@ -58,7 +58,7 @@
      */
     AXIS2_EXTERN axutil_base64_binary_t* AXIS2_CALL
     axutil_base64_binary_create_with_plain_binary(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const unsigned char *plain_binary,
         int plain_binary_len);
 
@@ -70,7 +70,7 @@
      */
     AXIS2_EXTERN axutil_base64_binary_t* AXIS2_CALL
     axutil_base64_binary_create_with_encoded_binary(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const char *encoded_binary);
 
     /**
@@ -81,7 +81,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL 
     axutil_base64_binary_free(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * store the value from plain binary.
@@ -93,7 +93,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_base64_binary_set_plain_binary(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const unsigned char* plain_binary,
         int plain_binary_len);
 
@@ -107,7 +107,7 @@
 
     AXIS2_EXTERN unsigned char* AXIS2_CALL 
     axutil_base64_binary_get_plain_binary(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int* plain_binary_len);
 
     /**
@@ -119,7 +119,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_base64_binary_set_encoded_binary(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const char* encoded_binary);
 
     /**
@@ -130,7 +130,7 @@
      */
     AXIS2_EXTERN char* AXIS2_CALL 
     axutil_base64_binary_get_encoded_binary(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the value from encoded binary length.
@@ -140,7 +140,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_base64_binary_get_encoded_binary_len(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the value from decoded binary length.
@@ -150,7 +150,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_base64_binary_get_decoded_binary_len(axutil_base64_binary_t *base64_binary,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/util/include/axutil_class_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_class_loader.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_class_loader.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_class_loader.h Fri Mar 30 10:26:22 2007
@@ -41,14 +41,14 @@
  */
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_class_loader_init(const axis2_env_t *env);
+axutil_class_loader_init(const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_class_loader_delete_dll (const axis2_env_t *env,
+axutil_class_loader_delete_dll (const axutil_env_t *env,
                                     axutil_dll_desc_t *dll_desc);
 
 AXIS2_EXTERN void * AXIS2_CALL
-axutil_class_loader_create_dll (const axis2_env_t *env,
+axutil_class_loader_create_dll (const axutil_env_t *env,
                                 axis2_param_t *impl_info_param);
     
  

Modified: webservices/axis2/trunk/c/util/include/axutil_date_time.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_date_time.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_date_time.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_date_time.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 #define AXUTIL_DATE_TIME_H
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 /**
  * @file axutil_date_time.h
@@ -54,7 +54,7 @@
      * @return pointer to newly created axutil_date_time struct
      */
     AXIS2_EXTERN axutil_date_time_t * AXIS2_CALL
-    axutil_date_time_create(const axis2_env_t *env);
+    axutil_date_time_create(const axutil_env_t *env);
 
     /*
      * Creates axutil_date_time struct with an additional offset value
@@ -66,7 +66,7 @@
      * @return pointer to newly created axutil_date_time struct
      **/
     AXIS2_EXTERN axutil_date_time_t * AXIS2_CALL
-    axutil_date_time_create_with_offset(const axis2_env_t *env, int offset);
+    axutil_date_time_create_with_offset(const axutil_env_t *env, int offset);
 
     /**
      * free the axutil_date_time.
@@ -76,7 +76,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL 
     axutil_date_time_free(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * store the time value from plain text.
@@ -87,7 +87,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_date_time_deserialize_time(axutil_date_time_t *date_time,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t* time_str);
 
     /**
@@ -99,7 +99,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_date_time_deserialize_date(axutil_date_time_t *date_time,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t* date_str);
 
     /**
@@ -111,7 +111,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axutil_date_time_deserialize_date_time(axutil_date_time_t *date_time,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t* date_time_str);
 
     /**
@@ -128,7 +128,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_date_time_set_date_time(axutil_date_time_t* date_time,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int year, int month, int date,
         int hour, int min, int second, int milliseconds);
 
@@ -140,7 +140,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
     axutil_date_time_serialize_time(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrive the stored date as a string
@@ -150,7 +150,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
     axutil_date_time_serialize_date(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrive the stored date time  as a string
@@ -160,7 +160,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
     axutil_date_time_serialize_date_time(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the year of the date time
@@ -170,7 +170,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_year(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the month of the date time
@@ -180,7 +180,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_month(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the date of the date time
@@ -190,7 +190,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_date(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the hour of the date time
@@ -200,7 +200,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_hour(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the minute of the date time
@@ -210,7 +210,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_minute(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * retrieve the second of the date time
@@ -220,11 +220,11 @@
      */
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_second(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN int AXIS2_CALL 
     axutil_date_time_get_msec(axutil_date_time_t *date_time,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     /**
      * Compare the date and time of @date_time with the reference @ref.
      * If the @date_time < @ref this returns NOT_EXPIRED.
@@ -237,7 +237,7 @@
      */
     AXIS2_EXTERN axutil_date_time_comp_result_t AXIS2_CALL
     axutil_date_time_compare(axutil_date_time_t *date_time,   
-        const axis2_env_t *env, axutil_date_time_t *ref);
+        const axutil_env_t *env, axutil_date_time_t *ref);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/util/include/axutil_date_time_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_date_time_util.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_date_time_util.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_date_time_util.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 
@@ -40,7 +40,7 @@
  * @return generated uuid as a string
  */ 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_get_milliseconds(const axis2_env_t *env);
+axis2_get_milliseconds(const axutil_env_t *env);
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/util/include/axutil_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dir_handler.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dir_handler.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_string.h>
 #include <axutil_array_list.h>
 #include <axis2_utils.h>
@@ -42,7 +42,7 @@
      * @return array list of dll file names
      */
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-    axutil_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
+    axutil_dir_handler_list_services_or_modules_in_dir(const axutil_env_t *env,
             axis2_char_t *pathname);
 
     /**
@@ -52,7 +52,7 @@
      * @return array list of contents of services or modules folder
      */
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-    axutil_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
+    axutil_dir_handler_list_service_or_module_dirs(const axutil_env_t *env,
             axis2_char_t *pathname);
 
     /*



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