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/09/28 11:53:04 UTC
svn commit: r580276 [25/26] - in /webservices/axis2/trunk/c/src: core/addr/
core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/ core/transport/
core/transport/http/common/ core/transport/htt...
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,70 +31,72 @@
#include <axis2_msg_info_headers.h>
#include <axutil_property.h>
-axis2_status_t AXIS2_CALL
-axis2_addr_in_handler_invoke(struct axis2_handler *handler,
- const axutil_env_t *env,
- struct axis2_msg_ctx *msg_ctx);
-
-axis2_bool_t
-axis2_addr_in_check_element(const axutil_env_t *env, axutil_qname_t *expected_qname,
- axutil_qname_t *actual_qname);
-
-axis2_status_t
-axis2_addr_in_extract_svc_grp_ctx_id(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_ctx_t *msg_ctx);
-
-axis2_status_t
-axis2_addr_in_extract_ref_params(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t *msg_info_headers);
-
-axis2_status_t
-axis2_addr_in_extract_addr_final_info(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t **msg_info_headers,
- axutil_array_list_t *addr_headers,
- axis2_msg_ctx_t *msg_ctx);
-
-
-axis2_status_t
-axis2_addr_in_extract_to_epr_ref_params(const axutil_env_t *env,
- axis2_endpoint_ref_t * to_epr,
- axiom_soap_header_t *soap_header,
- const axis2_char_t *addr_ns);
-
-axis2_status_t
-axis2_addr_in_extract_epr_information(const axutil_env_t *env,
- axiom_soap_header_block_t *soap_header_block,
- axis2_endpoint_ref_t *endpoint_ref,
- const axis2_char_t *addr_ns);
-
-axis2_status_t
-axis2_addr_in_extract_addr_params(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t **msg_info_headers,
- axutil_array_list_t *addr_headers,
- const axis2_char_t *addr_ns,
- axis2_msg_ctx_t *msg_ctx);
-
-axis2_status_t axis2_addr_in_extract_addr_submission_info(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t **msg_info_headers,
- axutil_array_list_t *addr_headers,
- axis2_msg_ctx_t *msg_ctx);
-
-void
-axis2_addr_in_create_fault_envelope(const axutil_env_t *env,
- const axis2_char_t *header_name,
- const axis2_char_t *addr_ns_str,
- axis2_msg_ctx_t *msg_ctx);
+axis2_status_t AXIS2_CALL axis2_addr_in_handler_invoke(
+ struct axis2_handler * handler,
+ const axutil_env_t * env,
+ struct axis2_msg_ctx * msg_ctx);
+
+axis2_bool_t axis2_addr_in_check_element(
+ const axutil_env_t * env,
+ axutil_qname_t * expected_qname,
+ axutil_qname_t * actual_qname);
+
+axis2_status_t axis2_addr_in_extract_svc_grp_ctx_id(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_ctx_t * msg_ctx);
+
+axis2_status_t axis2_addr_in_extract_ref_params(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t * msg_info_headers);
+
+axis2_status_t axis2_addr_in_extract_addr_final_info(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t ** msg_info_headers,
+ axutil_array_list_t * addr_headers,
+ axis2_msg_ctx_t * msg_ctx);
+
+axis2_status_t axis2_addr_in_extract_to_epr_ref_params(
+ const axutil_env_t * env,
+ axis2_endpoint_ref_t * to_epr,
+ axiom_soap_header_t * soap_header,
+ const axis2_char_t * addr_ns);
+
+axis2_status_t axis2_addr_in_extract_epr_information(
+ const axutil_env_t * env,
+ axiom_soap_header_block_t * soap_header_block,
+ axis2_endpoint_ref_t * endpoint_ref,
+ const axis2_char_t * addr_ns);
+
+axis2_status_t axis2_addr_in_extract_addr_params(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t ** msg_info_headers,
+ axutil_array_list_t * addr_headers,
+ const axis2_char_t * addr_ns,
+ axis2_msg_ctx_t * msg_ctx);
+
+axis2_status_t axis2_addr_in_extract_addr_submission_info(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t ** msg_info_headers,
+ axutil_array_list_t * addr_headers,
+ axis2_msg_ctx_t * msg_ctx);
+
+void axis2_addr_in_create_fault_envelope(
+ const axutil_env_t * env,
+ const axis2_char_t * header_name,
+ const axis2_char_t * addr_ns_str,
+ axis2_msg_ctx_t * msg_ctx);
/******************************************************************************/
-AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-axis2_addr_in_handler_create(const axutil_env_t *env,
- axutil_string_t *name)
+AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
+axis2_addr_in_handler_create(
+ const axutil_env_t * env,
+ axutil_string_t * name)
{
axis2_handler_t *handler = NULL;
@@ -112,11 +115,11 @@
return handler;
}
-
axis2_status_t AXIS2_CALL
-axis2_addr_in_handler_invoke(struct axis2_handler *handler,
- const axutil_env_t *env,
- struct axis2_msg_ctx *msg_ctx)
+axis2_addr_in_handler_invoke(
+ struct axis2_handler * handler,
+ const axutil_env_t * env,
+ struct axis2_msg_ctx * msg_ctx)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_header_t *soap_header = NULL;
@@ -128,7 +131,7 @@
AXIS2_LOG_INFO(env->log, "Starting addressing in handler .........");
- soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (soap_envelope)
{
@@ -138,37 +141,46 @@
axutil_array_list_t *addr_headers = NULL;
axis2_ctx_t *ctx = NULL;
axis2_char_t *addr_ns_str = NULL;
- axis2_msg_info_headers_t *msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
+ axis2_msg_info_headers_t *msg_info_headers =
+ axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
- addr_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
+ addr_headers =
+ axiom_soap_header_get_header_blocks_with_namespace_uri
+ (soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
if (addr_headers)
{
- addr_ns_str = axutil_strdup(env, AXIS2_WSA_NAMESPACE_SUBMISSION);
- status = axis2_addr_in_extract_addr_submission_info(env,
- soap_header,
- &msg_info_headers,
- addr_headers,
- msg_ctx);
+ addr_ns_str =
+ axutil_strdup(env, AXIS2_WSA_NAMESPACE_SUBMISSION);
+ status =
+ axis2_addr_in_extract_addr_submission_info(env, soap_header,
+ &msg_info_headers,
+ addr_headers,
+ msg_ctx);
}
else
{
- addr_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env, AXIS2_WSA_NAMESPACE);
+ addr_headers =
+ axiom_soap_header_get_header_blocks_with_namespace_uri
+ (soap_header, env, AXIS2_WSA_NAMESPACE);
if (addr_headers)
{
addr_ns_str = axutil_strdup(env, AXIS2_WSA_NAMESPACE);
status = axis2_addr_in_extract_addr_final_info(env,
- soap_header,
- &msg_info_headers,
- addr_headers,
- msg_ctx);
- axis2_addr_in_extract_ref_params(env, soap_header, axis2_msg_ctx_get_msg_info_headers(msg_ctx, env));
+ soap_header,
+ &msg_info_headers,
+ addr_headers,
+ msg_ctx);
+ axis2_addr_in_extract_ref_params(env, soap_header,
+ axis2_msg_ctx_get_msg_info_headers
+ (msg_ctx, env));
}
else
{
- /* addressing headers are not present in the SOAP message*/
- AXIS2_LOG_INFO(env->log, AXIS2_LOG_SI, "No Addressing Headers present in the IN message. Addressing In Handler cannot do anything.");
- return AXIS2_SUCCESS; /* no addressing heades means addressing not in use */
+ /* addressing headers are not present in the SOAP message */
+ AXIS2_LOG_INFO(env->log, AXIS2_LOG_SI,
+ "No Addressing Headers present in the IN message. Addressing In Handler cannot do anything.");
+ return AXIS2_SUCCESS; /* no addressing heades means addressing not in use */
}
}
@@ -193,9 +205,10 @@
}
axis2_status_t
-axis2_addr_in_extract_svc_grp_ctx_id(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_ctx_t *msg_ctx)
+axis2_addr_in_extract_svc_grp_ctx_id(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_ctx_t * msg_ctx)
{
axiom_node_t *node = NULL;
axiom_element_t *element = NULL;
@@ -206,29 +219,35 @@
if (node && axiom_node_get_node_type(node, env) == AXIOM_ELEMENT)
{
axutil_qname_t *qname = NULL;
- element = (axiom_element_t *)axiom_node_get_data_element(node, env);
+ element = (axiom_element_t *) axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI,
- AXIS2_NAMESPACE_PREFIX);
+ AXIS2_NAMESPACE_PREFIX);
if (qname)
{
axiom_node_t *child_node = NULL;
axiom_element_t *child_element = NULL;
- child_element = axiom_element_get_first_child_with_qname(element, env, qname, node, &child_node);
+ child_element =
+ axiom_element_get_first_child_with_qname(element, env, qname,
+ node, &child_node);
if (child_element)
{
- axis2_conf_ctx_t * conf_ctx = NULL;
- axis2_char_t *grp_id = axiom_element_get_text(child_element, env,
- child_node);
- conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_char_t *grp_id =
+ axiom_element_get_text(child_element, env,
+ child_node);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if (conf_ctx && grp_id)
{
- axutil_string_t *svc_grp_ctx_id_str = axutil_string_create(env, grp_id);
- axis2_svc_grp_ctx_t *svc_ctx_grp_ctx = axis2_conf_ctx_get_svc_grp_ctx(conf_ctx, env, grp_id);
+ axutil_string_t *svc_grp_ctx_id_str =
+ axutil_string_create(env, grp_id);
+ axis2_svc_grp_ctx_t *svc_ctx_grp_ctx =
+ axis2_conf_ctx_get_svc_grp_ctx(conf_ctx, env, grp_id);
if (!svc_ctx_grp_ctx)
{
return AXIS2_FAILURE;
}
- axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
+ axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env,
+ svc_grp_ctx_id_str);
axutil_string_free(svc_grp_ctx_id_str, env);
return AXIS2_SUCCESS;
}
@@ -239,47 +258,48 @@
return AXIS2_FAILURE;
}
-
-
axis2_status_t
-axis2_addr_in_extract_addr_final_info(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t **msg_info_headers,
- axutil_array_list_t *addr_headers,
- axis2_msg_ctx_t *msg_ctx)
+axis2_addr_in_extract_addr_final_info(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t ** msg_info_headers,
+ axutil_array_list_t * addr_headers,
+ axis2_msg_ctx_t * msg_ctx)
{
return axis2_addr_in_extract_addr_params(env,
- soap_header,
- msg_info_headers,
- addr_headers,
- AXIS2_WSA_NAMESPACE,
- msg_ctx);
+ soap_header,
+ msg_info_headers,
+ addr_headers,
+ AXIS2_WSA_NAMESPACE, msg_ctx);
}
-axis2_status_t axis2_addr_in_extract_addr_submission_info(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t **msg_info_headers,
- axutil_array_list_t *addr_headers,
- axis2_msg_ctx_t *msg_ctx)
+axis2_status_t
+axis2_addr_in_extract_addr_submission_info(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t ** msg_info_headers,
+ axutil_array_list_t * addr_headers,
+ axis2_msg_ctx_t * msg_ctx)
{
return axis2_addr_in_extract_addr_params(env,
- soap_header,
- msg_info_headers,
- addr_headers,
- AXIS2_WSA_NAMESPACE_SUBMISSION,
- msg_ctx);
+ soap_header,
+ msg_info_headers,
+ addr_headers,
+ AXIS2_WSA_NAMESPACE_SUBMISSION,
+ msg_ctx);
}
axis2_status_t
-axis2_addr_in_extract_addr_params(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t **msg_info_headers_p,
- axutil_array_list_t *addr_headers,
- const axis2_char_t *addr_ns_str,
- axis2_msg_ctx_t *msg_ctx)
+axis2_addr_in_extract_addr_params(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t ** msg_info_headers_p,
+ axutil_array_list_t * addr_headers,
+ const axis2_char_t * addr_ns_str,
+ axis2_msg_ctx_t * msg_ctx)
{
axutil_hash_t *header_block_ht = NULL;
- axutil_hash_index_t *hash_index = NULL;
+ axutil_hash_index_t *hash_index = NULL;
axis2_msg_info_headers_t *msg_info_headers = *(msg_info_headers_p);
axis2_status_t status = AXIS2_SUCCESS;
axis2_bool_t to_found = AXIS2_FALSE;
@@ -294,8 +314,6 @@
AXIS2_PARAM_CHECK(env->error, addr_headers, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
-
-
if (!msg_info_headers)
msg_info_headers = axis2_msg_info_headers_create(env, NULL, NULL);
if (!msg_info_headers)
@@ -306,10 +324,10 @@
return AXIS2_FAILURE;
for (hash_index = axutil_hash_first(header_block_ht, env); hash_index;
- hash_index = axutil_hash_next(env, hash_index))
+ hash_index = axutil_hash_next(env, hash_index))
{
void *hb = NULL;
- axiom_soap_header_block_t *header_block = NULL;
+ axiom_soap_header_block_t *header_block = NULL;
axiom_node_t *header_block_node = NULL;
axiom_element_t *header_block_ele = NULL;
axis2_char_t *ele_localname = NULL;
@@ -318,9 +336,12 @@
axutil_hash_this(hash_index, NULL, NULL, &hb);
- header_block = (axiom_soap_header_block_t *)hb;
- header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
- header_block_ele = (axiom_element_t*)axiom_node_get_data_element(header_block_node, env);
+ header_block = (axiom_soap_header_block_t *) hb;
+ header_block_node =
+ axiom_soap_header_block_get_base_node(header_block, env);
+ header_block_ele =
+ (axiom_element_t *) axiom_node_get_data_element(header_block_node,
+ env);
ele_localname = axiom_element_get_localname(header_block_ele, env);
role = axiom_soap_header_block_get_role(header_block, env);
@@ -334,18 +355,24 @@
{
/* here the addressing epr overidde what ever already there in the message context */
- epr = axis2_endpoint_ref_create(env, axiom_element_get_text(header_block_ele, env, header_block_node));
+ epr =
+ axis2_endpoint_ref_create(env,
+ axiom_element_get_text
+ (header_block_ele, env,
+ header_block_node));
if (to_found == AXIS2_TRUE)
{
/* Duplicate To */
axis2_addr_in_create_fault_envelope(env,
- "wsa:To", addr_ns_str, msg_ctx);
+ "wsa:To", addr_ns_str,
+ msg_ctx);
status = AXIS2_FAILURE;
continue;
}
axis2_msg_info_headers_set_to(msg_info_headers, env, epr);
- axis2_addr_in_extract_to_epr_ref_params(env, epr, soap_header, addr_ns_str);
+ axis2_addr_in_extract_to_epr_ref_params(env, epr, soap_header,
+ addr_ns_str);
axiom_soap_header_block_set_processed(header_block, env);
to_found = AXIS2_TRUE;
}
@@ -355,13 +382,14 @@
if (!epr)
{
/* The address is not know now. Pass the empty
- string now and fill this once the element
- under this is processed. */
+ string now and fill this once the element
+ under this is processed. */
epr = axis2_endpoint_ref_create(env, "");
axis2_msg_info_headers_set_from(msg_info_headers, env, epr);
}
- axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
+ axis2_addr_in_extract_epr_information(env, header_block, epr,
+ addr_ns_str);
axiom_soap_header_block_set_processed(header_block, env);
}
else if (axutil_strcmp(ele_localname, AXIS2_WSA_REPLY_TO) == 0)
@@ -372,7 +400,8 @@
{
/* Duplicate Reply To */
axis2_addr_in_create_fault_envelope(env,
- "wsa:ReplyTo", addr_ns_str, msg_ctx);
+ "wsa:ReplyTo", addr_ns_str,
+ msg_ctx);
status = AXIS2_FAILURE;
continue;
}
@@ -382,21 +411,24 @@
epr = axis2_endpoint_ref_create(env, "");
axis2_msg_info_headers_set_reply_to(msg_info_headers, env, epr);
}
- axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
+ axis2_addr_in_extract_epr_information(env, header_block, epr,
+ addr_ns_str);
axiom_soap_header_block_set_processed(header_block, env);
reply_to_found = AXIS2_TRUE;
}
else if (axutil_strcmp(ele_localname, AXIS2_WSA_FAULT_TO) == 0)
{
- epr = axis2_msg_info_headers_get_fault_to(msg_info_headers , env);
+ epr = axis2_msg_info_headers_get_fault_to(msg_info_headers, env);
if (fault_to_found == AXIS2_TRUE)
{
/* Duplicate Fault To */
axis2_addr_in_create_fault_envelope(env,
- "wsa:FaultTo", addr_ns_str, msg_ctx);
+ "wsa:FaultTo", addr_ns_str,
+ msg_ctx);
status = AXIS2_FAILURE;
- axis2_msg_info_headers_set_fault_to(msg_info_headers, env, NULL);
+ axis2_msg_info_headers_set_fault_to(msg_info_headers, env,
+ NULL);
continue;
}
@@ -405,7 +437,8 @@
epr = axis2_endpoint_ref_create(env, "");
axis2_msg_info_headers_set_fault_to(msg_info_headers, env, epr);
}
- axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
+ axis2_addr_in_extract_epr_information(env, header_block, epr,
+ addr_ns_str);
axiom_soap_header_block_set_processed(header_block, env);
fault_to_found = AXIS2_TRUE;
}
@@ -417,12 +450,15 @@
{
/* Duplicate Message ID */
axis2_addr_in_create_fault_envelope(env,
- "wsa:MessageID", addr_ns_str, msg_ctx);
+ "wsa:MessageID",
+ addr_ns_str, msg_ctx);
status = AXIS2_FAILURE;
continue;
}
- text = axiom_element_get_text(header_block_ele, env, header_block_node);
+ text =
+ axiom_element_get_text(header_block_ele, env,
+ header_block_node);
axis2_msg_info_headers_set_message_id(msg_info_headers, env, text);
axiom_soap_header_block_set_processed(header_block, env);
msg_id_found = AXIS2_TRUE;
@@ -435,12 +471,15 @@
{
/* Duplicate Action */
axis2_addr_in_create_fault_envelope(env,
- "wsa:Action", addr_ns_str, msg_ctx);
+ "wsa:Action", addr_ns_str,
+ msg_ctx);
status = AXIS2_FAILURE;
continue;
}
- text = axiom_element_get_text(header_block_ele, env, header_block_node);
+ text =
+ axiom_element_get_text(header_block_ele, env,
+ header_block_node);
axis2_msg_info_headers_set_action(msg_info_headers, env, text);
axiom_soap_header_block_set_processed(header_block, env);
action_found = AXIS2_TRUE;
@@ -450,21 +489,25 @@
axis2_char_t *address = NULL;
axutil_qname_t *rqn = NULL;
axiom_attribute_t *relationship_type = NULL;
- const axis2_char_t *relationship_type_default_value = NULL;
+ const axis2_char_t *relationship_type_default_value = NULL;
const axis2_char_t *relationship_type_value = NULL;
- axis2_relates_to_t *relates_to = NULL;
- if (axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION , addr_ns_str) == 0)
+ axis2_relates_to_t *relates_to = NULL;
+ if (axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_str) == 0)
{
relationship_type_default_value =
AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE_SUBMISSION;
}
else
{
- relationship_type_default_value = AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
+ relationship_type_default_value =
+ AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
}
- rqn = axutil_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE, NULL, NULL);
+ rqn =
+ axutil_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE,
+ NULL, NULL);
- relationship_type = axiom_element_get_attribute(header_block_ele, env, rqn);
+ relationship_type =
+ axiom_element_get_attribute(header_block_ele, env, rqn);
if (!relationship_type)
{
@@ -473,22 +516,27 @@
}
else
{
- relationship_type_value = axiom_attribute_get_value(relationship_type, env);
+ relationship_type_value =
+ axiom_attribute_get_value(relationship_type, env);
}
- address = axiom_element_get_text(header_block_ele, env, header_block_node);
- relates_to = axis2_relates_to_create(env, address, relationship_type_value);
- axis2_msg_info_headers_set_relates_to(msg_info_headers, env, relates_to);
+ address =
+ axiom_element_get_text(header_block_ele, env,
+ header_block_node);
+ relates_to =
+ axis2_relates_to_create(env, address, relationship_type_value);
+ axis2_msg_info_headers_set_relates_to(msg_info_headers, env,
+ relates_to);
axiom_soap_header_block_set_processed(header_block, env);
axutil_qname_free(rqn, env);
}
}
- if (action_found == AXIS2_FALSE) /* Check is an action was found */
+ if (action_found == AXIS2_FALSE) /* Check is an action was found */
{
axis2_addr_in_create_fault_envelope(env,
- "wsa:Action", addr_ns_str, msg_ctx);
+ "wsa:Action", addr_ns_str, msg_ctx);
status = AXIS2_FAILURE;
}
@@ -496,10 +544,11 @@
}
axis2_status_t
-axis2_addr_in_extract_epr_information(const axutil_env_t *env,
- axiom_soap_header_block_t *soap_header_block,
- axis2_endpoint_ref_t *endpoint_ref,
- const axis2_char_t *addr_ns_str)
+axis2_addr_in_extract_epr_information(
+ const axutil_env_t * env,
+ axiom_soap_header_block_t * soap_header_block,
+ axis2_endpoint_ref_t * endpoint_ref,
+ const axis2_char_t * addr_ns_str)
{
axutil_qname_t *epr_addr_qn = NULL;
axutil_qname_t *epr_ref_qn = NULL;
@@ -512,50 +561,63 @@
AXIS2_PARAM_CHECK(env->error, endpoint_ref, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
- header_block_node = axiom_soap_header_block_get_base_node(soap_header_block, env);
- header_block_ele = (axiom_element_t *)axiom_node_get_data_element(header_block_node, env);
-
-
- child_ele_iter = axiom_element_get_child_elements(header_block_ele, env, header_block_node);
+ header_block_node =
+ axiom_soap_header_block_get_base_node(soap_header_block, env);
+ header_block_ele =
+ (axiom_element_t *) axiom_node_get_data_element(header_block_node, env);
+
+ child_ele_iter =
+ axiom_element_get_child_elements(header_block_ele, env,
+ header_block_node);
if (!child_ele_iter)
return AXIS2_FAILURE;
epr_addr_qn = axutil_qname_create(env, EPR_ADDRESS, addr_ns_str, NULL);
- epr_ref_qn = axutil_qname_create(env, EPR_REFERENCE_PARAMETERS, addr_ns_str, NULL);
- wsa_meta_qn = axutil_qname_create(env, AXIS2_WSA_METADATA, addr_ns_str, NULL);
+ epr_ref_qn =
+ axutil_qname_create(env, EPR_REFERENCE_PARAMETERS, addr_ns_str, NULL);
+ wsa_meta_qn =
+ axutil_qname_create(env, AXIS2_WSA_METADATA, addr_ns_str, NULL);
while (AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(child_ele_iter, env))
{
axiom_node_t *child_node = NULL;
axiom_element_t *child_ele = NULL;
axutil_qname_t *child_qn = NULL;
child_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(child_ele_iter, env);
- child_ele = (axiom_element_t*)axiom_node_get_data_element(child_node, env);
-
+ child_ele =
+ (axiom_element_t *) axiom_node_get_data_element(child_node, env);
child_qn = axiom_element_get_qname(child_ele, env, child_node);
if (axis2_addr_in_check_element(env, epr_addr_qn, child_qn))
{
axis2_endpoint_ref_set_address(endpoint_ref, env,
- axiom_element_get_text(child_ele, env, child_node));
+ axiom_element_get_text(child_ele,
+ env,
+ child_node));
}
- else if (axis2_addr_in_check_element(env, epr_ref_qn , child_qn))
+ else if (axis2_addr_in_check_element(env, epr_ref_qn, child_qn))
{
axiom_child_element_iterator_t *ref_param_iter = NULL;
- ref_param_iter = axiom_element_get_child_elements(child_ele, env, child_node);
+ ref_param_iter =
+ axiom_element_get_child_elements(child_ele, env, child_node);
if (ref_param_iter)
{
- while (AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(ref_param_iter, env))
+ while (AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT
+ (ref_param_iter, env))
{
- axiom_node_t *om_node = NULL;
+ axiom_node_t *om_node = NULL;
axiom_element_t *om_ele = NULL;
- om_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(ref_param_iter, env);
- om_ele = (axiom_element_t*)axiom_node_get_data_element(om_node, env);
+ om_node =
+ AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(ref_param_iter, env);
+ om_ele =
+ (axiom_element_t *) axiom_node_get_data_element(om_node,
+ env);
}
}
}
else if (axis2_addr_in_check_element(env, wsa_meta_qn, child_qn))
- {}
+ {
+ }
}
axutil_qname_free(epr_addr_qn, env);
axutil_qname_free(epr_ref_qn, env);
@@ -564,9 +626,10 @@
}
axis2_status_t
-axis2_addr_in_extract_ref_params(const axutil_env_t *env,
- axiom_soap_header_t *soap_header,
- axis2_msg_info_headers_t* msg_info_headers)
+axis2_addr_in_extract_ref_params(
+ const axutil_env_t * env,
+ axiom_soap_header_t * soap_header,
+ axis2_msg_info_headers_t * msg_info_headers)
{
axutil_hash_t *header_block_ht = NULL;
axutil_hash_index_t *hash_index = NULL;
@@ -579,35 +642,42 @@
header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
if (!header_block_ht)
return AXIS2_FAILURE;
- wsa_qname = axutil_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
- AXIS2_WSA_NAMESPACE, NULL);
+ wsa_qname =
+ axutil_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
+ AXIS2_WSA_NAMESPACE, NULL);
for (hash_index = axutil_hash_first(header_block_ht, env); hash_index;
- hash_index = axutil_hash_next(env, hash_index))
+ hash_index = axutil_hash_next(env, hash_index))
{
void *hb = NULL;
- axiom_soap_header_block_t *header_block = NULL;
+ axiom_soap_header_block_t *header_block = NULL;
axiom_node_t *header_block_node = NULL;
axiom_element_t *header_block_ele = NULL;
axutil_hash_this(hash_index, NULL, NULL, &hb);
- header_block = (axiom_soap_header_block_t *)hb;
- header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
+ header_block = (axiom_soap_header_block_t *) hb;
+ header_block_node =
+ axiom_soap_header_block_get_base_node(header_block, env);
if (header_block_node &&
- (axiom_node_get_node_type(header_block_node, env) == AXIOM_ELEMENT))
+ (axiom_node_get_node_type(header_block_node, env) == AXIOM_ELEMENT))
{
axiom_attribute_t *om_attr = NULL;
axis2_char_t *attr_value = NULL;
- header_block_ele = (axiom_element_t*)axiom_node_get_data_element(header_block_node, env);
- om_attr = axiom_element_get_attribute(header_block_ele, env, wsa_qname);
+ header_block_ele =
+ (axiom_element_t *)
+ axiom_node_get_data_element(header_block_node, env);
+ om_attr =
+ axiom_element_get_attribute(header_block_ele, env, wsa_qname);
if (om_attr)
{
attr_value = axiom_attribute_get_localname(om_attr, env);
- if (axutil_strcmp(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) == 0)
+ if (axutil_strcmp(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) ==
+ 0)
{
- axis2_msg_info_headers_add_ref_param(msg_info_headers, env, header_block_node);
+ axis2_msg_info_headers_add_ref_param(msg_info_headers, env,
+ header_block_node);
}
}
}
@@ -618,12 +688,12 @@
return AXIS2_SUCCESS;
}
-
axis2_status_t
-axis2_addr_in_extract_to_epr_ref_params(const axutil_env_t *env,
- axis2_endpoint_ref_t * to_epr,
- axiom_soap_header_t *soap_header,
- const axis2_char_t *addr_ns_str)
+axis2_addr_in_extract_to_epr_ref_params(
+ const axutil_env_t * env,
+ axis2_endpoint_ref_t * to_epr,
+ axiom_soap_header_t * soap_header,
+ const axis2_char_t * addr_ns_str)
{
axutil_hash_t *header_blocks_ht = NULL;
axutil_hash_index_t *hash_index = NULL;
@@ -634,16 +704,18 @@
AXIS2_PARAM_CHECK(env->error, soap_header, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
- header_blocks_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
+ header_blocks_ht =
+ axiom_soap_header_get_all_header_blocks(soap_header, env);
if (!header_blocks_ht)
return AXIS2_FAILURE;
- is_ref_qn = axutil_qname_create(env, "IsReferenceParameter", addr_ns_str, NULL);
+ is_ref_qn =
+ axutil_qname_create(env, "IsReferenceParameter", addr_ns_str, NULL);
if (!is_ref_qn)
return AXIS2_FAILURE;
for (hash_index = axutil_hash_first(header_blocks_ht, env); hash_index;
- hash_index = axutil_hash_next(env, hash_index))
+ hash_index = axutil_hash_next(env, hash_index))
{
axiom_element_t *header_block_ele = NULL;
axiom_node_t *header_block_node = NULL;
@@ -655,17 +727,22 @@
axutil_hash_this(hash_index, NULL, NULL, &hb);
if (hb)
{
- header_block = (axiom_soap_header_block_t*)hb;
- header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
- header_block_ele = (axiom_element_t*)
- axiom_node_get_data_element(header_block_node, env);
- is_ref_param_attr = axiom_element_get_attribute(header_block_ele, env, is_ref_qn);
+ header_block = (axiom_soap_header_block_t *) hb;
+ header_block_node =
+ axiom_soap_header_block_get_base_node(header_block, env);
+ header_block_ele =
+ (axiom_element_t *)
+ axiom_node_get_data_element(header_block_node, env);
+ is_ref_param_attr =
+ axiom_element_get_attribute(header_block_ele, env, is_ref_qn);
if (is_ref_param_attr)
{
- attr_value = axiom_attribute_get_localname(is_ref_param_attr, env);
+ attr_value =
+ axiom_attribute_get_localname(is_ref_param_attr, env);
if (axutil_strcmp("true", attr_value) == 0)
{
- axis2_endpoint_ref_add_ref_param(to_epr, env, header_block_node);
+ axis2_endpoint_ref_add_ref_param(to_epr, env,
+ header_block_node);
}
}
}
@@ -675,13 +752,13 @@
return AXIS2_SUCCESS;
}
-
axis2_bool_t
-axis2_addr_in_check_element(const axutil_env_t *env,
- axutil_qname_t *expected_qname,
- axutil_qname_t *actual_qname)
+axis2_addr_in_check_element(
+ const axutil_env_t * env,
+ axutil_qname_t * expected_qname,
+ axutil_qname_t * actual_qname)
{
- axis2_char_t *exp_qn_lpart = NULL;
+ axis2_char_t *exp_qn_lpart = NULL;
axis2_char_t *act_qn_lpart = NULL;
axis2_char_t *exp_qn_nsuri = NULL;
axis2_char_t *act_qn_nsuri = NULL;
@@ -701,26 +778,28 @@
}
void
-axis2_addr_in_create_fault_envelope(const axutil_env_t *env,
- const axis2_char_t *header_name,
- const axis2_char_t *addr_ns_str,
- axis2_msg_ctx_t *msg_ctx)
+axis2_addr_in_create_fault_envelope(
+ const axutil_env_t * env,
+ const axis2_char_t * header_name,
+ const axis2_char_t * addr_ns_str,
+ axis2_msg_ctx_t * msg_ctx)
{
axiom_soap_envelope_t *envelope = NULL;
axutil_array_list_t *sub_codes = NULL;
int soap_version = AXIOM_SOAP12;
- axiom_node_t* text_om_node = NULL;
- axiom_element_t * text_om_ele = NULL;
+ axiom_node_t *text_om_node = NULL;
+ axiom_element_t *text_om_ele = NULL;
axiom_namespace_t *ns1 = NULL;
- if ( axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
+ if (axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
soap_version = AXIOM_SOAP11;
}
-
ns1 = axiom_namespace_create(env, addr_ns_str, "wsa");
- text_om_ele = axiom_element_create(env, NULL, "ProblemHeaderQName", ns1, &text_om_node);
+ text_om_ele =
+ axiom_element_create(env, NULL, "ProblemHeaderQName", ns1,
+ &text_om_node);
axiom_element_set_text(text_om_ele, env, header_name, text_om_node);
sub_codes = axutil_array_list_create(env, 2);
@@ -731,11 +810,13 @@
}
envelope = axiom_soap_envelope_create_default_soap_fault_envelope(env,
- "soapenv:Sender",
- "A header representing a Message Addressing Property is not valid and the message cannot be processed",
- soap_version, sub_codes, text_om_node);
- axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, envelope);
- axis2_msg_ctx_set_wsa_action(msg_ctx, env,
- "http://www.w3.org/2005/08/addressing/fault");
+ "soapenv:Sender",
+ "A header representing a Message Addressing Property is not valid and the message cannot be processed",
+ soap_version,
+ sub_codes,
+ text_om_node);
+ axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, envelope);
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env,
+ "http://www.w3.org/2005/08/addressing/fault");
return;
}
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,71 +27,68 @@
#include <axutil_property.h>
#include <stdio.h>
-axis2_status_t AXIS2_CALL
-axis2_addr_out_handler_invoke(struct axis2_handler *handler,
- const axutil_env_t *env,
- struct axis2_msg_ctx *msg_ctx);
-
-
-axis2_status_t
-axis2_addr_out_handler_add_to_soap_header(const axutil_env_t *env,
- axis2_endpoint_ref_t *
- endpoint_ref,
- const axis2_char_t * type,
- axiom_soap_header_t * soap_header,
- const axis2_char_t * addr_ns);
-
-
-axis2_status_t
-axis2_addr_out_handler_add_to_header(const axutil_env_t *env,
- axis2_endpoint_ref_t * epr,
- axiom_node_t ** parent_node,
- const axis2_char_t * addr_ns);
-
-axis2_status_t
-axis2_addr_out_handler_process_any_content_type(const axutil_env_t *env,
- axis2_any_content_type_t *
- reference_values,
- axiom_node_t *
- parent_ele_node,
- const axis2_char_t * addr_ns);
-
-axiom_node_t *axis2_addr_out_handler_process_string_info(const axutil_env_t *env,
- const axis2_char_t *value,
- const axis2_char_t *type,
- axiom_soap_header_t **soap_header,
- const axis2_char_t *addr_ns);
-
+axis2_status_t AXIS2_CALL axis2_addr_out_handler_invoke(
+ struct axis2_handler * handler,
+ const axutil_env_t * env,
+ struct axis2_msg_ctx * msg_ctx);
+
+axis2_status_t axis2_addr_out_handler_add_to_soap_header(
+ const axutil_env_t * env,
+ axis2_endpoint_ref_t * endpoint_ref,
+ const axis2_char_t * type,
+ axiom_soap_header_t * soap_header,
+ const axis2_char_t * addr_ns);
+
+axis2_status_t axis2_addr_out_handler_add_to_header(
+ const axutil_env_t * env,
+ axis2_endpoint_ref_t * epr,
+ axiom_node_t ** parent_node,
+ const axis2_char_t * addr_ns);
+
+axis2_status_t axis2_addr_out_handler_process_any_content_type(
+ const axutil_env_t * env,
+ axis2_any_content_type_t * reference_values,
+ axiom_node_t * parent_ele_node,
+ const axis2_char_t * addr_ns);
+
+axiom_node_t *axis2_addr_out_handler_process_string_info(
+ const axutil_env_t * env,
+ const axis2_char_t * value,
+ const axis2_char_t * type,
+ axiom_soap_header_t ** soap_header,
+ const axis2_char_t * addr_ns);
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
-axis2_addr_out_handler_create(const axutil_env_t *env, axutil_string_t * name)
+axis2_addr_out_handler_create(
+ const axutil_env_t * env,
+ axutil_string_t * name)
{
axis2_handler_t *handler = NULL;
- /*axutil_qname_t *handler_qname = NULL;*/
+ /*axutil_qname_t *handler_qname = NULL; */
AXIS2_ENV_CHECK(env, NULL);
/*if (qname)
- {
- handler_qname = axutil_qname_clone(qname, env);
- if (!(handler_qname))
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
- AXIS2_FAILURE);
- return NULL;
- }
- }
- else
- {
- create default qname
- handler_qname = axutil_qname_create(env, "addr_out_handler",
- "http://axis.ws.apache.org",
- NULL);
- if (!handler_qname)
- {
- return NULL;
- }
- }*/
+ {
+ handler_qname = axutil_qname_clone(qname, env);
+ if (!(handler_qname))
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
+ AXIS2_FAILURE);
+ return NULL;
+ }
+ }
+ else
+ {
+ create default qname
+ handler_qname = axutil_qname_create(env, "addr_out_handler",
+ "http://axis.ws.apache.org",
+ NULL);
+ if (!handler_qname)
+ {
+ return NULL;
+ }
+ } */
handler = axis2_handler_create(env);
if (!handler)
@@ -104,8 +102,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_addr_out_handler_invoke(struct axis2_handler * handler,
- const axutil_env_t *env, axis2_msg_ctx_t * msg_ctx)
+axis2_addr_out_handler_invoke(
+ struct axis2_handler * handler,
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx)
{
axis2_char_t *addressing_version_from_msg_ctx = NULL;
const axis2_char_t *addr_ns = NULL;
@@ -118,37 +118,36 @@
axiom_element_t *soap_header_ele = NULL;
axis2_endpoint_ref_t *epr = NULL;
axutil_property_t *property = NULL;
- const axis2_char_t *wsa_action = NULL;
+ const axis2_char_t *wsa_action = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
+ msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
if (!msg_info_headers)
- return AXIS2_SUCCESS; /* no addressing in use */
- wsa_action = axis2_msg_info_headers_get_action (msg_info_headers, env);
- if (!wsa_action || !axutil_strcmp (wsa_action, ""))
- return AXIS2_SUCCESS; /* If no action present, assume no addressing in use */
-
+ return AXIS2_SUCCESS; /* no addressing in use */
+ wsa_action = axis2_msg_info_headers_get_action(msg_info_headers, env);
+ if (!wsa_action || !axutil_strcmp(wsa_action, ""))
+ return AXIS2_SUCCESS; /* If no action present, assume no addressing in use */
ctx = axis2_msg_ctx_get_base(msg_ctx, env);
- property =
- axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION);
+ property = axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION);
if (property)
{
addressing_version_from_msg_ctx = axutil_property_get_value(property,
- env);
+ env);
property = NULL;
}
if (addressing_version_from_msg_ctx)
{
if (axutil_strcmp
- (AXIS2_WSA_NAMESPACE, addressing_version_from_msg_ctx) == 0)
+ (AXIS2_WSA_NAMESPACE, addressing_version_from_msg_ctx) == 0)
{
addr_ns = AXIS2_WSA_NAMESPACE;
}
- else if(axutil_strcmp
- (AXIS2_WSA_NAMESPACE_SUBMISSION, addressing_version_from_msg_ctx) == 0)
+ else if (axutil_strcmp
+ (AXIS2_WSA_NAMESPACE_SUBMISSION,
+ addressing_version_from_msg_ctx) == 0)
{
addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;
}
@@ -157,29 +156,28 @@
addr_ns = AXIS2_WSA_NAMESPACE;
}
}
- else if ( axis2_msg_ctx_get_op_ctx(msg_ctx, env))
+ else if (axis2_msg_ctx_get_op_ctx(msg_ctx, env))
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_msg_ctx_t *in_msg_ctx = NULL;
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
{
in_msg_ctx =
- axis2_op_ctx_get_msg_ctx(op_ctx, env,
- AXIS2_WSDL_MESSAGE_LABEL_IN);
+ axis2_op_ctx_get_msg_ctx(op_ctx, env,
+ AXIS2_WSDL_MESSAGE_LABEL_IN);
}
if (!in_msg_ctx)
{
- addr_ns = AXIS2_WSA_NAMESPACE; /* setting version 1.0 as the default addressing namespace */
+ addr_ns = AXIS2_WSA_NAMESPACE; /* setting version 1.0 as the default addressing namespace */
}
else
{
axis2_ctx_t *in_ctx = NULL;
in_ctx = axis2_msg_ctx_get_base(in_msg_ctx, env);
- property =
- axis2_ctx_get_property(in_ctx, env, AXIS2_WSA_VERSION);
+ property = axis2_ctx_get_property(in_ctx, env, AXIS2_WSA_VERSION);
if (property)
{
addr_ns = axutil_property_get_value(property, env);
@@ -188,7 +186,7 @@
if (!addr_ns)
{
- addr_ns = AXIS2_WSA_NAMESPACE; /* Addressing version has not been set in the IN path */
+ addr_ns = AXIS2_WSA_NAMESPACE; /* Addressing version has not been set in the IN path */
}
}
}
@@ -198,20 +196,21 @@
addr_ns = AXIS2_WSA_NAMESPACE;
}
- addressing_namespace = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
- soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ addressing_namespace =
+ axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ msg_info_headers = axis2_msg_ctx_get_msg_info_headers(msg_ctx, env);
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (!soap_envelope)
{
axiom_namespace_free(addressing_namespace, env);
- return AXIS2_SUCCESS; /* can happen in case of one way services/clients */
+ return AXIS2_SUCCESS; /* can happen in case of one way services/clients */
}
- soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
+ soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
if (!soap_header)
{
axiom_namespace_free(addressing_namespace, env);
- return AXIS2_SUCCESS; /*No SOAP header, so no point proceeding*/
+ return AXIS2_SUCCESS; /*No SOAP header, so no point proceeding */
}
/* by this time, we definitely have some addressing information to be sent. This is because,
@@ -223,7 +222,7 @@
const axis2_char_t *action = NULL;
const axis2_char_t *address = NULL;
const axis2_char_t *svc_group_context_id = NULL;
- const axis2_char_t *message_id = NULL;
+ const axis2_char_t *message_id = NULL;
axis2_relates_to_t *relates_to = NULL;
axiom_node_t *relates_to_header_node = NULL;
axiom_element_t *relates_to_header_ele = NULL;
@@ -233,29 +232,36 @@
(axiom_element_t *)
axiom_node_get_data_element(soap_header_node, env);
axiom_element_declare_namespace(soap_header_ele, env,
- soap_header_node, addressing_namespace);
+ soap_header_node, addressing_namespace);
epr = axis2_msg_info_headers_get_to(msg_info_headers, env);
if (soap_envelope && epr)
{
- axiom_soap_body_t *body = axiom_soap_envelope_get_body(soap_envelope, env);
+ axiom_soap_body_t *body =
+ axiom_soap_envelope_get_body(soap_envelope, env);
if (body)
{
/* in case of a SOAP fault, we got to send the response to
the adress specified by FaultTo */
if (axiom_soap_body_has_fault(body, env))
{
- axis2_endpoint_ref_t *fault_epr = axis2_msg_info_headers_get_fault_to(msg_info_headers, env);
+ axis2_endpoint_ref_t *fault_epr =
+ axis2_msg_info_headers_get_fault_to(msg_info_headers,
+ env);
if (fault_epr)
{
- const axis2_char_t *fault_address = axis2_endpoint_ref_get_address(fault_epr, env);
+ const axis2_char_t *fault_address =
+ axis2_endpoint_ref_get_address(fault_epr, env);
if (fault_address)
{
- if (axutil_strcmp(AXIS2_WSA_NONE_URL, fault_address) != 0 &&
- axutil_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, fault_address) != 0)
+ if (axutil_strcmp(AXIS2_WSA_NONE_URL, fault_address)
+ != 0 &&
+ axutil_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION,
+ fault_address) != 0)
{
- axis2_endpoint_ref_set_address(epr, env, fault_address);
+ axis2_endpoint_ref_set_address(epr, env,
+ fault_address);
}
}
}
@@ -272,64 +278,91 @@
axiom_soap_header_block_t *to_header_block = NULL;
axutil_array_list_t *ref_param_list = NULL;
- to_header_block =
+ to_header_block =
axiom_soap_header_add_header_block(soap_header, env,
- AXIS2_WSA_TO,
- addressing_namespace);
+ AXIS2_WSA_TO,
+ addressing_namespace);
to_header_block_node =
axiom_soap_header_block_get_base_node(to_header_block, env);
if (to_header_block_node)
{
axiom_element_t *to_header_block_element = NULL;
- to_header_block_element = (axiom_element_t*)axiom_node_get_data_element(to_header_block_node, env);
+ to_header_block_element =
+ (axiom_element_t *)
+ axiom_node_get_data_element(to_header_block_node, env);
if (to_header_block_element)
{
- axiom_element_set_text(to_header_block_element, env, address, to_header_block_node);
+ axiom_element_set_text(to_header_block_element, env,
+ address, to_header_block_node);
}
}
-
-
- ref_param_list = axis2_endpoint_ref_get_ref_param_list(epr, env);
- if (ref_param_list && axutil_array_list_size(ref_param_list, env) > 0)
+
+ ref_param_list =
+ axis2_endpoint_ref_get_ref_param_list(epr, env);
+ if (ref_param_list &&
+ axutil_array_list_size(ref_param_list, env) > 0)
{
axiom_soap_header_block_t *reference_header_block = NULL;
axiom_node_t *reference_node = NULL;
int i = 0;
-
- for (i = 0; i < axutil_array_list_size(ref_param_list, env); i++)
+
+ for (i = 0; i < axutil_array_list_size(ref_param_list, env);
+ i++)
{
axiom_node_t *ref_node = NULL;
-
- ref_node = (axiom_node_t *)axutil_array_list_get(ref_param_list, env, i);
+
+ ref_node =
+ (axiom_node_t *)
+ axutil_array_list_get(ref_param_list, env, i);
if (ref_node)
{
- axiom_element_t* ref_ele = NULL;
-
- ref_ele = axiom_node_get_data_element(ref_node,env);
+ axiom_element_t *ref_ele = NULL;
+
+ ref_ele =
+ axiom_node_get_data_element(ref_node, env);
if (ref_ele)
- {
- reference_header_block =
- axiom_soap_header_add_header_block(soap_header, env,
- axiom_element_get_localname(ref_ele, env),
- axiom_element_get_namespace(ref_ele,env,ref_node));
-
- reference_node = axiom_soap_header_block_get_base_node(reference_header_block, env);
+ {
+ reference_header_block =
+ axiom_soap_header_add_header_block
+ (soap_header, env,
+ axiom_element_get_localname(ref_ele, env),
+ axiom_element_get_namespace(ref_ele, env,
+ ref_node));
+
+ reference_node =
+ axiom_soap_header_block_get_base_node
+ (reference_header_block, env);
if (reference_node)
{
axiom_element_t *reference_ele = NULL;
- reference_ele = (axiom_element_t*)axiom_node_get_data_element(reference_node, env);
-
+ reference_ele =
+ (axiom_element_t *)
+ axiom_node_get_data_element
+ (reference_node, env);
+
if (reference_ele)
{
axiom_namespace_t *addr_ns_obj = NULL;
- axiom_attribute_t *reference_attr = NULL;
-
- addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- reference_attr =
- axiom_attribute_create(env, "isReferenceParameter", "true", addr_ns_obj);
- axiom_element_add_attribute(reference_ele, env, reference_attr, reference_node);
- axiom_element_set_text( reference_ele, env,
- axiom_element_get_text( ref_ele, env, ref_node ), reference_node );
+ axiom_attribute_t *reference_attr =
+ NULL;
+
+ addr_ns_obj =
+ axiom_namespace_create(env, addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
+ reference_attr =
+ axiom_attribute_create(env,
+ "isReferenceParameter",
+ "true",
+ addr_ns_obj);
+ axiom_element_add_attribute
+ (reference_ele, env, reference_attr,
+ reference_node);
+ axiom_element_set_text(reference_ele,
+ env,
+ axiom_element_get_text
+ (ref_ele, env,
+ ref_node),
+ reference_node);
}
}
}
@@ -343,17 +376,19 @@
if (action && axutil_strcmp(action, ""))
{
axis2_addr_out_handler_process_string_info(env, action,
- AXIS2_WSA_ACTION,
- &soap_header,
- addr_ns);
+ AXIS2_WSA_ACTION,
+ &soap_header, addr_ns);
}
epr = axis2_msg_info_headers_get_reply_to(msg_info_headers, env);
if (!epr)
{
const axis2_char_t *anonymous_uri = NULL;
- axis2_bool_t anonymous = axis2_msg_info_headers_get_reply_to_anonymous(msg_info_headers, env);
- axis2_bool_t none = axis2_msg_info_headers_get_reply_to_none(msg_info_headers, env);
+ axis2_bool_t anonymous =
+ axis2_msg_info_headers_get_reply_to_anonymous(msg_info_headers,
+ env);
+ axis2_bool_t none =
+ axis2_msg_info_headers_get_reply_to_none(msg_info_headers, env);
if (axutil_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
{
if (none)
@@ -375,31 +410,31 @@
axis2_msg_info_headers_set_reply_to(msg_info_headers, env, epr);
}
-
/* add the service group id as a reference parameter */
- svc_group_context_id = axutil_string_get_buffer(
- axis2_msg_ctx_get_svc_grp_ctx_id(msg_ctx, env), env);
+ svc_group_context_id =
+ axutil_string_get_buffer(axis2_msg_ctx_get_svc_grp_ctx_id
+ (msg_ctx, env), env);
axis2_addr_out_handler_add_to_soap_header(env, epr,
- AXIS2_WSA_REPLY_TO,
- soap_header, addr_ns);
+ AXIS2_WSA_REPLY_TO,
+ soap_header, addr_ns);
/* It is wrong freeing the epr here. Instead I set the locally
* created epr to msg_info_headers just after creating it
*/
/*if( epr)
- {
- axis2_endpoint_ref_free(epr, env);
- epr = NULL;
- }*/
+ {
+ axis2_endpoint_ref_free(epr, env);
+ epr = NULL;
+ } */
epr = axis2_msg_info_headers_get_from(msg_info_headers, env);
if (epr)
{
axis2_addr_out_handler_add_to_soap_header(env, epr,
- AXIS2_WSA_FROM,
- soap_header, addr_ns);
+ AXIS2_WSA_FROM,
+ soap_header, addr_ns);
}
@@ -407,8 +442,11 @@
if (!epr)
{
const axis2_char_t *anonymous_uri = NULL;
- axis2_bool_t anonymous = axis2_msg_info_headers_get_fault_to_anonymous(msg_info_headers, env);
- axis2_bool_t none = axis2_msg_info_headers_get_fault_to_none(msg_info_headers, env);
+ axis2_bool_t anonymous =
+ axis2_msg_info_headers_get_fault_to_anonymous(msg_info_headers,
+ env);
+ axis2_bool_t none =
+ axis2_msg_info_headers_get_fault_to_none(msg_info_headers, env);
if (axutil_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
{
if (none)
@@ -432,36 +470,38 @@
{
/* optional */
axis2_addr_out_handler_add_to_soap_header(env, epr,
- AXIS2_WSA_FAULT_TO,
- soap_header, addr_ns);
+ AXIS2_WSA_FAULT_TO,
+ soap_header, addr_ns);
}
- message_id = axis2_msg_info_headers_get_message_id(msg_info_headers, env);
+ message_id =
+ axis2_msg_info_headers_get_message_id(msg_info_headers, env);
if (message_id)
{
axis2_addr_out_handler_process_string_info(env, message_id,
- AXIS2_WSA_MESSAGE_ID,
- &soap_header,
- addr_ns);
+ AXIS2_WSA_MESSAGE_ID,
+ &soap_header, addr_ns);
}
- relates_to = axis2_msg_info_headers_get_relates_to(msg_info_headers, env);
+ relates_to =
+ axis2_msg_info_headers_get_relates_to(msg_info_headers, env);
if (relates_to)
{
const axis2_char_t *value = NULL;
value = axis2_relates_to_get_value(relates_to, env);
relates_to_header_node =
axis2_addr_out_handler_process_string_info(env, value,
- AXIS2_WSA_RELATES_TO,
- &soap_header,
- addr_ns);
+ AXIS2_WSA_RELATES_TO,
+ &soap_header,
+ addr_ns);
}
if (relates_to_header_node)
{
const axis2_char_t *relationship_type = NULL;
- relationship_type = axis2_relates_to_get_relationship_type(relates_to, env);
+ relationship_type =
+ axis2_relates_to_get_relationship_type(relates_to, env);
if (axutil_strcmp(relationship_type, "") != 0)
{
axiom_attribute_t *om_attr = NULL;
@@ -469,42 +509,52 @@
axiom_namespace_t *dec_ns = NULL;
relates_to_header_ele =
(axiom_element_t *)
- axiom_node_get_data_element(relates_to_header_node,
- env);
+ axiom_node_get_data_element(relates_to_header_node, env);
if (relates_to_header_ele)
{
- dec_ns = axiom_element_find_declared_namespace(relates_to_header_ele, env,
- addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ dec_ns =
+ axiom_element_find_declared_namespace
+ (relates_to_header_ele, env, addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
if (dec_ns)
{
addr_ns_obj = dec_ns;
}
else
{
- addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns_obj =
+ axiom_namespace_create(env, addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
}
om_attr = axiom_attribute_create(env,
- AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE,
- AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE,
- addr_ns_obj);
+ AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE,
+ AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE,
+ addr_ns_obj);
axiom_element_add_attribute(relates_to_header_ele, env,
- om_attr, relates_to_header_node);
+ om_attr,
+ relates_to_header_node);
}
if (relates_to_header_ele)
{
- dec_ns = axiom_element_find_declared_namespace(relates_to_header_ele, env,
- addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- if (! dec_ns)
+ dec_ns =
+ axiom_element_find_declared_namespace
+ (relates_to_header_ele, env, addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
+ if (!dec_ns)
{
- dec_ns = axiom_element_find_namespace(relates_to_header_ele, env,
- relates_to_header_node, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ dec_ns =
+ axiom_element_find_namespace(relates_to_header_ele,
+ env,
+ relates_to_header_node,
+ addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
if (dec_ns)
{
axiom_namespace_free(addr_ns_obj, env);
- addr_ns_obj = NULL ;
+ addr_ns_obj = NULL;
axiom_attribute_set_namespace(om_attr, env, dec_ns);
}
}
@@ -516,14 +566,13 @@
return AXIS2_SUCCESS;
}
-
axiom_node_t *
-axis2_addr_out_handler_process_string_info(const axutil_env_t *env,
- const axis2_char_t * value,
- const axis2_char_t * type,
- axiom_soap_header_t **
- soap_header_p,
- const axis2_char_t * addr_ns)
+axis2_addr_out_handler_process_string_info(
+ const axutil_env_t * env,
+ const axis2_char_t * value,
+ const axis2_char_t * type,
+ axiom_soap_header_t ** soap_header_p,
+ const axis2_char_t * addr_ns)
{
axiom_soap_header_t *soap_header = NULL;
axiom_soap_header_block_t *header_block = NULL;
@@ -542,11 +591,10 @@
{
axiom_namespace_t *addr_ns_obj = NULL;
addr_ns_obj =
- axiom_namespace_create(env, addr_ns,
- AXIS2_WSA_DEFAULT_PREFIX);
+ axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
header_block =
axiom_soap_header_add_header_block(soap_header, env, type,
- addr_ns_obj);
+ addr_ns_obj);
header_block_node =
axiom_soap_header_block_get_base_node(header_block, env);
header_block_ele =
@@ -556,10 +604,12 @@
{
axiom_namespace_t *dec_ns = NULL;
axiom_element_set_text(header_block_ele, env, value,
- header_block_node);
- dec_ns = axiom_element_find_declared_namespace(header_block_ele, env,
- addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- if (! dec_ns)
+ header_block_node);
+ dec_ns =
+ axiom_element_find_declared_namespace(header_block_ele, env,
+ addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
+ if (!dec_ns)
{
axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL;
@@ -570,12 +620,12 @@
}
axis2_status_t
-axis2_addr_out_handler_add_to_soap_header(const axutil_env_t *env,
- axis2_endpoint_ref_t *
- endpoint_ref,
- const axis2_char_t * type,
- axiom_soap_header_t * soap_header,
- const axis2_char_t * addr_ns)
+axis2_addr_out_handler_add_to_soap_header(
+ const axutil_env_t * env,
+ axis2_endpoint_ref_t * endpoint_ref,
+ const axis2_char_t * type,
+ axiom_soap_header_t * soap_header,
+ const axis2_char_t * addr_ns)
{
axiom_soap_header_block_t *header_block = NULL;
const axis2_char_t *address = NULL;
@@ -594,10 +644,9 @@
header_node = axiom_soap_header_get_base_node(soap_header, env);
addr_ns_obj = axiom_namespace_create(env,
- addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
header_block =
- axiom_soap_header_add_header_block(soap_header, env, type,
- addr_ns_obj);
+ axiom_soap_header_add_header_block(soap_header, env, type, addr_ns_obj);
if (addr_ns_obj)
{
@@ -613,32 +662,33 @@
axiom_node_t *address_node = NULL;
axiom_element_t *address_ele = NULL;
hb_node = axiom_soap_header_block_get_base_node(header_block, env);
- hb_ele = (axiom_element_t *)
- axiom_node_get_data_element(hb_node, env);
+ hb_ele = (axiom_element_t *) axiom_node_get_data_element(hb_node, env);
- addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns_obj =
+ axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
address_ele =
axiom_element_create(env, hb_node, EPR_ADDRESS, addr_ns_obj,
- &address_node);
+ &address_node);
if (address_ele)
{
axiom_namespace_t *dec_ns = NULL;
axiom_element_set_text(address_ele, env, address, address_node);
dec_ns = axiom_element_find_declared_namespace(address_ele, env,
- addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
/*if (! dec_ns)
- {
- axiom_namespace_free(addr_ns_obj, env);
- addr_ns_obj = NULL;
- }*/
+ {
+ axiom_namespace_free(addr_ns_obj, env);
+ addr_ns_obj = NULL;
+ } */
}
}
header_block_node =
axiom_soap_header_block_get_base_node(header_block, env);
axis2_addr_out_handler_add_to_header(env, endpoint_ref,
- &header_block_node, addr_ns);
+ &header_block_node, addr_ns);
ref_param_list = axis2_endpoint_ref_get_ref_param_list(endpoint_ref, env);
if (ref_param_list && axutil_array_list_size(ref_param_list, env) > 0)
@@ -648,31 +698,37 @@
axutil_array_list_t *ref_attribute_list = NULL;
int i = 0;
- addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns_obj =
+ axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
reference_ele = axiom_element_create(env,
- header_block_node,
- EPR_REFERENCE_PARAMETERS,
- addr_ns_obj,
- &reference_node);
+ header_block_node,
+ EPR_REFERENCE_PARAMETERS,
+ addr_ns_obj, &reference_node);
- ref_attribute_list = axis2_endpoint_ref_get_ref_attribute_list(endpoint_ref, env);
+ ref_attribute_list =
+ axis2_endpoint_ref_get_ref_attribute_list(endpoint_ref, env);
if (ref_attribute_list)
{
int j = 0;
- for (j = 0; j < axutil_array_list_size(ref_attribute_list, env); j++)
+ for (j = 0; j < axutil_array_list_size(ref_attribute_list, env);
+ j++)
{
- axiom_attribute_t *attr = (axiom_attribute_t *)axutil_array_list_get(ref_attribute_list, env, j);
+ axiom_attribute_t *attr =
+ (axiom_attribute_t *)
+ axutil_array_list_get(ref_attribute_list, env, j);
if (attr)
{
- axiom_element_add_attribute(reference_ele, env, attr, reference_node);
+ axiom_element_add_attribute(reference_ele, env, attr,
+ reference_node);
}
}
}
for (i = 0; i < axutil_array_list_size(ref_param_list, env); i++)
{
- axiom_node_t *ref_node = (axiom_node_t *)axutil_array_list_get(ref_param_list, env, i);
+ axiom_node_t *ref_node =
+ (axiom_node_t *) axutil_array_list_get(ref_param_list, env, i);
if (ref_node)
{
axiom_node_add_child(reference_node, env, ref_node);
@@ -689,34 +745,40 @@
axutil_array_list_t *meta_attribute_list = NULL;
int i = 0;
- if (!reference_node) /* may be we alredy created this in ref params block */
+ if (!reference_node) /* may be we alredy created this in ref params block */
{
- addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns_obj =
+ axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
reference_ele = axiom_element_create(env,
- header_block_node,
- AXIS2_WSA_METADATA,
- addr_ns_obj,
- &reference_node);
+ header_block_node,
+ AXIS2_WSA_METADATA,
+ addr_ns_obj, &reference_node);
}
- meta_attribute_list = axis2_endpoint_ref_get_metadata_attribute_list(endpoint_ref, env);
+ meta_attribute_list =
+ axis2_endpoint_ref_get_metadata_attribute_list(endpoint_ref, env);
if (meta_attribute_list)
{
int j = 0;
- for (j = 0; j < axutil_array_list_size(meta_attribute_list, env); j++)
+ for (j = 0; j < axutil_array_list_size(meta_attribute_list, env);
+ j++)
{
- axiom_attribute_t *attr = (axiom_attribute_t *)axutil_array_list_get(meta_attribute_list, env, j);
+ axiom_attribute_t *attr =
+ (axiom_attribute_t *)
+ axutil_array_list_get(meta_attribute_list, env, j);
if (attr)
{
- axiom_element_add_attribute(reference_ele, env, attr, reference_node);
+ axiom_element_add_attribute(reference_ele, env, attr,
+ reference_node);
}
}
}
- for (i = 0; i < axutil_array_list_size(meta_data_list, env); i ++)
+ for (i = 0; i < axutil_array_list_size(meta_data_list, env); i++)
{
- axiom_node_t *ref_node = (axiom_node_t *)axutil_array_list_get(meta_data_list, env, i);
+ axiom_node_t *ref_node =
+ (axiom_node_t *) axutil_array_list_get(meta_data_list, env, i);
if (ref_node)
{
axiom_node_add_child(reference_node, env, ref_node);
@@ -728,9 +790,10 @@
if (extension_list && axutil_array_list_size(extension_list, env) > 0)
{
int i = 0;
- for (i = 0; i < axutil_array_list_size(extension_list, env); i ++)
+ for (i = 0; i < axutil_array_list_size(extension_list, env); i++)
{
- axiom_node_t *ref_node = (axiom_node_t *)axutil_array_list_get(extension_list, env, i);
+ axiom_node_t *ref_node =
+ (axiom_node_t *) axutil_array_list_get(extension_list, env, i);
if (ref_node)
{
axiom_node_add_child(header_block_node, env, ref_node);
@@ -742,10 +805,11 @@
}
axis2_status_t
-axis2_addr_out_handler_add_to_header(const axutil_env_t *env,
- axis2_endpoint_ref_t * epr,
- axiom_node_t ** parent_node_p,
- const axis2_char_t * addr_ns)
+axis2_addr_out_handler_add_to_header(
+ const axutil_env_t * env,
+ axis2_endpoint_ref_t * epr,
+ axiom_node_t ** parent_node_p,
+ const axis2_char_t * addr_ns)
{
axiom_node_t *parent_node = NULL;
const axutil_qname_t *interface_qname = NULL;
@@ -761,7 +825,6 @@
parent_node = *(parent_node_p);
-
interface_qname = axis2_endpoint_ref_get_interface_qname(epr, env);
if (interface_qname)
@@ -770,7 +833,8 @@
axis2_char_t *qname_prefix = NULL;
axis2_char_t *qname_localpart = NULL;
- addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+ addr_ns_obj =
+ axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
if (axutil_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
{
@@ -782,26 +846,26 @@
}
interface_ele = axiom_element_create(env, parent_node,
- element_localname,
- addr_ns_obj,
- &interface_node);
+ element_localname,
+ addr_ns_obj, &interface_node);
qname_prefix = axutil_qname_get_prefix(interface_qname, env);
qname_localpart = axutil_qname_get_localpart(interface_qname, env);
text =
AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) *
- (axutil_strlen(qname_prefix) +
- axutil_strlen(qname_localpart) + 2));
+ sizeof(axis2_char_t) *
+ (axutil_strlen(qname_prefix) +
+ axutil_strlen(qname_localpart) + 2));
sprintf(text, "%s:%s", qname_prefix, qname_localpart);
axiom_element_set_text(interface_ele, env, text, interface_node);
AXIS2_FREE(env->allocator, text);
if (interface_ele)
{
axiom_namespace_t *dec_ns = NULL;
- dec_ns = axiom_element_find_declared_namespace(interface_ele , env,
- addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- if (! dec_ns)
+ dec_ns = axiom_element_find_declared_namespace(interface_ele, env,
+ addr_ns,
+ AXIS2_WSA_DEFAULT_PREFIX);
+ if (!dec_ns)
{
axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL;
@@ -814,14 +878,12 @@
return AXIS2_SUCCESS;
}
-
axis2_status_t
-axis2_addr_out_handler_process_any_content_type(const axutil_env_t *env,
- axis2_any_content_type_t *
- reference_values,
- axiom_node_t *
- parent_ele_node,
- const axis2_char_t * addr_ns)
+axis2_addr_out_handler_process_any_content_type(
+ const axutil_env_t * env,
+ axis2_any_content_type_t * reference_values,
+ axiom_node_t * parent_ele_node,
+ const axis2_char_t * addr_ns)
{
axutil_hash_t *value_ht = NULL;
axutil_hash_index_t *hash_index = NULL;
@@ -833,13 +895,12 @@
const void *k = NULL;
void *v = NULL;
axis2_ssize_t len = 0;
- value_ht =
- axis2_any_content_type_get_value_map(reference_values, env);
+ value_ht = axis2_any_content_type_get_value_map(reference_values, env);
if (!value_ht)
return AXIS2_FAILURE;
for (hash_index = axutil_hash_first(value_ht, env); hash_index;
- hash_index = axutil_hash_next(env, hash_index))
+ hash_index = axutil_hash_next(env, hash_index))
{
axutil_hash_this(hash_index, &k, &len, &v);
if (k)
@@ -847,8 +908,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
ele =
- axiom_element_create(env, parent_ele_node, k, NULL,
- &node);
+ axiom_element_create(env, parent_ele_node, k, NULL, &node);
if (ele)
{
if (axutil_strcmp(AXIS2_WSA_NAMESPACE, addr_ns) == 0)
@@ -857,12 +917,12 @@
axiom_attribute_t *att = NULL;
addr_ns_obj =
axiom_namespace_create(env, addr_ns,
- AXIS2_WSA_DEFAULT_PREFIX);
+ AXIS2_WSA_DEFAULT_PREFIX);
att =
axiom_attribute_create(env,
- AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
- AXIS2_WSA_TYPE_ATTRIBUTE_VALUE,
- addr_ns_obj);
+ AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
+ AXIS2_WSA_TYPE_ATTRIBUTE_VALUE,
+ addr_ns_obj);
}
axiom_element_set_text(ele, env, v, node);
}
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/mod_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/mod_addr.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/mod_addr.c (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/mod_addr.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,20 +19,19 @@
#include <axis2_addr_mod.h>
#include <axis2_conf_ctx.h>
-axis2_status_t AXIS2_CALL
-axis2_mod_addr_shutdown(axis2_module_t *module,
- const axutil_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_mod_addr_init(
- axis2_module_t *module,
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_module_desc_t *module_desc);
-
-axis2_status_t AXIS2_CALL
-axis2_mod_addr_fill_handler_create_func_map(axis2_module_t *module,
- const axutil_env_t *env);
+axis2_status_t AXIS2_CALL axis2_mod_addr_shutdown(
+ axis2_module_t * module,
+ const axutil_env_t * env);
+
+axis2_status_t AXIS2_CALL axis2_mod_addr_init(
+ axis2_module_t * module,
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx,
+ axis2_module_desc_t * module_desc);
+
+axis2_status_t AXIS2_CALL axis2_mod_addr_fill_handler_create_func_map(
+ axis2_module_t * module,
+ const axutil_env_t * env);
static const axis2_module_ops_t addr_module_ops_var = {
axis2_mod_addr_init,
@@ -40,31 +40,32 @@
};
axis2_module_t *
-axis2_mod_addr_create(const axutil_env_t *env)
+axis2_mod_addr_create(
+ const axutil_env_t * env)
{
axis2_module_t *module = NULL;
- module = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_module_t));
+ module = AXIS2_MALLOC(env->allocator, sizeof(axis2_module_t));
module->ops = &addr_module_ops_var;
-
+
return module;
}
axis2_status_t AXIS2_CALL
axis2_mod_addr_init(
- axis2_module_t *module,
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_module_desc_t *module_desc)
+ axis2_module_t * module,
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx,
+ axis2_module_desc_t * module_desc)
{
/* Any initialization stuff of mod_addr goes here */
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_mod_addr_shutdown(axis2_module_t *module,
- const axutil_env_t *env)
+axis2_mod_addr_shutdown(
+ axis2_module_t * module,
+ const axutil_env_t * env)
{
if (module->handler_create_func_map)
{
@@ -81,23 +82,23 @@
}
axis2_status_t AXIS2_CALL
-axis2_mod_addr_fill_handler_create_func_map(axis2_module_t *module,
- const axutil_env_t *env)
+axis2_mod_addr_fill_handler_create_func_map(
+ axis2_module_t * module,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
module->handler_create_func_map = axutil_hash_make(env);
if (!module->handler_create_func_map)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
axutil_hash_set(module->handler_create_func_map, "AddressingInHandler",
- AXIS2_HASH_KEY_STRING, axis2_addr_in_handler_create);
+ AXIS2_HASH_KEY_STRING, axis2_addr_in_handler_create);
axutil_hash_set(module->handler_create_func_map, "AddressingOutHandler",
- AXIS2_HASH_KEY_STRING, axis2_addr_out_handler_create);
+ AXIS2_HASH_KEY_STRING, axis2_addr_out_handler_create);
return AXIS2_SUCCESS;
}
@@ -107,8 +108,9 @@
*/
AXIS2_EXPORT int
-axis2_get_instance(axis2_module_t **inst,
- const axutil_env_t *env)
+axis2_get_instance(
+ axis2_module_t ** inst,
+ const axutil_env_t * env)
{
*inst = axis2_mod_addr_create(env);
if (!(*inst))
@@ -120,8 +122,9 @@
}
AXIS2_EXPORT int
-axis2_remove_instance(axis2_module_t *inst,
- const axutil_env_t *env)
+axis2_remove_instance(
+ axis2_module_t * inst,
+ const axutil_env_t * env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org