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/19 09:45:00 UTC
svn commit: r519876 - in /webservices/axis2/trunk/c/modules/core/deployment:
arch_file_data.c arch_reader.c axis2_arch_file_data.h dep_engine.c
module_builder.c svc_builder.c svc_grp_builder.c
Author: dushshantha
Date: Mon Mar 19 01:45:00 2007
New Revision: 519876
URL: http://svn.apache.org/viewvc?view=rev&rev=519876
Log:
removed macros and corrected indentation.
Modified:
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=519876&r1=519875&r2=519876
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Mon Mar 19 01:45:00 2007
@@ -38,18 +38,17 @@
};
AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
-axis2_arch_file_data_create(
- const axis2_env_t *env)
+axis2_arch_file_data_create(const axis2_env_t *env)
{
axis2_arch_file_data_t *arch_file_data = NULL;
AXIS2_ENV_CHECK(env, NULL);
arch_file_data = (axis2_arch_file_data_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_arch_file_data_t));
+ allocator, sizeof(axis2_arch_file_data_t));
- if (NULL == arch_file_data)
+ if (!arch_file_data)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -76,34 +75,32 @@
}
AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
-axis2_arch_file_data_create_with_type_and_file(
- const axis2_env_t *env,
+axis2_arch_file_data_create_with_type_and_file(const axis2_env_t *env,
int type,
axis2_file_t *file)
{
axis2_arch_file_data_t *arch_file_data = NULL;
arch_file_data = (axis2_arch_file_data_t *)
- axis2_arch_file_data_create(env);
- if (NULL == arch_file_data)
+ axis2_arch_file_data_create(env);
+ if (!arch_file_data)
{
return NULL;
}
-
+
arch_file_data->type = type;
arch_file_data->file = axis2_file_clone(file, env);
return arch_file_data;
}
AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
-axis2_arch_file_data_create_with_type_and_name(
- const axis2_env_t *env,
+axis2_arch_file_data_create_with_type_and_name(const axis2_env_t *env,
int type,
const axis2_char_t *name)
{
axis2_arch_file_data_t *arch_file_data = NULL;
arch_file_data = (axis2_arch_file_data_t *)
- axis2_arch_file_data_create(env);
- if (NULL == arch_file_data)
+ axis2_arch_file_data_create(env);
+ if (!arch_file_data)
{
return NULL;
}
@@ -113,8 +110,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_file_data_free(
- axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_free(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -146,7 +142,7 @@
void *val = NULL;
for (hi = axis2_hash_first(arch_file_data->svc_map, env); hi;
- hi = axis2_hash_next(env, hi))
+ hi = axis2_hash_next(env, hi))
{
axis2_svc_t *svc = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
@@ -172,16 +168,14 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_arch_file_data_get_msg_recv(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_msg_recv(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
return arch_file_data->msg_recv;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_file_data_set_msg_recv(
- axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_set_msg_recv(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env,
axis2_char_t *msg_recv)
{
@@ -198,16 +192,14 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_arch_file_data_get_name(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_name(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
return axis2_file_get_name(arch_file_data->file, env);
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_arch_file_data_get_svc_name(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_svc_name(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
axis2_char_t *svc_name = NULL;
@@ -227,24 +219,21 @@
}
AXIS2_EXTERN int AXIS2_CALL
-axis2_arch_file_data_get_type(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_type(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
return arch_file_data->type;
}
AXIS2_EXTERN axis2_file_t *AXIS2_CALL
-axis2_arch_file_data_get_file(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_file(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
return arch_file_data->file;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_arch_file_data_get_module_name(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_module_name(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
axis2_char_t *module_name = NULL;
@@ -263,8 +252,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_file_data_set_module_name(
- axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_set_module_name(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env,
axis2_char_t *module_name)
{
@@ -281,16 +269,14 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_arch_file_data_get_module_dll_name(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_module_dll_name(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
return arch_file_data->module_dll_name;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_file_data_set_module_dll_name(
- axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_set_module_dll_name(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env,
axis2_char_t *module_dll_name)
{
@@ -307,8 +293,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_file_data_add_svc(
- axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_add_svc(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env,
axis2_svc_t *svc_desc)
{
@@ -329,15 +314,14 @@
}
}
axis2_hash_set(arch_file_data->svc_map, svc_name, AXIS2_HASH_KEY_STRING,
- svc_desc);
+ svc_desc);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
- axis2_arch_file_data_get_svc(
- const axis2_arch_file_data_t *arch_file_data,
- const axis2_env_t *env,
- axis2_char_t *svc_name)
+axis2_arch_file_data_get_svc(const axis2_arch_file_data_t *arch_file_data,
+ const axis2_env_t *env,
+ axis2_char_t *svc_name)
{
axis2_svc_t *svc = NULL;
@@ -347,7 +331,7 @@
if (arch_file_data->svc_map)
{
svc = (axis2_svc_t *) axis2_hash_get(arch_file_data->svc_map, svc_name,
- AXIS2_HASH_KEY_STRING);
+ AXIS2_HASH_KEY_STRING);
}
else
{
@@ -357,25 +341,21 @@
}
AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
-axis2_arch_file_data_get_svc_map(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_svc_map(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return arch_file_data->svc_map;
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_arch_file_data_get_deployable_svcs(
- const axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_get_deployable_svcs(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
return arch_file_data->deployable_svcs;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_file_data_set_deployable_svcs(
- axis2_arch_file_data_t *arch_file_data,
+axis2_arch_file_data_set_deployable_svcs(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env,
axis2_array_list_t *deployable_svcs)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=519876&r1=519875&r2=519876
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Mon Mar 19 01:45:00 2007
@@ -122,7 +122,7 @@
return status;
}
arch_file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
- svc_name = AXIS2_ARCH_FILE_DATA_GET_SVC_NAME(arch_file_data, env);
+ svc_name = axis2_arch_file_data_get_svc_name(arch_file_data, env);
axis2_svc_grp_set_name(svc_grp, env, svc_name);
}
else
@@ -186,15 +186,15 @@
axis2_char_t *svc_name = NULL;
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
- svc_name = AXIS2_ARCH_FILE_DATA_GET_NAME(file_data, env);
- svc = AXIS2_ARCH_FILE_DATA_GET_SVC(file_data, env, svc_name);
+ svc_name = axis2_arch_file_data_get_name(file_data, env);
+ svc = axis2_arch_file_data_get_svc(file_data, env, svc_name);
if (NULL == svc)
{
axis2_qname_t *svc_qname = NULL;
svc_qname = axis2_qname_create(env, svc_name, NULL, NULL);
svc = axis2_svc_create_with_qname(env, svc_qname);
- status = AXIS2_ARCH_FILE_DATA_ADD_SVC(file_data, env, svc);
+ status = axis2_arch_file_data_add_svc(file_data, env, svc);
axis2_qname_free(svc_qname, env);
if (AXIS2_SUCCESS != status)
{
@@ -215,7 +215,7 @@
return AXIS2_FAILURE;
}
- dep_svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(file_data, env);
+ dep_svcs = axis2_arch_file_data_get_deployable_svcs(file_data, env);
if (!dep_svcs)
{
return AXIS2_FAILURE;
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=519876&r1=519875&r2=519876
==============================================================================
--- 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 Mon Mar 19 01:45:00 2007
@@ -23,12 +23,6 @@
* @{
*/
-
-/**
- * @file axis2_arch_file_data.h
- * @brief Axis2 Arch File Data interface
- */
-
#include <axis2_const.h>
#include <axis2_error.h>
#include <axis2_defines.h>
@@ -46,7 +40,7 @@
#endif
struct axis2_conf;
-
+
/** Type name for struct axis2_arch_fila_data */
typedef struct axis2_arch_file_data axis2_arch_file_data_t;
@@ -228,70 +222,6 @@
axis2_arch_file_data_create_with_type_and_name(const axis2_env_t *env,
int type,
const axis2_char_t *name);
-
-/** Frees the arch file data struct. */
-#define AXIS2_ARCH_FILE_DATA_FREE(arch_file_data, env) \
- axis2_arch_file_data_free (arch_file_data, env)
-
-/** Gets the message receiver. */
-#define AXIS2_ARCH_FILE_DATA_GET_MSG_RECV(arch_file_data, env) \
- axis2_arch_file_data_get_msg_recv (arch_file_data, env)
-
-/** Sets the message receiver. */
-#define AXIS2_ARCH_FILE_DATA_SET_MSG_RECV(arch_file_data, env, msg_recv) \
- axis2_arch_file_data_set_msg_recv (arch_file_data, env, msg_recv)
-
-/** Gets the name. */
-#define AXIS2_ARCH_FILE_DATA_GET_NAME(arch_file_data, env) \
- axis2_arch_file_data_get_name (arch_file_data, env)
-
-/** Gets the service name. */
-#define AXIS2_ARCH_FILE_DATA_GET_SVC_NAME(arch_file_data, env) \
- axis2_arch_file_data_get_svc_name (arch_file_data, env)
-
-/** Gets the type. */
-#define AXIS2_ARCH_FILE_DATA_GET_TYPE(arch_file_data, env) \
- axis2_arch_file_data_get_type (arch_file_data, env)
-
-/** Gets the file. */
-#define AXIS2_ARCH_FILE_DATA_GET_FILE(arch_file_data, env) \
- axis2_arch_file_data_get_file (arch_file_data, env)
-
-/** Gets the module name. */
-#define AXIS2_ARCH_FILE_DATA_GET_MODULE_NAME(arch_file_data, env) \
- axis2_arch_file_data_get_module_name (arch_file_data, env)
-
-/** Sets the module name. */
-#define AXIS2_ARCH_FILE_DATA_SET_MODULE_NAME(arch_file_data, env, module_name) \
- axis2_arch_file_data_set_module_name (arch_file_data, env, module_name)
-
-/** Gets the module dll name. */
-#define AXIS2_ARCH_FILE_DATA_GET_MODULE_DLL_NAME(arch_file_data, env) \
- axis2_arch_file_data_get_module_dll_name (arch_file_data, env)
-
-/** Sets the module dll name. */
-#define AXIS2_ARCH_FILE_DATA_SET_MODULE_DLL_NAME(arch_file_data, env, class_name) \
- axis2_arch_file_data_set_module_dll_name (arch_file_data, env, class_name)
-
-/** Adds the service. */
-#define AXIS2_ARCH_FILE_DATA_ADD_SVC(arch_file_data, env, svc_desc) \
- axis2_arch_file_data_add_svc (arch_file_data, env, svc_desc)
-
-/** Gets the service. */
-#define AXIS2_ARCH_FILE_DATA_GET_SVC(arch_file_data, env, svc_name) \
- axis2_arch_file_data_get_svc (arch_file_data, env, svc_name)
-
-/** Gets the service map. */
-#define AXIS2_ARCH_FILE_DATA_GET_SVC_MAP(arch_file_data, env) \
- axis2_arch_file_data_get_svc_map (arch_file_data, env)
-
-/** Gets the deployable services. */
-#define AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(arch_file_data, env) \
- axis2_arch_file_data_get_deployable_svcs (arch_file_data, env)
-
-/** Sets the deployable services. */
-#define AXIS2_ARCH_FILE_DATA_SET_DEPLOYABLE_SVCS(arch_file_data, env, deployable_svcs) \
- axis2_arch_file_data_set_deployable_svcs (arch_file_data, env, deployable_svcs)
/** @} */
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=519876&r1=519875&r2=519876
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Mar 19 01:45:00 2007
@@ -274,7 +274,7 @@
if (dep_engine->curr_file)
{
- AXIS2_ARCH_FILE_DATA_FREE(dep_engine->curr_file, env);
+ axis2_arch_file_data_free(dep_engine->curr_file, env);
}
if (dep_engine->phases_info)
@@ -309,7 +309,7 @@
file_data = (axis2_arch_file_data_t *)
axis2_array_list_get(dep_engine->ws_to_deploy, env, i);
- AXIS2_ARCH_FILE_DATA_FREE(file_data, env);
+ axis2_arch_file_data_free(file_data, env);
}
axis2_array_list_free(dep_engine->ws_to_deploy, env);
dep_engine->ws_to_deploy = NULL;
@@ -320,14 +320,14 @@
int size = 0;
size = axis2_array_list_size(dep_engine->ws_to_undeploy, env);
-
+
for (i = 0; i < size; i++)
{
axis2_arch_file_data_t *file_data = NULL;
file_data = (axis2_arch_file_data_t *)
axis2_array_list_get(dep_engine->ws_to_undeploy, env, i);
- AXIS2_ARCH_FILE_DATA_FREE(file_data, env);
+ axis2_arch_file_data_free(file_data, env);
}
axis2_array_list_free(dep_engine->ws_to_undeploy, env);
dep_engine->ws_to_undeploy = NULL;
@@ -338,7 +338,7 @@
int i = 0;
size = axis2_array_list_size(dep_engine->module_list, env);
-
+
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
@@ -759,7 +759,7 @@
return AXIS2_SUCCESS;
}
size = axis2_array_list_size(dep_engine->module_list, env);
-
+
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
@@ -824,7 +824,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_metadata, AXIS2_FAILURE);
- svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(dep_engine->curr_file,
+ svcs = axis2_arch_file_data_get_deployable_svcs(dep_engine->curr_file,
env);
if (svcs)
sizei = axis2_array_list_size(svcs, env);
@@ -844,7 +844,7 @@
svc = (axis2_svc_t *) axis2_array_list_get(svcs, env, i);
/*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
- file = AXIS2_ARCH_FILE_DATA_GET_FILE(dep_engine->curr_file, env);
+ file = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
file_name = axis2_file_get_name(file, env);
AXIS2_SVC_SET_FILE_NAME(svc, env, file_name);
@@ -971,13 +971,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
- read_in_dll = AXIS2_ARCH_FILE_DATA_GET_MODULE_DLL_NAME(dep_engine->
+ read_in_dll = axis2_arch_file_data_get_module_dll_name(dep_engine->
curr_file, env);
dll_desc = axis2_dll_desc_create(env);
dll_name = axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
read_in_dll);
- module_folder = AXIS2_ARCH_FILE_DATA_GET_FILE(dep_engine->curr_file, env);
+ module_folder = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
timestamp = axis2_file_get_timestamp(module_folder, env);
axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
module_folder_path = axis2_file_get_path(module_folder, env);
@@ -1193,7 +1193,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
size = axis2_array_list_size(dep_engine->ws_to_deploy, env);
-
+
if (size > 0)
{
int i = 0;
@@ -1208,7 +1208,7 @@
dep_engine->curr_file = (axis2_arch_file_data_t *)
axis2_array_list_get(dep_engine->ws_to_deploy, env, i);
- type = AXIS2_ARCH_FILE_DATA_GET_TYPE(dep_engine->curr_file, env);
+ type = axis2_arch_file_data_get_type(dep_engine->curr_file, env);
switch (type)
{
case AXIS2_SVC:
@@ -1222,7 +1222,7 @@
*/
svc_grp = axis2_svc_grp_create_with_conf(env,
dep_engine->conf);
- file_name = AXIS2_ARCH_FILE_DATA_GET_NAME(dep_engine->
+ file_name = axis2_arch_file_data_get_name(dep_engine->
curr_file, env);
status = AXIS2_ARCH_READER_PROCESS_SVC_GRP(arch_reader, env,
file_name, dep_engine, svc_grp);
@@ -1252,7 +1252,7 @@
}
dep_engine->arch_reader = axis2_arch_reader_create(env);
meta_data = axis2_module_desc_create(env);
- file_name = AXIS2_ARCH_FILE_DATA_GET_NAME(dep_engine->
+ file_name = axis2_arch_file_data_get_name(dep_engine->
curr_file, env);
status = AXIS2_ARCH_READER_READ_MODULE_ARCH(
dep_engine->arch_reader, env, file_name, dep_engine,
@@ -1322,7 +1322,7 @@
}
axis2_array_list_free(dep_engine->ws_to_undeploy, env);
-
+
return AXIS2_SUCCESS;
}
@@ -1507,7 +1507,7 @@
if (dep_engine->curr_file)
{
- AXIS2_ARCH_FILE_DATA_FREE(dep_engine->curr_file, env);
+ axis2_arch_file_data_free(dep_engine->curr_file, env);
dep_engine->curr_file = NULL;
}
dep_engine->curr_file = file_data;
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=519876&r1=519875&r2=519876
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Mon Mar 19 01:45:00 2007
@@ -171,7 +171,7 @@
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(module_builder->
desc_builder->engine, env);
- module_name = AXIS2_ARCH_FILE_DATA_GET_MODULE_NAME(file_data, env);
+ module_name = axis2_arch_file_data_get_module_name(file_data, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Populate module %s", module_name);
module_qname = axis2_qname_create(env, module_name, NULL, NULL);
@@ -190,7 +190,7 @@
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
axis2_desc_builder_get_dep_engine(module_builder->desc_builder, env),
env);
- module_name = AXIS2_ARCH_FILE_DATA_GET_MODULE_NAME(file_data, env);
+ module_name = axis2_arch_file_data_get_module_name(file_data, env);
module_qname = axis2_qname_create(env, module_name, NULL, NULL);
axis2_module_desc_set_qname(module_builder->module_desc, env, module_qname);
@@ -222,7 +222,7 @@
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
dep_engine, env);
- AXIS2_ARCH_FILE_DATA_SET_MODULE_DLL_NAME(file_data, env,
+ axis2_arch_file_data_set_module_dll_name(file_data, env,
class_name);
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=519876&r1=519875&r2=519876
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Mar 19 01:45:00 2007
@@ -261,7 +261,7 @@
arch_file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env),
env);
- svc_folder = AXIS2_ARCH_FILE_DATA_GET_FILE(arch_file_data, env);
+ svc_folder = axis2_arch_file_data_get_file(arch_file_data, env);
timestamp = axis2_file_get_timestamp(svc_folder, env);
axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
svc_folder_path = axis2_file_get_path(svc_folder, env);
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=519876&r1=519875&r2=519876
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Mar 19 01:45:00 2007
@@ -188,7 +188,7 @@
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env),
env);
- axis_svc = AXIS2_ARCH_FILE_DATA_GET_SVC(file_data, env, svc_name);
+ axis_svc = axis2_arch_file_data_get_svc(file_data, env, svc_name);
if (NULL == axis_svc)
{
axis2_qname_t *qsvc_name = NULL;
@@ -196,12 +196,12 @@
qsvc_name = axis2_qname_create(env, svc_name, NULL, NULL);
axis_svc = axis2_svc_create_with_qname(env, qsvc_name);
axis2_qname_free(qsvc_name, env);
- AXIS2_ARCH_FILE_DATA_ADD_SVC(file_data, env, axis_svc);
+ axis2_arch_file_data_add_svc(file_data, env, axis_svc);
}
/* the service that has to be deployed */
- deployable_svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(file_data,
+ deployable_svcs = axis2_arch_file_data_get_deployable_svcs(file_data,
env);
axis2_array_list_add(deployable_svcs, env, axis_svc);
AXIS2_SVC_SET_PARENT(axis_svc, env, svc_grp);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org