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 08:06:44 UTC
svn commit: r375876 - in /webservices/axis2/trunk/c/modules/core:
description/op.c phaseresolver/phase_resolver.c
Author: damitha
Date: Tue Feb 7 23:06:42 2006
New Revision: 375876
URL: http://svn.apache.org/viewcvs?rev=375876&view=rev
Log:
more fixes to get module working
Modified:
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/op.c?rev=375876&r1=375875&r2=375876&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Tue Feb 7 23:06:42 2006
@@ -336,6 +336,9 @@
axis2_array_list_t *array_list_l = NULL;
axis2_op_impl_t *op_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ axis2_phase_t *policy_determination = NULL;
+ axis2_phase_t *message_processing = NULL;
+ axis2_phase_t *message_out = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -378,35 +381,88 @@
return NULL;
}
- /*op_impl->remaining_phases_inflow = axis2_array_list_create(env, 20);
+ op_impl->remaining_phases_inflow = axis2_array_list_create(env, 0);
if(NULL == op_impl->remaining_phases_inflow)
{
axis2_op_free(&(op_impl->op), env);
return NULL;
}
+ policy_determination = axis2_phase_create(env,
+ AXIS2_PHASE_POLICY_DETERMINATION);
+ status = AXIS2_ARRAY_LIST_ADD(op_impl->remaining_phases_inflow, env,
+ policy_determination);
+ if(AXIS2_SUCCESS != status)
+ {
+ AXIS2_PHASE_FREE(policy_determination, env);
+ policy_determination = NULL;
+ return NULL;
+ }
+ policy_determination = NULL;
+ message_processing = axis2_phase_create(env, AXIS2_PHASE_MESSAGE_PROCESSING);
+ /* TODO
+ * Add soap processing model checker handler to this when the handler once
+ * handler is written
+ */
+
+ status = AXIS2_ARRAY_LIST_ADD(op_impl->remaining_phases_inflow, env,
+ message_processing);
+ if(AXIS2_SUCCESS != status)
+ {
+ AXIS2_PHASE_FREE(policy_determination, env);
+ AXIS2_PHASE_FREE(message_processing, env);
+ policy_determination = NULL;
+ message_processing = NULL;
+ return NULL;
+ }
+ message_processing = NULL;
- op_impl->phases_outflow = axis2_array_list_create(env, 20);
+
+ op_impl->phases_outflow = axis2_array_list_create(env, 0);
if(NULL == op_impl->phases_outflow)
{
axis2_op_free(&(op_impl->op), env);
return NULL;
}
+
+ policy_determination = axis2_phase_create(env,
+ AXIS2_PHASE_POLICY_DETERMINATION);
+ status = AXIS2_ARRAY_LIST_ADD(op_impl->phases_outflow, env,
+ policy_determination);
+ if(AXIS2_SUCCESS != status)
+ {
+ AXIS2_PHASE_FREE(policy_determination, env);
+ policy_determination = NULL;
+ return NULL;
+ }
+ policy_determination = NULL;
- op_impl->phases_in_fault_flow = axis2_array_list_create(env, 20);
+ message_out = axis2_phase_create(env, AXIS2_PHASE_MESSAGE_OUT);
+ status = AXIS2_ARRAY_LIST_ADD(op_impl->phases_outflow, env, message_out);
+ if(AXIS2_SUCCESS != status)
+ {
+ AXIS2_PHASE_FREE(policy_determination, env);
+ AXIS2_PHASE_FREE(message_out, env);
+ policy_determination = NULL;
+ message_out = NULL;
+ return NULL;
+ }
+ message_out = NULL;
+ /*
+ op_impl->phases_in_fault_flow = axis2_array_list_create(env, 0);
if(NULL == op_impl->phases_in_fault_flow)
{
axis2_op_free(&(op_impl->op), env);
return NULL;
}
- op_impl->modulerefs = axis2_array_list_create(env, 20);
+ op_impl->modulerefs = axis2_array_list_create(env, 0);
if(NULL == op_impl->modulerefs)
{
axis2_op_free(&(op_impl->op), env);
return NULL;
}
- op_impl->phases_out_fault_flow = axis2_array_list_create(env, 20);
+ op_impl->phases_out_fault_flow = axis2_array_list_create(env, 0);
if(NULL == op_impl->phases_out_fault_flow)
{
axis2_op_free(&(op_impl->op), env);
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=375876&r1=375875&r2=375876&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 23:06:42 2006
@@ -1123,30 +1123,43 @@
{
case AXIS2_INFLOW:
{
- resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
+ axis2_array_list_t *phase_list = NULL;
+
+ phase_list =
AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(
- resolver_impl->axis2_config, env));
+ resolver_impl->axis2_config, env);
+ resolver_impl->phase_holder =
+ axis2_phase_holder_create_with_phases(env, phase_list);
break;
}
case AXIS2_OUTFLOW:
{
- resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_CONF_GET_OUTFLOW(resolver_impl->axis2_config,
- env));
+ axis2_array_list_t *phase_list = NULL;
+
+ phase_list = AXIS2_CONF_GET_OUTFLOW(resolver_impl->axis2_config,
+ env);
+ resolver_impl->phase_holder =
+ axis2_phase_holder_create_with_phases(env, phase_list);
break;
}
case AXIS2_FAULT_INFLOW:
{
- resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_CONF_GET_IN_FAULT_FLOW(resolver_impl->axis2_config,
- env));
+ axis2_array_list_t *phase_list = NULL;
+
+ phase_list = AXIS2_CONF_GET_IN_FAULT_FLOW(resolver_impl->
+ axis2_config, env);
+ resolver_impl->phase_holder =
+ axis2_phase_holder_create_with_phases(env, phase_list);
break;
}
case AXIS2_FAULT_OUTFLOW:
{
- resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_CONF_GET_OUT_FAULT_FLOW(resolver_impl->axis2_config,
- env));
+ axis2_array_list_t *phase_list = NULL;
+
+ phase_list = AXIS2_CONF_GET_OUT_FAULT_FLOW(resolver_impl->
+ axis2_config, env);
+ resolver_impl->phase_holder =
+ axis2_phase_holder_create_with_phases(env, phase_list);
break;
}
}
@@ -1202,10 +1215,10 @@
{
status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder,
env, metadata);
- if(AXIS2_SUCCESS != status)
+ /*if(AXIS2_SUCCESS != status)
{
return status;
- }
+ }*/
}
else