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/22 07:07:25 UTC
svn commit: r521127 [2/2] - in /webservices/axis2/trunk/c: ./
modules/core/deployment/ modules/core/engine/ test/core/deployment/
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=521127&r1=521126&r2=521127
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Wed Mar 21 23:07:24 2007
@@ -89,7 +89,7 @@
if (module_builder->desc_builder)
{
- AXIS2_DESC_BUILDER_FREE(module_builder->desc_builder, env);
+ axis2_desc_builder_free(module_builder->desc_builder, env);
}
if (module_builder)
@@ -136,7 +136,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- module_node = AXIS2_DESC_BUILDER_BUILD_OM(module_builder->desc_builder, env);
+ module_node = axis2_desc_builder_build_om(module_builder->desc_builder, env);
module_element = AXIOM_NODE_GET_DATA_ELEMENT(module_node, env);
if (!module_element)
{
@@ -169,7 +169,7 @@
axis2_char_t *module_name = NULL;
axis2_qname_t *module_qname = NULL;
- file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(module_builder->
+ 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);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Populate module %s", module_name);
@@ -187,7 +187,7 @@
axis2_char_t *module_name = NULL;
axis2_qname_t *module_qname = NULL;
- file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
+ 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);
@@ -220,7 +220,7 @@
{
axis2_arch_file_data_t *file_data = NULL;
- file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
+ file_data = axis2_dep_engine_get_current_file_item(
dep_engine, env);
axis2_arch_file_data_set_module_dll_name(file_data, env,
class_name);
@@ -242,7 +242,7 @@
if (parent)
parent_container = axis2_conf_get_param_container(parent, env);
- AXIS2_DESC_BUILDER_PROCESS_PARAMS(module_builder->desc_builder, env,
+ axis2_desc_builder_process_params(module_builder->desc_builder, env,
itr, axis2_module_desc_get_param_container(module_builder->module_desc, env),
parent_container);
@@ -257,7 +257,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+ flow = axis2_desc_builder_process_flow(module_builder->
desc_builder, env, in_flow_element,
axis2_module_desc_get_param_container(module_builder->module_desc, env),
in_flow_node);
@@ -281,7 +281,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+ flow = axis2_desc_builder_process_flow(module_builder->
desc_builder, env, out_flow_element,
axis2_module_desc_get_param_container(module_builder->module_desc, env),
out_flow_node);
@@ -304,7 +304,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+ flow = axis2_desc_builder_process_flow(module_builder->
desc_builder, env, in_fault_flow_element,
axis2_module_desc_get_param_container(module_builder->module_desc, env),
in_fault_flow_node);
@@ -327,7 +327,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+ flow = axis2_desc_builder_process_flow(module_builder->
desc_builder, env, out_fault_flow_element,
axis2_module_desc_get_param_container(module_builder->module_desc, env),
out_fault_flow_node);
@@ -445,12 +445,12 @@
if (qparamst)
axis2_qname_free(qparamst, env);
- AXIS2_DESC_BUILDER_PROCESS_PARAMS(module_builder->desc_builder, env,
+ axis2_desc_builder_process_params(module_builder->desc_builder, env,
params,
axis2_op_get_param_container(op_desc, env),
axis2_module_desc_get_param_container(module_builder->module_desc, env));
/* To process wsamapping */
- AXIS2_DESC_BUILDER_PROCESS_ACTION_MAPPINGS(module_builder->desc_builder,
+ axis2_desc_builder_process_action_mappings(module_builder->desc_builder,
env, op_node, op_desc);
/* setting the mep of the operation */
@@ -465,7 +465,7 @@
{
axis2_msg_recv_t *msg_recv = NULL;
- msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(module_builder->
+ msg_recv = axis2_desc_builder_load_msg_recv(module_builder->
desc_builder, env, recv_element);
axis2_op_set_msg_recv(op_desc, env, msg_recv);
}
@@ -483,10 +483,10 @@
qmodulest, op_node);
if (qmodulest)
axis2_qname_free(qmodulest, env);
- AXIS2_DESC_BUILDER_PROCESS_OP_MODULE_REFS(module_builder->desc_builder,
+ axis2_desc_builder_process_op_module_refs(module_builder->desc_builder,
env, modules, op_desc);
/* setting Operation phase */
- info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(
+ info = axis2_dep_engine_get_phases_info(
axis2_desc_builder_get_dep_engine(module_builder->desc_builder, env),
env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_desc);
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=521127&r1=521126&r2=521127
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Wed Mar 21 23:07:24 2007
@@ -123,7 +123,7 @@
if (svc_builder->desc_builder)
{
- AXIS2_DESC_BUILDER_FREE(svc_builder->desc_builder, env);
+ axis2_desc_builder_free(svc_builder->desc_builder, env);
}
svc_builder->svc = NULL;
@@ -199,7 +199,7 @@
qparamst = NULL;
parent = AXIS2_SVC_GET_PARENT(svc_builder->svc, env);
- status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(svc_builder->desc_builder, env,
+ status = axis2_desc_builder_process_params(svc_builder->desc_builder, env,
itr,
axis2_svc_get_param_container(svc_builder->svc, env),
axis2_svc_grp_get_param_container(parent, env));
@@ -258,7 +258,7 @@
svc_dll_name =
axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
- arch_file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
+ 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);
@@ -309,7 +309,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
+ flow = axis2_desc_builder_process_flow(svc_builder->desc_builder, env,
in_flow_element, svc_builder->svc->param_container, in_flow_node);
status = AXIS2_SVC_SET_IN_FLOW(svc_builder->svc, env, flow);
if (AXIS2_SUCCESS != status)
@@ -328,7 +328,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
+ flow = axis2_desc_builder_process_flow(svc_builder->desc_builder, env,
out_flow_element, svc_builder->svc->param_container, out_flow_node);
status = AXIS2_SVC_SET_OUT_FLOW(svc_builder->svc, env, flow);
if (AXIS2_SUCCESS != status)
@@ -348,7 +348,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
+ flow = axis2_desc_builder_process_flow(svc_builder->desc_builder, env,
in_faultflow_element, svc_builder->svc->param_container,
in_faultflow_node);
status = AXIS2_SVC_SET_FAULT_IN_FLOW(svc_builder->svc, env, flow);
@@ -368,7 +368,7 @@
{
axis2_flow_t *flow = NULL;
- flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
+ flow = axis2_desc_builder_process_flow(svc_builder->desc_builder, env,
out_faultflow_element, svc_builder->svc->param_container,
out_faultflow_node);
status = AXIS2_SVC_SET_FAULT_OUT_FLOW(svc_builder->svc, env, flow);
@@ -537,12 +537,12 @@
qparamst, op_node);
axis2_qname_free(qparamst, env);
qparamst = NULL;
- status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(svc_builder->desc_builder,
+ status = axis2_desc_builder_process_params(svc_builder->desc_builder,
env, params_itr,
axis2_op_get_param_container(op_desc, env),
axis2_svc_get_param_container(svc_builder->svc, env));
/* To process wsamapping */
- AXIS2_DESC_BUILDER_PROCESS_ACTION_MAPPINGS(svc_builder->desc_builder,
+ axis2_desc_builder_process_action_mappings(svc_builder->desc_builder,
env, op_node, op_desc);
/* loading the message receivers */
@@ -554,7 +554,7 @@
if (recv_element && NULL != recv_node)
{
axis2_msg_recv_t *msg_recv = NULL;
- msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(svc_builder->desc_builder,
+ msg_recv = axis2_desc_builder_load_msg_recv(svc_builder->desc_builder,
env, recv_element);
axis2_op_set_msg_recv(op_desc, env, msg_recv);
@@ -572,7 +572,7 @@
qmodulest, op_node);
axis2_qname_free(qmodulest, env);
qmodulest = NULL;
- status = AXIS2_DESC_BUILDER_PROCESS_OP_MODULE_REFS(svc_builder->
+ status = axis2_desc_builder_process_op_module_refs(svc_builder->
desc_builder, env, module_itr, op_desc);
if (AXIS2_SUCCESS != status)
{
@@ -583,7 +583,7 @@
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env);
if (dep_engine)
{
- axis2_phases_info_t *info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(
+ axis2_phases_info_t *info = axis2_dep_engine_get_phases_info(
dep_engine, env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_desc);
}
@@ -661,7 +661,7 @@
ref_name = axiom_attribute_get_value(module_ref_att, env);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
- if (! AXIS2_DEP_ENGINE_GET_MODULE(
+ if (! axis2_dep_engine_get_module(
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env),
env, qrefname))
{
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=521127&r1=521126&r2=521127
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Wed Mar 21 23:07:24 2007
@@ -83,7 +83,7 @@
if (svc_grp_builder->desc_builder)
{
- AXIS2_DESC_BUILDER_FREE(svc_grp_builder->desc_builder,
+ axis2_desc_builder_free(svc_grp_builder->desc_builder,
env);
}
if (svc_grp_builder)
@@ -124,7 +124,7 @@
}
parent = axis2_svc_grp_get_parent(svc_grp, env);
- status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(svc_grp_builder->desc_builder, env, itr,
+ status = axis2_desc_builder_process_params(svc_grp_builder->desc_builder, env, itr,
axis2_svc_grp_get_param_container(svc_grp, env),
axis2_conf_get_param_container(parent, env));
@@ -185,7 +185,7 @@
axis2_array_list_t *deployable_svcs = NULL;
axis2_svc_builder_t *svc_builder = NULL;
- file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(
+ 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);
@@ -249,7 +249,7 @@
ref_name = axiom_attribute_get_value(module_ref_att, env);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
- module = AXIS2_DEP_ENGINE_GET_MODULE(
+ module = axis2_dep_engine_get_module(
axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env),
env, qrefname);
if (! module)
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=521127&r1=521126&r2=521127
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Wed Mar 21 23:07:24 2007
@@ -142,7 +142,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
size = axis2_array_list_size(ws_info_list->ws_info_list, env);
-
+
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -197,7 +197,7 @@
axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_SVC);
status = axis2_array_list_add(ws_info_list->ws_info_list, env, ws_info);
-
+
if (AXIS2_SUCCESS != status)
{
return status;
@@ -205,7 +205,7 @@
file_data = axis2_arch_file_data_create_with_type_and_file(env,
AXIS2_SVC, file);
/* to inform that new web service is deployed */
- status = AXIS2_DEP_ENGINE_ADD_WS_TO_DEPLOY(ws_info_list->deployer,
+ status = axis2_dep_engine_add_ws_to_deploy(ws_info_list->deployer,
env, file_data);
if (AXIS2_SUCCESS != status)
{
@@ -231,7 +231,7 @@
axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_MODULE);
status = axis2_array_list_add(ws_info_list->ws_info_list, env, ws_info);
-
+
if (AXIS2_SUCCESS != status)
{
return status;
@@ -239,7 +239,7 @@
file_data = axis2_arch_file_data_create_with_type_and_file(env,
AXIS2_MODULE, file);
/* to inform that new web service is deployed */
- status = AXIS2_DEP_ENGINE_ADD_WS_TO_DEPLOY(ws_info_list->deployer,
+ status = axis2_dep_engine_add_ws_to_deploy(ws_info_list->deployer,
env, file_data);
if (AXIS2_SUCCESS != status)
{
@@ -274,7 +274,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);
if (0 == axis2_strcmp(file_name_l, file_name))
{
@@ -333,7 +333,7 @@
return AXIS2_FAILURE;
}
list_size = axis2_array_list_size(ws_info_list->ws_info_list, env);
-
+
for (i = 0; i < list_size; i++)
{
int current_lists_size = 0;
@@ -344,7 +344,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);
current_lists_size = axis2_array_list_size(ws_info_list->
current_info_lists, env);
@@ -371,7 +371,7 @@
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date(
env, file_item_name, last_modified_date);
/* this is to be undeployed */
- AXIS2_DEP_ENGINE_ADD_WS_TO_UNDEPLOY(ws_info_list->deployer, env,
+ axis2_dep_engine_add_ws_to_undeploy(ws_info_list->deployer, env,
ws_info);
}
@@ -408,12 +408,12 @@
}
/* TODO uncomment when hot deployment supported */
/*
- if(AXIS2_TRUE == AXIS2_DEP_ENGINE_IS_HOT_UPDATE(ws_info_list->deployer,
+ if(AXIS2_TRUE == axis2_dep_engine_is_hot_update(ws_info_list->deployer,
env))
{
- AXIS2_DEP_ENGINE_UNDEPLOY(ws_info_list->deployer, env);
+ axis2_dep_engine_undeploy(ws_info_list->deployer, env);
}
*/
- return AXIS2_DEP_ENGINE_DO_DEPLOY(ws_info_list->deployer, env);
+ return axis2_dep_engine_do_deploy(ws_info_list->deployer, env);
}
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=521127&r1=521126&r2=521127
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Wed Mar 21 23:07:24 2007
@@ -297,7 +297,7 @@
if (conf->dep_engine)
{
- AXIS2_DEP_ENGINE_FREE(conf->dep_engine, env);
+ axis2_dep_engine_free(conf->dep_engine, env);
}
if (conf->all_modules)
@@ -1328,8 +1328,8 @@
AXIS2_MODULE, file);
dep_engine = axis2_dep_engine_create_with_repos_name(env, repos_path);
- AXIS2_DEP_ENGINE_SET_CURRENT_FILE_ITEM(dep_engine, env, file_data);
- module_desc = AXIS2_DEP_ENGINE_BUILD_MODULE(dep_engine, env, file, conf);
+ axis2_dep_engine_set_current_file_item(dep_engine, env, file_data);
+ module_desc = axis2_dep_engine_build_module(dep_engine, env, file, conf);
is_new_module = AXIS2_TRUE;
}
if (module_desc)
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=521127&r1=521126&r2=521127
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Wed Mar 21 23:07:24 2007
@@ -54,7 +54,7 @@
printf("dep engine is not created \n");
return -1;
}
- conf = AXIS2_DEP_ENGINE_LOAD(dep_engine, env);
+ conf = axis2_dep_engine_load(dep_engine, env);
axis2_conf_set_dep_engine(conf, env, dep_engine);
if (!conf)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org