Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 79822 invoked from network); 8 Feb 2006 07:07:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Feb 2006 07:07:09 -0000 Received: (qmail 38619 invoked by uid 500); 8 Feb 2006 07:07:07 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 38566 invoked by uid 500); 8 Feb 2006 07:07:07 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 38554 invoked by uid 500); 8 Feb 2006 07:07:07 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 38549 invoked by uid 99); 8 Feb 2006 07:07:06 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2006 23:07:06 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 07 Feb 2006 23:07:05 -0800 Received: (qmail 79483 invoked by uid 65534); 8 Feb 2006 07:06:45 -0000 Message-ID: <20060208070645.79482.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r375876 - in /webservices/axis2/trunk/c/modules/core: description/op.c phaseresolver/phase_resolver.c Date: Wed, 08 Feb 2006 07:06:44 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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