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 sa...@apache.org on 2007/03/15 14:16:11 UTC
svn commit: r518623 [17/17] - in /webservices/axis2/trunk/c: build/win32/
include/ modules/core/clientapi/ modules/core/deployment/
modules/core/engine/ modules/core/phaseresolver/ modules/core/receivers/
modules/core/transport/http/receiver/ modules/c...
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=518623&r1=518622&r2=518623
==============================================================================
--- 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 15 06:16:07 2007
@@ -24,17 +24,13 @@
#include <axiom_soap_fault.h>
#include <axiom_soap.h>
-/************************* Function prototypes ********************************/
-
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync(
axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
axis2_msg_ctx_t *new_msg_ctx);
-/************************** End of function prototypes ************************/
-
AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
axis2_raw_xml_in_out_msg_recv_create(
const axis2_env_t *env)
@@ -55,15 +51,13 @@
AXIS2_MSG_RECV_FREE(msg_recv, env);
return NULL;
}
- msg_recv->ops->invoke_in_out_business_logic_sync =
- axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync;
- msg_recv->ops->receive = msg_recv->ops->receive_sync;
+
+ axis2_msg_recv_set_invoke_business_logic(msg_recv, env,
+ axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync);
return msg_recv;
}
-/***************************Function implementation****************************/
-
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync(
axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
@@ -220,8 +214,6 @@
*/
}
-
-
if (result_node)
{
if (0 == AXIS2_STRCMP(style, AXIS2_STYLE_RPC))
@@ -241,7 +233,6 @@
ns, &body_content_node);
AXIOM_NODE_ADD_CHILD(body_content_node, env, result_node);
}
-
}
else
{
@@ -353,11 +344,6 @@
return status;
}
-/**
- * Following block distinguish the exposed part of the dll.
- */
-
-
AXIS2_EXPORT int axis2_get_instance(
struct axis2_msg_recv **inst,
const axis2_env_t *env)
@@ -382,3 +368,5 @@
}
return status;
}
+
+
Modified: webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Thu Mar 15 06:16:07 2007
@@ -18,107 +18,47 @@
#include <axis2_svr_callback.h>
#include <axis2_engine.h>
-/**
- * @brief Message Receiver struct impl
- * Axis2 Message Receiver impl
- */
-typedef struct axis2_svr_callback_impl
+struct axis2_svr_callback
{
- axis2_svr_callback_t svr_callback;
axis2_char_t *scope;
-}
-axis2_svr_callback_impl_t;
-
-#define AXIS2_INTF_TO_IMPL(svr_callback) ((axis2_svr_callback_impl_t *) svr_callback)
-
-/*************************** Function headers *********************************/
-
-axis2_status_t AXIS2_CALL
-axis2_svr_callback_free(
- axis2_svr_callback_t *svr_callback,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_svr_callback_handle_result(
- axis2_svr_callback_t *svr_callback,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
-
-axis2_status_t AXIS2_CALL
-axis2_svr_callback_handle_fault(
- axis2_svr_callback_t *svr_callback,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+};
-/************************* End of function headers ****************************/
-
-axis2_svr_callback_t *AXIS2_CALL
+AXIS2_EXPORT axis2_svr_callback_t *AXIS2_CALL
axis2_svr_callback_create(
const axis2_env_t *env)
{
- axis2_svr_callback_impl_t *svr_callback_impl = NULL;
+ axis2_svr_callback_t *svr_callback = NULL;
AXIS2_ENV_CHECK(env, NULL);
- svr_callback_impl = (axis2_svr_callback_impl_t *)
- AXIS2_MALLOC(env->allocator, sizeof(axis2_svr_callback_impl_t));
+ svr_callback = (axis2_svr_callback_t *)
+ AXIS2_MALLOC(env->allocator, sizeof(axis2_svr_callback_t));
- if (NULL == svr_callback_impl)
+ if (NULL == svr_callback)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- svr_callback_impl->svr_callback.ops = NULL;
-
- svr_callback_impl->svr_callback.ops = (axis2_svr_callback_ops_t *)
- AXIS2_MALLOC(env->allocator, sizeof(axis2_svr_callback_ops_t));
-
- if (NULL == svr_callback_impl->svr_callback.ops)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- axis2_svr_callback_free(&(svr_callback_impl->svr_callback), env);
-
- return NULL;
- }
-
- svr_callback_impl->svr_callback.ops->free = axis2_svr_callback_free;
- svr_callback_impl->svr_callback.ops->handle_result =
- axis2_svr_callback_handle_result;
- svr_callback_impl->svr_callback.ops->handle_fault =
- axis2_svr_callback_handle_fault;
-
- return &(svr_callback_impl->svr_callback);
+ return svr_callback;
}
-/******************************************************************************/
-
-axis2_status_t AXIS2_CALL
+AXIS2_EXPORT axis2_status_t AXIS2_CALL
axis2_svr_callback_free(
axis2_svr_callback_t *svr_callback,
const axis2_env_t *env)
{
- axis2_svr_callback_impl_t *svr_callback_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- svr_callback_impl = AXIS2_INTF_TO_IMPL(svr_callback);
- if (svr_callback->ops)
+ if (svr_callback)
{
- AXIS2_FREE(env->allocator, svr_callback->ops);
- svr_callback->ops = NULL;
- }
-
- if (svr_callback_impl)
- {
- AXIS2_FREE(env->allocator, svr_callback_impl);
- svr_callback_impl = NULL;
+ AXIS2_FREE(env->allocator, svr_callback);
}
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXPORT axis2_status_t AXIS2_CALL
axis2_svr_callback_handle_result(
axis2_svr_callback_t *svr_callback,
const axis2_env_t *env,
@@ -143,7 +83,7 @@
return AXIS2_ENGINE_SEND(engine, env, msg_ctx);
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXPORT axis2_status_t AXIS2_CALL
axis2_svr_callback_handle_fault(
axis2_svr_callback_t *svr_callback,
const axis2_env_t *env,
@@ -170,3 +110,5 @@
fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
return AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
}
+
+
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Thu Mar 15 06:16:07 2007
@@ -124,7 +124,7 @@
* server_impl->conf_ctx because it may own to any other object which
* may lead to double free
*/
- server_impl->conf_ctx_private = build_conf_ctx(env, repo);
+ server_impl->conf_ctx_private = axis2_build_conf_ctx(env, repo);
if (NULL == server_impl->conf_ctx_private)
{
axis2_http_server_free((axis2_transport_receiver_t *) server_impl, env);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Thu Mar 15 06:16:07 2007
@@ -101,7 +101,7 @@
return NULL;
}
iis_worker_impl->iis_worker.ops = NULL;
- iis_worker_impl->conf_ctx = build_conf_ctx(env, repo_path);
+ iis_worker_impl->conf_ctx = axis2_build_conf_ctx(env, repo_path);
if (NULL == iis_worker_impl->conf_ctx)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Thu Mar 15 06:16:07 2007
@@ -84,7 +84,7 @@
return NULL;
}
apache2_worker_impl->apache2_worker.ops = NULL;
- apache2_worker_impl->conf_ctx = build_conf_ctx(env, repo_path);
+ apache2_worker_impl->conf_ctx = axis2_build_conf_ctx(env, repo_path);
if (NULL == apache2_worker_impl->conf_ctx)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org