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 17:53:00 UTC

svn commit: r524142 - in /webservices/axis2/trunk/c: include/ modules/core/deployment/ modules/core/engine/ samples/codegen/client/interop_doc1/ samples/codegen/server/interop_doc1/ util/include/ util/src/ util/src/minizip/ util/test/util/

Author: pini
Date: Fri Mar 30 08:52:58 2007
New Revision: 524142

URL: http://svn.apache.org/viewvc?view=rev&rev=524142
Log:
Fixing jira issue 292

Added:
    webservices/axis2/trunk/c/util/include/axutil_date_time.h
      - copied, changed from r524104, webservices/axis2/trunk/c/util/include/axis2_date_time.h
    webservices/axis2/trunk/c/util/include/axutil_dir_handler.h
      - copied, changed from r524104, webservices/axis2/trunk/c/util/include/axis2_dir_handler.h
Removed:
    webservices/axis2/trunk/c/util/include/axis2_date_time.h
    webservices/axis2/trunk/c/util/include/axis2_dir_handler.h
Modified:
    webservices/axis2/trunk/c/include/axis2_util.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
    webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
    webservices/axis2/trunk/c/modules/core/engine/conf.c
    webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c
    webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c
    webservices/axis2/trunk/c/util/include/axis2_rand.h
    webservices/axis2/trunk/c/util/include/axis2_utils.h
    webservices/axis2/trunk/c/util/src/date_time.c
    webservices/axis2/trunk/c/util/src/dir_handler.c
    webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
    webservices/axis2/trunk/c/util/src/rand.c
    webservices/axis2/trunk/c/util/test/util/test_util.c

Modified: webservices/axis2/trunk/c/include/axis2_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_util.h?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Fri Mar 30 08:52:58 2007
@@ -21,7 +21,7 @@
 #include <axutil_allocator.h>
 #include <axutil_array_list.h>
 #include <axutil_class_loader.h>
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include <axis2_dll_desc.h>
 #include <axis2_env.h>
 #include <axis2_error.h>

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h Fri Mar 30 08:52:58 2007
@@ -31,7 +31,7 @@
 #include <axis2_qname.h>
 #include <axis2_conf.h>
 #include <axutil_array_list.h>
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include <axis2_file.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Fri Mar 30 08:52:58 2007
@@ -37,7 +37,7 @@
 #include <axis2_conf.h>
 #include "axis2_deployment.h"
 #include <axis2_file_handler.h>
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include "axis2_ws_info.h"
 #include "axis2_arch_file_data.h"
 #include "axis2_dep_engine.h"

Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Fri Mar 30 08:52:58 2007
@@ -17,7 +17,7 @@
 
 #include <axis2_repos_listener.h>
 #include <axis2_ws_info_list.h>
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 
 struct axis2_repos_listener
 {
@@ -226,7 +226,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, folder_name, AXIS2_FAILURE);
 
