axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r525098 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/transport/http/common/ modules/core/transport/http/receiver/ modules/core/transport/http/sender/ modules/core/transport/http/sender/ssl/ modules/core/tra...
Date Tue, 03 Apr 2007 09:06:16 GMT
Author: pini
Date: Tue Apr  3 02:06:13 2007
New Revision: 525098

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

Added:
    webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h
      - copied, changed from r525067, webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h
      - copied, changed from r525067, webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h
Removed:
    webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h
Modified:
    webservices/axis2/trunk/c/include/axis2_util.h
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h
    webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h
    webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
    webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c
    webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
    webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
    webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
    webservices/axis2/trunk/c/util/include/Makefile.am
    webservices/axis2/trunk/c/util/include/axutil_date_time_util.h
    webservices/axis2/trunk/c/util/include/axutil_dll_desc.h
    webservices/axis2/trunk/c/util/include/axutil_file.h
    webservices/axis2/trunk/c/util/include/axutil_network_handler.h
    webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h
    webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h
    webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
    webservices/axis2/trunk/c/util/src/dir_handler.c
    webservices/axis2/trunk/c/util/src/file_handler.c
    webservices/axis2/trunk/c/util/src/log.c
    webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
    webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
    webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
    webservices/axis2/trunk/c/util/src/rand.c
    webservices/axis2/trunk/c/util/src/stream.c
    webservices/axis2/trunk/c/util/src/utils.c
    webservices/axis2/trunk/c/util/src/uuid_gen.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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Tue Apr  3 02:06:13 2007
@@ -44,7 +44,7 @@
 #include <axutil_url.h>
 #include <axutil_utils.h>
 #include <axutil_uuid_gen.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Tue Apr  3 02:06:13 2007
