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 da...@apache.org on 2006/02/08 05:28:44 UTC
svn commit: r375846 - in /webservices/axis2/trunk/c/modules/core:
deployment/desc_builder.c deployment/module_builder.c
description/handler_desc.c phaseresolver/phase_resolver.c
Author: damitha
Date: Tue Feb 7 20:28:43 2006
New Revision: 375846
URL: http://svn.apache.org/viewcvs?rev=375846&view=rev
Log:
More fixes towards makieng module work
Modified:
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/description/handler_desc.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=375846&r1=375845&r2=375846&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Tue Feb 7 20:28:43 2006
@@ -373,7 +373,7 @@
axis2_qname_t *order_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, handler_element, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, handler_node, NULL);
AXIS2_PARAM_CHECK((*env)->error, parent, NULL);
handler = axis2_handler_desc_create_with_qname(env, NULL);
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=375846&r1=375845&r2=375846&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Tue Feb 7 20:28:43 2006
@@ -171,6 +171,7 @@
axis2_param_container_t *parent_container = NULL;
int size = 0;
int i = 0;
+ axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(module_builder);
@@ -288,7 +289,11 @@
axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
desc_builder, env, in_flow_element, builder_impl->module_desc->params,
in_flow_node);
- AXIS2_MODULE_DESC_SET_INFLOW(builder_impl->module_desc, env, flow);
+ status = AXIS2_MODULE_DESC_SET_INFLOW(builder_impl->module_desc, env, flow);
+ if(AXIS2_SUCCESS != status)
+ {
+ return status;
+ }
}
qoutflowst = axis2_qname_create(env, AXIS2_OUTFLOWST, NULL, NULL);
@@ -302,7 +307,11 @@
axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
desc_builder, env, out_flow_element, builder_impl->module_desc->params,
out_flow_node);
- AXIS2_MODULE_DESC_SET_OUTFLOW(builder_impl->module_desc, env, flow);
+ status = AXIS2_MODULE_DESC_SET_OUTFLOW(builder_impl->module_desc, env, flow);
+ if(AXIS2_SUCCESS != status)
+ {
+ return status;
+ }
}
qinfaultflow = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
@@ -316,7 +325,11 @@
axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
desc_builder, env, in_fault_flow_element, builder_impl->module_desc->
params, in_fault_flow_node);
- AXIS2_MODULE_DESC_SET_FAULT_INFLOW(builder_impl->module_desc, env, flow);
+ status = AXIS2_MODULE_DESC_SET_FAULT_INFLOW(builder_impl->module_desc, env, flow);
+ if(AXIS2_SUCCESS != status)
+ {
+ return status;
+ }
}
qoutfaultflow = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
@@ -330,7 +343,11 @@
axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
desc_builder, env, out_fault_flow_element, builder_impl->module_desc->
params, out_fault_flow_node);
- AXIS2_MODULE_DESC_SET_FAULT_OUTFLOW(builder_impl->module_desc, env, flow);
+ status = AXIS2_MODULE_DESC_SET_FAULT_OUTFLOW(builder_impl->module_desc, env, flow);
+ if(AXIS2_SUCCESS != status)
+ {
+ return status;
+ }
}
/* processing Operations */
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?rev=375846&r1=375845&r2=375846&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Tue Feb 7 20:28:43 2006
@@ -184,7 +184,7 @@
{
/**TODO: need to have the qname copy constructor here */
AXIS2_FUNC_PARAM_CHECK(handler_desc, env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(handler_desc)->qname = qname;
+ AXIS2_INTF_TO_IMPL(handler_desc)->qname = AXIS2_QNAME_CLONE(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=375846&r1=375845&r2=375846&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Feb 7 20:28:43 2006
@@ -857,7 +857,7 @@
axis2_status_t AXIS2_CALL
axis2_phase_resolver_engage_module_globally(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
- axis2_module_desc_t *module)
+ axis2_module_desc_t *module_desc)
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
axis2_hash_t *svc_grps = NULL;
@@ -866,7 +866,8 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- status = axis2_phase_resolver_engage_to_global_chain(phase_resolver, env, module);
+ status = axis2_phase_resolver_engage_to_global_chain(phase_resolver, env,
+ module_desc);
if(AXIS2_FAILURE == status)
return status;
svc_grps = AXIS2_CONF_GET_SVC_GRPS(resolver_impl->axis2_config, env);
@@ -896,21 +897,21 @@
axis2_hash_this (index_j, NULL, NULL, &w);
svc = (axis2_svc_t *) w;
- status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module,
+ status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc,
resolver_impl->axis2_config);
if(AXIS2_SUCCESS != status)
{
return status;
}
status = axis2_phase_resolver_engage_module_to_svc_from_global(
- phase_resolver, env, svc, module);
+ phase_resolver, env, svc, module_desc);
if(AXIS2_SUCCESS != status)
{
return status;
}
- status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module);
+ status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_desc);
if(AXIS2_SUCCESS != status)
{
return status;
@@ -918,7 +919,7 @@
index_j = axis2_hash_next (env, index_j);
}
- mod_name = AXIS2_MODULE_DESC_GET_NAME(module, env);
+ mod_name = AXIS2_MODULE_DESC_GET_NAME(module_desc, env);
status = AXIS2_SVC_GRP_ADD_MODULE(svc_grp, env,
mod_name);