-    current_info_list = axis2_dir_handler_list_service_or_module_dirs(env,
+    current_info_list = axutil_dir_handler_list_service_or_module_dirs(env,
         folder_name);
     if (!current_info_list)
     {

Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Fri Mar 30 08:52:58 2007
@@ -19,7 +19,7 @@
 #include <axis2_disp.h>
 #include "axis2_disp_checker.h"
 #include <axis2_conf.h>
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include <axis2_dep_engine.h>
 #include <axis2_arch_reader.h>
 #include <axis2_core_utils.h>

Modified: webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c Fri Mar 30 08:52:58 2007
@@ -30,8 +30,8 @@
     axis2_echoDate_t* echo_in = NULL;
     axis2_echoDateResponse_t* echo_out = NULL;
 
-    axis2_date_time_t* echo_date = NULL;
-    axis2_date_time_t* return_echo_date = NULL;
+    axutil_date_time_t* echo_date = NULL;
+    axutil_date_time_t* return_echo_date = NULL;
 
     axis2_char_t* send_date_str = NULL;
     axis2_char_t* return_date_str = NULL;
@@ -51,8 +51,8 @@
             client_home , endpoint_uri);
 
     /* create the struct */
-    echo_date = axis2_date_time_create(env); /* default to current date */
-    send_date_str =  axis2_date_time_seriasize_date_time(echo_date, env);
+    echo_date = axutil_date_time_create(env); /* default to current date */
+    send_date_str =  axutil_date_time_seriasize_date_time(echo_date, env);
     printf("sending date %s\n", send_date_str);
 
     /* create the input params using databinding */
@@ -65,7 +65,7 @@
     /* return the output params using databinding */
     return_echo_date  = AXIS2_ECHODATERESPONSE_GET_ECHODATERETURN(echo_out, env);
 
-    return_date_str =  axis2_date_time_seriasize_date_time(return_echo_date, env);
+    return_date_str =  axutil_date_time_seriasize_date_time(return_echo_date, env);
     printf("returned date %s\n", return_date_str);
 
     return 0;

Modified: webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c (original)
+++ webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c Fri Mar 30 08:52:58 2007
@@ -71,12 +71,12 @@
     axis2_echoDate_t* echo_in =  param4;
     axis2_echoDateResponse_t* echo_out = NULL;
 
-    axis2_date_time_t* echo_date = NULL;
+    axutil_date_time_t* echo_date = NULL;
     axis2_char_t* recieved_date_str  = NULL;
 
     echo_date = AXIS2_ECHODATE_GET_ARG_0_10(echo_in, env);
 
-    recieved_date_str =  axis2_date_time_seriasize_date_time(echo_date, env);
+    recieved_date_str =  axutil_date_time_seriasize_date_time(echo_date, env);
     printf("echoing date %s\n", recieved_date_str);
 
     echo_out = axis2_echoDateResponse_create(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=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_rand.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_rand.h Fri Mar 30 08:52:58 2007
@@ -19,7 +19,7 @@
 
 #include <axis2_error.h>
 #include <axis2_env.h>
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
 #include <axutil_base64_binary.h>
 
 #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=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_utils.h Fri Mar 30 08:52:58 2007
@@ -21,7 +21,7 @@
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
 #include <axis2_env.h>
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
 #include <axutil_base64_binary.h>
 
 #ifdef __cplusplus

Copied: webservices/axis2/trunk/c/util/include/axutil_date_time.h (from r524104, webservices/axis2/trunk/c/util/include/axis2_date_time.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_date_time.h?view=diff&rev=524142&p1=webservices/axis2/trunk/c/util/include/axis2_date_time.h&r1=524104&p2=webservices/axis2/trunk/c/util/include/axutil_date_time.h&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_date_time.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_date_time.h Fri Mar 30 08:52:58 2007
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_DATE_TIME_H
-#define AXIS2_DATE_TIME_H
+#ifndef AXUTIL_DATE_TIME_H
+#define AXUTIL_DATE_TIME_H
 
 #include <axis2_utils_defines.h>
 #include <axis2_env.h>
 
 /**
- * @file axis2_date_time.h
+ * @file axutil_date_time.h
  * @brief axis2-util
  */
 
@@ -32,12 +32,12 @@
 #endif
 
     /**
-     * @defgroup axis2_date_time
+     * @defgroup axutil_date_time
      * @ingroup axis2_util
      * @{
      */
 
-    typedef struct axis2_date_time axis2_date_time_t;
+    typedef struct axutil_date_time axutil_date_time_t;
 
 
     typedef enum  {
@@ -46,36 +46,36 @@
         AXIS2_DATE_TIME_COMP_RES_EXPIRED,
         AXIS2_DATE_TIME_COMP_RES_EQUAL,
         AXIS2_DATE_TIME_COMP_RES_NOT_EXPIRED
-    }axis2_date_time_comp_result_t; 
+    }axutil_date_time_comp_result_t; 
 
     /**
-     * Creates axis2_date_time struct with current date time
+     * Creates axutil_date_time struct with current date time
      * @param env double pointer to environment struct. MUST NOT be NULL
-     * @return pointer to newly created axis2_date_time struct
+     * @return pointer to newly created axutil_date_time struct
      */
-    AXIS2_EXTERN axis2_date_time_t * AXIS2_CALL
-    axis2_date_time_create(const axis2_env_t *env);
+    AXIS2_EXTERN axutil_date_time_t * AXIS2_CALL
+    axutil_date_time_create(const axis2_env_t *env);
 
     /*
-     * Creates axis2_date_time struct with an additional offset value
+     * Creates axutil_date_time struct with an additional offset value
      * If the offset is a positive value then the time will be in the future
      *        offset is 0, then the time will be the current time
      *        offset is a negative value then the time is in the past.
      * @param env double pointer to environment struct. MUST NOT be NULL
      * @param offset the offset from the current time in seconds
-     * @return pointer to newly created axis2_date_time struct
+     * @return pointer to newly created axutil_date_time struct
      **/
-    AXIS2_EXTERN axis2_date_time_t * AXIS2_CALL
-    axis2_date_time_create_with_offset(const axis2_env_t *env, int offset);
+    AXIS2_EXTERN axutil_date_time_t * AXIS2_CALL
+    axutil_date_time_create_with_offset(const axis2_env_t *env, int offset);
 
     /**
-     * free the axis2_date_time.
+     * free the axutil_date_time.
      * @param date_time represet the type object
      * @param env pointer to environment struct. MUST NOT be NULL
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN void AXIS2_CALL 
-    axis2_date_time_free(axis2_date_time_t *date_time,
+    axutil_date_time_free(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -86,7 +86,7 @@
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-    axis2_date_time_deserialize_time(axis2_date_time_t *date_time,
+    axutil_date_time_deserialize_time(axutil_date_time_t *date_time,
         const axis2_env_t *env,
         const axis2_char_t* time_str);
 
@@ -98,7 +98,7 @@
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-    axis2_date_time_deserialize_date(axis2_date_time_t *date_time,
+    axutil_date_time_deserialize_date(axutil_date_time_t *date_time,
         const axis2_env_t *env,
         const axis2_char_t* date_str);
 
@@ -110,7 +110,7 @@
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-    axis2_date_time_deserialize_date_time(axis2_date_time_t *date_time,
+    axutil_date_time_deserialize_date_time(axutil_date_time_t *date_time,
         const axis2_env_t *env,
         const axis2_char_t* date_time_str);
 
@@ -127,7 +127,7 @@
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_date_time_set_date_time(axis2_date_time_t* date_time,
+    axutil_date_time_set_date_time(axutil_date_time_t* date_time,
         const axis2_env_t *env,
         int year, int month, int date,
         int hour, int min, int second, int milliseconds);
@@ -139,7 +139,7 @@
      * @return time as a string format HH:MM:SSZ
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
-    axis2_date_time_serialize_time(axis2_date_time_t *date_time,
+    axutil_date_time_serialize_time(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -149,7 +149,7 @@
      * @return date as a string  format YYYY-MM-DD
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
-    axis2_date_time_serialize_date(axis2_date_time_t *date_time,
+    axutil_date_time_serialize_date(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -159,7 +159,7 @@
      * @return time as a string format YYYY-MM-DDTHH:MM:SSZ
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
-    axis2_date_time_serialize_date_time(axis2_date_time_t *date_time,
+    axutil_date_time_serialize_date_time(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -169,7 +169,7 @@
      * @return year as an integer 
      */
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_year(axis2_date_time_t *date_time,
+    axutil_date_time_get_year(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -179,7 +179,7 @@
      * @return month as an integer 
      */
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_month(axis2_date_time_t *date_time,
+    axutil_date_time_get_month(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -189,7 +189,7 @@
      * @return date as an integer 
      */
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_date(axis2_date_time_t *date_time,
+    axutil_date_time_get_date(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -199,7 +199,7 @@
      * @return hour as an integer 
      */
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_hour(axis2_date_time_t *date_time,
+    axutil_date_time_get_hour(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -209,7 +209,7 @@
      * @return minute as an integer 
      */
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_minute(axis2_date_time_t *date_time,
+    axutil_date_time_get_minute(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     /**
@@ -219,11 +219,11 @@
      * @return second as an integer 
      */
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_second(axis2_date_time_t *date_time,
+    axutil_date_time_get_second(axutil_date_time_t *date_time,
         const axis2_env_t *env);
 
     AXIS2_EXTERN int AXIS2_CALL 
-    axis2_date_time_get_msec(axis2_date_time_t *date_time,
+    axutil_date_time_get_msec(axutil_date_time_t *date_time,
         const axis2_env_t *env);
     /**
      * Compare the date and time of @date_time with the reference @ref.
@@ -235,9 +235,9 @@
      * @ref the reference date time
      * @return NOT_EXPIRED/EXPIRED/EQUAL if valid otherwise return FAILURE
      */
-    AXIS2_EXTERN axis2_date_time_comp_result_t AXIS2_CALL
-    axis2_date_time_compare(axis2_date_time_t *date_time,   
-        const axis2_env_t *env, axis2_date_time_t *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);
 
 #ifdef __cplusplus
 }

Copied: webservices/axis2/trunk/c/util/include/axutil_dir_handler.h (from r524104, webservices/axis2/trunk/c/util/include/axis2_dir_handler.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dir_handler.h?view=diff&rev=524142&p1=webservices/axis2/trunk/c/util/include/axis2_dir_handler.h&r1=524104&p2=webservices/axis2/trunk/c/util/include/axutil_dir_handler.h&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dir_handler.h Fri Mar 30 08:52:58 2007
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_DIR_HANDLER_H
-#define AXIS2_DIR_HANDLER_H
+#ifndef AXUTIL_DIR_HANDLER_H
+#define AXUTIL_DIR_HANDLER_H
 
 #include <axis2_utils_defines.h>
 #include <axis2_error.h>
@@ -32,7 +32,7 @@
 #endif
 
     /**
-     * @defgroup axis2_dir_handler dir handler
+     * @defgroup axutil_dir_handler dir handler
      * @ingroup axis2_util
      * @{
      */
@@ -42,7 +42,7 @@
      * @return array list of dll file names
      */
     AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-    axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
+    axutil_dir_handler_list_services_or_modules_in_dir(const axis2_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
-    axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
+    axutil_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
             axis2_char_t *pathname);
 
     /*

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=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/src/date_time.c (original)
+++ webservices/axis2/trunk/c/util/src/date_time.c Fri Mar 30 08:52:58 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
 #include <stdio.h>
 #include <time.h>
 #include <stdlib.h>
@@ -23,7 +23,7 @@
 #include <axis2_utils.h>
 #include <axutil_date_time_util.h>
 
-struct axis2_date_time
+struct axutil_date_time
 {
     int year;
     int mon;
@@ -34,17 +34,17 @@
     int msec;
 };
 
-AXIS2_EXTERN axis2_date_time_t * AXIS2_CALL
-axis2_date_time_create_with_offset(const axis2_env_t *env, int offset)
+AXIS2_EXTERN axutil_date_time_t * AXIS2_CALL
+axutil_date_time_create_with_offset(const axis2_env_t *env, int offset)
 {
-    axis2_date_time_t *date_time = NULL;
+    axutil_date_time_t *date_time = NULL;
     time_t t;
     struct tm* utc_time = NULL;
     /*struct tm* utc_time_ret = NULL;*/
     AXIS2_ENV_CHECK(env, NULL);
 
-    date_time = (axis2_date_time_t *) AXIS2_MALLOC(env->
-            allocator, sizeof(axis2_date_time_t));
+    date_time = (axutil_date_time_t *) AXIS2_MALLOC(env->
+            allocator, sizeof(axutil_date_time_t));
 
     if (!date_time)
     {
@@ -68,15 +68,15 @@
 }
 
 
-AXIS2_EXTERN axis2_date_time_t * AXIS2_CALL
-axis2_date_time_create(const axis2_env_t *env)
+AXIS2_EXTERN axutil_date_time_t * AXIS2_CALL
+axutil_date_time_create(const axis2_env_t *env)
 {
-    return axis2_date_time_create_with_offset(env, 0);
+    return axutil_date_time_create_with_offset(env, 0);
 }
 
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_date_time_free(axis2_date_time_t *date_time,
+axutil_date_time_free(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -89,7 +89,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_date_time_deserialize_time(axis2_date_time_t *date_time,
+axutil_date_time_deserialize_time(axutil_date_time_t *date_time,
         const axis2_env_t *env,
         const axis2_char_t* time_str)
 {
@@ -100,7 +100,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_date_time_deserialize_date(axis2_date_time_t *date_time,
+axutil_date_time_deserialize_date(axutil_date_time_t *date_time,
         const axis2_env_t *env,
         const axis2_char_t* date_str)
 {
@@ -113,7 +113,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_date_time_deserialize_date_time(axis2_date_time_t *date_time,
+axutil_date_time_deserialize_date_time(axutil_date_time_t *date_time,
         const axis2_env_t *env,
         const axis2_char_t* date_time_str)
 {
@@ -127,9 +127,9 @@
 }
 
 /*Check if the @data_time is not expired, compared to @ref*/
-AXIS2_EXTERN axis2_date_time_comp_result_t AXIS2_CALL
-axis2_date_time_compare(axis2_date_time_t *date_time,
-        const axis2_env_t *env, axis2_date_time_t *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)
 {
    
    AXIS2_ENV_CHECK(env, AXIS2_DATE_TIME_COMP_RES_FAILURE);
@@ -180,7 +180,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_date_time_set_date_time(axis2_date_time_t* date_time,
+axutil_date_time_set_date_time(axutil_date_time_t* date_time,
         const axis2_env_t *env,
         int year, int month, int day,
         int hour, int min, int second, int milliseconds)
@@ -199,7 +199,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_date_time_serialize_time(axis2_date_time_t *date_time,
+axutil_date_time_serialize_time(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     axis2_char_t* time_str = NULL;
@@ -213,7 +213,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_date_time_serialize_date(axis2_date_time_t *date_time,
+axutil_date_time_serialize_date(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     axis2_char_t* date_str = NULL;
@@ -229,7 +229,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_date_time_serialize_date_time(axis2_date_time_t *date_time,
+axutil_date_time_serialize_date_time(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     axis2_char_t* date_time_str = NULL;
@@ -244,7 +244,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_year(axis2_date_time_t *date_time,
+axutil_date_time_get_year(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -252,7 +252,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_month(axis2_date_time_t *date_time,
+axutil_date_time_get_month(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     return (date_time->mon);
@@ -260,35 +260,35 @@
 
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_date(axis2_date_time_t *date_time,
+axutil_date_time_get_date(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     return (date_time->day);
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_hour(axis2_date_time_t *date_time,
+axutil_date_time_get_hour(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     return (date_time->hour);
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_minute(axis2_date_time_t *date_time,
+axutil_date_time_get_minute(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     return (date_time->min);
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_second(axis2_date_time_t *date_time,
+axutil_date_time_get_second(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     return (date_time->sec);
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_date_time_get_msec(axis2_date_time_t *date_time,
+axutil_date_time_get_msec(axutil_date_time_t *date_time,
         const axis2_env_t *env)
 {
     return (date_time->msec);

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=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Fri Mar 30 08:52:58 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include <axis2_file.h>
 #include <platforms/axis2_platform_auto_sense.h>
 #include <axis2_string.h>
@@ -36,7 +36,7 @@
  * @return array list of dll file names
  */
 AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
+axutil_dir_handler_list_services_or_modules_in_dir(const axis2_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
-axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
+axutil_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
         axis2_char_t *pathname)
 {
     axutil_array_list_t *file_list = NULL;

Modified: webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/archive_extract.c?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/archive_extract.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/archive_extract.c Fri Mar 30 08:52:58 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include <platforms/axis2_platform_auto_sense.h>
 #include <axis2_string.h>
 #include <zlib.h>

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=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/src/rand.c (original)
+++ webservices/axis2/trunk/c/util/src/rand.c Fri Mar 30 08:52:58 2007
@@ -48,13 +48,13 @@
 AXIS2_EXTERN unsigned int AXIS2_CALL
 axis2_rand_get_seed_value_based_on_time(const axis2_env_t *env)
 {
-    axis2_date_time_t *date = axis2_date_time_create(env);
-    unsigned int rand_var =  axis2_date_time_get_year(date, env);
-    rand_var +=  axis2_date_time_get_month(date, env);
-    rand_var +=  axis2_date_time_get_date(date, env);
-    rand_var +=   axis2_date_time_get_hour(date, env);
-    rand_var +=  axis2_date_time_get_minute(date, env);
-    rand_var +=  axis2_date_time_get_second(date, env);
+    axutil_date_time_t *date = axutil_date_time_create(env);
+    unsigned int rand_var =  axutil_date_time_get_year(date, env);
+    rand_var +=  axutil_date_time_get_month(date, env);
+    rand_var +=  axutil_date_time_get_date(date, env);
+    rand_var +=   axutil_date_time_get_hour(date, env);
+    rand_var +=  axutil_date_time_get_minute(date, env);
+    rand_var +=  axutil_date_time_get_second(date, env);
     return rand_var;
 }
 

Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=524142&r1=524141&r2=524142
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 08:52:58 2007
@@ -24,7 +24,7 @@
 #include <axis2_uuid_gen.h>
 #include <axis2_log_default.h>
 #include <axis2_log.h>
-#include <axis2_dir_handler.h>
+#include <axutil_dir_handler.h>
 #include <axis2_file.h>
 #include "axis2_log.h"
 #include "test_thread.h"
@@ -107,7 +107,7 @@
     return 0;
 }
 
-void test_axis2_dir_handler_list_service_or_module_dirs()
+void test_axutil_dir_handler_list_service_or_module_dirs()
 {
     int i, isize;
     axis2_file_t *file = NULL;
@@ -118,7 +118,7 @@
 
     axis2_char_t *pathname = axis2_strdup(env, "/tmp/test/");
 
-    axutil_array_list_t *arr_folders = axis2_dir_handler_list_service_or_module_dirs(env, pathname);
+    axutil_array_list_t *arr_folders = axutil_dir_handler_list_service_or_module_dirs(env, pathname);
     if (arr_folders == NULL)
     {
         printf("List of folders is NULL\n");
@@ -135,7 +135,7 @@
         filename =  axis2_file_get_name(file, env);
         printf("filename = %s \n", filename);
     }
-    printf("----end of test_axis2_dir_handler_list_service_or_module_dirs----\n");
+    printf("----end of test_axutil_dir_handler_list_service_or_module_dirs----\n");
 
 }
 
@@ -263,7 +263,7 @@
     test_array_list(env);
     test_uuid_gen(env);
     run_test_log();
-    test_axis2_dir_handler_list_service_or_module_dirs();
+    test_axutil_dir_handler_list_service_or_module_dirs();
     axutil_allocator_t *allocator = env->allocator;
 /*    axis2_env_free(env);*/
     axutil_allocator_free(allocator);



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