@@ -28,7 +28,7 @@
 #include <axiom_soap_const.h>
 #include <axiom_soap_body.h>
 #include <axutil_types.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 struct axis2_op_client
 {

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Tue Apr  3 02:06:13 2007
@@ -29,7 +29,7 @@
 #include <axutil_array_list.h>
 #include <axis2_options.h>
 #include <axis2_conf_init.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <stdio.h>
 
 struct axis2_svc_client

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c Tue
Apr  3 02:06:13 2007
@@ -20,7 +20,7 @@
 #include <axutil_string.h>
 #include <axutil_network_handler.h>
 #include <axis2_http_chunked_stream.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 struct axis2_simple_http_svr_conn
 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Tue Apr
 3 02:06:13 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axis2_http_svr_thread.h>
 #include <axis2_http_server.h>
 #include <axis2_http_transport.h>

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Tue Apr  3
02:06:13 2007
@@ -25,7 +25,7 @@
 #include <axis2_http_header.h>
 #include <axis2_http_status_line.h>
 #include <axis2_http_chunked_stream.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #ifdef AXIS2_SSL_ENABLED
 #include "ssl/ssl_stream.h"

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h Tue Apr
 3 02:06:13 2007
@@ -21,7 +21,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_stream.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <openssl/ssl.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h Tue Apr 
3 02:06:13 2007
@@ -19,7 +19,7 @@
 #define AXIS2_SSL_UTILS_H
 
 #include <openssl/ssl.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axis2_const.h>
 #include <axis2_defines.h>
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
(original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
Tue Apr  3 02:06:13 2007
@@ -17,7 +17,7 @@
 
 #include <axis2_http_server.h>
 #include <axis2_http_transport.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <axutil_error_default.h>

Modified: webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c Tue Apr  3 02:06:13
2007
@@ -18,7 +18,7 @@
 #include <axiom_element.h>
 #include <axiom_soap_body.h>
 #include <axis2_options.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #include <savan_publishing_client.h>
 #include <savan_constants.h>

Modified: webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Tue Apr  3 02:06:13
2007
@@ -15,7 +15,7 @@
  */
  
 #include <axiom.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #include <axis2_endpoint_ref.h>
 #include <axis2_svc_client.h>

Modified: webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c Tue Apr  3 02:06:13 2007
@@ -21,7 +21,7 @@
 #include <axutil_allocator.h>
 #include <axis2_svc_client.h>
 #include <axis2_options.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 axiom_node_t *
 build_om_payload_for_echo_svc(const axutil_env_t *env,

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c Tue Apr  3 02:06:13 2007
@@ -22,7 +22,7 @@
 #include <tcpmon_session.h>
 #include <tcpmon_entry.h>
 #include <tcpmon_util.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axutil_string.h>
 
 #define SIZE 1024

Modified: webservices/axis2/trunk/c/util/include/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/Makefile.am?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/include/Makefile.am Tue Apr  3 02:06:13 2007
@@ -1,2 +1,2 @@
 includedir=$(prefix)/include/axis2-1.0
-nobase_include_HEADERS= platforms/axis2_platform_auto_sense.h platforms/unix/*.h platforms/windows/*.h
+nobase_include_HEADERS= platforms/axutil_platform_auto_sense.h platforms/unix/*.h platforms/windows/*.h

Modified: webservices/axis2/trunk/c/util/include/axutil_date_time_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_date_time_util.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_date_time_util.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_date_time_util.h Tue Apr  3 02:06:13 2007
@@ -20,7 +20,7 @@
 #include <axutil_utils.h>
 #include <axutil_utils_defines.h>
 #include <axutil_env.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 
 #ifdef __cplusplus

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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dll_desc.h Tue Apr  3 02:06:13 2007
@@ -27,7 +27,7 @@
 #include <axutil_qname.h>
 #include <axutil_error.h>
 #include <axutil_utils.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/util/include/axutil_file.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_file.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_file.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_file.h Tue Apr  3 02:06:13 2007
@@ -22,7 +22,7 @@
 #include <axutil_error.h>
 #include <axutil_env.h>
 #include <axutil_utils.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/axutil_network_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_network_handler.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_network_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_network_handler.h Tue Apr  3 02:06:13 2007
@@ -21,7 +21,7 @@
 #include <axutil_utils_defines.h>
 #include <axutil_env.h>
 #include <sys/types.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 
 

Modified: webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h Tue Apr  3 02:06:13 2007
@@ -20,7 +20,7 @@
 #include <axutil_utils.h>
 #include <axutil_utils_defines.h>
 #include <axutil_env.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 
 #ifdef __cplusplus

Copied: webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h (from
r525067, webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h?view=diff&rev=525098&p1=webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h&r1=525067&p2=webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h Tue Apr
 3 02:06:13 2007
@@ -20,7 +20,7 @@
 #define AXIS2_PLATFORM_AUTOSENSE_H
 
 /**
-  * @file axis2_platform_auto_sense.h
+  * @file axutil_platform_auto_sense.h
   * @brief axis2 platform auto sense
   */
 
@@ -48,7 +48,7 @@
 #elif defined ( HPUX )
   #include <hp-ux/axis2_ht-ux.h>
 #else
-  #include <platforms/unix/axis2_unix.h>
+  #include <platforms/unix/axutil_unix.h>
 #endif
 
 /** @} */

Copied: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h (from r525067,
webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h?view=diff&rev=525098&p1=webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h&r1=525067&p2=webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h Tue Apr  3 02:06:13
2007
@@ -24,7 +24,7 @@
 #endif
 
 /**
-  * @file axis2_unix.h
+  * @file axutil_unix.h
   * @brief axis2 unix platform specific interface
   */
 

Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h Tue Apr 
3 02:06:13 2007
@@ -37,7 +37,7 @@
  */
 
 
-struct axis2_uuid {
+struct axutil_uuid {
    unsigned int time_low;
    unsigned short int time_mid;
    unsigned short int time_high_version;
@@ -51,26 +51,27 @@
  * bits 66-79 clock sequence
  * bits 80-107 node MAC address
  */
-struct axis2_uuid_st {
+struct axutil_uuid_st {
     unsigned char   mac[6];      /* pre-determined MAC address */
     struct timeval time_last;   /* last retrieved timestamp */
     unsigned long  time_seq;    /* last timestamp sequence counter */
     short int clock;            /* clock tick - incremented random number */
 };
-typedef struct axis2_uuid axis2_uuid_t;
+
+typedef struct axutil_uuid axutil_uuid_t;
 
 /**
  * Returns the mac address of the first ethernet intsrface
  * @return MAC address as a <code>char[6]</code>
  */ 
 char * AXIS2_CALL
-axis2_uuid_get_mac_addr();
+axutil_uuid_get_mac_addr();
 
 /**
  * Generates a uuid in version1 format (node - timestamp based)
- * @return generated uuid as a axis2_uuid_t
+ * @return generated uuid as a axutil_uuid_t
  */ 
-axis2_uuid_t* AXIS2_CALL
+axutil_uuid_t* AXIS2_CALL
 axutil_uuid_gen_v1();
 
 /**
@@ -78,7 +79,7 @@
  * @return generated uuid as a string
  */ 
 axis2_char_t* AXIS2_CALL
-axis2_platform_uuid_gen(char *s);
+axutil_platform_uuid_gen(char *s);
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h Tue
Apr  3 02:06:13 2007
@@ -30,7 +30,7 @@
   * Generate universally unique id
   * @return a char pointer to uuid
   */
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_platform_uuid_gen(char *s);
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL axutil_platform_uuid_gen(char *s);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h Tue Apr  3 02:06:13
2007
@@ -20,7 +20,7 @@
 #define AXIS2_WINDOWS_H
 
 /**
-  * @file axis2_unix.h
+  * @file axutil_unix.h
   * @brief axis2 unix platform specific interface
   */
 #include <axutil_utils_defines.h>

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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Tue Apr  3 02:06:13 2007
@@ -17,7 +17,7 @@
 
 #include <axutil_dir_handler.h>
 #include <axutil_file.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axutil_string.h>
 #ifndef S_ISDIR
 #   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)

Modified: webservices/axis2/trunk/c/util/src/file_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_handler.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/file_handler.c Tue Apr  3 02:06:13 2007
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #include <axutil_file_handler.h>
 

Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Tue Apr  3 02:06:13 2007
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axutil_log_default.h>
 #include <axutil_file_handler.h>
 #include <axutil_thread.h>

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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/archive_extract.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/archive_extract.c Tue Apr  3 02:06:13 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axutil_dir_handler.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axutil_string.h>
 #include <zlib.h>
 #include <fcntl.h>

Modified: webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c Tue Apr  3 02:06:13
2007
@@ -45,15 +45,15 @@
 #endif
 
 #include <platforms/unix/axutil_uuid_gen_unix.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 
 /* We need these static variables to track throughout the program execution */
 static axis2_bool_t axutil_uuid_gen_is_first = AXIS2_TRUE;
-static struct axis2_uuid_st axis2_uuid_static;
+static struct axutil_uuid_st axutil_uuid_static;
 
 
-axis2_uuid_t* AXIS2_CALL
+axutil_uuid_t* AXIS2_CALL
 axutil_uuid_gen_v1()
 {
     struct timeval time_now;
@@ -61,15 +61,15 @@
     unsigned long long time_val;
     unsigned long long time_val2;
     unsigned short int clck = 0;
-    axis2_uuid_t *ret_uuid = NULL;
+    axutil_uuid_t *ret_uuid = NULL;
     unsigned short int time_high_version = 0;
 
     if (AXIS2_TRUE == axutil_uuid_gen_is_first)
     {
-        char *mac_addr = axis2_uuid_get_mac_addr();
-        memcpy(axis2_uuid_static.mac, mac_addr, 6);
-        axis2_uuid_static.time_seq = 0;
-        axis2_uuid_static.clock = 0;
+        char *mac_addr = axutil_uuid_get_mac_addr();
+        memcpy(axutil_uuid_static.mac, mac_addr, 6);
+        axutil_uuid_static.time_seq = 0;
+        axutil_uuid_static.clock = 0;
         free(mac_addr);
         axutil_uuid_gen_is_first = AXIS2_FALSE;
     }
@@ -82,19 +82,19 @@
         return NULL;
 
     /* check whether system time changed since last retrieve */
-    if (!(time_now.tv_sec  == axis2_uuid_static.time_last.tv_sec
+    if (!(time_now.tv_sec  == axutil_uuid_static.time_last.tv_sec
         && time_now.tv_usec ==
-        axis2_uuid_static.time_last.tv_usec))
+        axutil_uuid_static.time_last.tv_usec))
     {
         /* reset time sequence counter and continue */
-        axis2_uuid_static.time_seq = 0;
+        axutil_uuid_static.time_seq = 0;
     }
 
     /* until we are out of UUIDs per tick, increment
     the time/tick sequence counter and continue */
-    while (axis2_uuid_static.time_seq < UUIDS_PER_TICK)
+    while (axutil_uuid_static.time_seq < UUIDS_PER_TICK)
     {
-        axis2_uuid_static.time_seq++;
+        axutil_uuid_static.time_seq++;
     }
     /* sleep for 1000ns (1us) */
     tv.tv_sec  = 0;
@@ -107,13 +107,13 @@
     time_val = (unsigned long long)time_now.tv_sec * 10000000ull;
     time_val += (unsigned long long)time_now.tv_usec * 10ull;
 
-    ret_uuid = malloc(sizeof(axis2_uuid_t));
+    ret_uuid = malloc(sizeof(axutil_uuid_t));
 
     time_val += UUID_TIMEOFFSET;
     /* compensate for low resolution system clock by adding
        the time/tick sequence counter */
-    if (axis2_uuid_static.time_seq > 0)
-        time_val += (unsigned long long)axis2_uuid_static.time_seq;
+    if (axutil_uuid_static.time_seq > 0)
+        time_val += (unsigned long long)axutil_uuid_static.time_seq;
 
     time_val2 = time_val;
     ret_uuid->time_low = (unsigned long)time_val2;
@@ -133,13 +133,13 @@
       */
 
     /* retrieve current clock sequence */
-    clck = axis2_uuid_static.clock;
+    clck = axutil_uuid_static.clock;
 
     /* generate new random clock sequence (initially or if the
        time has stepped backwards) or else just increase it */
-    if (clck == 0 || (time_now.tv_sec < axis2_uuid_static.time_last.tv_sec ||
-        (time_now.tv_sec == axis2_uuid_static.time_last.tv_sec
-        && time_now.tv_usec < axis2_uuid_static.time_last.tv_usec)))
+    if (clck == 0 || (time_now.tv_sec < axutil_uuid_static.time_last.tv_sec ||
+        (time_now.tv_sec == axutil_uuid_static.time_last.tv_sec
+        && time_now.tv_usec < axutil_uuid_static.time_last.tv_usec)))
     {
         srand(time_now.tv_usec);
         clck = rand();
@@ -151,7 +151,7 @@
     clck %= (2 << 14);
 
     /* store back new clock sequence */
-    axis2_uuid_static.clock = clck;
+    axutil_uuid_static.clock = clck;
 
     clck &= 0x1FFF;
     clck |= 0x2000;
@@ -160,23 +160,23 @@
      *  FINISH
      */
     /* remember current system time for next iteration */
-    axis2_uuid_static.time_last.tv_sec  = time_now.tv_sec;
-    axis2_uuid_static.time_last.tv_usec = time_now.tv_usec;
+    axutil_uuid_static.time_last.tv_sec  = time_now.tv_sec;
+    axutil_uuid_static.time_last.tv_usec = time_now.tv_usec;
 
     if (! ret_uuid)
     {
         return NULL;
     }
     ret_uuid->clock_variant = clck;
-    memcpy(ret_uuid->mac_addr, axis2_uuid_static.mac, 6);
+    memcpy(ret_uuid->mac_addr, axutil_uuid_static.mac, 6);
     return ret_uuid;
 }
 
 
 axis2_char_t* AXIS2_CALL
-axis2_platform_uuid_gen(char *s)
+axutil_platform_uuid_gen(char *s)
 {
-    axis2_uuid_t *uuid_struct = NULL;
+    axutil_uuid_t *uuid_struct = NULL;
     axis2_char_t *uuid_str = NULL;
     unsigned char mac[7];
     char mac_hex[13];
@@ -209,7 +209,7 @@
 #ifdef HAVE_LINUX_IF_H   /* Linux */
 
 char * AXIS2_CALL
-axis2_uuid_get_mac_addr()
+axutil_uuid_get_mac_addr()
 {
     struct ifreq ifr;
     struct sockaddr *sa;
@@ -242,7 +242,7 @@
 * http://forum.sun.com/jive/thread.jspa?threadID=84804&tstart=30
 */
 char * AXIS2_CALL
-axis2_uuid_get_mac_addr()
+axutil_uuid_get_mac_addr()
 {
     unsigned char eth_addr[6];
     int sock;
@@ -313,7 +313,7 @@
 #endif /* !max */
 
 char * AXIS2_CALL
-axis2_uuid_get_mac_addr()
+axutil_uuid_get_mac_addr()
 {
     struct ifconf ifc;
     struct ifreq *ifr;

Modified: webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c Tue Apr  3 02:06:13
2007
@@ -23,7 +23,7 @@
 
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_platform_uuid_gen(char *s)
+axutil_platform_uuid_gen(char *s)
 {
     RPC_STATUS         retval;
     UUID            uuid;

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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/rand.c (original)
+++ webservices/axis2/trunk/c/util/src/rand.c Tue Apr  3 02:06:13 2007
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <axutil_rand.h>
 #include <axutil_string.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 #define AXIS2_RAND_MAX 32768
 

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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Tue Apr  3 02:06:13 2007
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <axutil_stream.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 
 /** basic stream operatons **/

Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Tue Apr  3 02:06:13 2007
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <axutil_string.h>
 #include <string.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 
 AXIS2_EXTERN axis2_char_t** AXIS2_CALL
 axis2_parse_request_url_for_svc_and_op(const axutil_env_t *env,

Modified: webservices/axis2/trunk/c/util/src/uuid_gen.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uuid_gen.c?view=diff&rev=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/src/uuid_gen.c (original)
+++ webservices/axis2/trunk/c/util/src/uuid_gen.c Tue Apr  3 02:06:13 2007
@@ -24,7 +24,7 @@
 {
 
     axis2_char_t *str = AXIS2_MALLOC(env->allocator, 40 * sizeof(char));
-    axis2_platform_uuid_gen(str);
+    axutil_platform_uuid_gen(str);
     if (!str)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_UUID_GEN_FAILED,

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=525098&r1=525097&r2=525098
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Tue Apr  3 02:06:13 2007
@@ -20,7 +20,7 @@
 #include <axutil_string.h>
 #include <axutil_error_default.h>
 #include <axutil_array_list.h>
-#include <platforms/axis2_platform_auto_sense.h>
+#include <platforms/axutil_platform_auto_sense.h>
 #include <axutil_uuid_gen.h>
 #include <axutil_log_default.h>
 #include <axutil_log.h>



---------------------------------------------------------------------
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