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 07:26:29 UTC
svn commit: r356488 [6/8] - in /webservices/axis2/trunk/c: include/
modules/core/addr/src/ modules/core/context/src/
modules/core/deployment/src/ modules/core/description/src/
modules/core/engine/src/ modules/core/phaseresolver/src/
modules/core/transp...
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Mon Dec 12 22:23:36 2005
@@ -29,19 +29,19 @@
axis2_svc_free (axis2_svc_t *svc, axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_svc_add_operation (axis2_svc_t *svc, axis2_env_t **env
- , struct axis2_operation *operation);
+axis2_svc_add_op (axis2_svc_t *svc, axis2_env_t **env
+ , struct axis2_op *op);
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_with_qname (axis2_svc_t *svc, axis2_env_t **env,
- axis2_qname_t *operation_name);
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_with_qname (axis2_svc_t *svc, axis2_env_t **env,
+ axis2_qname_t *op_name);
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_with_name (axis2_svc_t *svc, axis2_env_t **env,
- const axis2_char_t* operation_name);
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_with_name (axis2_svc_t *svc, axis2_env_t **env,
+ const axis2_char_t* op_name);
axis2_hash_t * AXIS2_CALL
-axis2_svc_get_operations (axis2_svc_t *svc, axis2_env_t **env);
+axis2_svc_get_ops (axis2_svc_t *svc, axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_set_parent (axis2_svc_t *svc, axis2_env_t **env,
@@ -94,7 +94,7 @@
struct axis2_engine_config * axis2_config);
axis2_status_t AXIS2_CALL
-axis2_svc_add_module_operations(axis2_svc_t *svc,
+axis2_svc_add_module_ops(axis2_svc_t *svc,
axis2_env_t **env,
struct axis2_module_desc * module,
struct axis2_engine_config * axis2_config);
@@ -110,9 +110,9 @@
void *AXIS2_CALL
-axis2_svc_get_wsdl_operation(axis2_svc_t *svc,
+axis2_svc_get_wsdl_op(axis2_svc_t *svc,
axis2_env_t **env,
- axis2_qname_t *operation_name);
+ axis2_qname_t *op_name);
axis2_status_t AXIS2_CALL
axis2_svc_set_context_path(axis2_svc_t *svc,
@@ -168,14 +168,14 @@
axis2_env_t **env,
struct axis2_flow *fault_flow);
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_by_soap_action(axis2_svc_t *svc,
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_by_soap_action(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action);
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_by_soap_action_and_endpoint(axis2_svc_t *svc,
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_by_soap_action_and_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action,
axis2_qname_t * endpoint);
@@ -233,7 +233,7 @@
axis2_svc_add_mapping(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t * mapping_key ,
- struct axis2_operation * axis2_opt);
+ struct axis2_op * axis2_opt);
axis2_status_t AXIS2_CALL
axis2_svc_add_module_ref(axis2_svc_t *svc,
@@ -369,12 +369,12 @@
}
svc_impl->svc.ops->free = axis2_svc_free;
- svc_impl->svc.ops->add_operation = axis2_svc_add_operation;
- svc_impl->svc.ops->get_operation_with_qname =
- axis2_svc_get_operation_with_qname;
- svc_impl->svc.ops->get_operation_with_name =
- axis2_svc_get_operation_with_name;
- svc_impl->svc.ops->get_operations = axis2_svc_get_operations;
+ svc_impl->svc.ops->add_op = axis2_svc_add_op;
+ svc_impl->svc.ops->get_op_with_qname =
+ axis2_svc_get_op_with_qname;
+ svc_impl->svc.ops->get_op_with_name =
+ axis2_svc_get_op_with_name;
+ svc_impl->svc.ops->get_ops = axis2_svc_get_ops;
svc_impl->svc.ops->set_parent = axis2_svc_set_parent;
svc_impl->svc.ops->get_parent = axis2_svc_get_parent;
svc_impl->svc.ops->set_name = axis2_svc_set_name;
@@ -388,13 +388,13 @@
svc_impl->svc.ops->engage_module = axis2_svc_engage_module;
- svc_impl->svc.ops->add_module_operations = axis2_svc_add_module_operations;
+ svc_impl->svc.ops->add_module_ops = axis2_svc_add_module_ops;
svc_impl->svc.ops->add_to_engaged_module_list = axis2_svc_add_to_engaged_module_list;
svc_impl->svc.ops->get_engaged_modules = axis2_svc_get_engaged_modules;
- svc_impl->svc.ops->get_wsdl_operation = axis2_svc_get_wsdl_operation;
+ svc_impl->svc.ops->get_wsdl_op = axis2_svc_get_wsdl_op;
svc_impl->svc.ops->set_context_path = axis2_svc_set_context_path;
@@ -420,9 +420,9 @@
svc_impl->svc.ops->set_fault_outflow = axis2_svc_set_fault_outflow;
- svc_impl->svc.ops->get_operation_by_soap_action = axis2_svc_get_operation_by_soap_action;
+ svc_impl->svc.ops->get_op_by_soap_action = axis2_svc_get_op_by_soap_action;
- svc_impl->svc.ops->get_operation_by_soap_action_and_endpoint = axis2_svc_get_operation_by_soap_action_and_endpoint;
+ svc_impl->svc.ops->get_op_by_soap_action_and_endpoint = axis2_svc_get_op_by_soap_action_and_endpoint;
svc_impl->svc.ops->get_axis2_svc_name = axis2_svc_get_axis2_svc_name;
@@ -539,9 +539,9 @@
for (hi = axis2_hash_first (svc_impl->wasaction_opeartionmap, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_operation *opt = NULL;
+ struct axis2_op *opt = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- opt = (struct axis2_operation *) val;
+ opt = (struct axis2_op *) val;
if (opt)
AXIS2_OPERATION_FREE (opt, env);
@@ -584,9 +584,9 @@
axis2_status_t AXIS2_CALL
-axis2_svc_add_operation (axis2_svc_t *svc,
+axis2_svc_add_op (axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_operation *axis2_opt)
+ struct axis2_op *axis2_opt)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -602,49 +602,49 @@
return status;
}
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_with_qname (axis2_svc_t *svc,
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_with_qname (axis2_svc_t *svc,
axis2_env_t **env,
- axis2_qname_t *operation_name)
+ axis2_qname_t *op_name)
{
- struct axis2_operation *operation_l = NULL;
+ struct axis2_op *op_l = NULL;
axis2_char_t *op_str = NULL;
- /*axis2_hash_t *all_operations = NULL; */
+ /*axis2_hash_t *all_ops = NULL; */
AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, operation_name, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, op_name, NULL);
- op_str = AXIS2_QNAME_GET_LOCALPART(operation_name, env);
+ op_str = AXIS2_QNAME_GET_LOCALPART(op_name, env);
/* commented until AXIS2_WSDL_INTERFACE_GET_ALL_OPERATIONS is implemented
- all_operations = AXIS2_WSDL_INTERFACE_GET_ALL_OPERATIONS(
+ all_ops = AXIS2_WSDL_INTERFACE_GET_ALL_OPERATIONS(
axis2_svc_get_svc_interface(svc, env), env);
- opeartion_l = (struct axis2_operation) (axis2_hash_get (all_operations,
+ opeartion_l = (struct axis2_op) (axis2_hash_get (all_ops,
op_str, AXIS2_HASH_KEY_STRING));
*/
- if(NULL == operation_l )
+ if(NULL == op_l )
{
- operation_l = (struct axis2_operation *) (axis2_hash_get (
+ op_l = (struct axis2_op *) (axis2_hash_get (
AXIS2_INTF_TO_IMPL(svc)->wasaction_opeartionmap, op_str,
AXIS2_HASH_KEY_STRING));
}
- return operation_l;
+ return op_l;
}
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_with_name (axis2_svc_t *svc,
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_with_name (axis2_svc_t *svc,
axis2_env_t **env,
const axis2_char_t* nc_name)
{
AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, nc_name, NULL);
- return (axis2_operation_t *) axis2_hash_get(AXIS2_WSDL_INTERFACE_GET_OPERATIONS(
+ return (axis2_op_t *) axis2_hash_get(AXIS2_WSDL_INTERFACE_GET_OPERATIONS(
axis2_svc_get_svc_interface(svc, env), env), nc_name, AXIS2_HASH_KEY_STRING);
}
axis2_hash_t * AXIS2_CALL
-axis2_svc_get_operations (axis2_svc_t *svc,
+axis2_svc_get_ops (axis2_svc_t *svc,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
@@ -873,7 +873,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_svc_add_module_operations(axis2_svc_t *svc,
+axis2_svc_add_module_ops(axis2_svc_t *svc,
axis2_env_t **env,
struct axis2_module_desc * module_desc,
struct axis2_engine_config * axis2_config)
@@ -881,7 +881,7 @@
axis2_hash_t * map = NULL;
axis2_hash_index_t *index = NULL;
struct axis2_phase_resolver * pr = NULL;
- struct axis2_operation * axis2_opt = NULL;
+ struct axis2_op * axis2_opt = NULL;
axis2_array_list_t *params = NULL;
struct axis2_param *param = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -904,7 +904,7 @@
int j = 0;
void *v = NULL;
axis2_hash_this (index, NULL, NULL, &v);
- axis2_opt = (struct axis2_operation *) v;
+ axis2_opt = (struct axis2_op *) v;
params = AXIS2_OPERATION_GET_PARAMS(axis2_opt, env);
/* Adding wsa-maping into service */
size = AXIS2_ARRAY_LIST_SIZE(params, env);
@@ -938,7 +938,7 @@
return status;
}
- status = axis2_svc_add_operation(svc, env, axis2_opt);
+ status = axis2_svc_add_op(svc, env, axis2_opt);
}
if(pr)
@@ -992,17 +992,17 @@
}
void * AXIS2_CALL
-axis2_svc_get_wsdl_operation(axis2_svc_t *svc,
+axis2_svc_get_wsdl_op(axis2_svc_t *svc,
axis2_env_t **env,
- axis2_qname_t *operation_name)
+ axis2_qname_t *op_name)
{
struct axis2_wsdl_interface *svc_interface = NULL;
axis2_char_t * op_str = NULL;
AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, operation_name, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, op_name, NULL);
- op_str = AXIS2_QNAME_GET_LOCALPART(operation_name, env);
+ op_str = AXIS2_QNAME_GET_LOCALPART(op_name, env);
svc_interface = axis2_svc_get_svc_interface(svc, env);
if(svc_interface)
{
@@ -1153,8 +1153,8 @@
OUT_FAULTFLOW_KEY, fault_flow);
}
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_by_soap_action(axis2_svc_t *svc,
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_by_soap_action(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action)
{
@@ -1181,50 +1181,50 @@
{
axis2_hash_this(index, NULL, NULL, &value);
endpoint = (struct axis2_wsdl_endpoint *) value;
- return axis2_svc_get_operation_by_soap_action_and_endpoint(svc, env,
+ return axis2_svc_get_op_by_soap_action_and_endpoint(svc, env,
soap_action, AXIS2_WSDL_ENDPOINT_GET_NAME(endpoint, env));
}
return NULL;
}
-struct axis2_operation * AXIS2_CALL
-axis2_svc_get_operation_by_soap_action_and_endpoint(axis2_svc_t *svc,
+struct axis2_op * AXIS2_CALL
+axis2_svc_get_op_by_soap_action_and_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action,
axis2_qname_t * endpoint)
{
axis2_svc_impl_t *svc_impl = NULL;
- axis2_hash_t *binding_operations = NULL;
+ axis2_hash_t *binding_ops = NULL;
int count = 0;
axis2_hash_index_t *index_i = NULL;
void *k = NULL;
- struct axis2_wsdl_binding_operation *binding_operation = NULL;
- struct axis2_wsdl_soap_operation *element = NULL;
- struct axis2_operation *op = NULL;
+ struct axis2_wsdl_binding_op *binding_op = NULL;
+ struct axis2_wsdl_soap_op *element = NULL;
+ struct axis2_op *op = NULL;
axis2_linked_list_t *extensiblity_elements = NULL;
axis2_qname_t *type_1 = NULL;
axis2_qname_t *type_2 = NULL;
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- type_1 = axis2_qname_create(env, "operation", SOAP_11_OPERATION, NULL);
- binding_operations = AXIS2_WSDL_BINDING_GET_BINDING_OPERATIONS(
+ type_1 = axis2_qname_create(env, "op", SOAP_11_OPERATION, NULL);
+ binding_ops = AXIS2_WSDL_BINDING_GET_BINDING_OPERATIONS(
AXIS2_WSDL_ENDPOINT_GET_BINDING(axis2_svc_get_endpoint(svc, env, endpoint),
env), env);
- if(NULL == binding_operations)
+ if(NULL == binding_ops)
{
return NULL;
}
- index_i = axis2_hash_first (binding_operations, env);
+ index_i = axis2_hash_first (binding_ops, env);
while(NULL != index_i)
{
int j = 0;
int size = 0;
axis2_hash_this (index_i, &k, NULL, NULL);
- binding_operation = (struct axis2_wsdl_binding_operation *) k;
+ binding_op = (struct axis2_wsdl_binding_op *) k;
extensiblity_elements = AXIS2_WSDL_COMPONENT_GET_EXTENSIBILITY_ELEMENTS(
- binding_operation->extensible_component->wsdl_component, env);
+ binding_op->extensible_component->wsdl_component, env);
size = AXIS2_LINKED_LIST_SIZE(extensiblity_elements, env);
if(AXIS2_TRUE != size)
@@ -1233,7 +1233,7 @@
}
while(j < size)
{
- element = (struct axis2_wsdl_soap_operation *) AXIS2_LINKED_LIST_GET(
+ element = (struct axis2_wsdl_soap_op *) AXIS2_LINKED_LIST_GET(
extensiblity_elements, env, j);
type_2 = AXIS2_WSDL_EXTENSIBLE_ELEMENT_GET_TYPE(element->extensible_element, env);
@@ -1242,8 +1242,8 @@
if(0 == AXIS2_STRCMP(AXIS2_WSDL_SOAP_OPERATION_GET_SOAP_ACTION(
element, env), soap_action))
{
- op = (struct axis2_operation *)
- AXIS2_WSDL_BINDING_OPERATION_GET_OPERATION(binding_operation,
+ op = (struct axis2_op *)
+ AXIS2_WSDL_BINDING_OPERATION_GET_OPERATION(binding_op,
env);
count++;
}
@@ -1374,7 +1374,7 @@
axis2_svc_add_mapping(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t * mapping_key ,
- struct axis2_operation * axis2_opt)
+ struct axis2_op * axis2_opt)
{
axis2_svc_impl_t *svc_impl = AXIS2_INTF_TO_IMPL(svc);
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=356488&r1=356487&r2=356488&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 Mon Dec 12 22:23:36 2005
@@ -29,7 +29,7 @@
struct axis2_msg_ctx *msg_ctx);
axis2_svc_t* AXIS2_CALL axis2_addr_disp_find_svc(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env);
-axis2_operation_t* AXIS2_CALL axis2_addr_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_addr_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc);
@@ -69,7 +69,7 @@
/** The struct that inherits from this struct
- should implement the find_service and find_operation methods and assing the
+ should implement the find_service and find_op methods and assing the
respective function pointers in the base struct.
Here we have only the dummy implementation to gauard against erros due to
the failure to provide an impl version by mistake.
@@ -108,7 +108,7 @@
return NULL;
}
- url_tokens = axis2_parse_request_url_for_svc_and_operation(env, address);
+ url_tokens = axis2_parse_request_url_for_svc_and_op(env, address);
if (url_tokens)
{
@@ -140,13 +140,13 @@
}
/**
- * finds the operation
+ * finds the op
*
* @param service
* @param msg_ctx
* @return
*/
-axis2_operation_t* AXIS2_CALL axis2_addr_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_addr_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc)
{
@@ -193,21 +193,21 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- axis2_operation_ctx_t *operation_ctx = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
axis2_char_t *msg_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
- operation_ctx = AXIS2_CONF_CTX_GET_OPERATION_CTX(conf_ctx, env, msg_id);
- if (operation_ctx)
+ op_ctx = AXIS2_CONF_CTX_GET_OPERATION_CTX(conf_ctx, env, msg_id);
+ if (op_ctx)
{
- axis2_operation_t *operation = NULL;
- operation = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
- if (operation)
+ axis2_op_t *op = NULL;
+ op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
+ if (op)
{
axis2_svc_ctx_t *svc_ctx = NULL;
- AXIS2_MSG_CTX_SET_OPERATION_CTX(msg_ctx, env, operation_ctx);
- AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, operation);
- /*TODO : AXIS2_OPERATION_REGISTER_OPERATION_CTX(operation, env, operation_ctx);*/
+ 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);*/
- svc_ctx = AXIS2_OPERATION_CTX_GET_PARENT(operation_ctx, env);
+ svc_ctx = AXIS2_OPERATION_CTX_GET_PARENT(op_ctx, env);
if (svc_ctx)
{
axis2_svc_t *svc = NULL;
@@ -233,7 +233,7 @@
}
msg_ctx->ops->find_svc = axis2_addr_disp_find_svc;
- msg_ctx->ops->find_operation = axis2_addr_disp_find_operation;
+ msg_ctx->ops->find_op = axis2_addr_disp_find_op;
return axis2_disp_invoke(handler, env, msg_ctx);
}
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=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/disp.c Mon Dec 12 22:23:36 2005
@@ -48,7 +48,7 @@
axis2_env_t **env);
axis2_svc_t* AXIS2_CALL axis2_disp_find_svc(axis2_msg_ctx_t * msg_ctx,
axis2_env_t **env);
-struct axis2_operation* AXIS2_CALL axis2_disp_find_operation(axis2_msg_ctx_t * msg_ctx,
+struct axis2_op* AXIS2_CALL axis2_disp_find_op(axis2_msg_ctx_t * msg_ctx,
axis2_env_t **env,
struct axis2_svc *svc);
@@ -110,11 +110,11 @@
AXIS2_HANDLER_INIT(disp_impl->base, env, handler_desc);
- /* set the base struct's invoke operation */
+ /* set the base struct's invoke op */
if (disp_impl->base->ops)
disp_impl->base->ops->invoke = axis2_disp_invoke;
- /* initialize operations */
+ /* initialize ops */
disp_impl->disp.ops = NULL;
disp_impl->disp.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_disp_ops_t) );
if (!disp_impl->disp.ops)
@@ -129,7 +129,7 @@
disp_impl->disp.ops->set_qname = axis2_disp_set_qname;
disp_impl->disp.ops->free = axis2_disp_free;
disp_impl->disp.ops->find_svc = axis2_disp_find_svc;
- disp_impl->disp.ops->find_operation = axis2_disp_find_operation;
+ disp_impl->disp.ops->find_op = axis2_disp_find_op;
return &(disp_impl->disp);
}
@@ -178,7 +178,7 @@
struct axis2_msg_ctx *msg_ctx)
{
axis2_svc_t *axis_service = NULL;
- axis2_operation_t *operation = NULL;
+ axis2_op_t *op = NULL;
AXIS2_FUNC_PARAM_CHECK(handler, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
@@ -198,10 +198,10 @@
axis_service = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if (axis_service)
{
- operation = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
- if (operation)
+ op = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
+ if (op)
{
- AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, operation);
+ AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, op);
}
}
@@ -242,7 +242,7 @@
}
/** The struct that inherits from this struct
- should implement the find_service and find_operation methods and assing the
+ should implement the find_service and find_op methods and assing the
respective function pointers in the base struct.
Here we have only the dummy implementation to gauard against erros due to
the failure to provide an impl version by mistake.
@@ -261,13 +261,13 @@
}
/**
- * finds the operation
+ * finds the op
*
* @param service
* @param msg_ctx
* @return
*/
-struct axis2_operation* AXIS2_CALL axis2_disp_find_operation(axis2_msg_ctx_t * msg_ctx,
+struct axis2_op* AXIS2_CALL axis2_disp_find_op(axis2_msg_ctx_t * msg_ctx,
axis2_env_t **env,
struct axis2_svc *svc)
{
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=356488&r1=356487&r2=356488&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 Mon Dec 12 22:23:36 2005
@@ -21,7 +21,7 @@
#include <axis2_svc.h>
#include <axis2.h>
#include <axis2_msg_ctx.h>
-#include <axis2_operation_ctx.h>
+#include <axis2_op_ctx.h>
#include <axis2_svc_ctx.h>
#include <axis2_endpoint_ref.h>
@@ -95,11 +95,11 @@
AXIS2_HANDLER_INIT(disp_checker_impl->base, env, handler_desc);
- /* set the base struct's invoke operation */
+ /* set the base struct's invoke op */
if (disp_checker_impl->base->ops)
disp_checker_impl->base->ops->invoke = axis2_disp_checker_invoke;
- /* initialize operations */
+ /* initialize ops */
disp_checker_impl->disp_checker.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_disp_checker_ops_t) );
if (!disp_checker_impl->disp_checker.ops)
{
@@ -197,8 +197,8 @@
*/
axis2_status_t AXIS2_CALL axis2_disp_checker_invoke(axis2_handler_t* handler, axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)
{
- axis2_operation_t *operation = NULL;
- axis2_operation_ctx_t *operation_ctx = NULL;
+ axis2_op_t *op = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
axis2_svc_t *svc = NULL;
axis2_svc_ctx_t *svc_ctx = NULL;
axis2_endpoint_ref_t *endpoint_ref = NULL;
@@ -207,14 +207,14 @@
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- operation = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
+ op = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
- if (!operation)
+ if (!op)
{
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
- if (operation_ctx)
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ if (op_ctx)
{
- axis2_operation_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
+ axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
if (op)
AXIS2_MSG_CTX_SET_OPERATION(msg_ctx, env, op);
}
@@ -247,8 +247,8 @@
return AXIS2_FAILURE;
}
- operation = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
- if (!operation)
+ op = AXIS2_MSG_CTX_GET_OPERATION(msg_ctx, env);
+ if (!op)
{
AXIS2_LOG(env, "Operation Not found. Endpoint reference is ");
if (endpoint_ref)
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=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/engine.c Mon Dec 12 22:23:36 2005
@@ -20,7 +20,7 @@
/**
* There is only one engine for the Server and the Client. the send() and receive()
- * Methods are the basic operations the Sync, Async messageing are build on top.
+ * Methods are the basic ops the Sync, Async messageing are build on top.
*/
@@ -75,7 +75,7 @@
engine_impl->conf_ctx = conf_ctx;
}
- /* initialize operations */
+ /* initialize ops */
engine_impl->engine.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_engine_ops_t) );
if (!engine_impl->engine.ops)
{
@@ -138,7 +138,7 @@
{
axis2_engine_impl_t *engine_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
- axis2_operation_ctx_t *operation_ctx = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
axis2_array_list_t *phases = NULL;
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
@@ -151,10 +151,10 @@
return status;
/* find and invoke the phases */
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
- if (operation_ctx)
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ if (op_ctx)
{
- axis2_operation_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
+ axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
if (op)
{
phases = AXIS2_OPERATION_GET_PHASES_OUTFLOW(op, env);
@@ -230,10 +230,10 @@
axis2_engine_impl_t *engine_impl = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_engine_config_t *engine_config = NULL;
- axis2_operation_ctx_t *operation_ctx = NULL;
- axis2_operation_t *operation = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
+ axis2_op_t *op = NULL;
axis2_array_list_t *pre_calculated_phases = NULL;
- axis2_array_list_t *operation_specific_phases = NULL;
+ axis2_array_list_t *op_specific_phases = NULL;
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
@@ -258,13 +258,13 @@
}
axis2_engine_verify_ctx_built(engine, env, msg_ctx);
- /* resume operation specific phases */
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
- if (operation_ctx)
- {
- operation = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
- operation_specific_phases = AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(operation, env);
- axis2_engine_resume_invocation_phases(engine, env, operation_specific_phases, msg_ctx);
+ /* resume op specific phases */
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_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);
+ axis2_engine_resume_invocation_phases(engine, env, op_specific_phases, msg_ctx);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
return AXIS2_SUCCESS;
@@ -280,12 +280,12 @@
}
axis2_engine_verify_ctx_built(engine, env, msg_ctx); /* TODO : Chinthaka remove me. I'm redundant */
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
- if (operation_ctx)
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ if (op_ctx)
{
- operation = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
- operation_specific_phases = AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(operation, env);
- axis2_engine_invoke_phases(engine, env, operation_specific_phases, msg_ctx);
+ op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
+ op_specific_phases = AXIS2_OPERATION_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))
{
return AXIS2_SUCCESS;
@@ -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(operation, env);
+ axis2_msg_recv_t *receiver = AXIS2_OPERATION_GET_MSG_RECEIVER(op, env);
AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx);
}
return AXIS2_SUCCESS;
@@ -310,18 +310,18 @@
*/
axis2_status_t AXIS2_CALL axis2_engine_send_fault(struct axis2_engine *engine, axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)
{
- axis2_operation_ctx_t *operation_ctx = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
/* find and execute the Fault Out Flow Handlers */
- if (operation_ctx)
+ if (op_ctx)
{
- axis2_operation_t *operation = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
- axis2_array_list_t *phases = AXIS2_OPERATION_GET_PHASES_OUTFLOW(operation, env);
+ axis2_op_t *op = AXIS2_OPERATION_CTX_GET_OPERATION(op_ctx, env);
+ axis2_array_list_t *phases = AXIS2_OPERATION_GET_PHASES_OUTFLOW(op, env);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -332,7 +332,7 @@
axis2_engine_invoke_phases(engine, env, phases, msg_ctx);
}
}
- /* it is possible that operation context is NULL as the error occered before the
+ /* it is possible that op context is NULL as the error occered before the
dispatcher. We do not run Handlers in that case */
if (!(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)))
@@ -354,16 +354,16 @@
*/
axis2_status_t AXIS2_CALL axis2_engine_receive_fault(struct axis2_engine *engine, axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)
{
- axis2_operation_ctx_t *operation_ctx = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
- if (!operation_ctx)
+ if (!op_ctx)
{
- /* if we do not have an operation context that means this may be an incoming
+ /* if we do not have an op context that means this may be an incoming
dual channel response. So try to dispatch the service */
axis2_conf_ctx_t *conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
@@ -388,12 +388,12 @@
}
}
- operation_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OPERATION_CTX(msg_ctx, env);
/* find and execute the fault in flow handlers */
- if (operation_ctx)
+ if (op_ctx)
{
- axis2_operation_t *operation = AXIS2_OPERATION_CTX_GET_OPERATION(operation_ctx, env);
- axis2_array_list_t *phases = AXIS2_OPERATION_GET_PHASES_IN_FAULT_FLOW(operation, env);
+ 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);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
Modified: webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c Mon Dec 12 22:23:36 2005
@@ -521,7 +521,7 @@
return &(config_impl->engine_config);
}
-/**********************Start of operation impls********************************/
+/**********************Start of op impls********************************/
axis2_status_t AXIS2_CALL
axis2_engine_config_free (axis2_engine_config_t *engine_config,
Modified: webservices/axis2/trunk/c/modules/core/engine/src/event.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/event.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/event.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/event.c Mon Dec 12 22:23:36 2005
@@ -57,7 +57,7 @@
event_impl->svc = svc;
}
- /* initialize operations */
+ /* initialize ops */
event_impl->event.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_event_ops_t) );
if (!event_impl->event.ops)
{
Modified: webservices/axis2/trunk/c/modules/core/engine/src/handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/handler.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/handler.c Mon Dec 12 22:23:36 2005
@@ -68,7 +68,7 @@
/*handler_impl->derived = NULL;*/
handler_impl->handler_desc = NULL;
- /* initialize operations */
+ /* initialize ops */
handler_impl->handler.ops = NULL;
handler_impl->handler.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_handler_ops_t) );
if (!handler_impl->handler.ops)
Modified: webservices/axis2/trunk/c/modules/core/engine/src/phase.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/phase.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/phase.c Mon Dec 12 22:23:36 2005
@@ -122,7 +122,7 @@
}
}
- /* initialize operations */
+ /* initialize ops */
phase_impl->phase.ops = NULL;
phase_impl->phase.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_phase_ops_t) );
if (!phase_impl->phase.ops)
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=356488&r1=356487&r2=356488&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 Mon Dec 12 22:23:36 2005
@@ -29,7 +29,7 @@
struct axis2_msg_ctx *msg_ctx);
axis2_svc_t* AXIS2_CALL axis2_req_uri_disp_find_svc(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env);
-axis2_operation_t* AXIS2_CALL axis2_req_uri_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_req_uri_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc);
@@ -69,7 +69,7 @@
/** The struct that inherits from this struct
- should implement the find_service and find_operation methods and assing the
+ should implement the find_service and find_op methods and assing the
respective function pointers in the base struct.
Here we have only the dummy implementation to gauard against erros due to
the failure to provide an impl version by mistake.
@@ -102,7 +102,7 @@
AXIS2_LOG(env, "Checking for Service using target endpoint address :");
AXIS2_LOG(env, address);
- url_tokens = axis2_parse_request_url_for_svc_and_operation(env, address);
+ url_tokens = axis2_parse_request_url_for_svc_and_op(env, address);
if (url_tokens)
{
@@ -131,13 +131,13 @@
}
/**
- * finds the operation
+ * finds the op
*
* @param service
* @param msg_ctx
* @return
*/
-axis2_operation_t* AXIS2_CALL axis2_req_uri_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_req_uri_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc)
{
@@ -157,19 +157,19 @@
{
axis2_char_t **url_tokens = NULL;
- url_tokens = axis2_parse_request_url_for_svc_and_operation(env, address);
+ url_tokens = axis2_parse_request_url_for_svc_and_op(env, address);
if (url_tokens)
{
if (url_tokens[1])
{
- axis2_qname_t *operation_qname = NULL;
- axis2_operation_t *op = NULL;
+ axis2_qname_t *op_qname = NULL;
+ axis2_op_t *op = NULL;
AXIS2_LOG(env, "Checking for Operation using target endpoint uri fragment : ");
AXIS2_LOG(env, url_tokens[1]);
- operation_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
- op = AXIS2_SVC_GET_OPERATION_WITH_QNAME(svc, env, operation_qname);
- AXIS2_QNAME_FREE(operation_qname, env);
+ op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
+ op = AXIS2_SVC_GET_OPERATION_WITH_QNAME(svc, env, op_qname);
+ AXIS2_QNAME_FREE(op_qname, env);
return op;
}
}
@@ -185,7 +185,7 @@
AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
msg_ctx->ops->find_svc = axis2_req_uri_disp_find_svc;
- msg_ctx->ops->find_operation = axis2_req_uri_disp_find_operation;
+ msg_ctx->ops->find_op = axis2_req_uri_disp_find_op;
return axis2_disp_invoke(handler, env, msg_ctx);
}
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=356488&r1=356487&r2=356488&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 Mon Dec 12 22:23:36 2005
@@ -29,7 +29,7 @@
struct axis2_msg_ctx *msg_ctx);
axis2_svc_t* AXIS2_CALL axis2_soap_action_disp_find_svc(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env);
-axis2_operation_t* AXIS2_CALL axis2_soap_action_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_soap_action_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc);
@@ -69,7 +69,7 @@
/** The struct that inherits from this struct
- should implement the find_service and find_operation methods and assing the
+ should implement the find_service and find_op methods and assing the
respective function pointers in the base struct.
Here we have only the dummy implementation to gauard against erros due to
the failure to provide an impl version by mistake.
@@ -92,13 +92,13 @@
}
/**
- * finds the operation
+ * finds the op
*
* @param service
* @param msg_ctx
* @return
*/
-axis2_operation_t* AXIS2_CALL axis2_soap_action_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_soap_action_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc)
{
@@ -111,7 +111,7 @@
if (action)
{
- axis2_operation_t *op = NULL;
+ axis2_op_t *op = NULL;
op = AXIS2_SVC_GET_OPERATION_BY_SOAP_ACTION(svc, env, action);
if (!op)
@@ -142,7 +142,7 @@
AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
msg_ctx->ops->find_svc = axis2_soap_action_disp_find_svc;
- msg_ctx->ops->find_operation = axis2_soap_action_disp_find_operation;
+ msg_ctx->ops->find_op = axis2_soap_action_disp_find_op;
return axis2_disp_invoke(handler, env, msg_ctx);
}
Modified: webservices/axis2/trunk/c/modules/core/engine/src/soap_body_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/soap_body_disp.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/soap_body_disp.c Mon Dec 12 22:23:36 2005
@@ -29,7 +29,7 @@
struct axis2_msg_ctx *msg_ctx);
axis2_svc_t* AXIS2_CALL axis2_soap_body_disp_find_svc(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env);
-axis2_operation_t* AXIS2_CALL axis2_soap_body_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_soap_body_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc);
@@ -69,7 +69,7 @@
/** The struct that inherits from this struct
- should implement the find_service and find_operation methods and assing the
+ should implement the find_service and find_op methods and assing the
respective function pointers in the base struct.
Here we have only the dummy implementation to gauard against erros due to
the failure to provide an impl version by mistake.
@@ -97,7 +97,7 @@
String[] values = Utils.parseRequestURLForServiceAndOperation(
filePart);
if (values[1] != null) {
- operationName = new QName(values[1]);
+ opName = new QName(values[1]);
}
if (values[0] != null) {
serviceName = values[0];
@@ -112,13 +112,13 @@
}
/**
- * finds the operation
+ * finds the op
*
* @param service
* @param msg_ctx
* @return
*/
-axis2_operation_t* AXIS2_CALL axis2_soap_body_disp_find_operation(axis2_msg_ctx_t *msg_ctx,
+axis2_op_t* AXIS2_CALL axis2_soap_body_disp_find_op(axis2_msg_ctx_t *msg_ctx,
axis2_env_t **env,
axis2_svc_t *svc)
{
@@ -132,10 +132,10 @@
return null;
} else {
log.debug("Checking for Operation using SOAP message body's first child's local name : " + bodyFirstChild.getLocalName());
- operationName = new QName(bodyFirstChild.getLocalName());
+ opName = new QName(bodyFirstChild.getLocalName());
}
- return service.getOperation(operationName);
+ return service.getOperation(opName);
*/
return NULL;
}
@@ -147,7 +147,7 @@
AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
msg_ctx->ops->find_svc = axis2_soap_body_disp_find_svc;
- msg_ctx->ops->find_operation = axis2_soap_body_disp_find_operation;
+ msg_ctx->ops->find_op = axis2_soap_body_disp_find_op;
return axis2_disp_invoke(handler, env, msg_ctx);
}
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=356488&r1=356487&r2=356488&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 Mon Dec 12 22:23:36 2005
@@ -55,9 +55,9 @@
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_phase_resolver_build_module_operation(axis2_phase_resolver_t *phase_resolver,
+axis2_phase_resolver_build_module_op(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
- struct axis2_operation *operation);
+ struct axis2_op *op);
/**
* this opeartion is used to build all the three cahins ,
@@ -72,7 +72,7 @@
axis2_phase_resolver_build_execution_chains(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
int type,
- struct axis2_operation *operation);
+ struct axis2_op *op);
axis2_status_t AXIS2_CALL
axis2_phase_resolver_build_transport_chains(axis2_phase_resolver_t *phase_resolver,
@@ -121,9 +121,9 @@
struct axis2_module_desc *module_desc);
axis2_status_t AXIS2_CALL
-axis2_phase_resolver_engage_module_to_operation(axis2_phase_resolver_t *phase_resolver,
+axis2_phase_resolver_engage_module_to_op(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
- struct axis2_operation *axis_operation,
+ struct axis2_op *axis_op,
struct axis2_module_desc *module_desc);
/************************** End of function prototypes ************************/
@@ -166,8 +166,8 @@
phase_resolver_impl->phase_resolver.ops->build_chains =
axis2_phase_resolver_build_chains;
- phase_resolver_impl->phase_resolver.ops->build_module_operation =
- axis2_phase_resolver_build_module_operation;
+ phase_resolver_impl->phase_resolver.ops->build_module_op =
+ axis2_phase_resolver_build_module_op;
phase_resolver_impl->phase_resolver.ops->build_transport_chains =
axis2_phase_resolver_build_transport_chains;
@@ -181,8 +181,8 @@
phase_resolver_impl->phase_resolver.ops->engage_module_to_svc =
axis2_phase_resolver_engage_module_to_svc;
- phase_resolver_impl->phase_resolver.ops->engage_module_to_operation =
- axis2_phase_resolver_engage_module_to_operation;
+ phase_resolver_impl->phase_resolver.ops->engage_module_to_op =
+ axis2_phase_resolver_engage_module_to_op;
return &(phase_resolver_impl->phase_resolver);
@@ -273,24 +273,24 @@
axis2_phase_resolver_impl_t *resolver_impl = NULL;
axis2_hash_index_t *index_i = 0;
axis2_status_t status = AXIS2_FAILURE;
- struct axis2_operation *operation = NULL;
- axis2_hash_t *operations = NULL;
+ struct axis2_op *op = NULL;
+ axis2_hash_t *ops = NULL;
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- operations = AXIS2_SVC_GET_OPERATIONS(resolver_impl->svc, env);
+ ops = AXIS2_SVC_GET_OPERATIONS(resolver_impl->svc, env);
- for (index_i = axis2_hash_first (operations, env); index_i; index_i =
+ for (index_i = axis2_hash_first (ops, env); index_i; index_i =
axis2_hash_next (env, index_i))
{
void * v = NULL;
int j = 0;
axis2_hash_this (index_i, NULL, NULL, &v);
- operation = (struct axis2_operation *)v;
+ op = (struct axis2_op *)v;
for(j = 1; j < 5; j++)
{
status = axis2_phase_resolver_build_execution_chains(phase_resolver,
- env, j, operation );
+ env, j, op );
}
}
@@ -299,18 +299,18 @@
}
axis2_status_t AXIS2_CALL
-axis2_phase_resolver_build_module_operation(axis2_phase_resolver_t *phase_resolver,
+axis2_phase_resolver_build_module_op(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
- struct axis2_operation *operation)
+ struct axis2_op *op)
{
AXIS2_FUNC_PARAM_CHECK(phase_resolver, env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, operation, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
int i = 0;
axis2_status_t status = AXIS2_FAILURE;
for (i = 1; i < 5; i++)
{
status = axis2_phase_resolver_build_execution_chains(phase_resolver, env,
- i, operation);
+ i, op);
}
return status;
}
@@ -319,7 +319,7 @@
axis2_phase_resolver_build_execution_chains(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
int type,
- struct axis2_operation *operation)
+ struct axis2_op *op)
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
axis2_array_list_t *all_handlers = NULL;
@@ -380,7 +380,7 @@
{
return status;
}
- status = AXIS2_OPERATION_ADD_TO_ENGAGE_MODULE_LIST(operation, env, module_desc);
+ status = AXIS2_OPERATION_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(operation, env));
+ AXIS2_OPERATION_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(operation, env));
+ AXIS2_OPERATION_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(operation, env));
+ AXIS2_OPERATION_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(operation, env));
+ AXIS2_OPERATION_GET_PHASES_OUT_FAULT_FLOW(op, env));
break;
}
}
@@ -889,7 +889,7 @@
struct axis2_module_desc *module_desc)
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
- axis2_hash_t *operations = NULL;
+ axis2_hash_t *ops = NULL;
axis2_bool_t engaged = AXIS2_FALSE;
axis2_hash_index_t *index_i = NULL;
int type = 0;
@@ -897,16 +897,16 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- operations = AXIS2_SVC_GET_OPERATIONS(svc, env);
- for (index_i = axis2_hash_first (operations, env); index_i; index_i = axis2_hash_next (env, index_i))
+ ops = AXIS2_SVC_GET_OPERATIONS(svc, env);
+ for (index_i = axis2_hash_first (ops, env); index_i; index_i = axis2_hash_next (env, index_i))
{
void *v = NULL;
- struct axis2_operation *op_desc = NULL;
+ struct axis2_op *op_desc = NULL;
axis2_array_list_t *modules = NULL;
struct axis2_flow *flow = NULL;
axis2_hash_this (index_i, NULL, NULL, &v);
- op_desc = (struct axis2_operation *) v;
+ op_desc = (struct axis2_op *) v;
modules = AXIS2_OPERATION_GET_MODULES(op_desc, env);
int j = 0;
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(modules, env); j++)
@@ -1106,7 +1106,7 @@
} else
{
/**
- * These handlers will go to operation's handler chains , since the module
+ * These handlers will go to op's handler chains , since the module
* try to add handlres to both sytem predefined phases and user defined phase
* so global module can do that. here the global module are the module which are
* reffred by axis2.xml
@@ -1127,7 +1127,7 @@
struct axis2_module_desc *module_desc)
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
- axis2_hash_t *operations = NULL;
+ axis2_hash_t *ops = NULL;
axis2_bool_t engaged = AXIS2_FALSE;
axis2_hash_index_t *index_i = NULL;
void *v = NULL;
@@ -1136,8 +1136,8 @@
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- operations = AXIS2_SVC_GET_OPERATIONS(resolver_impl->svc, env);
- if(!operations)
+ ops = AXIS2_SVC_GET_OPERATIONS(resolver_impl->svc, env);
+ if(!ops)
{
return AXIS2_FAILURE;
}
@@ -1148,14 +1148,14 @@
{
return AXIS2_FAILURE;
}
- for (index_i = axis2_hash_first (operations, env); index_i; index_i =
+ for (index_i = axis2_hash_first (ops, env); index_i; index_i =
axis2_hash_next (env, index_i))
{
axis2_array_list_t *modules = NULL;
- struct axis2_operation *op_desc = NULL;
+ struct axis2_op *op_desc = NULL;
axis2_hash_this (index_i, NULL, NULL, &v);
- op_desc = (struct axis2_operation *) v;
+ op_desc = (struct axis2_op *) v;
modules = AXIS2_OPERATION_GET_MODULES(op_desc, env);
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(modules, env); j++)
{
@@ -1170,7 +1170,7 @@
}
if(AXIS2_FALSE == engaged)
{
- status = axis2_phase_resolver_engage_module_to_operation(
+ status = axis2_phase_resolver_engage_module_to_op(
phase_resolver, env, op_desc, module_desc);
if(AXIS2_FAILURE == status)
return status;
@@ -1186,9 +1186,9 @@
axis2_status_t AXIS2_CALL
-axis2_phase_resolver_engage_module_to_operation(axis2_phase_resolver_t *phase_resolver,
+axis2_phase_resolver_engage_module_to_op(axis2_phase_resolver_t *phase_resolver,
axis2_env_t **env,
- struct axis2_operation *axis_operation,
+ struct axis2_op *axis_op,
struct axis2_module_desc *module_desc)
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
@@ -1205,7 +1205,7 @@
switch (type) {
case AXIS2_INFLOW:
{
- phases = AXIS2_OPERATION_GET_REMAINING_PHASES_INFLOW(axis_operation, env);
+ phases = AXIS2_OPERATION_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_operation, env));
+ AXIS2_OPERATION_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_operation, env));
+ AXIS2_OPERATION_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_operation, env));
+ AXIS2_OPERATION_GET_PHASES_OUT_FAULT_FLOW(axis_op, env));
break;
}
}
Modified: webservices/axis2/trunk/c/modules/core/transport/axis2_transport_listener.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/axis2_transport_listener.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/axis2_transport_listener.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/axis2_transport_listener.h Mon Dec 12 22:23:36 2005
@@ -48,8 +48,8 @@
*/
/**
- * @brief Description Transport Listener operations struct
- * Encapsulator struct for operations of axis2_transport_listener
+ * @brief Description Transport Listener ops struct
+ * Encapsulator struct for ops of axis2_transport_listener
*/
AXIS2_DECLARE_DATA struct axis2_transport_listener_ops
{
Modified: webservices/axis2/trunk/c/modules/core/transport/axis2_transport_sender.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/axis2_transport_sender.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/axis2_transport_sender.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/axis2_transport_sender.h Mon Dec 12 22:23:36 2005
@@ -52,8 +52,8 @@
*/
/**
- * @brief Description Transport Sender operations struct
- * Encapsulator struct for operations of axis2_transport_sender
+ * @brief Description Transport Sender ops struct
+ * Encapsulator struct for ops of axis2_transport_sender
*/
AXIS2_DECLARE_DATA struct axis2_transport_sender_ops
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c Mon Dec 12 22:23:36 2005
@@ -337,7 +337,7 @@
header_group;
if(NULL == header_group)
{
- /* Even though we couldn't complete the operation, we are sure that the
+ /* Even though we couldn't complete the op, we are sure that the
* requred header is no more in the request. So we can proceed without a
* problem.
*/
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c Mon Dec 12 22:23:36 2005
@@ -423,7 +423,7 @@
header_group;
if(NULL == header_group)
{
- /* Even though we couldn't complete the operation, we are sure that the
+ /* Even though we couldn't complete the op, we are sure that the
* requred header is no more in the request. So we can proceed without a
* problem.
*/
Modified: webservices/axis2/trunk/c/modules/util/src/array_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/array_list.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/array_list.c Mon Dec 12 22:23:36 2005
@@ -104,7 +104,7 @@
}
array_list_impl->capacity = capacity;
- /* initialize operations */
+ /* initialize ops */
array_list_impl->array_list.ops = NULL;
array_list_impl->array_list.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_array_list_ops_t) );
if (!array_list_impl->array_list.ops)
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_array_list.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_array_list.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_array_list.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_array_list.h Mon Dec 12 22:23:36 2005
@@ -42,7 +42,7 @@
*/
/**
- * \brief Array List operations struct
+ * \brief Array List ops struct
*/
AXIS2_DECLARE_DATA typedef struct axis2_array_list_ops
{
@@ -177,7 +177,7 @@
typedef struct axis2_array_list
{
- /** Handler Description related operations */
+ /** Handler Description related ops */
axis2_array_list_ops_t *ops;
} axis2_array_list_t;
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_linked_list.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_linked_list.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_linked_list.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_linked_list.h Mon Dec 12 22:23:36 2005
@@ -56,7 +56,7 @@
} entry_t; /* struct entry */
/**
-* \brief Linked List operations struct
+* \brief Linked List ops struct
*/
AXIS2_DECLARE_DATA struct axis2_linked_list_ops_s
{
@@ -309,7 +309,7 @@
struct axis2_linked_list_s
{
- /** Linked List related operations */
+ /** Linked List related ops */
axis2_linked_list_ops_t *ops;
};
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h Mon Dec 12 22:23:36 2005
@@ -40,7 +40,7 @@
* @return pointer to the newly created log struct
*/
AXIS2_DECLARE(axis2_log_t *) axis2_log_create (axis2_allocator_t * allocator,
- axis2_log_ops_t * operations);
+ axis2_log_ops_t * ops);
/** @} */
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_stream_default.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_stream_default.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_stream_default.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_stream_default.h Mon Dec 12 22:23:36 2005
@@ -37,7 +37,7 @@
/**
* Creates a stream struct
* @param allocator allocator to be used. Mandatory, cannot be NULL
- * @param operations operations struct. Optional, can be NULL. If null default operations would be assigned.
+ * @param ops ops struct. Optional, can be NULL. If null default ops would be assigned.
* @return pointer to the newly created log struct
*/
AXIS2_DECLARE(axis2_stream_t *) axis2_stream_create (axis2_allocator_t * allocator,
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_utils.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_utils.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_utils.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_utils.h Mon Dec 12 22:23:36 2005
@@ -34,7 +34,7 @@
*/
#define AXIS2_REQUEST_URL_PREFIX "/services"
/**
- * This function allows users to reolve the service and operation from the
+ * This function allows users to reolve the service and op from the
* url. It returns an array of 2 elements of axis2_char_t arrays (strings).
* The caller is responsible to free the memory allocated by the function
* for the return value.
@@ -43,7 +43,7 @@
* @return axis2_char_t ** <code>axis2_char_t **<code>
*/
AXIS2_DECLARE(axis2_char_t**)
- axis2_parse_request_url_for_svc_and_operation(axis2_env_t **env, axis2_char_t *request);
+ axis2_parse_request_url_for_svc_and_op(axis2_env_t **env, axis2_char_t *request);
/** @} */
Modified: webservices/axis2/trunk/c/modules/util/src/hash.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/hash.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/hash.c Mon Dec 12 22:23:36 2005
@@ -229,8 +229,8 @@
* number 33 and a few other equally good numbers like 17, 31, 63,
* 127 and 129 have nevertheless a great advantage to the remaining
* numbers in the large set of possible multipliers: their multiply
- * operation can be replaced by a faster operation based on just one
- * shift plus either a single addition or subtraction operation. And
+ * op can be replaced by a faster op based on just one
+ * shift plus either a single addition or subtraction op. And
* because a hash function has to both distribute good _and_ has to
* be very fast to compute, those few numbers should be preferred.
*
Modified: webservices/axis2/trunk/c/modules/util/src/linked_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/linked_list.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/linked_list.c Mon Dec 12 22:23:36 2005
@@ -40,7 +40,7 @@
* are ones which change the list size or affect how iterations would
* behave. This field is available for use by Iterator and ListIterator,
* in order to throw a {@link ConcurrentModificationException} in response
- * to the next operation on the iterator. This <i>fail-fast</i> behavior
+ * to the next op on the iterator. This <i>fail-fast</i> behavior
* saves the user from many subtle bugs otherwise possible from concurrent
* modification during iteration.
* <p>
@@ -204,7 +204,7 @@
return NULL;
}
- /* initialize operations */
+ /* initialize ops */
linked_list_impl->linked_list.ops = NULL;
linked_list_impl->linked_list.ops = AXIS2_MALLOC( (*env)->allocator,
sizeof(axis2_linked_list_ops_t) );
Modified: webservices/axis2/trunk/c/modules/util/src/log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/log.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/log.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/log.c Mon Dec 12 22:23:36 2005
@@ -34,7 +34,7 @@
axis2_status_t AXIS2_CALL axis2_log_impl_write (const void *buffer, size_t count);
AXIS2_DECLARE(axis2_log_t *)
-axis2_log_create (axis2_allocator_t * allocator, axis2_log_ops_t * operations)
+axis2_log_create (axis2_allocator_t * allocator, axis2_log_ops_t * ops)
{
axis2_log_t *log;
if (!allocator)
@@ -45,8 +45,8 @@
if (!log)
return NULL;
- if (operations)
- log->ops = operations;
+ if (ops)
+ log->ops = ops;
else
{
log->ops =
Modified: webservices/axis2/trunk/c/modules/util/src/utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/utils.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/utils.c Mon Dec 12 22:23:36 2005
@@ -20,7 +20,7 @@
#include <string.h>
AXIS2_DECLARE(axis2_char_t**)
-axis2_parse_request_url_for_svc_and_operation(axis2_env_t **env,
+axis2_parse_request_url_for_svc_and_op(axis2_env_t **env,
axis2_char_t *request)
{
@@ -58,7 +58,7 @@
strncpy(ret[0], service_str,i);
ret[0][i] = '\0';
- /* Now search for the operation */
+ /* Now search for the op */
service_str = tmp;
if('\0' != *service_str)
{
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=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c Mon Dec 12 22:23:36 2005
@@ -42,7 +42,7 @@
/**
* Field bindingOperations
*/
- axis2_hash_t *binding_operations;
+ axis2_hash_t *binding_ops;
} axis2_wsdl_binding_impl_t;
@@ -88,21 +88,21 @@
axis2_hash_t *binding_faults);
axis2_hash_t * AXIS2_CALL
-axis2_wsdl_binding_get_binding_operations(axis2_wsdl_binding_t *wsdl_binding,
+axis2_wsdl_binding_get_binding_ops(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_set_binding_operations(axis2_wsdl_binding_t *wsdl_binding,
+axis2_wsdl_binding_set_binding_ops(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env,
- axis2_hash_t *binding_operations);
+ axis2_hash_t *binding_ops);
axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_add_binding_operation(axis2_wsdl_binding_t *wsdl_binding,
+axis2_wsdl_binding_add_binding_op(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env,
- struct axis2_wsdl_binding_operation *binding_operation);
+ struct axis2_wsdl_binding_op *binding_op);
-struct axis2_wsdl_binding_operation *AXIS2_CALL
-axis2_wsdl_binding_get_binding_operation(axis2_wsdl_binding_t *wsdl_binding,
+struct axis2_wsdl_binding_op *AXIS2_CALL
+axis2_wsdl_binding_get_binding_op(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env,
axis2_qname_t *qName);
@@ -134,13 +134,13 @@
}
wsdl_binding_impl->qname = NULL;
- wsdl_binding_impl->binding_operations = NULL;
+ wsdl_binding_impl->binding_ops = NULL;
wsdl_binding_impl->binding_faults = NULL;
wsdl_binding_impl->wsdl_binding.extensible_component = NULL;
wsdl_binding_impl->wsdl_binding.ops = NULL;
- wsdl_binding_impl->binding_operations = axis2_hash_make(env);
- if(NULL == wsdl_binding_impl->binding_operations)
+ wsdl_binding_impl->binding_ops = axis2_hash_make(env);
+ if(NULL == wsdl_binding_impl->binding_ops)
{
axis2_wsdl_binding_free(&(wsdl_binding_impl->wsdl_binding), env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
@@ -195,17 +195,17 @@
wsdl_binding_impl->wsdl_binding.ops->set_binding_faults =
axis2_wsdl_binding_set_binding_faults;
- wsdl_binding_impl->wsdl_binding.ops->get_binding_operations =
- axis2_wsdl_binding_get_binding_operations;
+ wsdl_binding_impl->wsdl_binding.ops->get_binding_ops =
+ axis2_wsdl_binding_get_binding_ops;
- wsdl_binding_impl->wsdl_binding.ops->set_binding_operations =
- axis2_wsdl_binding_set_binding_operations;
+ wsdl_binding_impl->wsdl_binding.ops->set_binding_ops =
+ axis2_wsdl_binding_set_binding_ops;
- wsdl_binding_impl->wsdl_binding.ops->add_binding_operation =
- axis2_wsdl_binding_add_binding_operation;
+ wsdl_binding_impl->wsdl_binding.ops->add_binding_op =
+ axis2_wsdl_binding_add_binding_op;
- wsdl_binding_impl->wsdl_binding.ops->get_binding_operation =
- axis2_wsdl_binding_get_binding_operation;
+ wsdl_binding_impl->wsdl_binding.ops->get_binding_op =
+ axis2_wsdl_binding_get_binding_op;
wsdl_binding_impl->wsdl_binding.ops->add_binding_fault =
axis2_wsdl_binding_add_binding_fault;
@@ -267,16 +267,16 @@
binding_impl->binding_faults = NULL;
}
- if(NULL != binding_impl->binding_operations)
+ if(NULL != binding_impl->binding_ops)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first (binding_impl->binding_operations, env); hi;
+ for (hi = axis2_hash_first (binding_impl->binding_ops, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_wsdl_binding_operation *binding_optr = NULL;
+ struct axis2_wsdl_binding_op *binding_optr = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- binding_optr = (struct axis2_wsdl_binding_operation *) val;
+ binding_optr = (struct axis2_wsdl_binding_op *) val;
if (binding_optr)
{
AXIS2_WSDL_BINDING_OPERATION_FREE (binding_optr, env);
@@ -286,8 +286,8 @@
binding_optr = NULL;
}
- axis2_hash_free(binding_impl->binding_operations, env);
- binding_impl->binding_operations = NULL;
+ axis2_hash_free(binding_impl->binding_ops, env);
+ binding_impl->binding_ops = NULL;
}
if(NULL != wsdl_binding->extensible_component)
@@ -416,34 +416,34 @@
}
axis2_hash_t * AXIS2_CALL
-axis2_wsdl_binding_get_binding_operations(axis2_wsdl_binding_t *wsdl_binding,
+axis2_wsdl_binding_get_binding_ops(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(wsdl_binding, env, NULL);
- return AXIS2_INTF_TO_IMPL(wsdl_binding)->binding_operations;
+ return AXIS2_INTF_TO_IMPL(wsdl_binding)->binding_ops;
}
axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_set_binding_operations(axis2_wsdl_binding_t *wsdl_binding,
+axis2_wsdl_binding_set_binding_ops(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env,
- axis2_hash_t *binding_operations)
+ axis2_hash_t *binding_ops)
{
axis2_wsdl_binding_impl_t *binding_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(wsdl_binding, env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, binding_operations, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, binding_ops, AXIS2_FAILURE);
binding_impl = AXIS2_INTF_TO_IMPL(wsdl_binding);
- if(NULL != binding_impl->binding_operations)
+ if(NULL != binding_impl->binding_ops)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first (binding_impl->binding_operations, env); hi;
+ for (hi = axis2_hash_first (binding_impl->binding_ops, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_wsdl_binding_operation *binding_optr = NULL;
+ struct axis2_wsdl_binding_op *binding_optr = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- binding_optr = (struct axis2_wsdl_binding_operation *) val;
+ binding_optr = (struct axis2_wsdl_binding_op *) val;
if (binding_optr)
{
AXIS2_WSDL_BINDING_OPERATION_FREE (binding_optr, env);
@@ -453,45 +453,45 @@
binding_optr = NULL;
}
- axis2_hash_free(binding_impl->binding_operations, env);
- binding_impl->binding_operations = NULL;
+ axis2_hash_free(binding_impl->binding_ops, env);
+ binding_impl->binding_ops = NULL;
}
- binding_impl->binding_operations = binding_operations;
+ binding_impl->binding_ops = binding_ops;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_add_binding_operation(axis2_wsdl_binding_t *wsdl_binding,
+axis2_wsdl_binding_add_binding_op(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env,
- struct axis2_wsdl_binding_operation *binding_operation)
+ struct axis2_wsdl_binding_op *binding_op)
{
axis2_wsdl_binding_impl_t *binding_impl = NULL;
axis2_qname_t *qname = NULL;
AXIS2_FUNC_PARAM_CHECK(wsdl_binding, env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, binding_operation, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, binding_op, AXIS2_FAILURE);
binding_impl = AXIS2_INTF_TO_IMPL(wsdl_binding);
- qname = AXIS2_WSDL_BINDING_OPERATION_GET_QNAME(binding_operation, env);
+ qname = AXIS2_WSDL_BINDING_OPERATION_GET_QNAME(binding_op, env);
if(NULL == qname)
{
return AXIS2_FAILURE;
}
- axis2_hash_set(binding_impl->binding_operations, qname,
- sizeof(axis2_qname_t), binding_operation);
+ axis2_hash_set(binding_impl->binding_ops, qname,
+ sizeof(axis2_qname_t), binding_op);
return AXIS2_SUCCESS;
}
-struct axis2_wsdl_binding_operation *AXIS2_CALL
-axis2_wsdl_binding_get_binding_operation(axis2_wsdl_binding_t *wsdl_binding,
+struct axis2_wsdl_binding_op *AXIS2_CALL
+axis2_wsdl_binding_get_binding_op(axis2_wsdl_binding_t *wsdl_binding,
axis2_env_t **env,
axis2_qname_t *qName)
{
AXIS2_FUNC_PARAM_CHECK(wsdl_binding, env, NULL);
- return (struct axis2_wsdl_binding_operation *) axis2_hash_get(
- AXIS2_INTF_TO_IMPL(wsdl_binding)->binding_operations, qName,
+ return (struct axis2_wsdl_binding_op *) axis2_hash_get(
+ AXIS2_INTF_TO_IMPL(wsdl_binding)->binding_ops, qName,
sizeof(axis2_qname_t));
}