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 di...@apache.org on 2007/03/19 08:50:48 UTC
svn commit: r519867 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ modules/core/engine/
modules/core/transport/http/util/
Author: dinesh
Date: Mon Mar 19 00:50:46 2007
New Revision: 519867
URL: http://svn.apache.org/viewvc?view=rev&rev=519867
Log:
axis2_disp.h , removed macros
Modified:
webservices/axis2/trunk/c/include/axis2_disp.h
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp.h?view=diff&rev=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Mon Mar 19 00:50:46 2007
@@ -149,19 +149,11 @@
/** Gets the base handler. */
-#define AXIS2_DISP_GET_BASE(disp, env) \
+#define axis2_disp_get_base(disp, env) \
axis2_disp_get_base(disp, env)
-/** Gets QName. */
-#define AXIS2_DISP_GET_NAME(disp, env) \
- axis2_disp_get_name(disp, env)
-
-/** Sets QName. */
-#define AXIS2_DISP_SET_QNAME(disp, env, name) \
- axis2_disp_set_name(disp, env, name)
-
/** Frees dispatcher. */
-#define AXIS2_DISP_FREE(disp, env) \
+#define axis2_disp_free(disp, env) \
axis2_disp_free(disp, env)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Mon Mar 19 00:50:46 2007
@@ -425,7 +425,7 @@
disp_dll = (axis2_disp_t *) axis2_class_loader_create_dll(env,
impl_info_param);
- handler = AXIS2_DISP_GET_BASE(disp_dll, env);
+ handler = axis2_disp_get_base(disp_dll, env);
handler_desc = AXIS2_HANDLER_GET_HANDLER_DESC(handler, env);
axis2_handler_desc_add_param(handler_desc, env, impl_info_param);
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=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 19 00:50:46 2007
@@ -69,7 +69,7 @@
return NULL;
}
- handler = AXIS2_DISP_GET_BASE(disp, env);
+ handler = axis2_disp_get_base(disp, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 19 00:50:46 2007
@@ -164,8 +164,8 @@
if (uri_dispatch)
{
axis2_handler_t *handler = NULL;
- handler = AXIS2_DISP_GET_BASE(uri_dispatch, env);
- AXIS2_DISP_FREE(uri_dispatch, env);
+ handler = axis2_disp_get_base(uri_dispatch, env);
+ axis2_disp_free(uri_dispatch, env);
AXIS2_PHASE_ADD_HANDLER_AT(phase, env, 0, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
@@ -1165,8 +1165,8 @@
return AXIS2_FAILURE;
}
- handler = AXIS2_DISP_GET_BASE(soap_msg_body_based_dispatch, env);
- AXIS2_DISP_FREE(soap_msg_body_based_dispatch, env);
+ handler = axis2_disp_get_base(soap_msg_body_based_dispatch, env);
+ axis2_disp_free(soap_msg_body_based_dispatch, env);
AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 0, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
@@ -1178,8 +1178,8 @@
return AXIS2_FAILURE;
}
- handler = AXIS2_DISP_GET_BASE(add_dispatch, env);
- AXIS2_DISP_FREE(add_dispatch, env);
+ handler = axis2_disp_get_base(add_dispatch, env);
+ axis2_disp_free(add_dispatch, env);
AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 1, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
@@ -1190,8 +1190,8 @@
return AXIS2_FAILURE;
}
- handler = AXIS2_DISP_GET_BASE(uri_dispatch, env);
- AXIS2_DISP_FREE(uri_dispatch, env);
+ handler = axis2_disp_get_base(uri_dispatch, env);
+ axis2_disp_free(uri_dispatch, env);
AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 1, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;*/
@@ -1202,8 +1202,8 @@
return AXIS2_FAILURE;
}
- handler = AXIS2_DISP_GET_BASE(soap_action_based_dispatch, env);
- AXIS2_DISP_FREE(soap_action_based_dispatch, env);
+ handler = axis2_disp_get_base(soap_action_based_dispatch, env);
+ axis2_disp_free(soap_action_based_dispatch, env);
AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 2, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Mon Mar 19 00:50:46 2007
@@ -64,7 +64,7 @@
return NULL;
}
- handler = AXIS2_DISP_GET_BASE(disp, env);
+ handler = axis2_disp_get_base(disp, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error,
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Mon Mar 19 00:50:46 2007
@@ -64,7 +64,7 @@
return NULL;
}
- handler = AXIS2_DISP_GET_BASE(disp, env);
+ handler = axis2_disp_get_base(disp, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=519867&r1=519866&r2=519867
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Mon Mar 19 00:50:46 2007
@@ -67,7 +67,7 @@
return NULL;
}
- handler = AXIS2_DISP_GET_BASE(disp, env);
+ handler = axis2_disp_get_base(disp, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error,
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=519867&r1=519866&r2=519867
==============================================================================
--- 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 Mon Mar 19 00:50:46 2007
@@ -1494,7 +1494,7 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
req_uri_disp = axis2_req_uri_disp_create(env);
- handler = AXIS2_DISP_GET_BASE(req_uri_disp, env);
+ handler = axis2_disp_get_base(req_uri_disp, env);
AXIS2_HANDLER_INVOKE(handler, env, msg_ctx);
if (NULL == axis2_msg_ctx_get_svc(msg_ctx, env) || NULL ==
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org