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 sh...@apache.org on 2009/08/18 12:15:53 UTC
svn commit: r805347 [5/31] - in /webservices/axis2/trunk/c/src: core/addr/
core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/
core/transport/amqp/receiver/ core/transport/amqp/receiver/qpid...
Modified: webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c?rev=805347&r1=805346&r2=805347&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c Tue Aug 18 10:15:49 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -42,20 +41,18 @@
const axutil_env_t * env)
{
axis2_arch_file_data_t *arch_file_data = NULL;
- arch_file_data = (axis2_arch_file_data_t *) AXIS2_MALLOC(env->
- allocator,
- sizeof
- (axis2_arch_file_data_t));
+ arch_file_data = (axis2_arch_file_data_t *)AXIS2_MALLOC(env-> allocator,
+ sizeof(axis2_arch_file_data_t));
- if (!arch_file_data)
+ if(!arch_file_data)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- memset ((void *)arch_file_data, 0, sizeof (axis2_arch_file_data_t));
+ memset((void *)arch_file_data, 0, sizeof(axis2_arch_file_data_t));
arch_file_data->deployable_svcs = axutil_array_list_create(env, 0);
- if (!arch_file_data->deployable_svcs)
+ if(!arch_file_data->deployable_svcs)
{
axis2_arch_file_data_free(arch_file_data, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -72,13 +69,12 @@
axutil_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 (!arch_file_data)
+ arch_file_data = (axis2_arch_file_data_t *)axis2_arch_file_data_create(env);
+ if(!arch_file_data)
{
axis2_char_t *file_name = axutil_file_get_name(file, env);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Could not create arch_file_data for file %s", file_name);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Could not create arch_file_data for file %s",
+ file_name);
return NULL;
}
@@ -94,12 +90,10 @@
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 (!arch_file_data)
+ arch_file_data = (axis2_arch_file_data_t *)axis2_arch_file_data_create(env);
+ if(!arch_file_data)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Could not create arch_file_data for %s", name);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Could not create arch_file_data for %s", name);
return NULL;
}
arch_file_data->type = type;
@@ -112,53 +106,53 @@
axis2_arch_file_data_t * arch_file_data,
const axutil_env_t * env)
{
- if (arch_file_data->file)
+ if(arch_file_data->file)
{
axutil_file_free(arch_file_data->file, env);
}
- if (arch_file_data->msg_recv)
+ if(arch_file_data->msg_recv)
{
AXIS2_FREE(env->allocator, arch_file_data->msg_recv);
}
- if (arch_file_data->module_name)
+ if(arch_file_data->module_name)
{
AXIS2_FREE(env->allocator, arch_file_data->module_name);
}
- if (arch_file_data->module_dll_name)
+ if(arch_file_data->module_dll_name)
{
AXIS2_FREE(env->allocator, arch_file_data->module_dll_name);
}
- if (arch_file_data->name)
+ if(arch_file_data->name)
{
AXIS2_FREE(env->allocator, arch_file_data->name);
}
- if (arch_file_data->svc_map)
+ if(arch_file_data->svc_map)
{
axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axutil_hash_first(arch_file_data->svc_map, env); hi;
- hi = axutil_hash_next(env, hi))
+ for(hi = axutil_hash_first(arch_file_data->svc_map, env); hi; hi
+ = axutil_hash_next(env, hi))
{
axis2_svc_t *svc = NULL;
axutil_hash_this(hi, NULL, NULL, &val);
- svc = (axis2_svc_t *) val;
- if (svc)
+ svc = (axis2_svc_t *)val;
+ if(svc)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Service name :%s",
- axis2_svc_get_name(svc, env));
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Service name :%s", axis2_svc_get_name(svc,
+ env));
axis2_svc_free(svc, env);
}
}
axutil_hash_free(arch_file_data->svc_map, env);
}
- if (arch_file_data->deployable_svcs)
+ if(arch_file_data->deployable_svcs)
{
axutil_array_list_free(arch_file_data->deployable_svcs, env);
}
- if (arch_file_data)
+ if(arch_file_data)
{
AXIS2_FREE(env->allocator, arch_file_data);
}
@@ -182,7 +176,7 @@
{
AXIS2_PARAM_CHECK(env->error, msg_recv, AXIS2_FAILURE);
- if (arch_file_data->msg_recv)
+ if(arch_file_data->msg_recv)
{
AXIS2_FREE(env->allocator, arch_file_data->msg_recv);
arch_file_data->msg_recv = NULL;
@@ -206,7 +200,7 @@
{
axis2_char_t *svc_name = NULL;
- if (arch_file_data->file)
+ if(arch_file_data->file)
{
svc_name = axutil_file_get_name(arch_file_data->file, env);
}
@@ -241,7 +235,7 @@
{
axis2_char_t *module_name = NULL;
- if (arch_file_data->file)
+ if(arch_file_data->file)
{
module_name = axutil_file_get_name(arch_file_data->file, env);
}
@@ -260,7 +254,7 @@
{
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
- if (arch_file_data->module_name)
+ if(arch_file_data->module_name)
{
AXIS2_FREE(env->allocator, arch_file_data->module_name);
arch_file_data->module_name = NULL;
@@ -285,7 +279,7 @@
{
AXIS2_PARAM_CHECK(env->error, module_dll_name, AXIS2_FAILURE);
- if (arch_file_data->module_dll_name)
+ if(arch_file_data->module_dll_name)
{
AXIS2_FREE(env->allocator, arch_file_data->module_dll_name);
arch_file_data->module_dll_name = NULL;
@@ -305,18 +299,17 @@
AXIS2_PARAM_CHECK(env->error, svc_desc, AXIS2_FAILURE);
svc_qname = axis2_svc_get_qname(svc_desc, env);
- svc_name = axutil_qname_to_string((axutil_qname_t *) svc_qname, env);
- if (!arch_file_data->svc_map)
+ svc_name = axutil_qname_to_string((axutil_qname_t *)svc_qname, env);
+ if(!arch_file_data->svc_map)
{
arch_file_data->svc_map = axutil_hash_make(env);
- if (!arch_file_data->svc_map)
+ if(!arch_file_data->svc_map)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
- axutil_hash_set(arch_file_data->svc_map, svc_name, AXIS2_HASH_KEY_STRING,
- svc_desc);
+ axutil_hash_set(arch_file_data->svc_map, svc_name, AXIS2_HASH_KEY_STRING, svc_desc);
return AXIS2_SUCCESS;
}
@@ -330,10 +323,10 @@
AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
- if (arch_file_data->svc_map)
+ if(arch_file_data->svc_map)
{
- svc = (axis2_svc_t *) axutil_hash_get(arch_file_data->svc_map, svc_name,
- AXIS2_HASH_KEY_STRING);
+ svc = (axis2_svc_t *)axutil_hash_get(arch_file_data->svc_map, svc_name,
+ AXIS2_HASH_KEY_STRING);
}
else
{
@@ -365,7 +358,7 @@
axutil_array_list_t * deployable_svcs)
{
AXIS2_PARAM_CHECK(env->error, deployable_svcs, AXIS2_FAILURE);
- if (arch_file_data->deployable_svcs)
+ if(arch_file_data->deployable_svcs)
{
AXIS2_FREE(env->allocator, arch_file_data->deployable_svcs);
arch_file_data->deployable_svcs = NULL;
Modified: webservices/axis2/trunk/c/src/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/arch_reader.c?rev=805347&r1=805346&r2=805347&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/arch_reader.c Tue Aug 18 10:15:49 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,12 +33,9 @@
{
axis2_arch_reader_t *arch_reader = NULL;
- arch_reader = (axis2_arch_reader_t *) AXIS2_MALLOC(env->
- allocator,
- sizeof
- (axis2_arch_reader_t));
+ arch_reader = (axis2_arch_reader_t *)AXIS2_MALLOC(env-> allocator, sizeof(axis2_arch_reader_t));
- if (!arch_reader)
+ if(!arch_reader)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -57,7 +53,7 @@
{
/* Description builder is owned by dep_engine, so do not free it here */
- if (arch_reader)
+ if(arch_reader)
{
AXIS2_FREE(env->allocator, arch_reader);
}
@@ -91,56 +87,50 @@
AXIS2_PARAM_CHECK(env->error, dep_engine, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
- file_flag = axis2_dep_engine_get_file_flag (dep_engine, env);
+ file_flag = axis2_dep_engine_get_file_flag(dep_engine, env);
- if (!file_flag)
- {
+ if(!file_flag)
+ {
repos_path = axis2_dep_engine_get_repos_path(dep_engine, env);
-
- svc_grp_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
- AXIS2_SERVICE_FOLDER, AXIS2_PATH_SEP_STR,
- file_name, AXIS2_PATH_SEP_STR, AXIS2_SVC_XML,
- NULL);
+
+ svc_grp_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR, AXIS2_SERVICE_FOLDER,
+ AXIS2_PATH_SEP_STR, file_name, AXIS2_PATH_SEP_STR, AXIS2_SVC_XML, NULL);
}
else
{
- repos_path = axis2_dep_engine_get_svc_dir (dep_engine, env);
- svc_grp_xml = axutil_strcat (env, repos_path, AXIS2_PATH_SEP_STR,
- file_name, AXIS2_PATH_SEP_STR, AXIS2_SVC_XML,
- NULL);
+ repos_path = axis2_dep_engine_get_svc_dir(dep_engine, env);
+ svc_grp_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR, file_name,
+ AXIS2_PATH_SEP_STR, AXIS2_SVC_XML, NULL);
}
- if (!svc_grp_xml)
+ if(!svc_grp_xml)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Service xml file not found for %s", file_name);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Service xml file not found for %s", file_name);
return AXIS2_FAILURE;
}
status = axutil_file_handler_access(svc_grp_xml, AXIS2_F_OK);
- if (AXIS2_SUCCESS == status)
+ if(AXIS2_SUCCESS == status)
{
struct axis2_arch_file_data *arch_file_data = NULL;
axis2_char_t *svc_name = NULL;
- status = axis2_arch_reader_build_svc_grp(arch_reader, env, svc_grp_xml,
- dep_engine, svc_grp);
- if (AXIS2_SUCCESS != status)
+ status
+ = axis2_arch_reader_build_svc_grp(arch_reader, env, svc_grp_xml, dep_engine, svc_grp);
+ if(AXIS2_SUCCESS != status)
{
return status;
}
- arch_file_data =
- axis2_dep_engine_get_current_file_item(dep_engine, env);
+ 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);
axis2_svc_grp_set_name(svc_grp, env, svc_name);
}
else
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SERVICE_XML_NOT_FOUND,
- AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Access to service configuration file %s failed", file_name);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SERVICE_XML_NOT_FOUND, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Access to service configuration file %s failed",
+ file_name);
status = AXIS2_FAILURE;
}
AXIS2_FREE(env->allocator, svc_grp_xml);
@@ -164,31 +154,28 @@
AXIS2_PARAM_CHECK(env->error, dep_engine, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
- arch_reader->desc_builder =
- axis2_desc_builder_create_with_file_and_dep_engine(env, svc_xml,
- dep_engine);
- if (!arch_reader->desc_builder)
+ arch_reader->desc_builder = axis2_desc_builder_create_with_file_and_dep_engine(env, svc_xml,
+ dep_engine);
+ if(!arch_reader->desc_builder)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Creating description builder for service file %s failed", svc_xml);
return AXIS2_FAILURE;
}
- axis2_dep_engine_add_desc_builder(dep_engine, env,
- arch_reader->desc_builder);
+ axis2_dep_engine_add_desc_builder(dep_engine, env, arch_reader->desc_builder);
svc_grp_node = axis2_desc_builder_build_om(arch_reader->desc_builder, env);
- if (svc_grp_node)
+ if(svc_grp_node)
{
svc_grp_element = axiom_node_get_data_element(svc_grp_node, env);
- if (svc_grp_element)
+ if(svc_grp_element)
{
root_element_name = axiom_element_get_localname(svc_grp_element, env);
}
}
- if (root_element_name &&
- 0 == axutil_strcmp(AXIS2_SVC_ELEMENT, root_element_name))
+ if(root_element_name && 0 == axutil_strcmp(AXIS2_SVC_ELEMENT, root_element_name))
{
/* If service group is actually a service. In this case service group
* contain only single service */
@@ -201,7 +188,7 @@
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);
- if (!svc)
+ if(!svc)
{
axutil_qname_t *svc_qname = NULL;
@@ -209,7 +196,7 @@
svc = axis2_svc_create_with_qname(env, svc_qname);
status = axis2_arch_file_data_add_svc(file_data, env, svc);
axutil_qname_free(svc_qname, env);
- if (AXIS2_SUCCESS != status)
+ if(AXIS2_SUCCESS != status)
{
axis2_svc_free(svc, env);
return status;
@@ -217,41 +204,35 @@
}
axis2_svc_set_parent(svc, env, svc_grp);
- svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
- dep_engine,
- svc);
+ svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env, dep_engine, svc);
status = axis2_svc_builder_populate_svc(svc_builder, env, svc_grp_node);
axis2_dep_engine_add_svc_builder(dep_engine, env, svc_builder);
- if (AXIS2_SUCCESS != status)
+ if(AXIS2_SUCCESS != status)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Populating service failed for %s", svc_name);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Populating service failed for %s", svc_name);
return AXIS2_FAILURE;
}
dep_svcs = axis2_arch_file_data_get_deployable_svcs(file_data, env);
- if (!dep_svcs)
+ if(!dep_svcs)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Deployable services list is NULL within arch file data");
return AXIS2_FAILURE;
}
status = axutil_array_list_add(dep_svcs, env, svc);
- if (AXIS2_SUCCESS != status)
+ if(AXIS2_SUCCESS != status)
{
return AXIS2_FAILURE;
}
}
- else if (root_element_name &&
- 0 == axutil_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
+ else if(root_element_name && 0 == axutil_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
{
axis2_svc_grp_builder_t *grp_builder = NULL;
- grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env,
- svc_grp_node,
- dep_engine);
- status =
- axis2_svc_grp_builder_populate_svc_grp(grp_builder, env, svc_grp);
+ grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env, svc_grp_node,
+ dep_engine);
+ status = axis2_svc_grp_builder_populate_svc_grp(grp_builder, env, svc_grp);
axis2_dep_engine_add_svc_grp_builder(dep_engine, env, grp_builder);
}
return status;
@@ -273,24 +254,21 @@
AXIS2_PARAM_CHECK(env->error, dep_engine, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
- file_flag = axis2_dep_engine_get_file_flag (dep_engine, env);
- if (!file_flag)
- {
- repos_path = axis2_dep_engine_get_repos_path(dep_engine, env);
- module_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
- AXIS2_MODULE_FOLDER, AXIS2_PATH_SEP_STR,
- file_name, AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML,
- NULL);
- }
- else
- {
- repos_path = axis2_dep_engine_get_module_dir (dep_engine, env);
- module_xml = axutil_strcat (env, repos_path, AXIS2_PATH_SEP_STR,
- file_name, AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML,
- NULL);
- }
-
- if (!module_xml)
+ file_flag = axis2_dep_engine_get_file_flag(dep_engine, env);
+ if(!file_flag)
+ {
+ repos_path = axis2_dep_engine_get_repos_path(dep_engine, env);
+ module_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR, AXIS2_MODULE_FOLDER,
+ AXIS2_PATH_SEP_STR, file_name, AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML, NULL);
+ }
+ else
+ {
+ repos_path = axis2_dep_engine_get_module_dir(dep_engine, env);
+ module_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR, file_name,
+ AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML, NULL);
+ }
+
+ if(!module_xml)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory");
@@ -298,25 +276,19 @@
}
status = axutil_file_handler_access(module_xml, AXIS2_F_OK);
- if (AXIS2_SUCCESS == status)
+ if(AXIS2_SUCCESS == status)
{
axis2_module_builder_t *module_builder = NULL;
- module_builder =
- axis2_module_builder_create_with_file_and_dep_engine_and_module(env,
- module_xml,
- dep_engine,
- module_desc);
+ module_builder = axis2_module_builder_create_with_file_and_dep_engine_and_module(env,
+ module_xml, dep_engine, module_desc);
status = axis2_module_builder_populate_module(module_builder, env);
axis2_dep_engine_add_module_builder(dep_engine, env, module_builder);
}
else
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE,
- AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Module configuration file access failed for module file %s",
- module_xml);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Module configuration file access failed for module file %s", module_xml);
status = AXIS2_FAILURE;
}
AXIS2_FREE(env->allocator, module_xml);
@@ -331,7 +303,7 @@
axutil_file_t *file = NULL;
file = axutil_file_create(env);
- if (!file)
+ if(!file)
{
return NULL;
}