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 da...@apache.org on 2005/12/13 09:25:59 UTC
svn commit: r356513 [2/2] - in /webservices/axis2/trunk/c: ides/anjuta/
include/ modules/core/context/src/ modules/core/deployment/src/
modules/core/description/src/ modules/core/engine/src/
modules/core/phaseresolver/src/ modules/wsdl/src/ test/unit/c...
Modified: webservices/axis2/trunk/c/modules/core/engine/src/addr_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/addr_disp.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/addr_disp.c Tue Dec 13 00:24:29 2005
@@ -120,12 +120,12 @@
if (conf_ctx)
{
axis2_conf_t *conf = NULL;
- conf = AXIS2_CONF_CTX_GET_ENGINE_CONFIG(conf_ctx, env);
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
axis2_svc_t *svc = NULL;
axis2_qname_t *qname = axis2_qname_create(env, url_tokens[0], NULL, NULL);
- svc = AXIS2_ENGINE_CONFIG_GET_SVC(conf, env, AXIS2_QNAME_GET_LOCALPART(qname, env));
+ svc = AXIS2_CONF_GET_SVC(conf, env, AXIS2_QNAME_GET_LOCALPART(qname, env));
AXIS2_QNAME_FREE(qname, env);
return svc;
@@ -164,7 +164,7 @@
AXIS2_LOG(env, action );
qname = axis2_qname_create(env, action, NULL, NULL);
- return AXIS2_SVC_GET_OPERATION_WITH_QNAME(svc, env, qname);
+ return AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, qname);
}
return NULL;
@@ -195,19 +195,19 @@
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_char_t *msg_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
- op_ctx = AXIS2_CONF_CTX_GET_OPERATION_CTX(conf_ctx, env, msg_id);
+ op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, msg_id);
if (op_ctx)
{
axis2_op_t *op = NULL;
- op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
+ op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
{
axis2_svc_ctx_t *svc_ctx = NULL;
- AXIS2_MSG_CTX_SET_OPERATION_CTX(msg_ctx, env, op_ctx);
- AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, op);
- /*TODO : AXIS2_OPERATION_REGISTER_OPERATION_CTX(op, env, op_ctx);*/
+ AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
+ AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
+ /*TODO : AXIS2_OP_REGISTER_OP_CTX(op, env, op_ctx);*/
- svc_ctx = AXIS2_OPERATION_CTX_GET_PARENT(op_ctx, env);
+ svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
if (svc_ctx)
{
axis2_svc_t *svc = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/src/conf.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/conf.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/conf.c Tue Dec 13 00:24:29 2005
@@ -839,7 +839,7 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(!config_impl->svc_grps)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_ENGINE_CONFIG, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_CONF, NULL);
return NULL;
}
return (struct axis2_svc_grp *) (axis2_hash_get (config_impl->svc_grps,
Modified: webservices/axis2/trunk/c/modules/core/engine/src/disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/disp.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/disp.c Tue Dec 13 00:24:29 2005
@@ -198,10 +198,10 @@
axis_service = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if (axis_service)
{
- op = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
+ op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (op)
{
- AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, op);
+ AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
}
}
Modified: webservices/axis2/trunk/c/modules/core/engine/src/disp_checker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/disp_checker.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/disp_checker.c Tue Dec 13 00:24:29 2005
@@ -207,16 +207,16 @@
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- op = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
+ op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (!op)
{
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (op_ctx)
{
- axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
+ axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
- AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, op);
+ AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
}
}
@@ -247,7 +247,7 @@
return AXIS2_FAILURE;
}
- op = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
+ op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (!op)
{
AXIS2_LOG(env, "Operation Not found. Endpoint reference is ");
Modified: webservices/axis2/trunk/c/modules/core/engine/src/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/engine.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/engine.c Tue Dec 13 00:24:29 2005
@@ -151,13 +151,13 @@
return status;
/* find and invoke the phases */
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (op_ctx)
{
- axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
+ axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
{
- phases = AXIS2_OPERATION_GET_PHASES_OUTFLOW(op, env);
+ phases = AXIS2_OP_GET_PHASES_OUTFLOW(op, env);
}
}
@@ -180,10 +180,10 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- conf = AXIS2_CONF_CTX_GET_ENGINE_CONFIG(conf_ctx, env);
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
- /*TODO global_out_phase = AXIS2_ENGINE_CONFIG_GET_GLOBAL_OUT_PASES(conf, env);
+ /*TODO global_out_phase = AXIS2_CONF_GET_GLOBAL_OUT_PASES(conf, env);
axis2_engine_invoke_phases(engine, env, global_out_phase, msg_ctx); */
}
}
@@ -195,10 +195,10 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- conf = AXIS2_CONF_CTX_GET_ENGINE_CONFIG(conf_ctx, env);
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
- /*global_out_phase = AXIS2_ENGINE_CONFIG_GET_GLOBAL_OUT_PHASES(conf, env);
+ /*global_out_phase = AXIS2_CONF_GET_GLOBAL_OUT_PHASES(conf, env);
axis2_engine_invoke_phases(engine, env, global_out_phase, msg_ctx);*/
}
}
@@ -242,9 +242,9 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_ENGINE_CONFIG(conf_ctx, env);
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- pre_calculated_phases = AXIS2_ENGINE_CONFIG_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
+ pre_calculated_phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -259,11 +259,11 @@
axis2_engine_verify_ctx_built(engine, env, msg_ctx);
/* resume op specific phases */
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (op_ctx)
{
- op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
- op_specific_phases = AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(op, env);
+ op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+ op_specific_phases = AXIS2_OP_GET_REMAINING_PHASES_INFLOW(op, env);
axis2_engine_resume_invocation_phases(engine, env, op_specific_phases, msg_ctx);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -280,11 +280,11 @@
}
axis2_engine_verify_ctx_built(engine, env, msg_ctx); /* TODO : Chinthaka remove me. I'm redundant */
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (op_ctx)
{
- op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
- op_specific_phases = AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(op, env);
+ op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+ op_specific_phases = AXIS2_OP_GET_REMAINING_PHASES_INFLOW(op, env);
axis2_engine_invoke_phases(engine, env, op_specific_phases, msg_ctx);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -296,7 +296,7 @@
if ( (AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env)) && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)))
{
/* invoke the Message Receivers */
- axis2_msg_recv_t *receiver = AXIS2_OPERATION_GET_MSG_RECEIVER(op, env);
+ axis2_msg_recv_t *receiver = AXIS2_OP_GET_MSG_RECEIVER(op, env);
AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx);
}
return AXIS2_SUCCESS;
@@ -315,13 +315,13 @@
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
/* find and execute the Fault Out Flow Handlers */
if (op_ctx)
{
- axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
- axis2_array_list_t *phases = AXIS2_OPERATION_GET_PHASES_OUTFLOW(op, env);
+ axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+ axis2_array_list_t *phases = AXIS2_OP_GET_PHASES_OUTFLOW(op, env);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -359,7 +359,7 @@
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (!op_ctx)
{
@@ -368,10 +368,10 @@
axis2_conf_ctx_t *conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- axis2_conf_t *conf = AXIS2_CONF_CTX_GET_ENGINE_CONFIG(conf_ctx, env);
+ axis2_conf_t *conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *phases = AXIS2_ENGINE_CONFIG_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
+ axis2_array_list_t *phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
if (phases)
{
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
@@ -388,12 +388,12 @@
}
}
- op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
/* find and execute the fault in flow handlers */
if (op_ctx)
{
- axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
- axis2_array_list_t *phases = AXIS2_OPERATION_GET_PHASES_IN_FAULT_FLOW(op, env);
+ axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+ axis2_array_list_t *phases = AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(op, env);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
@@ -459,7 +459,7 @@
}*/
}
- AXIS2_MSG_CTX_SET_OPERATION_CTX(fault_ctx, env, AXIS2_MSG_CTX_GET_OPERATION_CTX(processing_context, env));
+ AXIS2_MSG_CTX_SET_OP_CTX(fault_ctx, env, AXIS2_MSG_CTX_GET_OP_CTX(processing_context, env));
AXIS2_MSG_CTX_SET_PROCESS_FAULT(fault_ctx, env, AXIS2_TRUE);
AXIS2_MSG_CTX_SET_SERVER_SIDE(fault_ctx, env, AXIS2_TRUE);
/*AXIS2_MSG_CTX_SET_PROPERTY(fault_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
@@ -614,7 +614,7 @@
{
return AXIS2_FAILURE;
}
- if (AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env))
+ if (AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env))
{
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/src/req_uri_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/req_uri_disp.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/req_uri_disp.c Tue Dec 13 00:24:29 2005
@@ -114,11 +114,11 @@
if (conf_ctx)
{
axis2_conf_t *conf = NULL;
- conf = AXIS2_CONF_CTX_GET_ENGINE_CONFIG(conf_ctx, env);
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
axis2_svc_t *svc = NULL;
- svc = AXIS2_ENGINE_CONFIG_GET_SVC(conf, env, url_tokens[0]);
+ svc = AXIS2_CONF_GET_SVC(conf, env, url_tokens[0]);
return svc;
}
}
@@ -168,7 +168,7 @@
AXIS2_LOG(env, "Checking for Operation using target endpoint uri fragment : ");
AXIS2_LOG(env, url_tokens[1]);
op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
- op = AXIS2_SVC_GET_OPERATION_WITH_QNAME(svc, env, op_qname);
+ op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
AXIS2_QNAME_FREE(op_qname, env);
return op;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/src/soap_action_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/soap_action_disp.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/soap_action_disp.c Tue Dec 13 00:24:29 2005
@@ -113,11 +113,11 @@
{
axis2_op_t *op = NULL;
- op = AXIS2_SVC_GET_OPERATION_BY_SOAP_ACTION(svc, env, action);
+ op = AXIS2_SVC_GET_OP_BY_SOAP_ACTION(svc, env, action);
if (!op)
{
axis2_qname_t *op_qname = axis2_qname_create(env, action, NULL, NULL);
- op = AXIS2_SVC_GET_OPERATION_WITH_QNAME(svc, env, op_qname);
+ op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
AXIS2_QNAME_FREE(op_qname, env);
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c Tue Dec 13 00:24:29 2005
@@ -278,7 +278,7 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- ops = AXIS2_SVC_GET_OPERATIONS(resolver_impl->svc, env);
+ ops = AXIS2_SVC_GET_OPS(resolver_impl->svc, env);
for (index_i = axis2_hash_first (ops, env); index_i; index_i =
axis2_hash_next (env, index_i))
@@ -333,7 +333,7 @@
/********************* Handlers from axis2.xml from modules *************/
/**************************************************************************/
- moduleqnames = (axis2_array_list_t *) AXIS2_ENGINE_CONFIG_GET_ENGAGED_MODULES(
+ moduleqnames = (axis2_array_list_t *) AXIS2_CONF_GET_ENGAGED_MODULES(
resolver_impl->axis2_config, env);
size = AXIS2_ARRAY_LIST_SIZE(moduleqnames, env);
@@ -348,7 +348,7 @@
struct axis2_module_desc *module_desc = NULL;
modulename = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(moduleqnames, env, i);
- module_desc = AXIS2_ENGINE_CONFIG_GET_MODULE(resolver_impl->axis2_config, env,
+ module_desc = AXIS2_CONF_GET_MODULE(resolver_impl->axis2_config, env,
modulename);
if (NULL != module_desc)
{
@@ -380,7 +380,7 @@
{
return status;
}
- status = AXIS2_OPERATION_ADD_TO_ENGAGE_MODULE_LIST(op, env, module_desc);
+ status = AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op, env, module_desc);
if(AXIS2_FAILURE == status)
{
return status;
@@ -550,25 +550,25 @@
case AXIS2_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(op, env));
+ AXIS2_OP_GET_REMAINING_PHASES_INFLOW(op, env));
break;
}
case AXIS2_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_OUTFLOW(op, env));
+ AXIS2_OP_GET_PHASES_OUTFLOW(op, env));
break;
}
case AXIS2_FAULT_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_IN_FAULT_FLOW(op, env));
+ AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(op, env));
break;
}
case AXIS2_FAULT_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_OUT_FAULT_FLOW(op, env));
+ AXIS2_OP_GET_PHASES_OUT_FAULT_FLOW(op, env));
break;
}
}
@@ -604,10 +604,10 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- transports_in = AXIS2_ENGINE_CONFIG_GET_TRANSPORTS_IN(
+ transports_in = AXIS2_CONF_GET_TRANSPORTS_IN(
resolver_impl->axis2_config, env);
- transports_out = AXIS2_ENGINE_CONFIG_GET_TRANSPORTS_OUT(
+ transports_out = AXIS2_CONF_GET_TRANSPORTS_OUT(
resolver_impl->axis2_config, env);
if(!transports_in || transports_out)
@@ -657,7 +657,7 @@
case AXIS2_INFLOW:
{
flow = AXIS2_TRANSPORT_IN_DESC_GET_INFLOW(transport, env);
- phase = AXIS2_TRANSPORT_IN_DESC_GET_INPHASE(transport, env);
+ phase = AXIS2_TRANSPORT_IN_DESC_GET_IN_PHASE(transport, env);
break;
}
case AXIS2_FAULT_INFLOW:
@@ -734,7 +734,7 @@
case AXIS2_OUTFLOW:
{
flow = AXIS2_TRANSPORT_OUT_DESC_GET_OUTFLOW(transport, env);
- phase = AXIS2_TRANSPORT_OUT_DESC_GET_OUTPHASE(transport, env);
+ phase = AXIS2_TRANSPORT_OUT_DESC_GET_OUT_PHASE(transport, env);
break;
}
case AXIS2_FAULT_OUTFLOW:
@@ -819,7 +819,7 @@
status = axis2_phase_resolver_engage_to_global_chain(phase_resolver, env, module);
if(AXIS2_FAILURE == status)
return status;
- svc_grps = AXIS2_ENGINE_CONFIG_GET_SVC_GRPS(resolver_impl->axis2_config, env);
+ svc_grps = AXIS2_CONF_GET_SVC_GRPS(resolver_impl->axis2_config, env);
if(!svc_grps)
{
return AXIS2_FAILURE;
@@ -846,7 +846,7 @@
axis2_hash_this (index_i, NULL, NULL, &w);
svc = (struct axis2_svc *) w;
- status = AXIS2_SVC_ADD_MODULE_OPERATIONS(svc, env, module,
+ status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module,
resolver_impl->axis2_config);
if(AXIS2_FAILURE == status)
{
@@ -897,7 +897,7 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- ops = AXIS2_SVC_GET_OPERATIONS(svc, env);
+ ops = AXIS2_SVC_GET_OPS(svc, env);
for (index_i = axis2_hash_first (ops, env); index_i; index_i = axis2_hash_next (env, index_i))
{
void *v = NULL;
@@ -907,7 +907,7 @@
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (struct axis2_op *) v;
- modules = AXIS2_OPERATION_GET_MODULES(op_desc, env);
+ modules = AXIS2_OP_GET_MODULES(op_desc, env);
int j = 0;
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(modules, env); j++)
{
@@ -932,25 +932,25 @@
case AXIS2_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(op_desc, env));
+ AXIS2_OP_GET_REMAINING_PHASES_INFLOW(op_desc, env));
break;
}
case AXIS2_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_OUTFLOW(op_desc, env));
+ AXIS2_OP_GET_PHASES_OUTFLOW(op_desc, env));
break;
}
case AXIS2_FAULT_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_IN_FAULT_FLOW(op_desc, env));
+ AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(op_desc, env));
break;
}
case AXIS2_FAULT_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_OUT_FAULT_FLOW(op_desc, env));
+ AXIS2_OP_GET_PHASES_OUT_FAULT_FLOW(op_desc, env));
break;
}
}
@@ -1005,7 +1005,7 @@
}
}
}
- status = AXIS2_OPERATION_ADD_TO_ENGAGE_MODULE_LIST(op_desc, env, module_desc);
+ status = AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op_desc, env, module_desc);
}
return status;
@@ -1032,28 +1032,28 @@
case AXIS2_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_ENGINE_CONFIG_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(
+ AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(
resolver_impl->axis2_config, env));
break;
}
case AXIS2_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_ENGINE_CONFIG_GET_OUTFLOW(resolver_impl->axis2_config,
+ AXIS2_CONF_GET_OUTFLOW(resolver_impl->axis2_config,
env));
break;
}
case AXIS2_FAULT_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_ENGINE_CONFIG_GET_IN_FAULT_FLOW(resolver_impl->axis2_config,
+ AXIS2_CONF_GET_IN_FAULT_FLOW(resolver_impl->axis2_config,
env));
break;
}
case AXIS2_FAULT_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_ENGINE_CONFIG_GET_OUT_FAULT_FLOW(resolver_impl->axis2_config,
+ AXIS2_CONF_GET_OUT_FAULT_FLOW(resolver_impl->axis2_config,
env));
break;
}
@@ -1136,12 +1136,12 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- ops = AXIS2_SVC_GET_OPERATIONS(resolver_impl->svc, env);
+ ops = AXIS2_SVC_GET_OPS(resolver_impl->svc, env);
if(!ops)
{
return AXIS2_FAILURE;
}
- status = AXIS2_SVC_ADD_MODULE_OPERATIONS(resolver_impl->svc, env, module_desc,
+ status = AXIS2_SVC_ADD_MODULE_OPS(resolver_impl->svc, env, module_desc,
resolver_impl->axis2_config);
if(AXIS2_FAILURE == status)
@@ -1156,7 +1156,7 @@
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (struct axis2_op *) v;
- modules = AXIS2_OPERATION_GET_MODULES(op_desc, env);
+ modules = AXIS2_OP_GET_MODULES(op_desc, env);
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(modules, env); j++)
{
struct axis2_module_desc *module_desc_l = NULL;
@@ -1175,7 +1175,7 @@
if(AXIS2_FAILURE == status)
return status;
- status = AXIS2_OPERATION_ADD_TO_ENGAGE_MODULE_LIST(op_desc, env,
+ status = AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op_desc, env,
module_desc);
}
}
@@ -1205,7 +1205,7 @@
switch (type) {
case AXIS2_INFLOW:
{
- phases = AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(axis_op, env);
+ phases = AXIS2_OP_GET_REMAINING_PHASES_INFLOW(axis_op, env);
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
phases);
@@ -1215,19 +1215,19 @@
case AXIS2_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_OUTFLOW(axis_op, env));
+ AXIS2_OP_GET_PHASES_OUTFLOW(axis_op, env));
break;
}
case AXIS2_FAULT_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_IN_FAULT_FLOW(axis_op, env));
+ AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(axis_op, env));
break;
}
case AXIS2_FAULT_OUTFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
- AXIS2_OPERATION_GET_PHASES_OUT_FAULT_FLOW(axis_op, env));
+ AXIS2_OP_GET_PHASES_OUT_FAULT_FLOW(axis_op, env));
break;
}
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl.h?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl.h (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl.h Tue Dec 13 00:24:29 2005
@@ -149,8 +149,8 @@
#define SOAP_12_ADDRESS "http://schemas.xmlsoap.org/wsdl/soap12/"
-#define SOAP_11_OPERATION "http://schemas.xmlsoap.org/wsdl/soap/"
- #define SOAP_12_OPERATION "http://schemas.xmlsoap.org/wsdl/soap12/"
+#define SOAP_11_OP "http://schemas.xmlsoap.org/wsdl/soap/"
+ #define SOAP_12_OP "http://schemas.xmlsoap.org/wsdl/soap12/"
#define SCHEMA "http://www.w3.org/2001/XMLSchema"
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c Tue Dec 13 00:24:29 2005
@@ -279,7 +279,7 @@
binding_optr = (struct axis2_wsdl_binding_op *) val;
if (binding_optr)
{
- AXIS2_WSDL_BINDING_OPERATION_FREE (binding_optr, env);
+ AXIS2_WSDL_BINDING_OP_FREE (binding_optr, env);
}
val = NULL;
@@ -446,7 +446,7 @@
binding_optr = (struct axis2_wsdl_binding_op *) val;
if (binding_optr)
{
- AXIS2_WSDL_BINDING_OPERATION_FREE (binding_optr, env);
+ AXIS2_WSDL_BINDING_OP_FREE (binding_optr, env);
}
val = NULL;
@@ -473,7 +473,7 @@
binding_impl = AXIS2_INTF_TO_IMPL(wsdl_binding);
- qname = AXIS2_WSDL_BINDING_OPERATION_GET_QNAME(binding_op, env);
+ qname = AXIS2_WSDL_BINDING_OP_GET_QNAME(binding_op, env);
if(NULL == qname)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c Tue Dec 13 00:24:29 2005
@@ -358,7 +358,7 @@
if(NULL != binding_op_impl->op)
{
optr = binding_op_impl->op;
- AXIS2_OPERATION_FREE(optr , env);
+ AXIS2_OP_FREE(optr , env);
binding_op_impl->op = NULL;
}
binding_op_impl->op = op;
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c Tue Dec 13 00:24:29 2005
@@ -283,15 +283,15 @@
struct axis2_wsdl_op *wsdl_optr = NULL;
struct axis2_op *optr = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- if(AXIS2_OPERATION == wsdl_interface->optr_type)
+ if(AXIS2_OP == wsdl_interface->optr_type)
{
optr = (struct axis2_op *) val;
- AXIS2_OPERATION_FREE (optr, env);
+ AXIS2_OP_FREE (optr, env);
}
- if(AXIS2_WSDL_OPERATION == wsdl_interface->optr_type)
+ if(AXIS2_WSDL_OP == wsdl_interface->optr_type)
{
wsdl_optr = (struct axis2_wsdl_op *) val;
- AXIS2_WSDL_OPERATION_FREE(wsdl_optr, env);
+ AXIS2_WSDL_OP_FREE(wsdl_optr, env);
}
val = NULL;
@@ -428,11 +428,11 @@
AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
op_l = (struct axis2_op *) op;
- wsdl_opt_name = AXIS2_WSDL_OPERATION_GET_NAME(op_l->wsdl_op, env);
+ wsdl_opt_name = AXIS2_WSDL_OP_GET_NAME(op_l->wsdl_op, env);
if (!wsdl_opt_name)
{
/* The Operation name cannot be null (required) */
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_OPERATION,
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_OP,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c Tue Dec 13 00:24:29 2005
@@ -82,7 +82,7 @@
soap_op_impl->soap_op.ops = NULL;
axis2_qname_t *type_l = NULL;
- type_l = axis2_qname_create(env, "op", SOAP_11_OPERATION, NULL);
+ type_l = axis2_qname_create(env, "op", SOAP_11_OP, NULL);
AXIS2_WSDL_EXTENSIBLE_ELEMENT_SET_TYPE(soap_op_impl->soap_op.
extensible_element, env, type_l);
Modified: webservices/axis2/trunk/c/test/unit/core/description/test_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/test_op.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/test_op.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/test_op.c Tue Dec 13 00:24:29 2005
@@ -14,7 +14,7 @@
struct axis2_op *op = axis2_op_create(&env);
op_in_phases = get_op_in_phases(&env);
- actual = AXIS2_OPERATION_SET_REMAINING_PHASES_INFLOW(op, &env, op_in_phases);
+ actual = AXIS2_OP_SET_REMAINING_PHASES_INFLOW(op, &env, op_in_phases);
CuAssertIntEquals(tc, expected, actual);
}
Modified: webservices/axis2/trunk/c/test/unit/core/description/test_op.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/test_op.h?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/test_op.h (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/test_op.h Tue Dec 13 00:24:29 2005
@@ -1,5 +1,5 @@
-#ifndef TEST_OPERATION_H
-#define TEST_OPERATION_H
+#ifndef TEST_OP_H
+#define TEST_OP_H
#include <string.h>
#include <stdio.h>
@@ -18,4 +18,4 @@
void Testaxis2_op_set_remaining_phases_inflow(CuTest *tc);
-#endif /* TEST_OPERATION_H*/
+#endif /* TEST_OP_H*/
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c?rev=356513&r1=356512&r2=356513&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c Tue Dec 13 00:24:29 2005
@@ -21,14 +21,14 @@
struct axis2_op *optr = axis2_op_create(&env);
op_in_phases = get_op_in_phases(&env);
- AXIS2_OPERATION_SET_REMAINING_PHASES_INFLOW(optr, &env, op_in_phases);
+ AXIS2_OP_SET_REMAINING_PHASES_INFLOW(optr, &env, op_in_phases);
flow = axis2_flow_create(&env);
add_handlers_to_flow(flow, &env);
module_desc = axis2_module_desc_create(&env);
AXIS2_MODULE_DESC_SET_INFLOW(module_desc, &env, flow);
resolver = axis2_phase_resolver_create(&env);
- actual = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OPERATION(resolver, &env, optr,
+ actual = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OP(resolver, &env, optr,
module_desc);
CuAssertIntEquals(tc, expected, actual);