You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by du...@apache.org on 2007/03/08 12:50:03 UTC
svn commit: r516016 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engine/ modules/core/phaseresolver/
modules/core/receivers/ modules/core/transpo...
Author: dushshantha
Date: Thu Mar 8 03:49:57 2007
New Revision: 516016
URL: http://svn.apache.org/viewvc?view=rev&rev=516016
Log:
Removed macros and corrected indentation.
Modified:
webservices/axis2/trunk/c/include/axis2_op.h
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/description/client_utils.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/msg.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/test/core/description/test_description.c
webservices/axis2/trunk/c/test/core/engine/test_engine.c
webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op.h?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Thu Mar 8 03:49:57 2007
@@ -591,213 +591,6 @@
axis2_op_free_void_arg(void *op,
const axis2_env_t *env);
-/** Frees operation.
- @sa axis2_op_ops#free */
-#define AXIS2_OP_FREE(op, env) \
- axis2_op_free (op, env)
-
-/** Adds parameter.
- @sa axis2_op_ops#add_param */
-#define AXIS2_OP_ADD_PARAM(op, env, param) \
- axis2_op_add_param (op, env, param)
-
-/** Gets named parameter.
- @sa axis2_op_ops#get_param */
-#define AXIS2_OP_GET_PARAM(op, env, key) \
- axis2_op_get_param (op, env, key)
-
-/** Gets all the parameters as a list.
- @sa axis2_op_ops#get_all_params */
-#define AXIS2_OP_GET_ALL_PARAMS(op, env) \
- axis2_op_get_all_params (op, env)
-
-/** Checks if the named parameter is locked.
- @sa axis2_op_ops#is_param_locked */
-#define AXIS2_OP_IS_PARAM_LOCKED(op, env, param_name) \
- axis2_op_is_param_locked(op, env, param_name)
-
-/** Sets parent service.
- @sa axis2_op_ops#set_parent */
-#define AXIS2_OP_SET_PARENT(op, env, service_desc) \
- axis2_op_set_parent (op, env, service_desc)
-
-/** Gets parent service.
- @sa axis2_op_ops#get_parent */
-#define AXIS2_OP_GET_PARENT(op, env) \
- axis2_op_get_parent (op, env)
-
-/** Sets message receiver.
- @sa axis2_op_ops#set_msg_recv */
-#define AXIS2_OP_SET_MSG_RECV(op, env, msg_recv) \
- axis2_op_set_msg_recv (op, env, msg_recv)
-
-/** Gets message receiver.
- @sa axis2_op_ops#get_msg_recv */
-#define AXIS2_OP_GET_MSG_RECV(op, env) \
- axis2_op_get_msg_recv (op, env)
-
-/** Sets QName.
- @sa axis2_op_ops#set_qname */
-#define AXIS2_OP_SET_QNAME(op, env, qname) \
- axis2_op_set_qname (op, env, qname)
-
-/** Gets QName.
- @sa axis2_op_ops#get_qname */
-#define AXIS2_OP_GET_QNAME(op, env) \
- axis2_op_get_qname (op, env)
-
-/** Sets message exchange pattern.
- @sa axis2_op_ops#set_msg_exchange_pattern */
-#define AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op , env, \
- msg_exchange_pattern) \
- axis2_op_set_msg_exchange_pattern (op, env, \
- msg_exchange_pattern)
-
-/** Gets message exchange pattern.
- @sa axis2_op_ops#get_msg_exchange_pattern */
-#define AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env) \
- axis2_op_get_msg_exchange_pattern (op, env)
-
-/** Gets style of operation.
- @sa axis2_op_ops#get_style */
-#define AXIS2_OP_GET_STYLE(op, env) \
- axis2_op_get_style (op, env)
-
-/** Sets style of operation.
- @sa axis2_op_ops#set_style */
-#define AXIS2_OP_SET_STYLE(op, env, style) \
- axis2_op_set_style (op, env, style)
-
-/** Engages the given module.
- @sa axis2_op_ops#engage_module */
-#define AXIS2_OP_ENGAGE_MODULE(op, env, moduleref, conf) \
- axis2_op_engage_module (op, env, moduleref, conf)
-
-/** Adds the named module to engaged module list.
- @sa axis2_op_ops#add_to_engaged_module_list */
-#define AXIS2_OP_ADD_TO_ENGAGED_MODULE_LIST(op, env, module_name) \
- axis2_op_add_to_engaged_module_list (op, env, module_name)
-
-/** Gets all modules.
- @sa axis2_op_ops#get_all_modules */
-#define AXIS2_OP_GET_ALL_MODULES(op, env) \
- axis2_op_get_all_modules (op, env)
-
-/** Gets Axis specific MEP constant.
- @sa axis2_op_ops#get_axis_specific_mep_const */
-#define AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op, env) \
- axis2_op_get_axis_specific_mep_const (op, env)
-
-/** Gets fault in flow.
- @sa axis2_op_ops#get_fault_in_flow */
-#define AXIS2_OP_GET_FAULT_IN_FLOW(op, env) \
- axis2_op_get_fault_in_flow (op, env)
-
-/** Gets fault out flow.
- @sa axis2_op_ops#get_fault_out_flow */
-#define AXIS2_OP_GET_FAULT_OUT_FLOW(op, env) \
- axis2_op_get_fault_out_flow (op, env)
-
-/** Gets out flow.
- @sa axis2_op_ops#get_out_flow */
-#define AXIS2_OP_GET_OUT_FLOW(op, env) \
- axis2_op_get_out_flow (op, env)
-
-/** Gets in flow.
- @sa axis2_op_ops#get_in_flow */
-#define AXIS2_OP_GET_IN_FLOW(op, env) \
- axis2_op_get_in_flow (op, env)
-
-/** Sets fault in flow.
- @sa axis2_op_ops#set_fault_in_flow */
-#define AXIS2_OP_SET_FAULT_IN_FLOW(op, env, list) \
- axis2_op_set_fault_in_flow (op, env, list)
-
-/** Sets fault out flow.
- @sa axis2_op_ops#set_fault_out_flow */
-#define AXIS2_OP_SET_FAULT_OUT_FLOW(op, env, list) \
- axis2_op_set_fault_out_flow (op, env, list)
-
-/** Sets out flow.
- @sa axis2_op_ops#set_out_flow */
-#define AXIS2_OP_SET_OUT_FLOW(op, env, list) \
- axis2_op_set_out_flow (op, env, list)
-
-/** Sets in flow.
- @sa axis2_op_ops#set_in_flow */
-#define AXIS2_OP_SET_IN_FLOW(op, env, list) \
- axis2_op_set_in_flow (op, env, list)
-
-/** Adds given module QName to module qname list.
- @sa axis2_op_ops#add_module_qname */
-#define AXIS2_OP_ADD_MODULE_QNAME(op, env, module_name) \
- axis2_op_add_module_qname (op, env, module_name)
-
-/** Gets all module descriptions.
- @sa axis2_op_ops#get_all_module_qnames */
-#define AXIS2_OP_GET_ALL_MODULE_QNAMES(op, env) \
- axis2_op_get_all_module_qnames (op, env)
-
-/** Adds in fault.
- @sa axis2_op_ops#add_in_fault */
-#define AXIS2_OP_ADD_IN_FAULT(op, env, in_fault) \
- axis2_op_add_in_fault (op, env, in_fault)
-
-/** Adds out fault.
- @sa axis2_op_ops#add_out_fault */
-#define AXIS2_OP_ADD_OUT_FAULT(op, env, out_fault) \
- axis2_op_add_out_fault (op, env, out_fault)
-
-/** Adds feature.
- @sa axis2_op_ops#add_feature */
-#define AXIS2_OP_ADD_FEATURE(op, env, feature) \
- axis2_op_add_feature (op, env, feature)
-
-/** Gets all properties.
- @sa axis2_op_ops#get_all_properties */
-#define AXIS2_OP_GET_ALL_PROPERTIES(op, env) \
- axis2_op_get_all_properties (op, env)
-
-/** Finds operation context related to this operation.
- @sa axis2_op_ops#find_op_ctx */
-#define AXIS2_OP_FIND_OP_CTX(op, env, msg_ctx, svc_ctx) \
- axis2_op_find_op_ctx (op, env, msg_ctx, svc_ctx)
-
-/** Finds existing operation context related to this operation.
- @sa axis2_op_ops#find_existing_op_ctx */
-#define AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, wsdl_op) \
- axis2_op_find_existing_op_ctx (op, env, wsdl_op)
-
-/** Registers given operation context against this operation.
- @sa axis2_op_ops#_register_op_ctx */
-#define AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, wsdl_op) \
- axis2_op_register_op_ctx (op, env, msg_ctx, wsdl_op)
-
-/** Gets message corresponding to given label.
- @sa axis2_op_ops#get_msg */
-#define AXIS2_OP_GET_MSG(op, env, label) \
- axis2_op_get_msg(op, env, label)
-
-/** Adds message with given label.
- @sa axis2_op_ops#add_msg */
-#define AXIS2_OP_ADD_MSG(op, env, label, msg) \
- axis2_op_add_msg(op, env, label, msg)
-
-/** Checks is the operation is from a module.
- @sa axis2_op_ops#is_from_module */
-#define AXIS2_OP_IS_FROM_MODULE(op, env) \
- axis2_op_is_from_module(op, env)
-
-/** Set wsa mapping list.
- @sa axis2_op_ops#set_wsamapping_list */
-#define AXIS2_OP_SET_WSAMAPPING_LIST(op, env, mapping_list) \
- axis2_op_set_wsamapping_list(op, env, mapping_list)
-
-/** Get wsa mapping list.
- @sa axis2_op_ops#get_wsamapping_list */
-#define AXIS2_OP_GET_WSAMAPPING_LIST(op, env) \
- axis2_op_get_wsamapping_list(op, env)
-
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Thu Mar 8 03:49:57 2007
@@ -216,7 +216,7 @@
/* make sure operation's MEP is the same as given MEP */
if (mep_client_impl->mep)
{
- if (AXIS2_STRCMP(mep_client_impl->mep, AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env)) != 0)
+ if (AXIS2_STRCMP(mep_client_impl->mep, axis2_op_get_msg_exchange_pattern(op, env)) != 0)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -228,7 +228,7 @@
return AXIS2_FAILURE;
}
/* If operation has a parent service get it */
- svc = AXIS2_OP_GET_PARENT(op, env);
+ svc = axis2_op_get_parent(op, env);
if (svc)
{
AXIS2_SVC_CTX_SET_SVC(mep_client_impl->svc_ctx, env, svc);
@@ -239,7 +239,7 @@
if (svc)
{
axis2_op_t *temp_op = NULL;
- const axis2_qname_t *op_qname = AXIS2_OP_GET_QNAME(op, env);
+ const axis2_qname_t *op_qname = axis2_op_get_qname(op, env);
temp_op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
if (!temp_op)
{
@@ -664,7 +664,7 @@
if (op)
{
/* handle one way case */
- const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
@@ -689,7 +689,7 @@
if (op)
{
- AXIS2_OP_REGISTER_OP_CTX(op, env, response, AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env));
+ axis2_op_register_op_ctx(op, env, response, AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env));
}
AXIS2_MSG_CTX_SET_SERVER_SIDE(response, env, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_CONF_CTX(response, env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env));
@@ -815,7 +815,7 @@
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (op)
{
- AXIS2_OP_REGISTER_OP_CTX(op, env, response, AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env));
+ axis2_op_register_op_ctx(op, env, response, AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env));
}
AXIS2_MSG_CTX_SET_SERVER_SIDE(response, env, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_CONF_CTX(response, env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env));
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Thu Mar 8 03:49:57 2007
@@ -189,7 +189,7 @@
return NULL;
}
- mep_uri = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ mep_uri = axis2_op_get_msg_exchange_pattern(op, env);
if (!mep_uri)
{
@@ -514,7 +514,7 @@
AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env),
op_client_impl->callback);
/* TODO: set up reply to */
- AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, AXIS2_OP_FIND_OP_CTX(op, env,
+ AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, axis2_op_find_op_ctx(op, env,
msg_ctx, op_client_impl->svc_ctx));
AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, op_client_impl->svc_ctx);
@@ -540,7 +540,7 @@
response_mc = axis2_mep_client_two_way_send(env, msg_ctx);
if (!response_mc)
{
- const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu Mar 8 03:49:57 2007
@@ -781,7 +781,7 @@
op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env, op_qname);
if (op)
{
- param = AXIS2_OP_GET_PARAM(op, env, AXIS2_SOAP_ACTION);
+ param = axis2_op_get_param(op, env, AXIS2_SOAP_ACTION);
if (param)
{
action_uri = (axis2_uri_t *) AXIS2_PARAM_GET_VALUE(param, env);
@@ -981,7 +981,7 @@
op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env,
op_qname);
- AXIS2_OP_SET_MSG_RECV(op, env,
+ axis2_op_set_msg_recv(op, env,
AXIS2_CALLBACK_RECV_GET_BASE(svc_client_impl->callback_recv, env));
AXIS2_OP_CLIENT_SET_CALLBACK_RECV(svc_client_impl->op_client, env,
svc_client_impl->callback_recv);
@@ -1300,23 +1300,23 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
if (op_out_in)
{
- AXIS2_OP_FREE(op_out_in, env);
+ axis2_op_free(op_out_in, env);
}
if (op_out_only)
{
- AXIS2_OP_FREE(op_out_only, env);
+ axis2_op_free(op_out_only, env);
}
if (op_robust_out_only)
{
- AXIS2_OP_FREE(op_robust_out_only, env);
+ axis2_op_free(op_robust_out_only, env);
}
return NULL;
}
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_out_in, env, AXIS2_MEP_URI_OUT_IN);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_out_only, env, AXIS2_MEP_URI_OUT_ONLY);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_robust_out_only, env, AXIS2_MEP_URI_ROBUST_OUT_ONLY);
+ axis2_op_set_msg_exchange_pattern(op_out_in, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op_out_only, env, AXIS2_MEP_URI_OUT_ONLY);
+ axis2_op_set_msg_exchange_pattern(op_robust_out_only, env, AXIS2_MEP_URI_ROBUST_OUT_ONLY);
/* Setting operation phase */
info = AXIS2_CONF_GET_PHASES_INFO(svc_client_impl->conf, env);
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Thu Mar 8 03:49:57 2007
@@ -1153,7 +1153,7 @@
if (msg_ctx->op)
{
- param = AXIS2_OP_GET_PARAM(msg_ctx->op, env, key);
+ param = axis2_op_get_param(msg_ctx->op, env, key);
if (param)
{
return param;
@@ -1221,7 +1221,7 @@
}
else
{
- param = AXIS2_OP_GET_PARAM(msg_ctx->op, env, key);
+ param = axis2_op_get_param(msg_ctx->op, env, key);
if (param)
{
return param;
@@ -1621,7 +1621,7 @@
if (op)
{
msg_ctx->op = op;
- msg_ctx->op_qname = (axis2_qname_t *)AXIS2_OP_GET_QNAME(op, env);
+ msg_ctx->op_qname = (axis2_qname_t *)axis2_op_get_qname(op, env);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Thu Mar 8 03:49:57 2007
@@ -105,8 +105,8 @@
if (op_ctx->op)
{
- op_ctx->op_qname = (axis2_qname_t *)AXIS2_OP_GET_QNAME(op_ctx->op, env);
- op_ctx->op_mep = AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op_ctx->op, env);
+ op_ctx->op_qname = (axis2_qname_t *)axis2_op_get_qname(op_ctx->op, env);
+ op_ctx->op_mep = axis2_op_get_axis_specific_mep_const(op_ctx->op, env);
}
axis2_op_ctx_set_parent(op_ctx, env, svc_ctx);
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Mar 8 03:49:57 2007
@@ -1173,7 +1173,7 @@
axis2_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *)v;
- modules = AXIS2_OP_GET_ALL_MODULE_QNAMES(op_desc, env);
+ modules = axis2_op_get_all_module_qnames(op_desc, env);
if (modules)
sizek = axis2_array_list_size(modules, env);
for (k = 0; k < sizek; k++)
@@ -1188,7 +1188,7 @@
if (module)
{
- AXIS2_OP_ENGAGE_MODULE(op_desc, env, module,
+ axis2_op_engage_module(op_desc, env, module,
dep_engine_impl->conf);
}
else
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Thu Mar 8 03:49:57 2007
@@ -791,7 +791,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Zero length " \
"input_action_string found. Not added to the mapping list");
}
- AXIS2_OP_SET_WSAMAPPING_LIST(op_desc, env, mapping_list);
+ axis2_op_set_wsamapping_list(op_desc, env, mapping_list);
/*qname = axis2_qname_create(env, AXIS2_OUTPUT_ACTION_MAPPING, NULL, NULL);
child_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(mapping_element,
env, qname, mapping_node, &child_node);
@@ -996,7 +996,7 @@
}
else
{
- status = AXIS2_OP_ADD_MODULE_QNAME(op, env, ref_qname);
+ status = axis2_op_add_module_qname(op, env, ref_qname);
AXIS2_QNAME_FREE(ref_qname, env);
if (AXIS2_SUCCESS != status)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Thu Mar 8 03:49:57 2007
@@ -482,7 +482,7 @@
op_name = AXIOM_ATTRIBUTE_GET_VALUE(op_name_att, env);
qopname = axis2_qname_create(env, op_name, NULL, NULL);
- AXIS2_OP_SET_QNAME(op_desc, env, qopname);
+ axis2_op_set_qname(op_desc, env, qopname);
if (qopname)
AXIS2_QNAME_FREE(qopname, env);
@@ -515,14 +515,14 @@
msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(module_builder->
desc_builder, env, recv_element);
- AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
+ axis2_op_set_msg_recv(op_desc, env, msg_recv);
}
else
{
axis2_msg_recv_t *msg_recv = NULL;
/* setting default message reciver */
msg_recv = axis2_desc_builder_load_default_msg_recv(env);
- AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
+ axis2_op_set_msg_recv(op_desc, env, msg_recv);
}
/* Process Module Refs */
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Thu Mar 8 03:49:57 2007
@@ -834,11 +834,11 @@
op_out_faultphases = axis2_phases_info_get_op_out_faultphases(phases_info,
env);
- status = AXIS2_OP_SET_IN_FLOW(op_desc, env, op_in_phases);
- status = AXIS2_OP_SET_OUT_FLOW(op_desc, env, op_out_phases);
+ status = axis2_op_set_in_flow(op_desc, env, op_in_phases);
+ status = axis2_op_set_out_flow(op_desc, env, op_out_phases);
if (op_in_faultphases)
{
- status = AXIS2_OP_SET_FAULT_IN_FLOW(op_desc, env,
+ status = axis2_op_set_fault_in_flow(op_desc, env,
op_in_faultphases);
}
/*
@@ -853,7 +853,7 @@
*/
if (op_out_faultphases)
{
- status = AXIS2_OP_SET_FAULT_OUT_FLOW(op_desc, env,
+ status = axis2_op_set_fault_out_flow(op_desc, env,
op_out_faultphases);
}
/*
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Mar 8 03:49:57 2007
@@ -476,7 +476,7 @@
int sizej = 0;
op_desc = (axis2_op_t *) axis2_array_list_get(ops, env, i);
- params = AXIS2_OP_GET_ALL_PARAMS(op_desc, env);
+ params = axis2_op_get_all_params(op_desc, env);
/* Adding wsa-mapping into service */
sizej = axis2_array_list_size(params, env);
for (j = 0; j < sizej; j++)
@@ -585,10 +585,10 @@
op_desc = axis2_op_create(env);*/
if(mep_url)
{
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_desc, env, mep_url);
+ axis2_op_set_msg_exchange_pattern(op_desc, env, mep_url);
}
/*}*/
- AXIS2_OP_SET_QNAME(op_desc, env, qopname);
+ axis2_op_set_qname(op_desc, env, qopname);
/*}
else
{
@@ -603,7 +603,7 @@
else
{
op_desc = axis2_op_create(env);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_desc, env, mep);
+ axis2_op_set_msg_exchange_pattern(op_desc, env, mep);
AXIS2_OP_SET_WSDL_OP(op_desc, env, wsdl_op);
}
}*/
@@ -634,7 +634,7 @@
axis2_msg_recv_t *msg_recv = NULL;
msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(svc_builder->desc_builder,
env, recv_element);
- AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
+ axis2_op_set_msg_recv(op_desc, env, msg_recv);
}
else
@@ -642,7 +642,7 @@
axis2_msg_recv_t *msg_recv = NULL;
/* setting the default messgae receiver */
msg_recv = axis2_desc_builder_load_default_msg_recv(env);
- AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
+ axis2_op_set_msg_recv(op_desc, env, msg_recv);
}
/* process module refs */
qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
Modified: webservices/axis2/trunk/c/modules/core/description/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/client_utils.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/client_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/client_utils.c Thu Mar 8 03:49:57 2007
@@ -243,14 +243,14 @@
}
axis2_op = axis2_op_create(env);
op_qname = WODEN_INTERFACE_OP_GET_QNAME(interface_op, env);
- AXIS2_OP_SET_QNAME(axis2_op, env, op_qname);
+ axis2_op_set_qname(axis2_op, env, op_qname);
mep_uri = WODEN_INTERFACE_OP_GET_MSG_EXCHANGE_PATTERN(interface_op,
env);
if (mep_uri)
{
mep_str = AXIS2_URI_TO_STRING(mep_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(axis2_op, env, mep_str);
+ axis2_op_set_msg_exchange_pattern(axis2_op, env, mep_str);
}
binding_op = woden_binding_op_to_element_extensible(binding_op, env);
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op,
@@ -456,14 +456,14 @@
}
axis2_op = axis2_op_create(env);
op_qname = WODEN_INTERFACE_OP_GET_QNAME(interface_op, env);
- AXIS2_OP_SET_QNAME(axis2_op, env, op_qname);
+ axis2_op_set_qname(axis2_op, env, op_qname);
mep_uri = WODEN_INTERFACE_OP_GET_MSG_EXCHANGE_PATTERN(interface_op,
env);
if (mep_uri)
{
mep_str = AXIS2_URI_TO_STRING(mep_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(axis2_op, env, mep_str);
+ axis2_op_set_msg_exchange_pattern(axis2_op, env, mep_str);
}
binding_op = woden_wsdl10_binding_op_to_element_extensible(
binding_op, env);
@@ -494,7 +494,7 @@
soap_action_uri = WODEN_WSDL10_SOAP_BINDING_OP_EXTS_GET_SOAP_ACTION(
soap_binding_op, env);
param = axis2_param_create(env, AXIS2_SOAP_ACTION, soap_action_uri);
- AXIS2_OP_ADD_PARAM(axis2_op, env, param);
+ axis2_op_add_param(axis2_op, env, param);
break;
}
}
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Thu Mar 8 03:49:57 2007
@@ -149,7 +149,7 @@
axis2_hash_this(hi, NULL, NULL, &val);
op = (struct axis2_op *) val;
if (op)
- AXIS2_OP_FREE(op, env);
+ axis2_op_free(op, env);
val = NULL;
op = NULL;
@@ -295,7 +295,7 @@
return AXIS2_FAILURE;
}
- op_qname = AXIS2_OP_GET_QNAME(op, env);
+ op_qname = axis2_op_get_qname(op, env);
if (NULL == op_qname)
{
Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Thu Mar 8 03:49:57 2007
@@ -221,7 +221,7 @@
parent_l = axis2_msg_get_parent(msg, env);
if (parent_l)
{
- locked = AXIS2_OP_IS_PARAM_LOCKED(parent_l, env, param_name);
+ locked = axis2_op_is_param_locked(parent_l, env, param_name);
}
if (AXIS2_TRUE == locked)
{
@@ -334,7 +334,7 @@
AXIS2_ENV_CHECK(env, NULL);
operation = axis2_msg_get_parent(msg, env);
- svc = AXIS2_OP_GET_PARENT(operation, env);
+ svc = axis2_op_get_parent(operation, env);
schemas = AXIS2_SVC_GET_ALL_SCHEMAS(svc, env);
schemas_size = AXIS2_ARRAY_LIST_SIZE(schemas, env);
for (i = 0; i < schemas_size; i++)
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Thu Mar 8 03:49:57 2007
@@ -326,8 +326,8 @@
if (val)
{
- if (AXIS2_OP_IS_FROM_MODULE((axis2_op_t *)val, env) == AXIS2_FALSE )
- AXIS2_OP_FREE((axis2_op_t *)val, env);
+ if (axis2_op_is_from_module((axis2_op_t *)val, env) == AXIS2_FALSE )
+ axis2_op_free((axis2_op_t *)val, env);
val = NULL;
}
}
@@ -410,7 +410,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
- status = AXIS2_OP_SET_PARENT(op, env, svc);
+ status = axis2_op_set_parent(op, env, svc);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -436,20 +436,20 @@
if (module_impl)
{
}
- status = AXIS2_OP_ENGAGE_MODULE(op, env, module_desc, conf);
+ status = axis2_op_engage_module(op, env, module_desc, conf);
if (AXIS2_SUCCESS != status)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Module already engaged to operation");
}
}*/
- msg_recv = AXIS2_OP_GET_MSG_RECV(op, env);
+ msg_recv = axis2_op_get_msg_recv(op, env);
if (msg_recv == NULL)
{
msg_recv = axis2_desc_builder_load_default_msg_recv(env);
- AXIS2_OP_SET_MSG_RECV(op, env, msg_recv);
+ axis2_op_set_msg_recv(op, env, msg_recv);
}
- qname = AXIS2_OP_GET_QNAME(op, env);
+ qname = axis2_op_get_qname(op, env);
if (qname)
key = AXIS2_QNAME_GET_LOCALPART(qname, env);
if (key)
@@ -768,7 +768,7 @@
void *v = NULL;
axis2_hash_this(index, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
- mappings_list = AXIS2_OP_GET_WSAMAPPING_LIST(op_desc, env);
+ mappings_list = axis2_op_get_wsamapping_list(op_desc, env);
/* adding WSA mapping into service */
size = axis2_array_list_size(mappings_list, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Thu Mar 8 03:49:57 2007
@@ -222,7 +222,7 @@
axis2_svc_ctx_t *svc_ctx = NULL;
AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
- AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx);
+ axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
if (svc_ctx)
Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Thu Mar 8 03:49:57 2007
@@ -123,11 +123,11 @@
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (op)
- op_ctx = AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, msg_ctx);
+ op_ctx = axis2_op_find_existing_op_ctx(op, env, msg_ctx);
if (op_ctx)
{
- AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx);
+ axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
if (svc_ctx)
{
@@ -155,7 +155,7 @@
AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
- AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx);
+ axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Thu Mar 8 03:49:57 2007
@@ -262,7 +262,7 @@
axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
{
- phases = AXIS2_OP_GET_OUT_FLOW(op, env);
+ phases = axis2_op_get_out_flow(op, env);
}
}
@@ -386,7 +386,7 @@
if (op_ctx)
{
op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- op_specific_phases = AXIS2_OP_GET_IN_FLOW(op, env);
+ op_specific_phases = axis2_op_get_in_flow(op, env);
axis2_engine_resume_invocation_phases(engine, env, op_specific_phases, msg_ctx);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -413,7 +413,7 @@
if (op_ctx)
{
op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- op_specific_phases = AXIS2_OP_GET_IN_FLOW(op, env);
+ op_specific_phases = axis2_op_get_in_flow(op, env);
status = axis2_engine_invoke_phases(engine, env, op_specific_phases, msg_ctx);
if (status != AXIS2_SUCCESS)
{
@@ -438,7 +438,7 @@
/* invoke the message receivers */
if (!op)
return AXIS2_FAILURE;
- receiver = AXIS2_OP_GET_MSG_RECV(op, env);
+ receiver = axis2_op_get_msg_recv(op, env);
if (!receiver)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Message receiver not set in operation description");
@@ -543,7 +543,7 @@
if (op_ctx)
{
axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- axis2_array_list_t *phases = AXIS2_OP_GET_FAULT_IN_FLOW(op, env);
+ axis2_array_list_t *phases = axis2_op_get_fault_in_flow(op, env);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
@@ -980,7 +980,7 @@
if (op)
{
axis2_msg_recv_t *receiver = NULL;
- receiver = AXIS2_OP_GET_MSG_RECV(op, env);
+ receiver = axis2_op_get_msg_recv(op, env);
if (!receiver)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Message receiver not set in operation description");
@@ -1011,7 +1011,7 @@
axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
{
- phases = AXIS2_OP_GET_OUT_FLOW(op, env);
+ phases = axis2_op_get_out_flow(op, env);
}
}
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Thu Mar 8 03:49:57 2007
@@ -302,7 +302,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(op, env),
+ AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname(op, env),
env));
for (i = 1; i < 5; i++)
{
@@ -387,7 +387,7 @@
{
return status;
}*/
- status = AXIS2_OP_ADD_TO_ENGAGED_MODULE_LIST(op, env, module_desc);
+ status = axis2_op_add_to_engaged_module_list(op, env, module_desc);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -603,7 +603,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_IN_FLOW(op, env);
+ phase_list = axis2_op_get_in_flow(op, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -612,7 +612,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_OUT_FLOW(op, env);
+ phase_list = axis2_op_get_out_flow(op, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -621,7 +621,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_FAULT_IN_FLOW(op, env);
+ phase_list = axis2_op_get_fault_in_flow(op, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -630,7 +630,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_FAULT_OUT_FLOW(op, env);
+ phase_list = axis2_op_get_fault_out_flow(op, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -1121,8 +1121,8 @@
axis2_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(op_desc, env), env));
- modules = AXIS2_OP_GET_ALL_MODULES(op_desc, env);
+ AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname(op_desc, env), env));
+ modules = axis2_op_get_all_modules(op_desc, env);
module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
if (modules)
size = axis2_array_list_size(modules, env);
@@ -1156,7 +1156,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_IN_FLOW(op_desc, env);
+ phase_list = axis2_op_get_in_flow(op_desc, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -1165,7 +1165,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_OUT_FLOW(op_desc, env);
+ phase_list = axis2_op_get_out_flow(op_desc, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -1174,7 +1174,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_FAULT_IN_FLOW(op_desc, env);
+ phase_list = axis2_op_get_fault_in_flow(op_desc, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -1183,7 +1183,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_OP_GET_FAULT_OUT_FLOW(op_desc, env);
+ phase_list = axis2_op_get_fault_out_flow(op_desc, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
break;
@@ -1258,7 +1258,7 @@
if(phase_holder)
AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
}
- status = AXIS2_OP_ADD_TO_ENGAGED_MODULE_LIST(op_desc, env, module_desc);
+ status = axis2_op_add_to_engaged_module_list(op_desc, env, module_desc);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -1454,7 +1454,7 @@
axis2_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
- modules = AXIS2_OP_GET_ALL_MODULES(op_desc, env);
+ modules = axis2_op_get_all_modules(op_desc, env);
if (modules)
size = axis2_array_list_size(modules, env);
for (j = 0; j < size; j++)
@@ -1481,7 +1481,7 @@
return status;
}
- status = AXIS2_OP_ADD_TO_ENGAGED_MODULE_LIST(op_desc, env,
+ status = axis2_op_add_to_engaged_module_list(op_desc, env,
module_desc);
}
@@ -1515,22 +1515,22 @@
{
case AXIS2_IN_FLOW:
{
- phases = AXIS2_OP_GET_IN_FLOW(axis_op, env);
+ phases = axis2_op_get_in_flow(axis_op, env);
break;
}
case AXIS2_OUT_FLOW:
{
- phases = AXIS2_OP_GET_OUT_FLOW(axis_op, env);
+ phases = axis2_op_get_out_flow(axis_op, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
{
- phases = AXIS2_OP_GET_FAULT_IN_FLOW(axis_op, env);
+ phases = axis2_op_get_fault_in_flow(axis_op, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
{
- phases = AXIS2_OP_GET_FAULT_OUT_FLOW(axis_op, env);
+ phases = axis2_op_get_fault_out_flow(axis_op, env);
break;
}
}
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Thu Mar 8 03:49:57 2007
@@ -126,7 +126,7 @@
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
op_desc = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- style = AXIS2_OP_GET_STYLE(op_desc, env);
+ style = axis2_op_get_style(op_desc, env);
if (0 == AXIS2_STRCMP(AXIS2_STYLE_DOC, style))
{
axiom_soap_envelope_t *envelope = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Thu Mar 8 03:49:57 2007
@@ -638,7 +638,7 @@
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (op)
{
- const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_HTTP_CLIENT_TRANSPORT_ERROR,
AXIS2_FAILURE);
/* handle one way case */
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Thu Mar 8 03:49:57 2007
@@ -599,7 +599,7 @@
if (op)
{
/* handle one way case */
- const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "OP name axis2_qname_get_localpart = %s",
mep);
if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Thu Mar 8 03:49:57 2007
@@ -541,7 +541,7 @@
/*if (op)
{
axis2_msg_t *msg = NULL;
- msg = AXIS2_OP_GET_MSG(op, env, AXIS2_MSG_IN);
+ msg = axis2_op_get_msg(op, env, AXIS2_MSG_IN);
schema_element = AXIS2_MSG_GET_SCHEMA_ELEMENT(msg, env);
}*/
soap_envelope = axis2_http_transport_utils_handle_media_type_url_encoded(
@@ -813,7 +813,7 @@
hi2 = axis2_hash_next(env, hi2))
{
axis2_hash_this(hi2, NULL, NULL, &op);
- oname = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(
+ oname = AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname(
((axis2_op_t *)op), env), env);
ret = AXIS2_STRACAT(tmp2, "<li>", env);
AXIS2_FREE(env->allocator, tmp2);
@@ -1326,7 +1326,7 @@
axiom_node_t *body_child_node = NULL;
body_child = axiom_element_create_with_qname(env, NULL,
- AXIS2_OP_GET_QNAME(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
+ axis2_op_get_qname(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
env), &body_child_node);
AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
if (param_map)
@@ -1453,7 +1453,7 @@
}
body_child = axiom_element_create_with_qname(env, NULL,
- AXIS2_OP_GET_QNAME(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
+ axis2_op_get_qname(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
env), &body_child_node);
AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
if (param_map)
Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Thu Mar 8 03:49:57 2007
@@ -54,25 +54,25 @@
op_qname = axis2_qname_create(env, "add" , "", NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
AXIS2_QNAME_FREE(op_qname, env);
op_qname = axis2_qname_create(env, "sub" , "", NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
AXIS2_QNAME_FREE(op_qname, env);
op_qname = axis2_qname_create(env, "mul" , "", NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
AXIS2_QNAME_FREE(op_qname, env);
op_qname = axis2_qname_create(env, "div" , "", NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
AXIS2_QNAME_FREE(op_qname, env);
}
Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c Thu Mar 8 03:49:57 2007
@@ -138,7 +138,7 @@
{
axis2_op_t *op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
axis2_msg_recv_t* msg_recv = savan_msg_recv_create(env);
- AXIS2_OP_SET_MSG_RECV(op, env, msg_recv);
+ axis2_op_set_msg_recv(op, env, msg_recv);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Thu Mar 8 03:49:57 2007
@@ -103,7 +103,7 @@
if (op)
{
const axis2_qname_t *qname = NULL;
- qname = AXIS2_OP_GET_QNAME((axis2_op_t *)op, env);
+ qname = axis2_op_get_qname((axis2_op_t *)op, env);
oname = AXIS2_QNAME_GET_LOCALPART(qname, env);
printf("op name = %s\n", oname);
}
Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Thu Mar 8 03:49:57 2007
@@ -43,15 +43,15 @@
moduleref = axis2_module_desc_create(env);
conf = axis2_conf_create(env);
- status = AXIS2_OP_ENGAGE_MODULE(op, env, moduleref, conf);
+ status = axis2_op_engage_module(op, env, moduleref, conf);
moduleref = NULL;
if (status != AXIS2_SUCCESS)
{
- AXIS2_OP_FREE(op, env);
+ axis2_op_free(op, env);
printf("ERROR %d\n", status);
}
- AXIS2_OP_FREE(op, env);
+ axis2_op_free(op, env);
axis2_env_free(env);
return 0;
}
@@ -183,7 +183,7 @@
if (op2)
{
const axis2_qname_t *qname = NULL;
- qname = AXIS2_OP_GET_QNAME((axis2_op_t *)op2, env);
+ qname = axis2_op_get_qname((axis2_op_t *)op2, env);
oname = AXIS2_QNAME_GET_LOCALPART(qname, env);
printf("op name = %s\n", oname);
}
Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Thu Mar 8 03:49:57 2007
@@ -74,7 +74,7 @@
AXIS2_SVC_CTX_FREE(svc_ctx, env);
AXIS2_SVC_FREE(svc, env);
AXIS2_OP_CTX_FREE(op_ctx, env);
- AXIS2_OP_FREE(op, env);
+ axis2_op_free(op, env);
AXIS2_ENGINE_FREE(engine, env);
return 0;
}
Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c Thu Mar 8 03:49:57 2007
@@ -75,7 +75,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -87,7 +87,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -99,7 +99,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -111,7 +111,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c?view=diff&rev=516016&r1=516015&r2=516016
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c Thu Mar 8 03:49:57 2007
@@ -75,7 +75,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -87,7 +87,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -99,7 +99,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -111,7 +111,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -123,7 +123,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -135,7 +135,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -147,7 +147,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -159,7 +159,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -171,7 +171,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -183,7 +183,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -195,7 +195,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -207,7 +207,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -219,7 +219,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
@@ -231,7 +231,7 @@
NULL);
op = axis2_op_create_with_qname(env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_SVC_ADD_OP(svc, env, op);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org