You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 20:47:02 UTC
svn commit: r524229 [2/2] - in /webservices/axis2/trunk/c: axiom/test/om/
axiom/test/soap/ include/ modules/core/deployment/
modules/core/transport/http/sender/
modules/core/transport/http/sender/libcurl/
modules/core/transport/http/server/IIS/ modules...
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=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Fri Mar 30 11:46:59 2007
@@ -19,50 +19,50 @@
#include <stdlib.h>
#include <string.h>
#include <platforms/axis2_platform_auto_sense.h>
-#include <axis2_log_default.h>
+#include <axutil_log_default.h>
#include <axutil_file_handler.h>
#include <axis2_thread.h>
-typedef struct axis2_log_impl axis2_log_impl_t;
+typedef struct axutil_log_impl axutil_log_impl_t;
static void AXIS2_CALL
-axis2_log_impl_write(axis2_log_t *log,
+axutil_log_impl_write(axutil_log_t *log,
const axis2_char_t *buffer,
- axis2_log_levels_t level,
+ axutil_log_levels_t level,
const axis2_char_t *file,
const int line);
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_write_to_file(FILE *fd,
+axutil_log_impl_write_to_file(FILE *fd,
axis2_thread_mutex_t *mutex,
- axis2_log_levels_t level,
+ axutil_log_levels_t level,
const axis2_char_t * file,
const int line,
const axis2_char_t * value);
static void AXIS2_CALL
-axis2_log_impl_free(axutil_allocator_t *allocator,
- axis2_log_t *log);
+axutil_log_impl_free(axutil_allocator_t *allocator,
+ axutil_log_t *log);
-struct axis2_log_impl
+struct axutil_log_impl
{
- axis2_log_t log;
+ axutil_log_t log;
void *stream;
axis2_thread_mutex_t *mutex;
};
-#define AXIS2_INTF_TO_IMPL(log) ((axis2_log_impl_t*)(log))
+#define AXIS2_INTF_TO_IMPL(log) ((axutil_log_impl_t*)(log))
-static const axis2_log_ops_t axis2_log_ops_var = {
- axis2_log_impl_free,
- axis2_log_impl_write
+static const axutil_log_ops_t axutil_log_ops_var = {
+ axutil_log_impl_free,
+ axutil_log_impl_write
};
static void AXIS2_CALL
-axis2_log_impl_free(axutil_allocator_t *allocator, axis2_log_t *log)
+axutil_log_impl_free(axutil_allocator_t *allocator, axutil_log_t *log)
{
- axis2_log_impl_t *log_impl = NULL;
+ axutil_log_impl_t *log_impl = NULL;
if (log)
{
@@ -85,11 +85,11 @@
}
-AXIS2_EXTERN axis2_log_t * AXIS2_CALL
-axis2_log_create(axutil_allocator_t * allocator, axis2_log_ops_t * ops,
+AXIS2_EXTERN axutil_log_t * AXIS2_CALL
+axutil_log_create(axutil_allocator_t * allocator, axutil_log_ops_t * ops,
const axis2_char_t * stream_name)
{
- axis2_log_impl_t *log_impl;
+ axutil_log_impl_t *log_impl;
axis2_char_t *path_home;
axis2_char_t log_file_name[500];
axis2_char_t log_dir[500];
@@ -98,8 +98,8 @@
if (!allocator)
return NULL;
- log_impl = (axis2_log_impl_t *) AXIS2_MALLOC(allocator,
- sizeof(axis2_log_impl_t));
+ log_impl = (axutil_log_impl_t *) AXIS2_MALLOC(allocator,
+ sizeof(axutil_log_impl_t));
if (!log_impl)
return NULL;
@@ -169,15 +169,15 @@
}
else
{
- log_impl->log.ops = &axis2_log_ops_var;
+ log_impl->log.ops = &axutil_log_ops_var;
}
return &(log_impl->log);
}
static void AXIS2_CALL
-axis2_log_impl_write(axis2_log_t *log, const axis2_char_t *buffer,
- axis2_log_levels_t level, const axis2_char_t *file, const int line)
+axutil_log_impl_write(axutil_log_t *log, const axis2_char_t *buffer,
+ axutil_log_levels_t level, const axis2_char_t *file, const int line)
{
if (log && buffer)
{
@@ -215,8 +215,8 @@
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_write_to_file(FILE *fd, axis2_thread_mutex_t *mutex,
- axis2_log_levels_t level, const axis2_char_t *file,
+axutil_log_impl_write_to_file(FILE *fd, axis2_thread_mutex_t *mutex,
+ axutil_log_levels_t level, const axis2_char_t *file,
const int line, const axis2_char_t *value)
{
const char *level_str = "";
@@ -247,10 +247,10 @@
}
axis2_thread_mutex_lock(mutex);
if (file)
- fprintf(fd, "[%s] %s%s(%d) %s\n", axis2_log_impl_get_time_str(),
+ fprintf(fd, "[%s] %s%s(%d) %s\n", axutil_log_impl_get_time_str(),
level_str, file, line, value);
else
- fprintf(fd, "[%s] %s %s\n", axis2_log_impl_get_time_str(),
+ fprintf(fd, "[%s] %s %s\n", axutil_log_impl_get_time_str(),
level_str, value);
fflush(fd);
axis2_thread_mutex_unlock(mutex);
@@ -258,7 +258,7 @@
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_log_debug(axis2_log_t *log, const axis2_char_t *filename,
+axutil_log_impl_log_debug(axutil_log_t *log, const axis2_char_t *filename,
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
@@ -285,7 +285,7 @@
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);
- axis2_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_DEBUG, filename,
+ axutil_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_DEBUG, filename,
linenumber, value);
}
}
@@ -294,7 +294,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_log_info(axis2_log_t *log, const axis2_char_t *format, ...)
+axutil_log_impl_log_info(axutil_log_t *log, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
axis2_thread_mutex_t *mutex = NULL;
@@ -320,7 +320,7 @@
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);
- axis2_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_INFO, NULL, -1,
+ axutil_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_INFO, NULL, -1,
value);
}
}
@@ -329,7 +329,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_log_warning(axis2_log_t *log, const axis2_char_t *filename,
+axutil_log_impl_log_warning(axutil_log_t *log, const axis2_char_t *filename,
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
@@ -357,7 +357,7 @@
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);
- axis2_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_WARNING,
+ axutil_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_WARNING,
filename, linenumber, value);
}
}
@@ -367,7 +367,7 @@
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_log_error(axis2_log_t *log, const axis2_char_t *filename,
+axutil_log_impl_log_error(axutil_log_t *log, const axis2_char_t *filename,
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
@@ -394,7 +394,7 @@
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);
- axis2_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_ERROR, filename,
+ axutil_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_ERROR, filename,
linenumber, value);
}
else
@@ -403,7 +403,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_log_critical(axis2_log_t *log, const axis2_char_t *filename,
+axutil_log_impl_log_critical(axutil_log_t *log, const axis2_char_t *filename,
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
@@ -431,7 +431,7 @@
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);
- axis2_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_CRITICAL, filename,
+ axutil_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_CRITICAL, filename,
linenumber, value);
}
else
@@ -440,7 +440,7 @@
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_log_impl_get_time_str(void)
+axutil_log_impl_get_time_str(void)
{
time_t tp;
char *time_str;
@@ -458,16 +458,16 @@
}
-AXIS2_EXTERN axis2_log_t * AXIS2_CALL
-axis2_log_create_default(axutil_allocator_t *allocator)
+AXIS2_EXTERN axutil_log_t * AXIS2_CALL
+axutil_log_create_default(axutil_allocator_t *allocator)
{
- axis2_log_impl_t *log_impl;
+ axutil_log_impl_t *log_impl;
if (!allocator)
return NULL;
- log_impl = (axis2_log_impl_t *) AXIS2_MALLOC(allocator,
- sizeof(axis2_log_impl_t));
+ log_impl = (axutil_log_impl_t *) AXIS2_MALLOC(allocator,
+ sizeof(axutil_log_impl_t));
if (!log_impl)
return NULL;
@@ -488,14 +488,14 @@
log_impl->log.enabled = 1;
log_impl->log.level = AXIS2_LOG_LEVEL_DEBUG;
- log_impl->log.ops = &axis2_log_ops_var;
+ log_impl->log.ops = &axutil_log_ops_var;
return &(log_impl->log);
}
#ifdef AXIS2_TRACE
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_impl_log_trace(axis2_log_t *log, const axis2_char_t *filename,
+axutil_log_impl_log_trace(axutil_log_t *log, const axis2_char_t *filename,
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
@@ -522,7 +522,7 @@
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);
- axis2_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_TRACE, filename,
+ axutil_log_impl_write_to_file(fd, mutex, AXIS2_LOG_LEVEL_TRACE, filename,
linenumber, value);
}
}
@@ -530,7 +530,7 @@
fprintf(stderr, "please check your log and buffer");
}
#else
-AXIS2_EXTERN void AXIS2_CALL axis2_log_impl_log_trace(axis2_log_t *log,
+AXIS2_EXTERN void AXIS2_CALL axutil_log_impl_log_trace(axutil_log_t *log,
const axis2_char_t *filename, const int linenumber,
const axis2_char_t *format, ...)
{
@@ -538,16 +538,16 @@
#endif
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_free(axutil_allocator_t *allocator,
- struct axis2_log *log)
+axutil_log_free(axutil_allocator_t *allocator,
+ struct axutil_log *log)
{
log->ops->free(allocator, log);
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_log_write(axis2_log_t *log,
+axutil_log_write(axutil_log_t *log,
const axis2_char_t *buffer,
- axis2_log_levels_t level,
+ axutil_log_levels_t level,
const axis2_char_t *file,
const int line)
{
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=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Fri Mar 30 11:46:59 2007
@@ -18,7 +18,7 @@
#include <axis2_param.h>
#include <axis2_utils.h>
#include <axis2_string.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
struct axis2_param
{
@@ -168,7 +168,7 @@
i = axutil_hash_next(env, i))
{
axutil_hash_this(i, NULL, NULL, &v);
- axis2_generic_obj_free(v, env);
+ axutil_generic_obj_free(v, env);
}
axutil_hash_free(param->attrs, env);
}
@@ -250,7 +250,7 @@
i = axutil_hash_next(env, i))
{
axutil_hash_this(i, NULL, NULL, &v);
- axis2_generic_obj_free(v, env);
+ axutil_generic_obj_free(v, env);
}
axutil_hash_free(param->attrs, env);
}
Modified: webservices/axis2/trunk/c/util/test/util/test_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_log.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_log.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_log.c Fri Mar 30 11:46:59 2007
@@ -17,8 +17,8 @@
#include <stdio.h>
#include <axutil_error_default.h>
-#include <axis2_log.h>
-#include <axis2_log_default.h>
+#include <axutil_log.h>
+#include <axutil_log_default.h>
#include <axutil_allocator.h>
#include <test_log.h>
#include <string.h>
@@ -37,7 +37,7 @@
return NULL;
}
- axis2_log_t *log22 = axis2_log_create(allocator, NULL, NULL);
+ axutil_log_t *log22 = axutil_log_create(allocator, NULL, NULL);
if (!log22)
{
printf("cannot create log\n");
@@ -57,80 +57,80 @@
return env;
}
-void test_axis2_log_write(const axutil_env_t *env)
+void test_axutil_log_write(const axutil_env_t *env)
{
char msg[10];
- printf("\n####start of test_axis2_log_write\n\n");
+ printf("\n####start of test_axutil_log_write\n\n");
strcpy(msg, "abcd test123");
AXIS2_LOG_WRITE(env->log, msg, AXIS2_LOG_LEVEL_ERROR);
- printf("\n####end of test_axis2_log_write\n\n");
+ printf("\n####end of test_axutil_log_write\n\n");
}
-void test_axis2_log_debug(const axutil_env_t *env)
+void test_axutil_log_debug(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_degug\n\n");
+ printf("\n####start of test_axutil_log_degug\n\n");
env->log->level = AXIS2_LOG_LEVEL_DEBUG;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "log_debug test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_debug\n\n");
+ printf("\n####end of test_axutil_log_debug\n\n");
}
-void test_axis2_log_debug_off(const axutil_env_t *env)
+void test_axutil_log_debug_off(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_degug_off\n\n");
+ printf("\n####start of test_axutil_log_degug_off\n\n");
env->log->level = AXIS2_LOG_LEVEL_ERROR;/*log only ERROR's and CRITICAL's*/
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "this should not be logged log_debug test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_debug_off\n\n");
+ printf("\n####end of test_axutil_log_debug_off\n\n");
}
-void test_axis2_log_info(const axutil_env_t *env)
+void test_axutil_log_info(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_info\n\n");
+ printf("\n####start of test_axutil_log_info\n\n");
env->log->level = AXIS2_LOG_LEVEL_DEBUG;
AXIS2_LOG_INFO(env->log, "log_info test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_info\n\n");
+ printf("\n####end of test_axutil_log_info\n\n");
}
-void test_axis2_log_info_off(const axutil_env_t *env)
+void test_axutil_log_info_off(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_info_off\n\n");
+ printf("\n####start of test_axutil_log_info_off\n\n");
env->log->level = AXIS2_LOG_LEVEL_ERROR;/*log only ERROR's and CRITICAL's*/
AXIS2_LOG_INFO(env->log, "this should not be logged log_info test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_info_off\n\n");
+ printf("\n####end of test_axutil_log_info_off\n\n");
}
-void test_axis2_log_warning(const axutil_env_t *env)
+void test_axutil_log_warning(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_warning\n\n");
+ printf("\n####start of test_axutil_log_warning\n\n");
env->log->level = AXIS2_LOG_LEVEL_DEBUG;
AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "log_warning test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_warning\n\n");
+ printf("\n####end of test_axutil_log_warning\n\n");
}
-void test_axis2_log_warning_off(const axutil_env_t *env)
+void test_axutil_log_warning_off(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_warning_off\n\n");
+ printf("\n####start of test_axutil_log_warning_off\n\n");
env->log->level = AXIS2_LOG_LEVEL_ERROR;/*log only ERROR's and CRITICAL's*/
AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "this should not be logged log_warning test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_warning_off\n\n");
+ printf("\n####end of test_axutil_log_warning_off\n\n");
}
/*no need to sent log level, should always log*/
-void test_axis2_log_error(const axutil_env_t *env)
+void test_axutil_log_error(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_error\n\n");
+ printf("\n####start of test_axutil_log_error\n\n");
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "log_error test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_error\n\n");
+ printf("\n####end of test_axutil_log_error\n\n");
}
/*no need to sent log level, should always log*/
-void test_axis2_log_critical(const axutil_env_t *env)
+void test_axutil_log_critical(const axutil_env_t *env)
{
- printf("\n####start of test_axis2_log_critical\n\n");
+ printf("\n####start of test_axutil_log_critical\n\n");
AXIS2_LOG_CRITICAL(env->log, AXIS2_LOG_SI, "log_critical test %s %d", "foo", 1);
- printf("\n####end of test_axis2_log_critical\n\n");
+ printf("\n####end of test_axutil_log_critical\n\n");
}
void run_test_log()
@@ -139,19 +139,19 @@
const axutil_env_t *env = create_env_with_error_log();
if (!env)
return;
- test_axis2_log_write(env);
- test_axis2_log_debug(env);
- test_axis2_log_debug_off(env);
+ test_axutil_log_write(env);
+ test_axutil_log_debug(env);
+ test_axutil_log_debug_off(env);
- test_axis2_log_info(env);
- test_axis2_log_info_off(env);
+ test_axutil_log_info(env);
+ test_axutil_log_info_off(env);
- test_axis2_log_warning(env);
- test_axis2_log_warning_off(env);
+ test_axutil_log_warning(env);
+ test_axutil_log_warning_off(env);
- test_axis2_log_error(env);
+ test_axutil_log_error(env);
- test_axis2_log_critical(env);
+ test_axutil_log_critical(env);
printf("\n####end of run_test_log test suite \n\n");
}
Modified: webservices/axis2/trunk/c/util/test/util/test_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_log.h?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_log.h (original)
+++ webservices/axis2/trunk/c/util/test/util/test_log.h Fri Mar 30 11:46:59 2007
@@ -22,15 +22,15 @@
void run_test_log();
const axutil_env_t *create_env_with_error_log();
-void test_axis2_log_write(const axutil_env_t *env);
-void test_axis2_log_debug(const axutil_env_t *env);
-void test_axis2_log_debug_off(const axutil_env_t *env);
-void test_axis2_log_info(const axutil_env_t *env);
-void test_axis2_log_info_off(const axutil_env_t *env);
-void test_axis2_log_warning(const axutil_env_t *env);
-void test_axis2_log_warning_off(const axutil_env_t *env);
-void test_axis2_log_error(const axutil_env_t *env);
-void test_axis2_log_critical(const axutil_env_t *env);
+void test_axutil_log_write(const axutil_env_t *env);
+void test_axutil_log_debug(const axutil_env_t *env);
+void test_axutil_log_debug_off(const axutil_env_t *env);
+void test_axutil_log_info(const axutil_env_t *env);
+void test_axutil_log_info_off(const axutil_env_t *env);
+void test_axutil_log_warning(const axutil_env_t *env);
+void test_axutil_log_warning_off(const axutil_env_t *env);
+void test_axutil_log_error(const axutil_env_t *env);
+void test_axutil_log_critical(const axutil_env_t *env);
#endif /* _TEST_LOG_H_ */
Modified: webservices/axis2/trunk/c/util/test/util/test_string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_string.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_string.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_string.c Fri Mar 30 11:46:59 2007
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <axutil_error_default.h>
-#include <axis2_log.h>
+#include <axutil_log.h>
#include <axis2_string.h>
void test_strltrim(const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/util/test/util/test_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.c Fri Mar 30 11:46:59 2007
@@ -19,8 +19,8 @@
#include <stdio.h>
#include <string.h>
#include <axutil_error_default.h>
-#include <axis2_log.h>
-#include <axis2_log_default.h>
+#include <axutil_log.h>
+#include <axutil_log_default.h>
#include <axutil_allocator.h>
#include <axis2_utils.h>
#include "test_thread.h"
@@ -255,7 +255,7 @@
const axutil_env_t *create_env_with_error_log()
{
axutil_error_t *error = NULL;
- axis2_log_t *log22 = NULL;
+ axutil_log_t *log22 = NULL;
const axutil_env_t *env = NULL;
axutil_allocator_t *allocator = axutil_allocator_init(NULL);
if (!allocator)
@@ -270,7 +270,7 @@
return NULL;
}
- log22 = axis2_log_create(allocator, NULL, "test123.log");
+ log22 = axutil_log_create(allocator, NULL, "test123.log");
if (!log22)
{
printf("cannot create log\n");
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=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 11:46:59 2007
@@ -22,11 +22,11 @@
#include <axutil_array_list.h>
#include <platforms/axis2_platform_auto_sense.h>
#include <axis2_uuid_gen.h>
-#include <axis2_log_default.h>
-#include <axis2_log.h>
+#include <axutil_log_default.h>
+#include <axutil_log.h>
#include <axutil_dir_handler.h>
#include <axutil_file.h>
-#include "axis2_log.h"
+#include "axutil_log.h"
#include "test_thread.h"
#include <test_log.h>
@@ -229,7 +229,7 @@
printf("cannot create error\n");
return;
}
- axis2_log_t *log22 = axis2_log_create(allocator, NULL, NULL);
+ axutil_log_t *log22 = axutil_log_create(allocator, NULL, NULL);
if (!log22)
{
printf("cannot create log\n");
Modified: webservices/axis2/trunk/c/woden/include/woden_element_decl.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_element_decl.h?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_element_decl.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_element_decl.h Fri Mar 30 11:46:59 2007
@@ -28,7 +28,7 @@
* (<xs:element>), that describes the content of WSDL input, output
* and fault messages. However, it does not impose XML Schema as the type system.
* It returns a String representing the content model or type system
- * (e.g. "http://www.w3.org/2001/XMLSchema") and a axis2_generic_obj_t type
+ * (e.g. "http://www.w3.org/2001/XMLSchema") and a axutil_generic_obj_t type
* representing the content of the element declaration. This Object may
* be cast to a type appropriate for the content model.
*
@@ -43,7 +43,7 @@
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
#include <woden.h>
#ifdef __cplusplus
@@ -143,7 +143,7 @@
*
* @return the Object representing the content of the element declaration
*/
- axis2_generic_obj_t *(AXIS2_CALL *
+ axutil_generic_obj_t *(AXIS2_CALL *
get_content) (
void *decl,
const axutil_env_t *env);
@@ -174,7 +174,7 @@
set_content) (
void *decl,
const axutil_env_t *env,
- axis2_generic_obj_t *element_content);
+ axutil_generic_obj_t *element_content);
};
Modified: webservices/axis2/trunk/c/woden/include/woden_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_generic_obj.h?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_generic_obj.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_generic_obj.h Fri Mar 30 11:46:59 2007
@@ -29,11 +29,11 @@
{
#endif
-typedef struct axis2_generic_obj axis2_generic_obj_t;
-typedef struct axis2_generic_obj_ops axis2_generic_obj_ops_t;
+typedef struct axutil_generic_obj axutil_generic_obj_t;
+typedef struct axutil_generic_obj_ops axutil_generic_obj_ops_t;
/**
- * @defgroup axis2_generic_obj Generic Obj
+ * @defgroup axutil_generic_obj Generic Obj
* @ingroup woden_util
* @{
*/
@@ -42,35 +42,35 @@
* @brief Generic Obj ops struct
* Encapsulator struct for ops of woden_generic_obj
*/
- struct axis2_generic_obj_ops
+ struct axutil_generic_obj_ops
{
axis2_status_t (AXIS2_CALL *
free) (
- axis2_generic_obj_t *generic_obj,
+ axutil_generic_obj_t *generic_obj,
const axutil_env_t *env);
axis2_status_t (AXIS2_CALL *
set_scope) (
- axis2_generic_obj_t *generic_obj,
+ axutil_generic_obj_t *generic_obj,
const axutil_env_t *env,
axis2_scope_t scope);
axis2_status_t (AXIS2_CALL *
set_free_func) (
- axis2_generic_obj_t *generic_obj,
+ axutil_generic_obj_t *generic_obj,
const axutil_env_t *env,
AXIS2_FREE_VOID_ARG free_func);
axis2_status_t (AXIS2_CALL *
set_value) (
- axis2_generic_obj_t *generic_obj,
+ axutil_generic_obj_t *generic_obj,
const axutil_env_t *env,
void *value);
void *(AXIS2_CALL *
get_value) (
- axis2_generic_obj_t *generic_obj,
+ axutil_generic_obj_t *generic_obj,
const axutil_env_t *env);
};
@@ -79,33 +79,33 @@
/**
* @brief
*/
- struct axis2_generic_obj
+ struct axutil_generic_obj
{
- axis2_generic_obj_ops_t *ops;
+ axutil_generic_obj_ops_t *ops;
};
/**
* create new generic_obj
* @return generic_obj newly created generic_obj
*/
-AXIS2_EXTERN axis2_generic_obj_t * AXIS2_CALL
-axis2_generic_obj_create(const axutil_env_t *env);
+AXIS2_EXTERN axutil_generic_obj_t * AXIS2_CALL
+axutil_generic_obj_create(const axutil_env_t *env);
/*************************** Function macros **********************************/
-#define axis2_generic_obj_free(generic_obj, env) \
+#define axutil_generic_obj_free(generic_obj, env) \
((generic_obj)->ops->free (generic_obj, env))
-#define axis2_generic_obj_set_free_func(generic_obj, env, free_func) \
+#define axutil_generic_obj_set_free_func(generic_obj, env, free_func) \
((generic_obj)->ops->set_free_func (generic_obj, env, free_func))
#define AXIS2_GENERIC_OBJ_SET_SCOPE(generic_obj, env, scope) \
((generic_obj)->ops->set_scope (generic_obj, env, scope))
-#define axis2_generic_obj_set_value(generic_obj, env, value) \
+#define axutil_generic_obj_set_value(generic_obj, env, value) \
((generic_obj)->ops->set_value (generic_obj, env, value))
-#define axis2_generic_obj_get_value(generic_obj, env) \
+#define axutil_generic_obj_get_value(generic_obj, env) \
((generic_obj)->ops->get_value(generic_obj, env))
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/woden/include/woden_property_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_property_element.h?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_property_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_property_element.h Fri Mar 30 11:46:59 2007
@@ -41,7 +41,7 @@
#include <axis2_utils.h>
#include <axutil_hash.h>
#include <axis2_qname.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
#include <axis2_uri.h>
#include <woden.h>
#include <woden_documentable_element.h>
@@ -91,9 +91,9 @@
axis2_status_t (AXIS2_CALL *
set_value) (void *doc_el,
const axutil_env_t *env,
- axis2_generic_obj_t *value);
+ axutil_generic_obj_t *value);
- axis2_generic_obj_t *(AXIS2_CALL *
+ axutil_generic_obj_t *(AXIS2_CALL *
get_value) (void *doc_el,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/woden/include/woden_xml_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_xml_attr.h?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_xml_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_xml_attr.h Fri Mar 30 11:46:59 2007
@@ -32,7 +32,7 @@
#include <axis2_utils.h>
#include <axutil_hash.h>
#include <axis2_qname.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
#include <woden.h>
#ifdef __cplusplus
@@ -80,7 +80,7 @@
void *xml_attr,
const axutil_env_t *env);
- axis2_generic_obj_t *(AXIS2_CALL *
+ axutil_generic_obj_t *(AXIS2_CALL *
get_content) (
void *xml_attr,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Fri Mar 30 11:46:59 2007
@@ -154,7 +154,7 @@
if (ed)
{
axis2_char_t *content_model = NULL;
- axis2_generic_obj_t *obj = NULL;
+ axutil_generic_obj_t *obj = NULL;
axis2_qname_t *ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
if (ed_qname)
@@ -172,7 +172,7 @@
{
void *value = NULL;
- value = axis2_generic_obj_get_value(obj, env);
+ value = axutil_generic_obj_get_value(obj, env);
printf("Content is:\n");
}
}
Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Fri Mar 30 11:46:59 2007
@@ -164,7 +164,7 @@
if (ed)
{
axis2_char_t *content_model = NULL;
- axis2_generic_obj_t *obj = NULL;
+ axutil_generic_obj_t *obj = NULL;
axis2_qname_t *ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
if (ed_qname)
@@ -181,7 +181,7 @@
{
void *value = NULL;
- value = axis2_generic_obj_get_value(obj, env);
+ value = axutil_generic_obj_get_value(obj, env);
printf("Content is:\n");
}
}
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Fri Mar 30 11:46:59 2007
@@ -116,7 +116,7 @@
#include <axiom_xml_reader.h>
#include <axiom_util.h>
#include <axis2_utils.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
#include <axis2_string_util.h>
@@ -3727,13 +3727,13 @@
q_elem_value, temp_el_node))
{
axiom_child_element_iterator_t *node_list = NULL;
- axis2_generic_obj_t *node_list_obj = NULL;
+ axutil_generic_obj_t *node_list_obj = NULL;
/* The property value consists of the child info items of <value> */
node_list = axiom_element_get_child_elements(temp_el, env, temp_el_node);
- node_list_obj = axis2_generic_obj_create(env);
- axis2_generic_obj_set_value(node_list_obj, env, node_list);
- axis2_generic_obj_set_free_func(node_list_obj, env, node_list->ops->free_fn);
+ node_list_obj = axutil_generic_obj_create(env);
+ axutil_generic_obj_set_value(node_list_obj, env, node_list);
+ axutil_generic_obj_set_free_func(node_list_obj, env, node_list->ops->free_fn);
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
}
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Fri Mar 30 11:46:59 2007
@@ -117,7 +117,7 @@
#include <axiom_xml_reader.h>
#include <axiom_util.h>
#include <axis2_utils.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
#include <axis2_string_util.h>
@@ -3544,13 +3544,13 @@
q_elem_value, temp_el_node))
{
axiom_child_element_iterator_t *node_list = NULL;
- axis2_generic_obj_t *node_list_obj = NULL;
+ axutil_generic_obj_t *node_list_obj = NULL;
/* The property value consists of the child info items of <value> */
node_list = axiom_element_get_child_elements(temp_el, env, temp_el_node);
- node_list_obj = axis2_generic_obj_create(env);
- axis2_generic_obj_set_value(node_list_obj, env, node_list);
- axis2_generic_obj_set_free_func(node_list_obj, env, node_list->ops->free_fn);
+ node_list_obj = axutil_generic_obj_create(env);
+ axutil_generic_obj_set_value(node_list_obj, env, node_list);
+ axutil_generic_obj_set_free_func(node_list_obj, env, node_list->ops->free_fn);
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c Fri Mar 30 11:46:59 2007
@@ -34,7 +34,7 @@
axis2_qname_t *f_qname;
axis2_uri_t *f_system;
axis2_char_t *f_content_model;
- axis2_generic_obj_t *f_content;
+ axutil_generic_obj_t *f_content;
};
#define INTF_TO_IMPL(decl) \
@@ -73,7 +73,7 @@
void *decl,
const axutil_env_t *env);
-axis2_generic_obj_t *AXIS2_CALL
+axutil_generic_obj_t *AXIS2_CALL
woden_element_decl_get_content(
void *decl,
const axutil_env_t *env);
@@ -104,7 +104,7 @@
woden_element_decl_set_content(
void *decl,
const axutil_env_t *env,
- axis2_generic_obj_t *element_content);
+ axutil_generic_obj_t *element_content);
AXIS2_EXTERN woden_element_decl_t * AXIS2_CALL
@@ -342,7 +342,7 @@
return decl_impl->f_content_model;
}
-axis2_generic_obj_t *AXIS2_CALL
+axutil_generic_obj_t *AXIS2_CALL
woden_element_decl_get_content(
void *decl,
const axutil_env_t *env)
@@ -440,7 +440,7 @@
woden_element_decl_set_content(
void *decl,
const axutil_env_t *env,
- axis2_generic_obj_t *element_content)
+ axutil_generic_obj_t *element_content)
{
woden_element_decl_impl_t *decl_impl = NULL;
axutil_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c Fri Mar 30 11:46:59 2007
@@ -25,7 +25,7 @@
#include <woden_type_def.h>
#include <woden_generic_obj.h>
#include <xml_schema_type.h>
-#include <axis2_generic_obj.h>
+#include <axutil_generic_obj.h>
typedef struct woden_property_impl woden_property_impl_t;
@@ -42,7 +42,7 @@
axutil_hash_t *methods;
/* WSDL Component model data */
axis2_uri_t *f_ref;
- axis2_generic_obj_t *f_value;
+ axutil_generic_obj_t *f_value;
woden_type_def_t *f_value_constraint;
void *f_parent;
/* XML Element data */
@@ -109,7 +109,7 @@
woden_property_set_value(
void *property,
const axutil_env_t *env,
- axis2_generic_obj_t *value);
+ axutil_generic_obj_t *value);
void *AXIS2_CALL
woden_property_get_value(
@@ -877,7 +877,7 @@
woden_property_set_value(
void *property,
const axutil_env_t *env,
- axis2_generic_obj_t *value)
+ axutil_generic_obj_t *value)
{
woden_property_impl_t *property_impl = NULL;
axutil_hash_t *super = NULL;
@@ -889,7 +889,7 @@
if (property_impl->f_value)
{
- axis2_generic_obj_free(property_impl->f_value, env);
+ axutil_generic_obj_free(property_impl->f_value, env);
property_impl->f_value = NULL;
}
property_impl->f_value = value;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c Fri Mar 30 11:46:59 2007
@@ -35,7 +35,7 @@
axis2_qname_t *f_qname;
axis2_uri_t *f_system;
axis2_char_t *f_content_model;
- axis2_generic_obj_t *f_content;
+ axutil_generic_obj_t *f_content;
};
#define INTF_TO_IMPL(type_def) ((woden_type_def_impl_t *) type_def)
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c Fri Mar 30 11:46:59 2007
@@ -266,14 +266,14 @@
{
woden_qname_list_or_token_any_attr_impl_t *
list_token_attr_impl = NULL;
- axis2_generic_obj_t *content = NULL;
+ axutil_generic_obj_t *content = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
content = WODEN_XML_ATTR_GET_CONTENT(list_token_attr_impl->xml_attr,
env);
- if (AXIS2_QNAME_LIST == axis2_generic_obj_get_type(content, env))
+ if (AXIS2_QNAME_LIST == axutil_generic_obj_get_type(content, env))
return AXIS2_TRUE;
return AXIS2_FALSE;
}
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c Fri Mar 30 11:46:59 2007
@@ -265,7 +265,7 @@
{
woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
- axis2_generic_obj_t *content = NULL;
+ axutil_generic_obj_t *content = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
token_attr_impl = INTF_TO_IMPL(token_attr);
@@ -276,7 +276,7 @@
env))
return AXIS2_TRUE;
content = WODEN_XML_ATTR_GET_CONTENT(token_attr_impl->xml_attr, env);
- if (AXIS2_QNAME == axis2_generic_obj_get_type(content, env))
+ if (AXIS2_QNAME == axutil_generic_obj_get_type(content, env))
return AXIS2_TRUE;
return AXIS2_FALSE;
}
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c?view=diff&rev=524229&r1=524228&r2=524229
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c Fri Mar 30 11:46:59 2007
@@ -31,7 +31,7 @@
{
woden_xml_attr_t xml_attr;
axis2_qname_t *f_attr_type;
- axis2_generic_obj_t *f_content;
+ axutil_generic_obj_t *f_content;
axis2_char_t *f_external_form;
axis2_bool_t f_valid;
};
@@ -57,7 +57,7 @@
void *xml_attr,
const axutil_env_t *env);
-axis2_generic_obj_t *AXIS2_CALL
+axutil_generic_obj_t *AXIS2_CALL
woden_xml_attr_get_content(
void *xml_attr,
const axutil_env_t *env);
@@ -234,7 +234,7 @@
return xml_attr_impl->f_attr_type;
}
-axis2_generic_obj_t *AXIS2_CALL
+axutil_generic_obj_t *AXIS2_CALL
woden_xml_attr_get_content(
void *xml_attr,
const axutil_env_t *env)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org