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 du...@apache.org on 2007/03/26 10:49:21 UTC
svn commit: r522457 - in /webservices/axis2/trunk/c/modules/core/deployment:
axis2_arch_reader.h axis2_ws_info.h dep_engine.c ws_info.c ws_info_list.c
Author: dushshantha
Date: Mon Mar 26 01:49:21 2007
New Revision: 522457
URL: http://svn.apache.org/viewvc?view=rev&rev=522457
Log:
removed macros and corrected indentation
Modified:
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h?view=diff&rev=522457&r1=522456&r2=522457
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Mon Mar 26 01:49:21 2007
@@ -134,31 +134,6 @@
AXIS2_EXTERN axis2_arch_reader_t *AXIS2_CALL
axis2_arch_reader_create(const axis2_env_t *env);
-
-/** Frees the arch reader.
-#define AXIS2_ARCH_READER_FREE(arch_reader, env) \
- axis2_arch_reader_free (arch_reader, env)*/
-
-/** Creates the service.
-#define AXIS2_ARCH_READER_CREATE_SVC(arch_reader, env, file) \
- axis2_arch_reader_create_svc (arch_reader, env, file)*/
-
-/** Process service group.
-#define AXIS2_ARCH_READER_PROCESS_SVC_GRP(arch_reader, env, file_path, dep_engine, svc_grp) \
- axis2_arch_reader_process_svc_grp (arch_reader, env, file_path, dep_engine, svc_grp)*/
-
-/** Builds the service group.
-#define AXIS2_ARCH_READER_BUILD_SVC_GRP(arch_reader, env, file_name, dep_engine, svc_grp) \
- axis2_arch_reader_build_svc_grp (arch_reader, env, file_name, dep_engine, svc_grp)*/
-
-/** Reads the module archive.
-#define AXIS2_ARCH_READER_READ_MODULE_ARCH(arch_reader, env, file_path, dep_engine, module) \
- axis2_arch_reader_read_module_arch (arch_reader, env, file_path, dep_engine, module)*/
-
-/** Creates the module archive.
-#define AXIS2_ARCH_READER_CREATE_MODULE_ARCH(arch_reader, env, module_name) \
- axis2_arch_reader_create_module_arch (arch_reader, env, module_name)*/
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h?view=diff&rev=522457&r1=522456&r2=522457
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h Mon Mar 26 01:49:21 2007
@@ -24,11 +24,6 @@
* @{
*/
-/**
- * @file axis2_ws_info.h
- * @brief Axis2 Ws Info interface
- */
-
#include <axis2_const.h>
#include <axis2_error.h>
#include <axis2_defines.h>
@@ -124,30 +119,6 @@
axis2_char_t *file_name,
long last_modified_date,
int type);
-
-/** Frees the ws info. */
-#define AXIS2_WS_INFO_FREE(ws_info, env) \
- axis2_ws_info_free (ws_info, env)
-
-/** Gets the file name. */
-#define AXIS2_WS_INFO_GET_FILE_NAME(ws_info, env) \
- axis2_ws_info_get_file_name (ws_info, env)
-
-/** Set file name. */
-#define AXIS2_WS_INFO_SET_FILE_NAME(ws_info, env, file_name) \
- axis2_ws_info_set_file_name (ws_info, env, file_name)
-
-/** Gets the last modified date. */
-#define AXIS2_WS_INFO_GET_LAST_MODIFIED_DATE(ws_info, env) \
- axis2_ws_info_get_last_modified_date (ws_info, env)
-
-/** Sets the last modified date. */
-#define AXIS2_WS_INFO_SET_LAST_MODIFIED_DATE(ws_info, env, last_modified_date) \
- axis2_ws_info_set_last_modified_date (ws_info, env, last_modified_date)
-
-/** Get type. */
-#define AXIS2_WS_INFO_GET_TYPE(ws_info, env) \
- axis2_ws_info_get_type (ws_info, env)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=522457&r1=522456&r2=522457
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Mar 26 01:49:21 2007
@@ -1326,12 +1326,12 @@
ws_info = (axis2_ws_info_t *)
axis2_array_list_get(dep_engine->ws_to_undeploy, env, i);
- type = AXIS2_WS_INFO_GET_TYPE(ws_info, env);
+ type = axis2_ws_info_get_type(ws_info, env);
if (type == AXIS2_SVC)
{
axis2_char_t *file_name = NULL;
- file_name = AXIS2_WS_INFO_GET_FILE_NAME(ws_info, env);
+ file_name = axis2_ws_info_get_file_name(ws_info, env);
svc_name = axis2_dep_engine_get_axis_svc_name(dep_engine, env,
file_name);
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info.c?view=diff&rev=522457&r1=522456&r2=522457
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Mon Mar 26 01:49:21 2007
@@ -29,8 +29,7 @@
};
AXIS2_EXTERN axis2_ws_info_t *AXIS2_CALL
-axis2_ws_info_create_with_file_name_and_last_modified_date(
- const axis2_env_t *env,
+axis2_ws_info_create_with_file_name_and_last_modified_date(const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date)
{
@@ -39,9 +38,8 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, file_name, NULL);
- ws_info = (axis2_ws_info_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_ws_info_t));
-
+ ws_info = (axis2_ws_info_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_ws_info_t));
if (! ws_info)
{
@@ -67,8 +65,7 @@
}
AXIS2_EXTERN axis2_ws_info_t *AXIS2_CALL
-axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
- const axis2_env_t *env,
+axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date,
int type)
@@ -79,8 +76,8 @@
AXIS2_PARAM_CHECK(env->error, file_name, NULL);
ws_info = (axis2_ws_info_t *)
- axis2_ws_info_create_with_file_name_and_last_modified_date(env,
- file_name, last_modified_date);
+ axis2_ws_info_create_with_file_name_and_last_modified_date(env,
+ file_name, last_modified_date);
if (!ws_info)
{
axis2_ws_info_free(ws_info, env);
@@ -92,8 +89,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_free(
- axis2_ws_info_t *ws_info,
+axis2_ws_info_free(axis2_ws_info_t *ws_info,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -112,16 +108,14 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_ws_info_get_file_name(
- const axis2_ws_info_t *ws_info,
+axis2_ws_info_get_file_name(const axis2_ws_info_t *ws_info,
const axis2_env_t *env)
{
return ws_info->file_name;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_set_file_name(
- axis2_ws_info_t *ws_info,
+axis2_ws_info_set_file_name(axis2_ws_info_t *ws_info,
const axis2_env_t *env,
axis2_char_t *file_name)
{
@@ -138,8 +132,7 @@
}
AXIS2_EXTERN long AXIS2_CALL
-axis2_ws_info_get_last_modified_date(
- const axis2_ws_info_t *ws_info,
+axis2_ws_info_get_last_modified_date(const axis2_ws_info_t *ws_info,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -148,8 +141,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_set_last_modified_date(
- axis2_ws_info_t *ws_info,
+axis2_ws_info_set_last_modified_date(axis2_ws_info_t *ws_info,
const axis2_env_t *env,
long last_modified_date)
{
@@ -159,9 +151,9 @@
}
AXIS2_EXTERN int AXIS2_CALL
-axis2_ws_info_get_type(
- const axis2_ws_info_t *ws_info,
+axis2_ws_info_get_type(const axis2_ws_info_t *ws_info,
const axis2_env_t *env)
{
return ws_info->type;
}
+
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=522457&r1=522456&r2=522457
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Mon Mar 26 01:49:21 2007
@@ -117,7 +117,7 @@
ws_info = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
ws_info_list, env, i);
- AXIS2_WS_INFO_FREE(ws_info, env);
+ axis2_ws_info_free(ws_info, env);
}
axis2_array_list_free(ws_info_list->ws_info_list, env);
ws_info_list->ws_info_list = NULL;
@@ -154,7 +154,7 @@
ws_info = (axis2_ws_info_t *)
axis2_array_list_get(ws_info_list->ws_info_list, env, i);
- AXIS2_WS_INFO_FREE(ws_info, env);
+ axis2_ws_info_free(ws_info, env);
}
return AXIS2_SUCCESS;
}
@@ -275,7 +275,7 @@
ws_info = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
ws_info_list, env, i);
- file_name_l = AXIS2_WS_INFO_GET_FILE_NAME(ws_info, env);
+ file_name_l = axis2_ws_info_get_file_name(ws_info, env);
if (0 == axis2_strcmp(file_name_l, file_name))
{
return ws_info;
@@ -297,7 +297,7 @@
AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ws_info, AXIS2_FAILURE);
- last_modified_date = AXIS2_WS_INFO_GET_LAST_MODIFIED_DATE(ws_info, env);
+ last_modified_date = axis2_ws_info_get_last_modified_date(ws_info, env);
return (last_modified_date != axis2_file_get_timestamp(file, env));
}
@@ -345,7 +345,7 @@
file_item = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
ws_info_list, env, i);
- file_item_name = AXIS2_WS_INFO_GET_FILE_NAME(file_item, env);
+ file_item_name = axis2_ws_info_get_file_name(file_item, env);
current_lists_size = axis2_array_list_size(ws_info_list->
current_info_lists, env);
for (j = 0; j < current_lists_size; j++)
@@ -365,7 +365,7 @@
axis2_ws_info_t *ws_info = NULL;
long last_modified_date = 0;
- last_modified_date = AXIS2_WS_INFO_GET_LAST_MODIFIED_DATE(file_item,
+ last_modified_date = axis2_ws_info_get_last_modified_date(file_item,
env);
axis2_array_list_add(temp_list, env, file_item);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date(
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org