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 18:32:24 UTC
svn commit: r520019 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/engine/ modules/core/receivers/
modules/core/transport/http/common/ modules/core/transport/http/server/IIS/
modules/core/transport/http/server/apache2/ m...
Author: dinesh
Date: Mon Mar 19 10:32:23 2007
New Revision: 520019
URL: http://svn.apache.org/viewvc?view=rev&rev=520019
Log:
engine.c macros removed, code formatted
Modified:
webservices/axis2/trunk/c/include/axis2_engine.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/engine/disp.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/test/core/engine/test_engine.c
Modified: webservices/axis2/trunk/c/include/axis2_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_engine.h?view=diff&rev=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine.h Mon Mar 19 10:32:23 2007
@@ -124,33 +124,6 @@
const axis2_env_t *env,
axis2_msg_ctx_t *processing_context);
- /**
- * Extracts fault information form message context.
- * @param engine pointer to engine
- * @param env pointer to environment struct
- * @param msg_ctx pointer to message context containing fault state
- * @param fault pointer to SOAP fault struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_engine_extract_fault_info_from_msg_ctx(axis2_engine_t *engine,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- struct axiom_soap_fault *fault);
-
- /**
- * Verifies that the context hierarchy consisting of service group
- * context, service context and operation context is built.
- * @param engine pointer to engine
- * @param env pointer to environment struct
- * @param msg_ctx pointer to message context containing the context
- * related information
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_engine_verify_ctx_built(axis2_engine_t *engine,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
/**
* Invokes the phases in the given array list of phases. The list of
@@ -265,63 +238,6 @@
axis2_engine_create(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-/** Sends SOAP message invoking the out flow. */
-#define AXIS2_ENGINE_SEND(engine, env, msg_ctx)\
- axis2_engine_send(engine, env, msg_ctx)
-
-/** Receives SOAP message invoking the in flow. */
-#define AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx) \
- axis2_engine_receive(engine, env, msg_ctx)
-
-/** Sends a SOAP fault. */
-#define AXIS2_ENGINE_SEND_FAULT(engine, env, msg_ctx) \
- axis2_engine_send_fault(engine, env, msg_ctx)
-
-/** Receive a SOAP fault. */
-#define AXIS2_ENGINE_RECEIVE_FAULT(engine, env, msg_ctx) \
- axis2_engine_receive_fault(engine, env, msg_ctx)
-
-/** Creates fault message context. */
-#define AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx) \
- axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx)
-
-/** Extracts the fault info from message context, */
-#define AXIS2_ENGINE_EXTRACT_FAULT_INFO_FROM_MSG_CTX(engine, env, msg_ctx, fault) \
- axis2_engine_extract_fault_info_from_msg_ctx(engine, env, msg_ctx, fault)
-
-/** Verifies that the context hierarchy is built. */
-#define AXIS2_ENGINE_VERIFY_CTX_BUILT(engine, env, msg_ctx) \
- axis2_engine_verify_ctx_built(engine, env, msg_ctx)
-
-/** Invokes the phases. */
-#define AXIS2_ENGINE_INVOKE_PHASES(engine, env, phases, msg_ctx) \
- axis2_engine_invoke_phases(engine, env, phases, msg_ctx)
-
-/** Resumes the invocation phases. */
-#define AXIS2_ENGINE_RESUME_INVOCATION_PHASES(engine, env, phases, msg_ctx) \
- axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx)
-
-/** Gets sender fault code. */
-#define AXIS2_ENGINE_GET_SENDER_FAULT_CODE(engine, env, soap_namespace) \
- axis2_engine_get_sender_fault_code(engine, env, soap_namespace)
-
-/** Gets receiver fault code. */
-#define AXIS2_ENGINE_GET_RECEIVER_FAULT_CODE(engine, env, soap_namespace) \
- axis2_engine_get_receiver_fault_code(engine, env, soap_namespace)
-
-/** Frees engine. */
-#define AXIS2_ENGINE_FREE(engine, env) \
- axis2_engine_free(engine, env)
-
-/** Resumes send operation. */
-#define AXIS2_ENGINE_RESUME_SEND(engine, env, msg_ctx)\
- axis2_engine_resume_send(engine, env, msg_ctx)
-
-/** Resumes receive operation. */
-#define AXIS2_ENGINE_RESUME_RECEIVE(engine, env, msg_ctx) \
- axis2_engine_resume_receive(engine, env, msg_ctx)
-
-/** @} */
#ifdef __cplusplus
}
#endif
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=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 19 10:32:23 2007
@@ -518,9 +518,9 @@
}
}
- status = AXIS2_ENGINE_SEND(engine, env, msg_ctx);
+ status = axis2_engine_send(engine, env, msg_ctx);
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
engine = NULL;
if (status != AXIS2_SUCCESS)
@@ -566,7 +566,7 @@
/* set response envelope */
if (engine)
{
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
engine = NULL;
}
response_envelope = axis2_msg_ctx_get_response_soap_envelope (msg_ctx, env);
@@ -576,7 +576,7 @@
engine = axis2_engine_create(env, conf_ctx);
if (engine)
{
- status = AXIS2_ENGINE_RECEIVE(engine, env, response);
+ status = axis2_engine_receive(engine, env, response);
if (status != AXIS2_SUCCESS)
return NULL;
}
@@ -614,7 +614,7 @@
engine = axis2_engine_create(env, conf_ctx);
if (engine)
{
- status = AXIS2_ENGINE_RECEIVE(engine, env, response);
+ status = axis2_engine_receive(engine, env, response);
if (status != AXIS2_SUCCESS)
return NULL;
}
@@ -626,7 +626,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_BLOCKING_INVOCATION_EXPECTS_RESPONSE, AXIS2_FAILURE);
if (engine)
{
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
engine = NULL;
}
axis2_msg_ctx_free(response, env);
@@ -642,7 +642,7 @@
if (engine)
{
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
engine = NULL;
}
return response;
@@ -696,14 +696,14 @@
axis2_msg_ctx_set_soap_envelope(response, env, response_envelope);
if (engine)
{
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
engine = NULL;
}
engine = axis2_engine_create(env, conf_ctx);
if (engine)
{
- status = AXIS2_ENGINE_RECEIVE(engine, env, response);
+ status = axis2_engine_receive(engine, env, response);
if (status != AXIS2_SUCCESS)
{
return NULL;
@@ -729,7 +729,7 @@
if (engine)
{
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
engine = NULL;
}
return response;
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=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 19 10:32:23 2007
@@ -388,8 +388,8 @@
engine = axis2_engine_create(env, conf_ctx);
if (!engine)
return AXIS2_FAILURE;
- AXIS2_ENGINE_SEND(engine, env, msg_ctx);
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_send(engine, env, msg_ctx);
+ axis2_engine_free(engine, env);
}
else
{
Modified: webservices/axis2/trunk/c/modules/core/engine/disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp.c?view=diff&rev=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp.c Mon Mar 19 10:32:23 2007
@@ -124,7 +124,6 @@
if (disp->name)
{
axis2_string_free(disp->name, env);
- disp->name = NULL;
}
if (name)
@@ -179,14 +178,11 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (disp->name)
{
axis2_string_free(disp->name, env);
}
-
AXIS2_FREE(env->allocator, disp);
-
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Mar 19 10:32:23 2007
@@ -58,7 +58,9 @@
disp_checker->base = NULL;
/* create default name */
- disp_checker->name = axis2_string_create_const(env, (axis2_char_t**)&AXIS2_DISP_CHECKER_NAME);
+ disp_checker->name = axis2_string_create_const(env,
+ (axis2_char_t**)&AXIS2_DISP_CHECKER_NAME);
+
if (!(disp_checker->name))
{
axis2_disp_checker_free(disp_checker, env);
@@ -81,7 +83,6 @@
}
AXIS2_HANDLER_INIT(disp_checker->base, env, handler_desc);
-
return disp_checker;
}
@@ -163,7 +164,8 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- if (!( axis2_msg_ctx_get_server_side(msg_ctx, env))) /*if is client side, no point in proceeding*/
+ /*if is client side, no point in proceeding*/
+ if (!(axis2_msg_ctx_get_server_side(msg_ctx, env)))
return AXIS2_SUCCESS;
op = axis2_msg_ctx_get_op(msg_ctx, env);
@@ -191,8 +193,8 @@
axis2_msg_ctx_set_svc(msg_ctx, env, tsvc);
}
}
-
endpoint_ref = axis2_msg_ctx_get_to(msg_ctx, env);
+
if (endpoint_ref)
address = axis2_endpoint_ref_get_address(endpoint_ref, env);
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=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 19 10:32:23 2007
@@ -68,9 +68,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
AXIS2_FREE(env->allocator, engine);
-
return AXIS2_SUCCESS;
}
@@ -91,10 +89,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- status = axis2_engine_verify_ctx_built(engine, env, msg_ctx);
- if (status != AXIS2_SUCCESS)
- return status;
-
/* find and invoke the phases */
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
@@ -160,11 +154,14 @@
{
/* write the message to wire */
axis2_transport_sender_t *transport_sender = NULL;
- axis2_transport_out_desc_t *transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
+ axis2_transport_out_desc_t *transport_out =
+ axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
if (transport_out)
{
- transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
+ transport_sender =
+ axis2_transport_out_desc_get_sender(transport_out, env);
+
if (transport_sender)
{
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
@@ -174,7 +171,8 @@
}
else
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Transport out is not set in message context");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Transport out is not set in message context");
return AXIS2_FAILURE;
}
}
@@ -211,21 +209,24 @@
if ( axis2_msg_ctx_is_paused(msg_ctx, env))
{
/* the message has paused, so re-run them from the position they stopped. */
- axis2_engine_resume_invocation_phases(engine, env, pre_calculated_phases, msg_ctx);
- if ( axis2_msg_ctx_is_paused(msg_ctx, env))
+ axis2_engine_resume_invocation_phases(engine, env,
+ pre_calculated_phases,
+ msg_ctx);
+ if (axis2_msg_ctx_is_paused(msg_ctx, env))
{
return AXIS2_SUCCESS;
}
- axis2_engine_verify_ctx_built(engine, env, msg_ctx);
/* resume op specific phases */
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
{
op = axis2_op_ctx_get_op(op_ctx, 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))
+ axis2_engine_resume_invocation_phases(engine, env,
+ op_specific_phases,
+ msg_ctx);
+ if (axis2_msg_ctx_is_paused(msg_ctx, env))
{
return AXIS2_SUCCESS;
}
@@ -233,7 +234,8 @@
}
else
{
- status = axis2_engine_invoke_phases(engine, env, pre_calculated_phases, msg_ctx);
+ status = axis2_engine_invoke_phases(engine, env,
+ pre_calculated_phases, msg_ctx);
if (status != AXIS2_SUCCESS)
{
if ( axis2_msg_ctx_get_server_side(msg_ctx, env))
@@ -245,13 +247,13 @@
return AXIS2_SUCCESS;
}
- axis2_engine_verify_ctx_built(engine, env, msg_ctx); /* TODO : Remove me. I'm redundant */
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
{
op = axis2_op_ctx_get_op(op_ctx, env);
op_specific_phases = axis2_op_get_in_flow(op, env);
- status = axis2_engine_invoke_phases(engine, env, op_specific_phases, msg_ctx);
+ status = axis2_engine_invoke_phases(engine, env,
+ op_specific_phases, msg_ctx);
if (status != AXIS2_SUCCESS)
{
return status;
@@ -264,7 +266,8 @@
}
}
- if (( axis2_msg_ctx_get_server_side(msg_ctx, env)) && !( axis2_msg_ctx_is_paused(msg_ctx, env)))
+ if ((axis2_msg_ctx_get_server_side(msg_ctx, env)) &&
+ !( axis2_msg_ctx_is_paused(msg_ctx, env)))
{
axis2_msg_recv_t *receiver = NULL;
@@ -278,7 +281,8 @@
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");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Message receiver not set in operation description");
return AXIS2_FAILURE;
}
status = AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx,
@@ -293,6 +297,7 @@
return status;
}
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_engine_send_fault(
axis2_engine_t *engine,
@@ -318,7 +323,8 @@
axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *phases = axis2_conf_get_out_fault_flow(conf, env);
+ axis2_array_list_t *phases =
+ axis2_conf_get_out_fault_flow(conf, env);
if (phases)
{
axis2_engine_invoke_phases(engine, env, phases, msg_ctx);
@@ -329,13 +335,20 @@
transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
if (transport_out)
- transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
+ {
+ transport_sender =
+ axis2_transport_out_desc_get_sender(transport_out, env);
+ }
+
if (transport_sender)
+ {
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
+ }
}
return AXIS2_SUCCESS;
}
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_engine_receive_fault(
axis2_engine_t *engine,
@@ -359,18 +372,19 @@
axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *phases = axis2_conf_get_in_phases_upto_and_including_post_dispatch(conf, env);
+ axis2_array_list_t *phases =
+ axis2_conf_get_in_phases_upto_and_including_post_dispatch(conf, env);
if (phases)
{
if ( axis2_msg_ctx_is_paused(msg_ctx, env))
{
- axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
+ axis2_engine_resume_invocation_phases(engine,
+ env, phases, msg_ctx);
}
else
{
axis2_engine_invoke_phases(engine, env, phases, msg_ctx);
}
- axis2_engine_verify_ctx_built(engine, env, msg_ctx);
}
}
}
@@ -417,7 +431,8 @@
if ( axis2_msg_ctx_get_process_fault(processing_context, env))
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_STATE_PROCESSING_FAULT_ALREADY, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_STATE_PROCESSING_FAULT_ALREADY,
+ AXIS2_FAILURE);
return NULL;
}
@@ -469,7 +484,8 @@
}
/* set WSA action */
- msg_info_headers = axis2_msg_ctx_get_msg_info_headers(processing_context, env);
+ msg_info_headers =
+ axis2_msg_ctx_get_msg_info_headers(processing_context, env);
if (msg_info_headers)
{
wsa_action = axis2_msg_info_headers_get_action (msg_info_headers, env);
@@ -495,7 +511,8 @@
msg_uuid = NULL;
}
- axis2_msg_ctx_set_op_ctx(fault_ctx, env, axis2_msg_ctx_get_op_ctx(processing_context, env));
+ axis2_msg_ctx_set_op_ctx(fault_ctx, env,
+ axis2_msg_ctx_get_op_ctx(processing_context, env));
axis2_msg_ctx_set_process_fault(fault_ctx, env, AXIS2_TRUE);
axis2_msg_ctx_set_server_side(fault_ctx, env, AXIS2_TRUE);
@@ -505,12 +522,14 @@
{
if ( axis2_msg_ctx_get_is_soap_11(processing_context, env))
{
- envelope = axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP11);
+ envelope =
+ axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP11);
}
else
{
- envelope = axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP12);
+ envelope =
+ axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP12);
}
if (envelope)
@@ -518,9 +537,8 @@
axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
if (body)
{
- axiom_soap_fault_t *fault = AXIOM_SOAP_BODY_GET_FAULT(body, env);
- axis2_engine_extract_fault_info_from_msg_ctx(engine, env,
- processing_context, fault);
+ /* axiom_soap_fault_t *fault = AXIOM_SOAP_BODY_GET_FAULT(body, env); */
+ /* TODO: fault processing method */
}
}
else
@@ -529,50 +547,13 @@
}
}
- axis2_msg_ctx_set_soap_envelope(fault_ctx, env, envelope);
+ axis2_msg_ctx_set_soap_envelope(fault_ctx, env, envelope);
axis2_msg_ctx_set_http_out_transport_info(fault_ctx, env,
axis2_msg_ctx_get_http_out_transport_info(processing_context, env));
return fault_ctx;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_engine_extract_fault_info_from_msg_ctx(
- axis2_engine_t *engine,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- struct axiom_soap_fault *fault)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, fault, AXIS2_FAILURE);
- return AXIS2_SUCCESS;
-}
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_engine_verify_ctx_built(
- axis2_engine_t *engine,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
-
- if (! axis2_msg_ctx_get_conf_ctx(msg_ctx, env))
- {
- return AXIS2_FAILURE;
- }
- if (! axis2_msg_ctx_get_op_ctx(msg_ctx, env))
- {
- return AXIS2_FAILURE;
- }
- if (! axis2_msg_ctx_get_svc_ctx(msg_ctx, env))
- {
- return AXIS2_FAILURE;
- }
-
- return AXIS2_SUCCESS;
-}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_engine_invoke_phases(
@@ -633,11 +614,11 @@
axis2_phase_t *phase = (axis2_phase_t *) axis2_array_list_get(phases,
env, i);
const axis2_char_t *phase_name = AXIS2_PHASE_GET_NAME(phase, env);
- const axis2_char_t *paused_phase_name = axis2_msg_ctx_get_paused_phase_name(
- msg_ctx, env);
+ const axis2_char_t *paused_phase_name =
+ axis2_msg_ctx_get_paused_phase_name(msg_ctx, env);
/* skip invoking handlers until we find the paused phase */
- if (phase_name && paused_phase_name && 0 == axis2_strcmp(phase_name,
- paused_phase_name))
+ if (phase_name && paused_phase_name && 0 ==
+ axis2_strcmp(phase_name, paused_phase_name))
{
int paused_handler_i = -1;
found_match = AXIS2_TRUE;
@@ -649,9 +630,10 @@
AXIS2_PHASE_INVOKE_START_FROM_HANDLER(phase, env, paused_handler_i,
msg_ctx);
}
- else /* now we have found the paused phase and invoked the rest of the
- * handlers of that phase, invoke all the phases after that */
+ else
{
+ /* now we have found the paused phase and invoked the rest of the
+ * handlers of that phase, invoke all the phases after that */
if (found_match)
{
AXIS2_PHASE_INVOKE(phase, env, msg_ctx);
@@ -662,17 +644,6 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
-axis2_engine_get_sender_fault_code(
- const axis2_engine_t *engine,
- const axis2_env_t *env,
- const axis2_char_t *soap_namespace)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, soap_namespace, AXIS2_FAILURE);
-
- return NULL;
-}
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_engine_get_receiver_fault_code(
@@ -680,9 +651,6 @@
const axis2_env_t *env,
const axis2_char_t *soap_namespace)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, soap_namespace, AXIS2_FAILURE);
-
if (axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_namespace))
return AXIOM_SOAP12_FAULT_CODE_RECEIVER;
else
@@ -799,12 +767,15 @@
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
/* invoking the message receiver */
- if ( axis2_msg_ctx_get_server_side(msg_ctx, env) && ! axis2_msg_ctx_is_paused(msg_ctx, env))
+ if ( axis2_msg_ctx_get_server_side(msg_ctx, env) &&
+ !axis2_msg_ctx_is_paused(msg_ctx, env))
{
/* invoke the message receivers */
axis2_op_ctx_t *op_ctx = NULL;
- status = axis2_engine_check_must_understand_headers(env, msg_ctx);
+ status =
+ axis2_engine_check_must_understand_headers(env, msg_ctx);
+
if (status != AXIS2_SUCCESS)
return status;
@@ -818,7 +789,8 @@
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");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Message receiver not set in operation description");
return AXIS2_FAILURE;
}
status = AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx,
@@ -853,7 +825,7 @@
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
/* invoking transport sender */
- if (! axis2_msg_ctx_is_paused(msg_ctx, env))
+ if (!axis2_msg_ctx_is_paused(msg_ctx, env))
{
/* write the message to the wire */
axis2_transport_out_desc_t *transport_out = NULL;
@@ -868,6 +840,5 @@
}
}
}
-
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 19 10:32:23 2007
@@ -345,12 +345,12 @@
{
/* if it is two way and not a fault then send through engine.
if it is one way we do not need to do an engine send */
- status = AXIS2_ENGINE_SEND(engine, env, out_msg_ctx);
+ status = axis2_engine_send(engine, env, out_msg_ctx);
}
}
}
}
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
if (! axis2_msg_ctx_is_paused(out_msg_ctx, env) &&
! axis2_msg_ctx_is_keep_alive(out_msg_ctx, env))
{
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=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Mon Mar 19 10:32:23 2007
@@ -80,7 +80,7 @@
{
return AXIS2_FAILURE;
}
- return AXIS2_ENGINE_SEND(engine, env, msg_ctx);
+ return axis2_engine_send(engine, env, msg_ctx);
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
@@ -107,8 +107,8 @@
return AXIS2_FAILURE;
}
- fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
- return AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
+ 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/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Mon Mar 19 10:32:23 2007
@@ -293,7 +293,7 @@
{
return AXIS2_FALSE;
}
- fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
+ fault_ctx = axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
req_line = AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request
, env);
if (req_line)
@@ -309,7 +309,7 @@
}
tmp_stat_line = axis2_http_status_line_create(env,
status_line_str);
- AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
+ axis2_engine_send_fault(engine, env, fault_ctx);
AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(tmp_stat_line, env),
AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(tmp_stat_line, 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=520019&r1=520018&r2=520019
==============================================================================
--- 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 Mon Mar 19 10:32:23 2007
@@ -309,8 +309,8 @@
{
send_status = HTTP_INTERNAL_SERVER_ERROR;
}
- fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
- AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
+ fault_ctx = axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
+ axis2_engine_send_fault(engine, env, fault_ctx);
if (out_stream)
{
body_string = axis2_stream_get_buffer(out_stream, env);
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=520019&r1=520018&r2=520019
==============================================================================
--- 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 Mon Mar 19 10:32:23 2007
@@ -272,8 +272,8 @@
{
send_status = HTTP_INTERNAL_SERVER_ERROR;
}
- fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
- AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
+ fault_ctx = axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
+ axis2_engine_send_fault(engine, env, fault_ctx);
if (out_stream)
{
body_string = axis2_stream_get_buffer(out_stream, env);
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=520019&r1=520018&r2=520019
==============================================================================
--- 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 10:32:23 2007
@@ -464,11 +464,11 @@
if (AXIS2_TRUE == AXIOM_SOAP_BODY_HAS_FAULT(soap_body, env))
{
- status = AXIS2_ENGINE_RECEIVE_FAULT(engine, env, msg_ctx);
+ status = axis2_engine_receive_fault(engine, env, msg_ctx);
}
else
{
- status = AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx);
+ status = axis2_engine_receive(engine, env, msg_ctx);
}
if (! axis2_msg_ctx_get_soap_envelope(msg_ctx, env) &&
AXIS2_FALSE == is_soap11)
@@ -481,7 +481,7 @@
if (engine)
{
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
}
if (soap_body_str)
@@ -555,7 +555,7 @@
axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
engine = axis2_engine_create(env, conf_ctx);
- AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx);
+ axis2_engine_receive(engine, env, msg_ctx);
return AXIS2_TRUE;
}
return AXIS2_FALSE;
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=520019&r1=520018&r2=520019
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 19 10:32:23 2007
@@ -59,7 +59,7 @@
axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
- status = AXIS2_ENGINE_SEND(engine, env, msg_ctx);
+ status = axis2_engine_send(engine, env, msg_ctx);
if (status != AXIS2_SUCCESS)
{
printf("axis2_test_engine_send ERROR %d\n", status);
@@ -75,7 +75,7 @@
AXIS2_SVC_FREE(svc, env);
axis2_op_ctx_free(op_ctx, env);
axis2_op_free(op, env);
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
return 0;
}
@@ -95,7 +95,7 @@
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
- status = AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx);
+ status = axis2_engine_receive(engine, env, msg_ctx);
if (status != AXIS2_SUCCESS)
{
printf("axis2_test_engine_receive ERROR %d\n", status);
@@ -104,7 +104,7 @@
printf("axis2_test_engine_receive SUCCESS\n");
axis2_conf_ctx_free(conf_ctx, env);
axis2_msg_ctx_free(msg_ctx, env);
- AXIS2_ENGINE_FREE(engine, env);
+ axis2_engine_free(engine, env);
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org