axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524188 [24/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...
Date Fri, 30 Mar 2007 17:26:54 GMT
Modified: webservices/axis2/trunk/c/util/include/axutil_dll_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dll_desc.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dll_desc.h Fri Mar 30 10:26:22 2007
@@ -42,9 +42,9 @@
 
     typedef struct axutil_dll_desc axutil_dll_desc_t;
 
-    typedef int(*CREATE_FUNCT)(void **inst, const axis2_env_t *env);
+    typedef int(*CREATE_FUNCT)(void **inst, const axutil_env_t *env);
 
-    typedef int(*DELETE_FUNCT)(void *inst, const axis2_env_t *env);
+    typedef int(*DELETE_FUNCT)(void *inst, const axutil_env_t *env);
 
     typedef enum axis2_dll_type
     {
@@ -69,22 +69,22 @@
      * @param qname qname, can be NULL
      */
     AXIS2_EXTERN axutil_dll_desc_t* AXIS2_CALL
-    axutil_dll_desc_create(const axis2_env_t *env);
+    axutil_dll_desc_create(const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axutil_dll_desc_free_void_arg(void *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN void AXIS2_CALL
     axutil_dll_desc_free(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Set path qualified platform specific dll name
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_name(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *name);
 
     /**
@@ -92,71 +92,71 @@
      */
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axutil_dll_desc_get_name(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_type(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_dll_type_t type);
 
     AXIS2_EXTERN axis2_dll_type_t AXIS2_CALL
     axutil_dll_desc_get_type(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_load_options(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int options);
 
     AXIS2_EXTERN int AXIS2_CALL
     axutil_dll_desc_get_load_options(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_dl_handler(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_DLHANDLER dl_handler);
 
     AXIS2_EXTERN AXIS2_DLHANDLER AXIS2_CALL
     axutil_dll_desc_get_dl_handler(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_create_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         CREATE_FUNCT funct);
 
     AXIS2_EXTERN CREATE_FUNCT AXIS2_CALL
     axutil_dll_desc_get_create_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_delete_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         DELETE_FUNCT funct);
 
     AXIS2_EXTERN DELETE_FUNCT AXIS2_CALL
     axutil_dll_desc_get_delete_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_timestamp(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_TIME_T timestamp);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axutil_dll_desc_set_error_code(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_error_codes_t error_code);
 
     AXIS2_EXTERN axis2_error_codes_t AXIS2_CALL
     axutil_dll_desc_get_error_code(
         axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
     axutil_dll_desc_get_timestamp(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     /**
     * This function will accept the library name without any platform
     * dependant prefixes or suffixes. It then prefix and suffix
@@ -168,7 +168,7 @@
     */
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL 
     axutil_dll_desc_create_platform_specific_dll_name(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *class_name);
 
 #ifdef __cplusplus

Copied: webservices/axis2/trunk/c/util/include/axutil_env.h (from r524104, webservices/axis2/trunk/c/util/include/axis2_env.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_env.h?view=diff&rev=524188&p1=webservices/axis2/trunk/c/util/include/axis2_env.h&r1=524104&p2=webservices/axis2/trunk/c/util/include/axutil_env.h&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_env.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_env.h Fri Mar 30 10:26:22 2007
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_ENV_H
-#define AXIS2_ENV_H
+#ifndef AXUTIL_ENV_H
+#define AXUTIL_ENV_H
 
 /**
- * @file axis2_env.h
+ * @file axutil_env.h
  * @brief Axis2 environment that acts as a container for error, log and memory
  *  allocator routines
  */
@@ -41,11 +41,11 @@
       */
 
 
-    struct axis2_env;
-    struct axis2_env_ops;
+    struct axutil_env;
+    struct axutil_env_ops;
 
     /**
-     * @defgroup axis2_env environment
+     * @defgroup axutil_env environment
      * @ingroup axis2_util
      * @{
      */
@@ -56,7 +56,7 @@
       * Environment acts as a container for error, log, memory allocator and other
       * routines
       */
-    typedef struct axis2_env
+    typedef struct axutil_env
     {
         /** Memory allocation routines */
         axutil_allocator_t *allocator;
@@ -69,7 +69,7 @@
         /** Thread pooling routines */
         axis2_thread_pool_t *thread_pool;
     }
-    axis2_env_t;
+    axutil_env_t;
 
     /**
     * Creates an environment struct with all of its default parts,
@@ -78,8 +78,8 @@
     * @param log_level log level to be used
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_all(const axis2_char_t *log_file,
+    AXIS2_EXTERN axutil_env_t * AXIS2_CALL 
+    axutil_env_create_all(const axis2_char_t *log_file,
         const axis2_log_levels_t log_level);
 
     /**
@@ -88,8 +88,8 @@
      * @param allocator pointer to an instance of allocator struct. Must be non-NULL   
      * @return pointer to the newly created environment struct 
      */
-    AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create(axutil_allocator_t *allocator);
+    AXIS2_EXTERN axutil_env_t * AXIS2_CALL 
+    axutil_env_create(axutil_allocator_t *allocator);
 
     /**
       * Creates an environment struct
@@ -98,8 +98,8 @@
       * it would be taken as a flag for no logging.  
       * @return pointer to the newly created environment struct 
       */
-    AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_with_error(axutil_allocator_t *allocator, 
+    AXIS2_EXTERN axutil_env_t * AXIS2_CALL 
+    axutil_env_create_with_error(axutil_allocator_t *allocator, 
         axis2_error_t *error);
 
     /**
@@ -110,8 +110,8 @@
      * it would be taken as a flag for no logging.   
      * @return pointer to the newly created environment struct 
      */
-    AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_with_error_log(axutil_allocator_t *allocator, 
+    AXIS2_EXTERN axutil_env_t * AXIS2_CALL 
+    axutil_env_create_with_error_log(axutil_allocator_t *allocator, 
         axis2_error_t *error, 
         axis2_log_t *log);
 
@@ -124,8 +124,8 @@
     * @param pool pointer to an instance of thread_pool. May be NULL. If NULL
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-    axis2_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator, 
+    AXIS2_EXTERN axutil_env_t * AXIS2_CALL 
+    axutil_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator, 
         axis2_error_t *error, 
         axis2_log_t *log, 
         axis2_thread_pool_t *pool);
@@ -142,7 +142,7 @@
       * @return pointer to the newly created environment struct 
       */
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_env_free(axis2_env_t *env);
+    axutil_env_free(axutil_env_t *env);
 
     /**
     * Frees the environment
@@ -157,20 +157,20 @@
     * @return status of the operation
     */
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_env_free_masked(axis2_env_t *env, 
+    axutil_env_free_masked(axutil_env_t *env, 
         char mask);
     /**
      * Enables logging
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-    axis2_env_enable_log(axis2_env_t *env, 
+    axutil_env_enable_log(axutil_env_t *env, 
         axis2_bool_t enable);
 
     /**
       * Checks the status code of environment
       */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-    axis2_env_check_status(const axis2_env_t *env);
+    axutil_env_check_status(const axutil_env_t *env);
 
 /*#define AXIS2_ENV_CHECK(env, error_return) \
     if(!env) \

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h Fri Mar 30 10:26:22 2007
@@ -63,7 +63,7 @@
     axis2_bool_t detached);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axis2_env_t *env);
+axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_threadattr_stacksize_set(axis2_threadattr_t *attr, size_t stacksize);
@@ -89,7 +89,7 @@
 axis2_thread_detach(axis2_thread_t *thd);
 
 AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
-axis2_os_thread_get(axis2_thread_t *thd, const axis2_env_t *env);
+axis2_os_thread_get(axis2_thread_t *thd, const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_thread_once_t * AXIS2_CALL
 axis2_thread_once_init(axutil_allocator_t *allocator);

Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Fri Mar 30 10:26:22 2007
@@ -30,7 +30,7 @@
 };
 
 AXIS2_EXTERN struct axutil_array_list* AXIS2_CALL 
-axutil_array_list_create(const axis2_env_t *env, 
+axutil_array_list_create(const axutil_env_t *env, 
     int capacity)
 {
     axutil_array_list_t *array_list = NULL;
@@ -66,7 +66,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -95,7 +95,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return array_list->size;
@@ -103,7 +103,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return array_list->size == 0;
@@ -111,7 +111,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -120,7 +120,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)
 {
     int i = 0;
@@ -135,7 +135,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)
 {
     if (axutil_array_list_check_bound_exclusive(array_list, env, index))
@@ -146,7 +146,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)
 {
@@ -164,7 +164,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -177,7 +177,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)
 {
@@ -202,7 +202,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)
 {
     void* result = NULL;
@@ -222,7 +222,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -237,7 +237,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -252,7 +252,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -266,7 +266,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)
 {
     axutil_array_list_t *array_list_l = NULL;
 

Modified: webservices/axis2/trunk/c/util/src/base64_binary.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/base64_binary.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/base64_binary.c (original)
+++ webservices/axis2/trunk/c/util/src/base64_binary.c Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 };
 
 AXIS2_EXTERN axutil_base64_binary_t * AXIS2_CALL
-axutil_base64_binary_create(const axis2_env_t *env)
+axutil_base64_binary_create(const axutil_env_t *env)
 {
     axutil_base64_binary_t *base64_binary = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -44,7 +44,7 @@
 }
 
 AXIS2_EXTERN axutil_base64_binary_t * AXIS2_CALL
-axutil_base64_binary_create_with_plain_binary(const axis2_env_t *env,
+axutil_base64_binary_create_with_plain_binary(const axutil_env_t *env,
         const unsigned char* plain_binary,
         int plain_binary_len)
 {
@@ -75,7 +75,7 @@
 }
 
 AXIS2_EXTERN axutil_base64_binary_t * AXIS2_CALL
-axutil_base64_binary_create_with_encoded_binary(const axis2_env_t *env,
+axutil_base64_binary_create_with_encoded_binary(const axutil_env_t *env,
         const char* encoded_binary)
 {
     axutil_base64_binary_t *base64_binary = NULL;
@@ -110,7 +110,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -129,7 +129,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)
 {
@@ -150,7 +150,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)
 {
     *plain_binary_len = base64_binary->plain_binary_len;
@@ -159,7 +159,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)
 {
     int plain_binary_len = 0;
@@ -185,7 +185,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)
 {
     char* encoded_binary = NULL;
     int encoded_binary_len = 0;
@@ -210,7 +210,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)
 {
     int encoded_binary_len = 0;
     encoded_binary_len = axutil_base64_encode_len(
@@ -220,7 +220,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)
 {
     return base64_binary -> plain_binary_len;
 }

Modified: webservices/axis2/trunk/c/util/src/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/class_loader.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/class_loader.c (original)
+++ webservices/axis2/trunk/c/util/src/class_loader.c Fri Mar 30 10:26:22 2007
@@ -18,23 +18,23 @@
 #include <axutil_class_loader.h>
 
 axis2_status_t
-axutil_class_loader_load_lib(const axis2_env_t *env,
+axutil_class_loader_load_lib(const axutil_env_t *env,
         axutil_dll_desc_t *dll_desc);
 
 axis2_status_t
-axutil_class_loader_unload_lib(const axis2_env_t *env,
+axutil_class_loader_unload_lib(const axutil_env_t *env,
         axutil_dll_desc_t *dll_desc);
 
 
 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_PLATFORM_LOADLIBINIT();
     return AXIS2_SUCCESS;
 }
 
 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)
 {
     if (!dll_desc)
@@ -49,7 +49,7 @@
 }
 
 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)
 {
     void *obj = NULL;
@@ -138,7 +138,7 @@
 }
 
 axis2_status_t
-axutil_class_loader_load_lib(const axis2_env_t *env,
+axutil_class_loader_load_lib(const axutil_env_t *env,
         axutil_dll_desc_t *dll_desc)
 {
     axis2_char_t *dll_name = NULL;
@@ -168,7 +168,7 @@
 }
 
 axis2_status_t
-axutil_class_loader_unload_lib(const axis2_env_t *env,
+axutil_class_loader_unload_lib(const axutil_env_t *env,
         axutil_dll_desc_t *dll_desc)
 {
     AXIS2_DLHANDLER dl_handler =  axutil_dll_desc_get_dl_handler(dll_desc, env);

Modified: webservices/axis2/trunk/c/util/src/date_time.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/date_time.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/date_time.c (original)
+++ webservices/axis2/trunk/c/util/src/date_time.c Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
 };
 
 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)
 {
     axutil_date_time_t *date_time = NULL;
     time_t t;
@@ -69,7 +69,7 @@
 
 
 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)
 {
     return axutil_date_time_create_with_offset(env, 0);
 }
@@ -77,7 +77,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -90,7 +90,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -101,7 +101,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -114,7 +114,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -129,7 +129,7 @@
 /*Check if the @data_time is not expired, compared to @ref*/
 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)
 {
    
    AXIS2_ENV_CHECK(env, AXIS2_DATE_TIME_COMP_RES_FAILURE);
@@ -181,7 +181,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 day,
         int hour, int min, int second, int milliseconds)
 {
@@ -200,7 +200,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)
 {
     axis2_char_t* time_str = NULL;
 
@@ -214,7 +214,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)
 {
     axis2_char_t* date_str = NULL;
 
@@ -230,7 +230,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)
 {
     axis2_char_t* date_time_str = NULL;
 
@@ -245,7 +245,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return (date_time->year + 1900);
@@ -253,7 +253,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)
 {
     return (date_time->mon);
 }
@@ -261,35 +261,35 @@
 
 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)
 {
     return (date_time->day);
 }
 
 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)
 {
     return (date_time->hour);
 }
 
 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)
 {
     return (date_time->min);
 }
 
 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)
 {
     return (date_time->sec);
 }
 
 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)
 {
     return (date_time->msec);
 }

Modified: webservices/axis2/trunk/c/util/src/date_time_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/date_time_util.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/date_time_util.c (original)
+++ webservices/axis2/trunk/c/util/src/date_time_util.c Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_get_milliseconds(const axis2_env_t *env)
+axis2_get_milliseconds(const axutil_env_t *env)
 {
     return axis2_platform_get_milliseconds();
 }

Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Fri Mar 30 10:26:22 2007
@@ -36,7 +36,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)
 {
     axutil_array_list_t *file_list = NULL;
@@ -159,7 +159,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)
 {
     axutil_array_list_t *file_list = NULL;

Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Fri Mar 30 10:26:22 2007
@@ -34,7 +34,7 @@
 };
 
 AXIS2_EXTERN axutil_dll_desc_t * AXIS2_CALL
-axutil_dll_desc_create(const axis2_env_t *env)
+axutil_dll_desc_create(const axutil_env_t *env)
 {
     axutil_dll_desc_t *dll_desc = NULL;
 
@@ -64,7 +64,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axutil_dll_desc_free(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -92,7 +92,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axutil_dll_desc_free_void_arg(void *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     axutil_dll_desc_t *dll_desc_l = NULL;
 
@@ -104,7 +104,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_name(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *name)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -125,14 +125,14 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axutil_dll_desc_get_name(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->path_qualified_dll_name;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_load_options(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int options)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -143,7 +143,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_type(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_dll_type_t type)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -154,21 +154,21 @@
 
 AXIS2_EXTERN axis2_dll_type_t AXIS2_CALL
 axutil_dll_desc_get_type(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->dll_type;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 axutil_dll_desc_get_load_options(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->load_options;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_dl_handler(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_DLHANDLER dl_handler)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -184,14 +184,14 @@
 
 AXIS2_EXTERN AXIS2_DLHANDLER AXIS2_CALL
 axutil_dll_desc_get_dl_handler(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->dl_handler;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_create_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         CREATE_FUNCT funct)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -201,14 +201,14 @@
 
 AXIS2_EXTERN CREATE_FUNCT AXIS2_CALL
 axutil_dll_desc_get_create_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->create_funct;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_delete_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         DELETE_FUNCT funct)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -219,14 +219,14 @@
 
 AXIS2_EXTERN DELETE_FUNCT AXIS2_CALL
 axutil_dll_desc_get_delete_funct(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->delete_funct;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_timestamp(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         AXIS2_TIME_T timestamp)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -236,7 +236,7 @@
 
 AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
 axutil_dll_desc_get_timestamp(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return dll_desc->timestamp;
 }
@@ -244,7 +244,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_dll_desc_set_error_code(
     axutil_dll_desc_t *dll_desc,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_error_codes_t error_code)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -257,14 +257,14 @@
 AXIS2_EXTERN axis2_error_codes_t AXIS2_CALL
 axutil_dll_desc_get_error_code(
     axutil_dll_desc_t *dll_desc,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return dll_desc->error_code;
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axutil_dll_desc_create_platform_specific_dll_name(axutil_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *class_name)
 {
     axis2_char_t *temp_name = NULL;

Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Fri Mar 30 10:26:22 2007
@@ -17,16 +17,16 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_error_default.h>
 #include <axis2_log_default.h>
 #include <axis2_string.h>
 
-AXIS2_EXTERN axis2_env_t * AXIS2_CALL 
-axis2_env_create_all(const axis2_char_t *log_file,
+AXIS2_EXTERN axutil_env_t * AXIS2_CALL 
+axutil_env_create_all(const axis2_char_t *log_file,
     const axis2_log_levels_t log_level)
 {
-    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;
@@ -44,7 +44,7 @@
         log = axis2_log_create_default(allocator);
 
     thread_pool = axis2_thread_pool_init(allocator);
-    env = axis2_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool);
+    env = axutil_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool);
     if (env->log)
     {
         env->log->level = log_level;
@@ -55,7 +55,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL  
-axis2_env_free(axis2_env_t *env)
+axutil_env_free(axutil_env_t *env)
 {
     axutil_allocator_t *allocator = NULL;
 
@@ -91,17 +91,17 @@
     return;
 }
 
-AXIS2_EXTERN axis2_env_t* AXIS2_CALL
-axis2_env_create(axutil_allocator_t *allocator)
+AXIS2_EXTERN axutil_env_t* AXIS2_CALL
+axutil_env_create(axutil_allocator_t *allocator)
 {
-    axis2_env_t *environment;
+    axutil_env_t *environment;
     axis2_log_t *log = NULL;
 
     if (! allocator)
         return NULL;
 
     environment =
-        (axis2_env_t *) AXIS2_MALLOC(allocator, sizeof(axis2_env_t));
+        (axutil_env_t *) AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
 
     if (! environment)
         return NULL;
@@ -120,25 +120,25 @@
 
 }
 
-AXIS2_EXTERN axis2_env_t* AXIS2_CALL
-axis2_env_create_with_error(axutil_allocator_t *allocator, 
+AXIS2_EXTERN axutil_env_t* AXIS2_CALL
+axutil_env_create_with_error(axutil_allocator_t *allocator, 
     axis2_error_t *error)
 {
-    return axis2_env_create_with_error_log(allocator, error, NULL);
+    return axutil_env_create_with_error_log(allocator, error, NULL);
 }
 
-AXIS2_EXTERN axis2_env_t * AXIS2_CALL
-axis2_env_create_with_error_log(axutil_allocator_t *allocator, 
+AXIS2_EXTERN axutil_env_t * AXIS2_CALL
+axutil_env_create_with_error_log(axutil_allocator_t *allocator, 
     axis2_error_t *error, 
     axis2_log_t *log)
 {
-    axis2_env_t *environment;
+    axutil_env_t *environment;
     if (! allocator)
         return NULL;
     if (! error)
         return NULL;
 
-    environment = (axis2_env_t *) AXIS2_MALLOC(allocator, sizeof(axis2_env_t));
+    environment = (axutil_env_t *) AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
 
     if (! environment)
         return NULL;
@@ -162,13 +162,13 @@
     return environment;
 }
 
-AXIS2_EXTERN axis2_env_t * AXIS2_CALL
-axis2_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator, 
+AXIS2_EXTERN axutil_env_t * AXIS2_CALL
+axutil_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator, 
     axis2_error_t *error, 
     axis2_log_t *log, 
     axis2_thread_pool_t *pool)
 {
-    axis2_env_t *environment;
+    axutil_env_t *environment;
     if (! allocator)
         return NULL;
     if (! error)
@@ -177,7 +177,7 @@
         return NULL;
 
     environment =
-        (axis2_env_t *) AXIS2_MALLOC(allocator, sizeof(axis2_env_t));
+        (axutil_env_t *) AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
 
     if (! environment)
         return NULL;
@@ -195,7 +195,7 @@
 }
 
 AXIS2_EXTERN  axis2_status_t  AXIS2_CALL
-axis2_env_check_status(const axis2_env_t *env)
+axutil_env_check_status(const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
 
@@ -203,7 +203,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-axis2_env_enable_log(axis2_env_t *env, 
+axutil_env_enable_log(axutil_env_t *env, 
     axis2_bool_t enable)
 {
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
@@ -214,7 +214,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL  
-axis2_env_free_masked(axis2_env_t *env, 
+axutil_env_free_masked(axutil_env_t *env, 
     char mask)
 {
     if (mask & 0x1)

Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 };
 
 AXIS2_EXTERN axis2_file_t *AXIS2_CALL
-axis2_file_create(const axis2_env_t *env)
+axis2_file_create(const axutil_env_t *env)
 {
     axis2_file_t *file = NULL;
 
@@ -49,7 +49,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_file_free(axis2_file_t *file,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -72,7 +72,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
@@ -94,7 +94,7 @@
 
 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)
 {
     if (!file->name)
     {
@@ -107,7 +107,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
@@ -132,7 +132,7 @@
 
 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)
 {
     if (!(file->path))
     {
@@ -146,7 +146,7 @@
 
 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)
 {
     file->timestamp = timestamp;
@@ -155,14 +155,14 @@
 
 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)
 {
     return file->timestamp;
 }
 
 AXIS2_EXTERN axis2_file_t *AXIS2_CALL
 axis2_file_clone(axis2_file_t *file,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     axis2_file_t *new_file = NULL;
     axis2_status_t status = AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/util/src/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/generic_obj.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Fri Mar 30 10:26:22 2007
@@ -25,7 +25,7 @@
 };
 
 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_generic_obj_t *generic_obj = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -46,7 +46,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -72,7 +72,7 @@
 
 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)
 {
     generic_obj->free_func = free_func;
@@ -81,7 +81,7 @@
 
 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)
 {
     generic_obj->value = value;
@@ -90,7 +90,7 @@
 
 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)
 {
     return generic_obj->value;
 }
@@ -98,7 +98,7 @@
 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)
 {
     generic_obj->type = type;
@@ -108,7 +108,7 @@
 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)
 {
     return generic_obj->type;
 }

Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Fri Mar 30 10:26:22 2007
@@ -62,7 +62,7 @@
  */
 struct axis2_hash_t
 {
-    const axis2_env_t *env;
+    const axutil_env_t *env;
     axis2_hash_entry_t **array;
     axis2_hash_index_t iterator;    /* For axis2_hash_first(NULL, ...) */
     unsigned int count, max;
@@ -86,7 +86,7 @@
 }
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_make(const axis2_env_t *env)
+axis2_hash_make(const axutil_env_t *env)
 {
     axis2_hash_t *ht;
     AXIS2_ENV_CHECK(env, NULL);
@@ -102,7 +102,7 @@
 }
 
 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)
 {
     axis2_hash_t *ht;
@@ -118,7 +118,7 @@
  */
 
 AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL
-axis2_hash_next(const axis2_env_t *env, axis2_hash_index_t *hi)
+axis2_hash_next(const axutil_env_t *env, axis2_hash_index_t *hi)
 {
     hi->this = hi->next;
     while (!hi->this)
@@ -137,7 +137,7 @@
 }
 
 AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL
-axis2_hash_first(axis2_hash_t *ht, const axis2_env_t *env)
+axis2_hash_first(axis2_hash_t *ht, const axutil_env_t *env)
 {
     axis2_hash_index_t *hi;
     if (env)
@@ -303,7 +303,7 @@
 }
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_copy(const axis2_hash_t *orig, const axis2_env_t *env)
+axis2_hash_copy(const axis2_hash_t *orig, const axutil_env_t *env)
 {
     axis2_hash_t *ht;
     axis2_hash_entry_t *new_vals;
@@ -392,7 +392,7 @@
 }
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_overlay(const axis2_hash_t *overlay, const axis2_env_t *env
+axis2_hash_overlay(const axis2_hash_t *overlay, const axutil_env_t *env
         , const axis2_hash_t * base)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -400,8 +400,8 @@
 }
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_merge(const axis2_hash_t *overlay, const axis2_env_t *env
-        , const axis2_hash_t * base, void *(*merger)(const axis2_env_t * env
+axis2_hash_merge(const axis2_hash_t *overlay, const axutil_env_t *env
+        , const axis2_hash_t * base, void *(*merger)(const axutil_env_t * env
                 , const void *key, axis2_ssize_t klen, const void *h1_val
                 , const void *h2_val, const void *data), const void *data)
 {
@@ -417,13 +417,13 @@
      * overlay->a.env and base->a.env have a life span at least
      * as long as p
      */
-    if (!axis2_env_is_ancestor(overlay->env, p))
+    if (!axutil_env_is_ancestor(overlay->env, p))
     {
         fprintf(stderr,
                 "axis2_hash_merge: overlay's env is not an ancestor of p\n");
         abort();
     }
-    if (!axis2_env_is_ancestor(base->env, p))
+    if (!axutil_env_is_ancestor(base->env, p))
     {
         fprintf(stderr,
                 "axis2_hash_merge: base's env is not an ancestor of p\n");
@@ -507,7 +507,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)
 {
     axis2_hash_index_t *i = NULL;
@@ -529,7 +529,7 @@
 }
 
 static void
-axis2_hash_entry_free(const axis2_env_t *env, axis2_hash_entry_t *hash_entry)
+axis2_hash_entry_free(const axutil_env_t *env, axis2_hash_entry_t *hash_entry)
 {
     AXIS2_ENV_CHECK(env, void);
     if (!hash_entry)
@@ -543,7 +543,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_hash_free(axis2_hash_t *ht, const axis2_env_t* env)
+axis2_hash_free(axis2_hash_t *ht, const axutil_env_t* env)
 {
     int i = 0;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -580,7 +580,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_hash_free_void_arg(void *ht_void, const axis2_env_t* env)
+axis2_hash_free_void_arg(void *ht_void, const axutil_env_t* env)
 {
     int i = 0;
     axis2_hash_t *ht = (axis2_hash_t*)ht_void;

Modified: webservices/axis2/trunk/c/util/src/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/linked_list.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/util/src/linked_list.c Fri Mar 30 10:26:22 2007
@@ -49,7 +49,7 @@
 };
 
 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_linked_list_t *linked_list = NULL;
 
@@ -71,7 +71,7 @@
 }
 
 static entry_t *
-axis2_linked_list_create_entry(const axis2_env_t *env, void *data)
+axis2_linked_list_create_entry(const axutil_env_t *env, void *data)
 {
     entry_t *entry = (entry_t *) AXIS2_MALLOC(env->allocator, sizeof(entry_t));
     if (!entry)
@@ -88,7 +88,7 @@
 
 static axis2_status_t
 axis2_linked_list_add_last_entry(axis2_linked_list_t *linked_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         entry_t *e)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -112,7 +112,7 @@
 
 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)
 {
     entry_t *current = NULL, *next = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -130,7 +130,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)
 {
     entry_t *e = NULL;
@@ -159,7 +159,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -193,7 +193,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -208,7 +208,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -222,7 +222,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)
 {
     if (linked_list->size == 0)
     {
@@ -235,7 +235,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)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -250,7 +250,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)
 {
     void *r;
     AXIS2_ENV_CHECK(env, NULL);
@@ -282,7 +282,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)
 {
     void *r = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -313,7 +313,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)
 {
     entry_t *e ;
@@ -340,7 +340,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)
 {
     entry_t *e;
@@ -353,7 +353,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)
 {
     entry_t *e;
@@ -372,14 +372,14 @@
 
 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)
 {
     return linked_list->size;
 }
 
 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)
 {
     entry_t *e;
@@ -392,7 +392,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)
 {
     entry_t *e;
@@ -414,7 +414,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)
 {
     if (linked_list->size > 0)
     {
@@ -430,7 +430,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)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -441,7 +441,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)
 {
     entry_t *e;
@@ -457,7 +457,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)
 {
@@ -492,7 +492,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)
 {
     entry_t *e;
@@ -506,7 +506,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)
 {
     int index = 0;
@@ -528,7 +528,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)
 {
     int index;
@@ -550,7 +550,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)
 {
     int i = 0;
     void **array;

Modified: webservices/axis2/trunk/c/util/src/network_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/network_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/network_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/network_handler.c Fri Mar 30 10:26:22 2007
@@ -28,7 +28,7 @@
 #endif
 
 AXIS2_EXTERN axis2_socket_t  AXIS2_CALL
-axis2_network_handler_open_socket(const axis2_env_t *env, char *server, int port)
+axis2_network_handler_open_socket(const axutil_env_t *env, char *server, int port)
 {
     axis2_socket_t sock = AXIS2_INVALID_SOCKET;
     struct sockaddr_in sock_addr;
@@ -95,7 +95,7 @@
 }
 
 AXIS2_EXTERN  axis2_socket_t  AXIS2_CALL
-axis2_network_handler_create_server_socket(const axis2_env_t *env, int port)
+axis2_network_handler_create_server_socket(const axutil_env_t *env, int port)
 {
     axis2_socket_t sock = AXIS2_INVALID_SOCKET;
     axis2_socket_t i = 0;
@@ -145,7 +145,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t  AXIS2_CALL
-axis2_network_handler_close_socket(const axis2_env_t *env,  axis2_socket_t socket)
+axis2_network_handler_close_socket(const axutil_env_t *env,  axis2_socket_t socket)
 {
     int i = 0;
     char buf[32];
@@ -164,7 +164,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_network_handler_set_sock_option(const axis2_env_t *env, axis2_socket_t socket,
+axis2_network_handler_set_sock_option(const axutil_env_t *env, axis2_socket_t socket,
         int option, int value)
 {
     if (option == SO_RCVTIMEO || option == SO_SNDTIMEO)
@@ -180,7 +180,7 @@
 }
 
 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 svr_socket)
 {
     struct sockaddr cli_addr;
@@ -244,7 +244,7 @@
 
 
 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)
 {
     struct sockaddr_in addr;
@@ -261,7 +261,7 @@
 }
 
 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)
 {
     struct sockaddr_in addr;

Modified: webservices/axis2/trunk/c/util/src/param.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Fri Mar 30 10:26:22 2007
@@ -34,11 +34,11 @@
     axutil_array_list_t *value_list;
     axis2_status_t (AXIS2_CALL *
     value_free) (void *param_value,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 };
 
 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)
 {
@@ -67,21 +67,21 @@
 
 axis2_char_t* AXIS2_CALL
 axis2_param_get_name(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return param->name;
 }
 
 void* AXIS2_CALL
 axis2_param_get_value(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return param->value;
 }
 
 axis2_status_t AXIS2_CALL
 axis2_param_set_name(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *name)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -92,7 +92,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_param_set_value(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *value)
 {
     void *param_value = NULL;
@@ -116,7 +116,7 @@
 
 axis2_bool_t AXIS2_CALL
 axis2_param_is_locked(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return param->locked;
@@ -124,7 +124,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_param_set_locked(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -135,14 +135,14 @@
 
 int AXIS2_CALL
 axis2_param_get_param_type(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return param->type;
 }
 
 axis2_status_t AXIS2_CALL
 axis2_param_set_param_type(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int type)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -153,7 +153,7 @@
 
 axis2_status_t AXIS2_CALL
 axis2_param_set_attributes(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_hash_t *attrs)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -179,14 +179,14 @@
 
 axis2_hash_t* AXIS2_CALL
 axis2_param_get_attributes(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return param->attrs;
 }
 
 axis2_status_t AXIS2_CALL
 axis2_param_set_value_list(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axutil_array_list_t *value_list)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -214,14 +214,14 @@
 
 axutil_array_list_t* AXIS2_CALL
 axis2_param_get_value_list(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return param->value_list;
 }
 
 void AXIS2_CALL
 axis2_param_free(axis2_param_t *param,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     void *param_value = NULL;
     axis2_char_t *param_name = NULL;
@@ -281,7 +281,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_param_set_value_free(axis2_param_t *param,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *free_fn)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/util/src/param_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param_container.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/param_container.c (original)
+++ webservices/axis2/trunk/c/util/src/param_container.c Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
 };
 
 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)
 {
     axis2_param_container_t *param_container = NULL;
 
@@ -56,7 +56,7 @@
 
 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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -95,7 +95,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_param_container_free_void_arg(void *param_container,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_param_container_t *param_container_l = NULL;
 
@@ -107,7 +107,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)
 {
     axis2_char_t *param_name = NULL;
@@ -138,7 +138,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)
 {
     return (axis2_param_t *)(axis2_hash_get(param_container->params, 
@@ -147,7 +147,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)
 {
     axis2_hash_index_t *index_i = 0;
     axis2_status_t status = AXIS2_FAILURE;
@@ -182,7 +182,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)
 {
     axis2_param_t *param = NULL;

Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c Fri Mar 30 10:26:22 2007
@@ -55,7 +55,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axis2_env_t *env)
+axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axutil_env_t *env)
 {
     if (1 == attr->detach)
     {
@@ -198,7 +198,7 @@
 }
 
 AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
-axis2_os_thread_get(axis2_thread_t *thd, const axis2_env_t *env)
+axis2_os_thread_get(axis2_thread_t *thd, const axutil_env_t *env)
 {
     return thd->td;
 }

Modified: webservices/axis2/trunk/c/util/src/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/properties.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Fri Mar 30 10:26:22 2007
@@ -25,7 +25,7 @@
 
 axis2_char_t*
 axis2_properties_read(FILE* input,
-    const axis2_env_t* env);
+    const axutil_env_t* env);
 
 axis2_char_t*
 axis2_properties_read_next(axis2_char_t* cur);
@@ -33,7 +33,7 @@
 axis2_char_t*
 axis2_properties_trunk_and_dup(axis2_char_t* start, 
     axis2_char_t* end,
-    const axis2_env_t* env);
+    const axutil_env_t* env);
 
 struct axis2_properties
 {
@@ -41,7 +41,7 @@
 };
 
 AXIS2_EXTERN axis2_properties_t *AXIS2_CALL
-axis2_properties_create(const axis2_env_t *env)
+axis2_properties_create(const axutil_env_t *env)
 {
     axis2_properties_t *properties = NULL;
 
@@ -62,7 +62,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_properties_free(axis2_properties_t *properties,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_char_t *key = NULL;
     axis2_char_t *value = NULL;
@@ -97,7 +97,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)
 {
     AXIS2_PARAM_CHECK(env-> error, key, NULL);
@@ -108,7 +108,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)
 {
@@ -122,14 +122,14 @@
 
 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)
 {
     return properties-> prop_hash;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_properties_store(axis2_properties_t *properties,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     FILE *output)
 {
     axis2_hash_index_t *hi = NULL;
@@ -160,7 +160,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)
 {
     FILE *input = NULL;
@@ -292,7 +292,7 @@
 axis2_char_t*
 axis2_properties_trunk_and_dup(axis2_char_t* start, 
     axis2_char_t* end,
-    const axis2_env_t* env)
+    const axutil_env_t* env)
 {
     for (; *start == ' '; start ++); /* remove front spaces */
     for (end --; *end == ' '; end --); /* remove rear spaces */
@@ -303,7 +303,7 @@
 
 axis2_char_t*
 axis2_properties_read(FILE* input,
-    const axis2_env_t* env)
+    const axutil_env_t* env)
 {
     int nread = 0;
     axis2_char_t* out_stream = NULL;

Modified: webservices/axis2/trunk/c/util/src/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/property.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/property.c (original)
+++ webservices/axis2/trunk/c/util/src/property.c Fri Mar 30 10:26:22 2007
@@ -27,7 +27,7 @@
 };
 
 axis2_property_t *AXIS2_CALL
-axis2_property_create(const axis2_env_t *env)
+axis2_property_create(const axutil_env_t *env)
 {
     axis2_property_t *property = NULL;
 
@@ -50,7 +50,7 @@
 }
 /*****************************************************************************/
 axis2_property_t *AXIS2_CALL
-axis2_property_create_with_args(const axis2_env_t *env,
+axis2_property_create_with_args(const axutil_env_t *env,
     axis2_scope_t scope,
     axis2_bool_t own_value,
     AXIS2_FREE_VOID_ARG free_func,
@@ -77,7 +77,7 @@
 
 void AXIS2_CALL
 axis2_property_free(axis2_property_t *property,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -105,7 +105,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
@@ -116,7 +116,7 @@
 
 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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -127,7 +127,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
@@ -153,14 +153,14 @@
 
 void *AXIS2_CALL
 axis2_property_get_value(axis2_property_t *property,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return property->value;
 }
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
@@ -172,7 +172,7 @@
 
 axis2_property_t* AXIS2_CALL
 axis2_property_clone(axis2_property_t *property,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_property_t *new_property = NULL;
     AXIS2_ENV_CHECK(env, NULL);

Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Fri Mar 30 10:26:22 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axis2_qname.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
 #include <string.h>
@@ -36,7 +36,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)
@@ -109,7 +109,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_qname_free(axis2_qname_t * qname,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -145,7 +145,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_qname_equals(const axis2_qname_t *qname,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_qname_t *qname2)
 {
     int uris_differ = 0;
@@ -188,7 +188,7 @@
 
 AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
 axis2_qname_clone(axis2_qname_t *qname,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     
@@ -204,14 +204,14 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_qname_get_uri(const axis2_qname_t *qname,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return qname->namespace_uri;
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_qname_get_prefix(const axis2_qname_t *qname,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return qname->prefix;
 }
@@ -219,14 +219,14 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_qname_get_localpart(const axis2_qname_t *qname,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return qname->localpart;
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_qname_to_string(axis2_qname_t *qname,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     if (qname->qname_string)
@@ -277,7 +277,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 *qstring)
 {
     axis2_char_t *localpart = NULL;

Modified: webservices/axis2/trunk/c/util/src/rand.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/rand.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/rand.c (original)
+++ webservices/axis2/trunk/c/util/src/rand.c Fri Mar 30 10:26:22 2007
@@ -46,7 +46,7 @@
 }
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-axis2_rand_get_seed_value_based_on_time(const axis2_env_t *env)
+axis2_rand_get_seed_value_based_on_time(const axutil_env_t *env)
 {
     axutil_date_time_t *date = axutil_date_time_create(env);
     unsigned int rand_var =  axutil_date_time_get_year(date, env);

Modified: webservices/axis2/trunk/c/util/src/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stack.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/stack.c (original)
+++ webservices/axis2/trunk/c/util/src/stack.c Fri Mar 30 10:26:22 2007
@@ -17,7 +17,7 @@
 
 #include <axis2_stack.h>
 #include <axis2_utils.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -34,7 +34,7 @@
 };
 
 AXIS2_EXTERN axis2_stack_t * AXIS2_CALL
-axis2_stack_create(const axis2_env_t *env)
+axis2_stack_create(const axutil_env_t *env)
 {
     axis2_stack_t *stack = NULL;
 
@@ -68,7 +68,7 @@
 
 void AXIS2_CALL
 axis2_stack_free(axis2_stack_t *stack,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -82,7 +82,7 @@
 
 void* AXIS2_CALL
 axis2_stack_pop(axis2_stack_t *stack,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     void *value = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -107,7 +107,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
@@ -144,7 +144,7 @@
 
 int AXIS2_CALL
 axis2_stack_size(axis2_stack_t *stack,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return stack->size;
@@ -152,7 +152,7 @@
 
 void * AXIS2_CALL
 axis2_stack_get(axis2_stack_t *stack,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (stack->size > 0)
     {
@@ -163,7 +163,7 @@
 
 void* AXIS2_CALL
 axis2_stack_get_at(axis2_stack_t *stack,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int i)
 {
     if ((stack->size == 0) || (i < 0) || (i >= stack->size))

Modified: webservices/axis2/trunk/c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stream.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Fri Mar 30 10:26:22 2007
@@ -24,53 +24,53 @@
 /** basic stream operatons **/
 int AXIS2_CALL
 axis2_stream_write_basic(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer, size_t count);
 
 int AXIS2_CALL
 axis2_stream_read_basic(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer, size_t count);
 
 int AXIS2_CALL
 axis2_stream_skip_basic(axis2_stream_t *stream, 
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     int count);
 
 /** file stream operations **/
 int AXIS2_CALL
 axis2_stream_write_file(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer, size_t count);
 
 int AXIS2_CALL
 axis2_stream_read_file(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer, size_t count);
 
 int AXIS2_CALL
 axis2_stream_skip_file(axis2_stream_t *stream, 
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     int count);
 
 /** socket stream operations **/
 int AXIS2_CALL
 axis2_stream_write_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer, size_t count);
 
 int AXIS2_CALL
 axis2_stream_read_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer, size_t count);
 
 int AXIS2_CALL
 axis2_stream_skip_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     int count);
 
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_internal(const axis2_env_t *env)
+axis2_stream_create_internal(const axutil_env_t *env)
 {
     axis2_stream_t *stream = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -97,7 +97,7 @@
 
 void AXIS2_CALL
 axis2_stream_free(axis2_stream_t *stream, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -140,7 +140,7 @@
 
 void AXIS2_CALL
 axis2_stream_free_void_arg(void *stream,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_stream_t *stream_l = NULL;
 
@@ -152,7 +152,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -168,7 +168,7 @@
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -219,7 +219,7 @@
 
 /************************ Basic Stream Operations *****************************/
 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)
 {
     axis2_stream_t *stream = NULL;
 
@@ -253,7 +253,7 @@
 
 
 int AXIS2_CALL
-axis2_stream_read_basic(axis2_stream_t *stream, const axis2_env_t *env,
+axis2_stream_read_basic(axis2_stream_t *stream, const axutil_env_t *env,
     void *buffer, size_t count)
 {
     int len = 0;
@@ -291,7 +291,7 @@
 
 int AXIS2_CALL
 axis2_stream_write_basic(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer, size_t count)
 {
     int new_len = 0;
@@ -334,14 +334,14 @@
 
 int AXIS2_CALL
 axis2_stream_get_len(axis2_stream_t *stream, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return stream->len;
 }
 
 int AXIS2_CALL
 axis2_stream_skip_basic(axis2_stream_t *stream, 
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     int count)
 {
     int del_len = 0;
@@ -366,14 +366,14 @@
 
 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)
 {
     return stream->buffer;
 }
 
 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_ENV_CHECK(env, AXIS2_FAILURE);
     stream->len = 0;
@@ -385,7 +385,7 @@
 
 /************************** File Stream Operations ****************************/
 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)
 {
     axis2_stream_t *stream = NULL;
 
@@ -412,7 +412,7 @@
 
 int AXIS2_CALL
 axis2_stream_read_file(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer, size_t count)
 {
     FILE *fp = NULL;
@@ -433,7 +433,7 @@
 
 int AXIS2_CALL
 axis2_stream_write_file(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer, size_t count)
 {
     int len = 0;
@@ -454,7 +454,7 @@
 
 int AXIS2_CALL
 axis2_stream_skip_file(axis2_stream_t *stream, 
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     int count)
 {
     int c = -1;
@@ -476,7 +476,7 @@
 
 /************************** Socket Stream Operations **************************/
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_socket(const axis2_env_t *env, 
+axis2_stream_create_socket(const axutil_env_t *env, 
     int socket)
 {
     axis2_stream_t *stream = NULL;
@@ -506,7 +506,7 @@
 
 int AXIS2_CALL
 axis2_stream_read_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer, size_t count)
 {
     int len = 0;
@@ -547,7 +547,7 @@
 
 int AXIS2_CALL
 axis2_stream_write_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const void *buffer, size_t count)
 {
     int len = 0;
@@ -586,7 +586,7 @@
 
 int AXIS2_CALL
 axis2_stream_skip_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     int count)
 {
     int len = 0;
@@ -609,7 +609,7 @@
 
 AXIS2_EXTERN int AXIS2_CALL
 axis2_stream_peek_socket(axis2_stream_t *stream, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *buffer, size_t count)
 {
     int len = 0;
@@ -636,7 +636,7 @@
 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)
 {
     stream->read = func;
@@ -646,7 +646,7 @@
 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)
 {
     stream->write = func;
@@ -656,7 +656,7 @@
 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)
 {
     stream->skip = func;
@@ -665,7 +665,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)
 {
@@ -674,7 +674,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)
 {
@@ -683,7 +683,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)
 {
     return stream->skip(stream, env, count);

Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Fri Mar 30 10:26:22 2007
@@ -30,7 +30,7 @@
 };
 
 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)
 {
     axis2_string_t *string = NULL;
@@ -80,7 +80,7 @@
 }
 
 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)
 {
     axis2_string_t *string = NULL;
@@ -119,7 +119,7 @@
 }
 
 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)
 {
     axis2_string_t *string = NULL;
@@ -159,7 +159,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_string_free(struct axis2_string *string,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -186,7 +186,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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -201,7 +201,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)
 {
     AXIS2_ENV_CHECK(env, NULL);
     
@@ -217,7 +217,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)
 {
     if (!string)
     {
@@ -229,7 +229,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)
 {
     if (!string)
     {
@@ -246,7 +246,7 @@
 #define MAX_SAVED_LENGTHS  6
 
 AXIS2_EXTERN void* AXIS2_CALL
-axis2_strdup(const axis2_env_t *env,
+axis2_strdup(const axutil_env_t *env,
     const void *ptr)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -272,7 +272,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_char_t *str;
 
@@ -309,7 +309,7 @@
 }
 
 AXIS2_EXTERN void* AXIS2_CALL
-axis2_strndup(const axis2_env_t *env,
+axis2_strndup(const axutil_env_t *env,
     const void *ptr,
     int n)
 {
@@ -336,7 +336,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_strcat(const axis2_env_t *env, ...)
+axis2_strcat(const axutil_env_t *env, ...)
 {
     axis2_char_t *cp, *argp, *str;
     size_t saved_lengths[MAX_SAVED_LENGTHS];
@@ -401,7 +401,7 @@
 }
 
 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)
 {
@@ -555,7 +555,7 @@
 }
 
 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)
@@ -578,7 +578,7 @@
 }
 
 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)
 {
@@ -608,7 +608,7 @@
 }
 
 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)
 {
@@ -637,7 +637,7 @@
 }
 
 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/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 #include <axis2_utils.h>
 
 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)
 {
@@ -73,7 +73,7 @@
 }
 
 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)
 {
@@ -112,7 +112,7 @@
 }
 
 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/src/thread_pool.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/thread_pool.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/thread_pool.c (original)
+++ webservices/axis2/trunk/c/util/src/thread_pool.c Fri Mar 30 10:26:22 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axis2_thread_pool.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_error_default.h>
 
 struct axis2_thread_pool
@@ -107,16 +107,16 @@
     return axis2_thread_detach(thd);
 }
 
-AXIS2_EXTERN axis2_env_t *AXIS2_CALL
-axis2_init_thread_env(const axis2_env_t *system_env)
+AXIS2_EXTERN axutil_env_t *AXIS2_CALL
+axis2_init_thread_env(const axutil_env_t *system_env)
 {
     axis2_error_t *error = axis2_error_create(system_env->allocator);
-    return axis2_env_create_with_error_log_thread_pool(system_env->allocator, error,
+    return axutil_env_create_with_error_log_thread_pool(system_env->allocator, error,
         system_env->log, system_env->thread_pool);
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_free_thread_env(struct axis2_env *thread_env)
+axis2_free_thread_env(struct axutil_env *thread_env)
 {
     if (!thread_env)
     {

Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Fri Mar 30 10:26:22 2007
@@ -181,7 +181,7 @@
 };
 
 AXIS2_EXTERN axis2_uri_t * AXIS2_CALL
-axis2_uri_create(const axis2_env_t *env)
+axis2_uri_create(const axutil_env_t *env)
 {
     axis2_uri_t *uri = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -210,7 +210,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axis2_uri_free(axis2_uri_t *uri,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -283,7 +283,7 @@
  */
 
 AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_parse_string(const axis2_env_t *env,
+axis2_uri_parse_string(const axutil_env_t *env,
     const axis2_char_t *uri_str)
 {
     axis2_uri_t *uri = NULL;
@@ -475,7 +475,7 @@
  * for the format of the "CONNECT host:port HTTP/1.0" request
  */
 AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_parse_hostinfo(const axis2_env_t *env,
+axis2_uri_parse_hostinfo(const axutil_env_t *env,
     const axis2_char_t *hostinfo)
 {
     axis2_uri_t *uri = NULL;
@@ -536,7 +536,7 @@
 
 /* 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,
+axis2_uri_resolve_relative(const axutil_env_t *env,
     const axis2_uri_t* base,
     axis2_uri_t* uri)
 {
@@ -638,7 +638,7 @@
 }
 
 AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_parse_relative(const axis2_env_t *env,
+axis2_uri_parse_relative(const axutil_env_t *env,
     const axis2_uri_t* base,
     const char* uri)
 {
@@ -673,7 +673,7 @@
 
 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)
 {
     axis2_uri_t *new_uri = NULL;
 
@@ -703,7 +703,7 @@
  */
 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_char_t *ret = "";
@@ -797,28 +797,28 @@
 
 axis2_char_t *AXIS2_CALL
 axis2_uri_get_protocol(axis2_uri_t *uri,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return uri->scheme;
 }
 
 axis2_char_t *AXIS2_CALL
 axis2_uri_get_server(axis2_uri_t *uri,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return uri->hostinfo;
 }
 
 axis2_port_t AXIS2_CALL
 axis2_uri_get_port(axis2_uri_t *uri,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return uri->port;
 }
 
 axis2_char_t *AXIS2_CALL
 axis2_uri_get_path(axis2_uri_t *uri,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return uri->path;
 }



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


Mime
View raw message