Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 78391 invoked from network); 5 Feb 2006 11:10:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Feb 2006 11:10:49 -0000 Received: (qmail 82705 invoked by uid 500); 5 Feb 2006 11:10:47 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 82651 invoked by uid 500); 5 Feb 2006 11:10:47 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 82640 invoked by uid 500); 5 Feb 2006 11:10:46 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 82637 invoked by uid 99); 5 Feb 2006 11:10:46 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Feb 2006 03:10:46 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 05 Feb 2006 03:10:45 -0800 Received: (qmail 78291 invoked by uid 65534); 5 Feb 2006 11:10:24 -0000 Message-ID: <20060205111024.78290.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r375001 - in /webservices/axis2/trunk/c: ./ include/ modules/ modules/core/addr/ modules/mod_addr/ modules/xml/soap/ samples/client/echo/ Date: Sun, 05 Feb 2006 11:10:22 -0000 To: axis2-cvs@ws.apache.org From: samisa@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: samisa Date: Sun Feb 5 03:10:19 2006 New Revision: 375001 URL: http://svn.apache.org/viewcvs?rev=375001&view=rev Log: Initial compiling version of addressing in handler added along with fixes to other sources to get it working. Added: webservices/axis2/trunk/c/include/axis2_addr_mod.h webservices/axis2/trunk/c/modules/mod_addr/ webservices/axis2/trunk/c/modules/mod_addr/Makefile.am webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Modified: webservices/axis2/trunk/c/configure.ac webservices/axis2/trunk/c/include/axis2.h webservices/axis2/trunk/c/include/axis2_call.h webservices/axis2/trunk/c/include/axis2_endpoint_ref.h webservices/axis2/trunk/c/include/axis2_soap_header.h webservices/axis2/trunk/c/include/axis2_soap_header_block.h webservices/axis2/trunk/c/modules/Makefile.am webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c webservices/axis2/trunk/c/modules/xml/soap/soap_header.c webservices/axis2/trunk/c/samples/client/echo/echo_client.c Modified: webservices/axis2/trunk/c/configure.ac URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/configure.ac (original) +++ webservices/axis2/trunk/c/configure.ac Sun Feb 5 03:10:19 2006 @@ -147,6 +147,7 @@ modules/util/Makefile \ modules/platforms/unix/Makefile \ modules/wsdl/Makefile \ + modules/mod_addr/Makefile \ samples/Makefile \ samples/server/Makefile \ samples/server/echo/Makefile \ Modified: webservices/axis2/trunk/c/include/axis2.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2.h (original) +++ webservices/axis2/trunk/c/include/axis2.h Sun Feb 5 03:10:19 2006 @@ -317,10 +317,10 @@ /******************************************************************************/ -#define AXIS2_AXIS2_NAMESPACE_PREFIX "axis2" -#define AXIS2_AXIS2_NAMESPACE_URI "http://ws.apache.org/namespaces/axis2" +#define AXIS2_NAMESPACE_PREFIX "axis2" +#define AXIS2_NAMESPACE_URI "http://ws.apache.org/namespaces/axis2" -#define AXIS2_SERVICE_GROUP_ID "ServiceGroupId" +#define AXIS2_SVC_GRP_ID "ServiceGroupId" /** @} */ Added: webservices/axis2/trunk/c/include/axis2_addr_mod.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_addr_mod.h?rev=375001&view=auto ============================================================================== --- webservices/axis2/trunk/c/include/axis2_addr_mod.h (added) +++ webservices/axis2/trunk/c/include/axis2_addr_mod.h Sun Feb 5 03:10:19 2006 @@ -0,0 +1,40 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AXIS2_ADDR_MOD_H +#define AXIS2_ADDR_MOD_H + +/** + * @file axis2_addr_mod.h + * @brief Axis2 addressing module interface + */ + +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +AXIS2_DECLARE(axis2_handler_t*) axis2_addr_in_handler_create(axis2_env_t **env, axis2_qname_t *qname); + +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* AXIS2_ADDR_MOD_H */ Modified: webservices/axis2/trunk/c/include/axis2_call.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_call.h?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_call.h (original) +++ webservices/axis2/trunk/c/include/axis2_call.h Sun Feb 5 03:10:19 2006 @@ -123,6 +123,31 @@ axis2_env_t **env, long time_out_ms); /** + * This invocation done via this method blocks till the result arrives, + * using this method does not indicate + * anyhting about the transport used or the nature of the transport. + * e.g. invocation done with this method might + *
    + *
  1. send request via http and recevie the response via the return path of the same http connection
    2. + *
  2. send request via http and recevie the response different http connection
    3. + *
  3. send request via an email smtp and recevie the response via an email
    4. + *
+ */ + + axis2_msg_ctx_t* (AXIS2_CALL *invoke_blocking)(struct axis2_call *call, + axis2_env_t **env, + axis2_op_t *op, + axis2_msg_ctx_t *msg_ctx); + /** + * This invocation done via this method blocks till the result arrives, using this method does not indicate + * anyhting about the transport used or the nature of the transport. + */ + axis2_status_t (AXIS2_CALL *invoke_non_blocking)(struct axis2_call *call, + axis2_env_t **env, + axis2_op_t *op, + axis2_msg_ctx_t *msg_ctx, + axis2_callback_t *callback); + /** * Invoke the blocking/Synchronous call * * @param op - this will be used to identify the operation in the client side, without dispatching @@ -215,7 +240,8 @@ axis2_char_t *client_home); /************************** Start of function macros **************************/ - +#define AXIS2_CALL_INVOKE_BLOCKING(call, env, op, msg_ctx) ((call)->ops->invoke_blocking(call, env, op, msg_ctx)) +#define AXIS2_CALL_INVOKE_NON_BLOCKING(call, env, op, msg_ctx, callback) ((call)->ops->invoke_non_blocking(call, env, op, msg_ctx, callback)) #define AXIS2_CALL_SET_TO(call, env, to) ((call)->ops->set_to(call, env, to)) #define AXIS2_CALL_SET_TRANSPORT_INFO(call, env, sender_transport, listener_transport, use_separate_listener) ((call)->ops->set_transport_info(call, env, sender_transport, listener_transport, use_separate_listener)) #define AXIS2_CALL_CHECK_TRANSPORT(call, env, msg_ctx) ((call)->ops->check_transport(call, env, msg_ctx)) Modified: webservices/axis2/trunk/c/include/axis2_endpoint_ref.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_endpoint_ref.h?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_endpoint_ref.h (original) +++ webservices/axis2/trunk/c/include/axis2_endpoint_ref.h Sun Feb 5 03:10:19 2006 @@ -90,6 +90,12 @@ axis2_any_content_type_t* (AXIS2_CALL *get_ref_params)(struct axis2_endpoint_ref *endpoint_ref, axis2_env_t **env); /** + * Method set_ref_params + */ + axis2_status_t (AXIS2_CALL *set_ref_params)(struct axis2_endpoint_ref *endpoint_ref, + axis2_env_t **env, + axis2_any_content_type_t* any_content_type); + /** * Method get_svc_name */ axis2_svc_name_t* (AXIS2_CALL *get_svc_name)(struct axis2_endpoint_ref *endpoint_ref, @@ -140,6 +146,7 @@ #define AXIS2_ENDPOINT_REF_GET_REF_PROPERTIES(endpoint_ref, env) ((endpoint_ref)->ops->get_ref_properties(endpoint_ref, env)) #define AXIS2_ENDPOINT_REF_SET_REF_PROPERTIES(endpoint_ref, env, ref_properties) ((endpoint_ref)->ops->set_ref_properties(endpoint_ref, env, ref_properties)) #define AXIS2_ENDPOINT_REF_GET_REF_PARAMS(endpoint_ref, env) ((endpoint_ref)->ops->get_ref_params(endpoint_ref, env)) +#define AXIS2_ENDPOINT_REF_SET_REF_PARAMS(endpoint_ref, env, any_content_type) ((endpoint_ref)->ops->set_ref_params(endpoint_ref, env, any_content_type)) #define AXIS2_ENDPOINT_REF_GET_SVC_NAME(endpoint_ref, env) ((endpoint_ref)->ops->get_svc_name(endpoint_ref, env)) #define AXIS2_ENDPOINT_REF_SET_SVC_NAME(endpoint_ref, env, svc_name) ((endpoint_ref)->ops->set_svc_name(endpoint_ref, env, svc_name)) #define AXIS2_ENDPOINT_REF_GET_POLICIES(endpoint_ref, env) ((endpoint_ref)->ops->get_policies(endpoint_ref, env)) Modified: webservices/axis2/trunk/c/include/axis2_soap_header.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_header.h?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_soap_header.h (original) +++ webservices/axis2/trunk/c/include/axis2_soap_header.h Sun Feb 5 03:10:19 2006 @@ -101,7 +101,7 @@ * given namespace uri exists * The returned array_list must be freed by the user. */ - axis2_array_list_t* (AXIS2_CALL *get_header_block_with_namespace_uri) + axis2_array_list_t* (AXIS2_CALL *get_header_blocks_with_namespace_uri) (axis2_soap_header_t* header, axis2_env_t **env, axis2_char_t *ns_uri); @@ -225,8 +225,8 @@ #define AXIS2_SOAP_HEADER_SET_BUILDER(header, env, builder) \ ((header)->ops->set_builder(header, env, builder)) -#define AXIS2_SOAP_HEADER_GET_HEADER_BLOCK_WITH_NAMESPACE_URI(header, env, uri)\ - ((header)->ops->get_header_block_with_namespace_uri(header, env, uri)) +#define AXIS2_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(header, env, uri)\ + ((header)->ops->get_header_blocks_with_namespace_uri(header, env, uri)) #define AXIS2_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(header, env) \ ((header)->ops->get_all_header_blocks(header, env)) Modified: webservices/axis2/trunk/c/include/axis2_soap_header_block.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_header_block.h?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_soap_header_block.h (original) +++ webservices/axis2/trunk/c/include/axis2_soap_header_block.h Sun Feb 5 03:10:19 2006 @@ -175,7 +175,7 @@ ((header_block)->ops->is_precessed(header_block, env)) #define AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block , env) \ - ((header_block)->ops->set_precessed(header_block, env)) + ((header_block)->ops->set_processed(header_block, env)) #define AXIS2_SOAP_HEADER_BLOCK_GET_MUST_UNDERSTAND(header_block, env) \ ((header_block)->ops->get_must_understand(header_block, env)) Modified: webservices/axis2/trunk/c/modules/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/Makefile.am?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/Makefile.am Sun Feb 5 03:10:19 2006 @@ -1,2 +1,2 @@ -SUBDIRS = platforms/unix util xml wsdl core +SUBDIRS = platforms/unix util xml wsdl core mod_addr EXTRA_DIST = platforms/axis2_platform_auto_sense.h Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original) +++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Sun Feb 5 03:10:19 2006 @@ -55,6 +55,9 @@ axis2_env_t **env, axis2_any_content_type_t *ref_properties); axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_params(struct axis2_endpoint_ref *endpoint_ref, axis2_env_t **env); +axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_params(struct axis2_endpoint_ref *endpoint_ref, + axis2_env_t **env, + axis2_any_content_type_t* any_content_type); axis2_svc_name_t* AXIS2_CALL axis2_endpoint_ref_get_svc_name(struct axis2_endpoint_ref *endpoint_ref, axis2_env_t **env); axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_svc_name(struct axis2_endpoint_ref *endpoint_ref, @@ -122,6 +125,7 @@ endpoint_ref_impl->endpoint_ref.ops->get_ref_properties = axis2_endpoint_ref_get_ref_properties; endpoint_ref_impl->endpoint_ref.ops->set_ref_properties = axis2_endpoint_ref_set_ref_properties; endpoint_ref_impl->endpoint_ref.ops->get_ref_params = axis2_endpoint_ref_get_ref_params; + endpoint_ref_impl->endpoint_ref.ops->set_ref_params = axis2_endpoint_ref_set_ref_params; endpoint_ref_impl->endpoint_ref.ops->get_svc_name = axis2_endpoint_ref_get_svc_name; endpoint_ref_impl->endpoint_ref.ops->set_svc_name = axis2_endpoint_ref_set_svc_name; endpoint_ref_impl->endpoint_ref.ops->get_policies = axis2_endpoint_ref_get_policies; @@ -214,6 +218,14 @@ return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params; } +axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_params(struct axis2_endpoint_ref *endpoint_ref, + axis2_env_t **env, + axis2_any_content_type_t* any_content_type) +{ + AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL); + AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params = any_content_type; + return AXIS2_SUCCESS; +} /** * Method get_svc_name Added: webservices/axis2/trunk/c/modules/mod_addr/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/Makefile.am?rev=375001&view=auto ============================================================================== --- webservices/axis2/trunk/c/modules/mod_addr/Makefile.am (added) +++ webservices/axis2/trunk/c/modules/mod_addr/Makefile.am Sun Feb 5 03:10:19 2006 @@ -0,0 +1,12 @@ +lib_LTLIBRARIES = libaxis2_mod_addr.la +AM_CPPFLAGS = $(CPPFLAGS) +libaxis2_mod_addr_la_SOURCES = addr_in_handler.c + +libaxis2_mod_addr_la_LIBADD = +INCLUDES = -I$(top_builddir)/include \ + -I$(top_builddir)/modules/util \ + -I$(top_builddir)/modules/xml/parser \ + -I$(top_builddir)/modules/core/description \ + -I$(top_builddir)/modules/core/transport \ + -I$(top_builddir)/modules/wsdl \ + -I$(top_builddir)/modules/platforms Added: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=375001&view=auto ============================================================================== --- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (added) +++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Sun Feb 5 03:10:19 2006 @@ -0,0 +1,744 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +axis2_status_t AXIS2_CALL +axis2_addr_in_handler_invoke(struct axis2_handler *handler, + axis2_env_t **env, + struct axis2_msg_ctx *msg_ctx); + +axis2_bool_t +axis2_addr_in_check_element(axis2_env_t **env, axis2_qname_t *expected_qname, + axis2_qname_t *actual_qname); + +axis2_status_t +axis2_addr_in_extract_svc_grp_ctx_id(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_ctx_t *msg_ctx); + +axis2_status_t +axis2_addr_in_extract_ref_params(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t *msg_info_headers); + +axis2_status_t +axis2_addr_in_extract_addr_final_info(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t **msg_info_headers, + axis2_array_list_t *addr_headers); + + +axis2_status_t +axis2_addr_in_extract_to_epr_ref_params(axis2_env_t **env, + axis2_endpoint_ref_t * to_epr, + axis2_soap_header_t *soap_header, + axis2_char_t *addr_ns); + +axis2_status_t +axis2_addr_in_extract_epr_information(axis2_env_t **env, + axis2_soap_header_block_t *soap_header_block, + axis2_endpoint_ref_t *endpoint_ref, + axis2_char_t *addr_ns); + +axis2_status_t +axis2_addr_in_extract_addr_params(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t **msg_info_headers, + axis2_array_list_t *addr_headers, + axis2_char_t *addr_ns); + +axis2_status_t axis2_addr_in_extract_addr_submission_info(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t **msg_info_headers, + axis2_array_list_t *addr_headers); + +/******************************************************************************/ + +AXIS2_DECLARE(axis2_handler_t*) +axis2_addr_in_handler_create(axis2_env_t **env, + axis2_qname_t *qname) +{ + axis2_handler_t *handler = NULL; + axis2_handler_desc_t *handler_desc = NULL; + axis2_qname_t *handler_qname = NULL; + + AXIS2_ENV_CHECK(env, NULL); + + if (qname) + { + handler_qname = AXIS2_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 = axis2_qname_create(env, "addr_in_handler", + "http://axis.ws.apache.org", + NULL); + if (!handler_qname) + { + return NULL; + } + } + + handler = axis2_handler_create(env); + if (!handler) + { + return NULL; + } + + /* handler desc of base handler */ + handler_desc = axis2_handler_desc_create_with_qname(env, handler_qname); + if (!handler_desc) + { + AXIS2_HANDLER_FREE(handler, env); + return NULL; + } + + AXIS2_HANDLER_INIT(handler, env, handler_desc); + + /* set the base struct's invoke op */ + if (handler->ops) + handler->ops->invoke = axis2_addr_in_handler_invoke; + + return handler; +} + + +/*axis2_status_t AXIS2_CALL +axis2_ctx_handler_invoke(struct axis2_handler *handler, + axis2_env_t **env, + struct axis2_msg_ctx *msg_ctx) +{ + axis2_op_t *op = NULL; + axis2_svc_ctx_t *svc_ctx = NULL; + axis2_op_ctx_t *op_ctx = NULL; + axis2_svc_grp_ctx_t *svc_grp_ctx = NULL; + + AXIS2_FUNC_PARAM_CHECK(handler, env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE); + + op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env); + + if (op_ctx && svc_ctx) + { + svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env); + if (svc_grp_ctx) + { + AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, + AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env)); + } + return AXIS2_SUCCESS; + } + + op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env); + + + op_ctx = AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, msg_ctx); + + if (op_ctx) + { + AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx); + svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env); + if (svc_ctx) + { + svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env); + AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx); + AXIS2_MSG_CTX_SET_SVC_GRP_CTX(msg_ctx, env, svc_grp_ctx); + AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, + AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env)); + } + return AXIS2_SUCCESS; + } + else + { + axis2_conf_ctx_t *conf_ctx = NULL; + op_ctx = axis2_op_ctx_create(env, op, NULL); + if (!op_ctx) + { + return AXIS2_FAILURE; + } + + AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx); + + AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx); + + conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + if (conf_ctx) + { + svc_grp_ctx = AXIS2_CONF_CTX_FILL_CTXS(conf_ctx, env, msg_ctx); + if (svc_grp_ctx) + return AXIS2_SUCCESS; + } + } + return AXIS2_FAILURE; +} +*/ + +axis2_status_t +axis2_addr_in_handler_invoke(struct axis2_handler *handler, + axis2_env_t **env, + struct axis2_msg_ctx *msg_ctx) +{ + axis2_soap_envelope_t *soap_envelope = NULL; + axis2_soap_header_t *soap_header = NULL; + + AXIS2_FUNC_PARAM_CHECK(handler, env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE); + + /*op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env); + svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env);*/ + + AXIS2_LOG_INFO((*env)->log, "Starting addressing in handler ........."); + + soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env); + + if (soap_envelope) + { + soap_header = AXIS2_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env); + if (soap_header) + { + axis2_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); + + /*addr_headers = AXIS2_SOAP_HEADER_GET_HEADER_BLOCKS(soap_header, env);*/ + if (addr_headers) + { + addr_ns_str = AXIS2_WSA_NAMESPACE_SUBMISSION; + axis2_addr_in_extract_addr_submission_info(env, + soap_header, + &msg_info_headers, + addr_headers); + } + else + { + addr_headers = AXIS2_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(soap_header, env, AXIS2_WSA_NAMESPACE); + if (addr_headers) + { + addr_ns_str = AXIS2_WSA_NAMESPACE; + axis2_addr_in_extract_addr_final_info(env, + soap_header, + &msg_info_headers, + addr_headers); + 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*/ + /*logger.debug( + "No Addressing Headers present in the IN message. Addressing In Handler does nothing."); + */ + /** TODO : set the error */ + AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "No Addressing Headers present in the IN message. Addressing In Handler cannot do anything."); + return AXIS2_FAILURE; + } + } + + ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env); + if (ctx) + { + AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, addr_ns_str, AXIS2_TRUE); + } + + /* extract service group context, if available */ + axis2_addr_in_extract_svc_grp_ctx_id(env, soap_header, msg_ctx); + + return AXIS2_SUCCESS; + } + } + + return AXIS2_FAILURE; +} + +axis2_status_t +axis2_addr_in_extract_svc_grp_ctx_id(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_ctx_t *msg_ctx) +{ + axis2_om_node_t *node = NULL; + axis2_om_element_t *element = NULL; + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_FUNC_PARAM_CHECK(soap_header, env, AXIS2_FAILURE); + AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE); + + node = AXIS2_SOAP_HEADER_GET_BASE_NODE(soap_header, env); + if (node && AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT) + { + axis2_qname_t *qname = NULL; + element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env); + qname = axis2_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI, + AXIS2_NAMESPACE_PREFIX); + if (qname) + { + axis2_om_node_t *child_node = NULL; + axis2_om_element_t *child_element = NULL; + child_element = AXIS2_OM_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 = AXIS2_OM_ELEMENT_GET_TEXT(child_element, env, + child_node); + conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); + if (conf_ctx && 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) + { + /** TODO, set error */ + return AXIS2_FAILURE; + } + AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, grp_id); + return AXIS2_SUCCESS; + } + } + } + } + /** TODO, set error */ + return AXIS2_FAILURE; +} + + + +axis2_status_t +axis2_addr_in_extract_addr_final_info(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t **msg_info_headers, + axis2_array_list_t *addr_headers) +{ + return axis2_addr_in_extract_addr_params(env, + soap_header, + msg_info_headers, + addr_headers, + AXIS2_WSA_NAMESPACE); +} + +axis2_status_t axis2_addr_in_extract_addr_submission_info(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t **msg_info_headers, + axis2_array_list_t *addr_headers) +{ + return axis2_addr_in_extract_addr_params(env, + soap_header, + msg_info_headers, + addr_headers, + AXIS2_WSA_NAMESPACE_SUBMISSION); +} + +axis2_status_t +axis2_addr_in_extract_addr_params(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t **msg_info_headers_p, + axis2_array_list_t *addr_headers, + axis2_char_t *addr_ns_str) +{ + axis2_hash_t *header_block_ht = NULL; + axis2_hash_index_t *hash_index = NULL; + axis2_msg_info_headers_t *msg_info_headers = *(msg_info_headers_p); + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, soap_header, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, msg_info_headers_p, AXIS2_FAILURE); + 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) + return AXIS2_FAILURE; + + header_block_ht = AXIS2_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env); + if(!header_block_ht) + return AXIS2_FAILURE; + + for(hash_index = axis2_hash_first(header_block_ht, env); hash_index; + hash_index = axis2_hash_next(env, hash_index)) + { + void *hb = NULL; + axis2_soap_header_block_t *header_block = NULL; + axis2_om_node_t *header_block_node = NULL; + axis2_om_element_t *header_block_ele = NULL; + axis2_char_t *ele_localname = NULL; + axis2_endpoint_ref_t *epr = NULL; + + axis2_hash_this(hash_index, NULL, NULL, &hb); + + header_block = (axis2_soap_header_block_t *)hb; + header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env); + header_block_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env); + ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(header_block_ele, env); + + if(AXIS2_STRCMP(ele_localname, AXIS2_WSA_TO) == 0) + { + /* here the addressing epr overidde what ever already there in the message context */ + + epr = axis2_endpoint_ref_create(env, AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node)); + 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_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + } + else if(AXIS2_STRCMP(ele_localname, AXIS2_WSA_FROM) == 0) + { + epr = AXIS2_MSG_INFO_HEADERS_GET_FROM(msg_info_headers, env); + if(!epr) + { + /* I don't know the address now. Let me pass the empty + string now and fill this once I process the Elements under this. */ + + + 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_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + } + else if( AXIS2_STRCMP(ele_localname, AXIS2_WSA_REPLY_TO) == 0) + { + epr = AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO(msg_info_headers, env); + if(!epr) + { + 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_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + } + else if(AXIS2_STRCMP(ele_localname, AXIS2_WSA_FAULT_TO) == 0) + { + epr = AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO(msg_info_headers , env); + if(!epr) + { + 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_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + } + else if(AXIS2_STRCMP(ele_localname, AXIS2_WSA_MESSAGE_ID) == 0) + { + AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, + AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node)); + AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + } + else if(AXIS2_STRCMP(ele_localname, AXIS2_WSA_ACTION) == 0) + { + AXIS2_MSG_INFO_HEADERS_SET_ACTION(msg_info_headers, env, + AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node)); + AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + + } + else if(AXIS2_STRCMP(ele_localname, AXIS2_WSA_RELATES_TO) == 0) + { + axis2_char_t *address = NULL; + axis2_qname_t *rqn = NULL; + axis2_om_attribute_t *relationship_type = NULL; + axis2_char_t *relationship_type_default_value = NULL; + axis2_char_t *relationship_type_value = NULL; + axis2_relates_to_t *relates_to = NULL; + if(AXIS2_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; + } + rqn = axis2_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE, NULL, NULL); + + relationship_type = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, rqn); + + if(!relationship_type) + { + relationship_type_value = + AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE_SUBMISSION; + } + else + { + relationship_type_value = AXIS2_OM_ATTRIBUTE_GET_VALUE(relationship_type, env); + } + + address = AXIS2_OM_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); + AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env); + + AXIS2_QNAME_FREE(rqn, env); + } + } + return AXIS2_SUCCESS; +} + +axis2_status_t +axis2_addr_in_extract_epr_information(axis2_env_t **env, + axis2_soap_header_block_t *soap_header_block, + axis2_endpoint_ref_t *endpoint_ref, + axis2_char_t *addr_ns_str) +{ + axis2_qname_t *epr_addr_qn = NULL; + axis2_qname_t *epr_ref_qn = NULL; + axis2_qname_t *wsa_meta_qn = NULL; + axis2_om_node_t *header_block_node = NULL; + axis2_om_element_t *header_block_ele = NULL; + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, soap_header_block, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, endpoint_ref, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, addr_ns_str, AXIS2_FAILURE); + + header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(soap_header_block, env); + header_block_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env); + + + axis2_om_child_element_iterator_t *child_ele_iter = AXIS2_OM_ELEMENT_GET_CHILD_ELEMENTS(header_block_ele, env, header_block_node); + if(!child_ele_iter) + return AXIS2_FAILURE; + epr_addr_qn = axis2_qname_create(env, EPR_ADDRESS, addr_ns_str, NULL); + epr_ref_qn = axis2_qname_create(env, EPR_REFERENCE_PARAMETERS, addr_ns_str, NULL); + wsa_meta_qn = axis2_qname_create(env, AXIS2_WSA_METADATA, addr_ns_str, NULL); + while(AXIS2_OM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(child_ele_iter, env)) + { + axis2_om_node_t *child_node = NULL; + axis2_om_element_t *child_ele = NULL; + child_node = AXIS2_OM_CHILD_ELEMENT_ITERATOR_NEXT(child_ele_iter, env); + child_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(child_node, env); + + + axis2_qname_t *child_qn = AXIS2_OM_ELEMENT_GET_QNAME(child_ele, env); + if(axis2_addr_in_check_element(env, epr_addr_qn, child_qn )) + { + AXIS2_ENDPOINT_REF_SET_ADDRESS(endpoint_ref, env, + AXIS2_OM_ELEMENT_GET_TEXT(child_ele, env, child_node)); + } + else if(axis2_addr_in_check_element(env, epr_ref_qn , child_qn)) + { + axis2_om_child_element_iterator_t *ref_param_iter = NULL; + + axis2_any_content_type_t *any_content_type = NULL; + any_content_type = AXIS2_ENDPOINT_REF_GET_REF_PARAMS(endpoint_ref, env); + if(any_content_type == NULL) + { + any_content_type = axis2_any_content_type_create(env); + AXIS2_ENDPOINT_REF_SET_REF_PARAMS(endpoint_ref, env, any_content_type); + } + + ref_param_iter = AXIS2_OM_ELEMENT_GET_CHILD_ELEMENTS(child_ele, env, child_node); + if(ref_param_iter) + { + while(AXIS2_OM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(ref_param_iter, env)) + { + axis2_om_node_t *om_node = NULL; + axis2_om_element_t *om_ele = NULL; + axis2_any_content_type_t *any_content = NULL; + om_node = AXIS2_OM_CHILD_ELEMENT_ITERATOR_NEXT(ref_param_iter, env); + om_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(om_node, env); + any_content = AXIS2_ENDPOINT_REF_GET_REF_PARAMS(endpoint_ref, env); + if(any_content && om_ele) + { + AXIS2_ANY_CONTENT_TYPE_ADD_VALUE(any_content, env, + AXIS2_OM_ELEMENT_GET_QNAME(om_ele, env), AXIS2_OM_ELEMENT_GET_TEXT(om_ele, env, om_node)); + + } + } + AXIS2_OM_CHILD_ELEMENT_ITERATOR_FREE(ref_param_iter, env); + } + + }else if(axis2_addr_in_check_element(env, wsa_meta_qn, child_qn)) + { + axis2_any_content_type_t *any_content_type = AXIS2_ENDPOINT_REF_GET_METADATA(endpoint_ref, env); + if(any_content_type) + { + AXIS2_ANY_CONTENT_TYPE_ADD_VALUE(any_content_type, env, + child_qn , AXIS2_OM_ELEMENT_GET_TEXT(child_ele, env, child_node)); + } + + } + } + AXIS2_QNAME_FREE(epr_addr_qn, env); + AXIS2_QNAME_FREE(epr_ref_qn, env); + return AXIS2_SUCCESS; +} + + + + + +/** + * WSA 1.0 specification mandates all the reference parameters to have a attribute as wsa:Type=???parameter???. So + * here this will check for soap_header blocks with the above attribute and will put them in message information soap_header collection + * + * @param soap_header + * @param messageInformationHeaders + */ +axis2_status_t +axis2_addr_in_extract_ref_params(axis2_env_t **env, + axis2_soap_header_t *soap_header, + axis2_msg_info_headers_t* msg_info_headers) +{ + axis2_hash_t *header_block_ht = NULL; + axis2_hash_index_t *hash_index = NULL; + axis2_qname_t *wsa_qname = NULL; + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, soap_header, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, msg_info_headers, AXIS2_FAILURE); + + header_block_ht = AXIS2_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env); + if(!header_block_ht) + return AXIS2_FAILURE; + wsa_qname = axis2_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE, + AXIS2_WSA_NAMESPACE, NULL); + + for(hash_index = axis2_hash_first(header_block_ht, env); hash_index; + hash_index = axis2_hash_next(env, hash_index)) + { + void *hb = NULL; + axis2_soap_header_block_t *header_block = NULL; + axis2_om_node_t *header_block_node = NULL; + axis2_om_element_t *header_block_ele = NULL; + + axis2_hash_this(hash_index, NULL, NULL, &hb); + + header_block = (axis2_soap_header_block_t *)hb; + header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env); + + if(header_block_node && + (AXIS2_OM_NODE_GET_NODE_TYPE(header_block_node, env) == AXIS2_OM_ELEMENT)) + { + axis2_om_attribute_t *om_attr = NULL; + axis2_char_t *attr_value = NULL; + header_block_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env); + om_attr = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, wsa_qname); + if(om_attr) + { + attr_value = AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(om_attr, env); + if(AXIS2_STRCMP(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) == 0) + { + AXIS2_MSG_INFO_HEADERS_ADD_REF_PARAM(msg_info_headers, env, header_block_node); + } + } + } + } + + AXIS2_QNAME_FREE(wsa_qname, env); + + return AXIS2_SUCCESS; +} + + +axis2_status_t +axis2_addr_in_extract_to_epr_ref_params(axis2_env_t **env, + axis2_endpoint_ref_t * to_epr, + axis2_soap_header_t *soap_header, + axis2_char_t *addr_ns_str) +{ + axis2_hash_t *header_blocks_ht = NULL; + axis2_hash_index_t *hash_index = NULL; + axis2_qname_t *is_ref_qn = NULL; + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, to_epr, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, soap_header, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, addr_ns_str, AXIS2_FAILURE); + + header_blocks_ht = AXIS2_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env); + if(!header_blocks_ht) + return AXIS2_FAILURE; + + is_ref_qn = axis2_qname_create(env, "IsReferenceParameter",addr_ns_str, NULL); + if(!is_ref_qn) + return AXIS2_FAILURE; + + for(hash_index = axis2_hash_first(header_blocks_ht, env); hash_index; + hash_index = axis2_hash_next( env, hash_index)) + { + axis2_om_element_t *header_block_ele = NULL; + axis2_om_node_t *header_block_node = NULL; + axis2_soap_header_block_t *header_block = NULL; + void *hb = NULL; + axis2_om_attribute_t *is_ref_param_attr = NULL; + axis2_char_t *attr_value = NULL; + + axis2_hash_this(hash_index, NULL, NULL, &hb); + if(hb) + { + header_block = (axis2_soap_header_block_t*)hb; + header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env); + header_block_ele = (axis2_om_element_t*) + AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env); + is_ref_param_attr = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, is_ref_qn); + if(is_ref_param_attr) + { + attr_value = AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(is_ref_param_attr, env); + if(AXIS2_STRCMP("true", attr_value) == 0) + { + AXIS2_ENDPOINT_REF_ADD_REF_PARAM(to_epr, env, + AXIS2_OM_ELEMENT_GET_QNAME(header_block_ele, env), + AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node)); + } + } + } + } + + AXIS2_QNAME_FREE(is_ref_qn, env); + return AXIS2_SUCCESS; +} + + +axis2_bool_t +axis2_addr_in_check_element(axis2_env_t **env, + axis2_qname_t *expected_qname, + axis2_qname_t *actual_qname) +{ + 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; + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, expected_qname, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, actual_qname, AXIS2_FAILURE); + + exp_qn_lpart = AXIS2_QNAME_GET_LOCALPART(expected_qname, env); + act_qn_lpart = AXIS2_QNAME_GET_LOCALPART(actual_qname, env); + + exp_qn_nsuri = AXIS2_QNAME_GET_LOCALPART(expected_qname, env); + act_qn_nsuri = AXIS2_QNAME_GET_LOCALPART(actual_qname, env); + + return ((AXIS2_STRCMP(exp_qn_lpart, act_qn_lpart) == 0) && + (AXIS2_STRCMP(exp_qn_nsuri,act_qn_nsuri) == 0)); +} Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_header.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_header.c?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/soap/soap_header.c (original) +++ webservices/axis2/trunk/c/modules/xml/soap/soap_header.c Sun Feb 5 03:10:19 2006 @@ -103,7 +103,7 @@ axis2_soap_builder_t *builder); axis2_array_list_t* AXIS2_CALL -axis2_soap_header_get_header_block_with_namespace_uri +axis2_soap_header_get_header_blocks_with_namespace_uri (axis2_soap_header_t* header, axis2_env_t **env, axis2_char_t *ns_uri); @@ -166,8 +166,8 @@ axis2_soap_header_set_header_block; header_impl->soap_header.ops->set_builder = axis2_soap_header_set_builder; - header_impl->soap_header.ops->get_header_block_with_namespace_uri = - axis2_soap_header_get_header_block_with_namespace_uri; + header_impl->soap_header.ops->get_header_blocks_with_namespace_uri = + axis2_soap_header_get_header_blocks_with_namespace_uri; header_impl->soap_header.ops->get_all_header_blocks = axis2_soap_header_get_all_header_blocks; @@ -470,7 +470,7 @@ } axis2_array_list_t* AXIS2_CALL -axis2_soap_header_get_header_block_with_namespace_uri +axis2_soap_header_get_header_blocks_with_namespace_uri (axis2_soap_header_t* header, axis2_env_t **env, axis2_char_t *ns_uri) @@ -529,4 +529,4 @@ axis2_soap_header_impl_t *header_impl = NULL; header_impl = AXIS2_INTF_TO_IMPL(header); return header_impl->header_blocks; -} \ No newline at end of file +} Modified: webservices/axis2/trunk/c/samples/client/echo/echo_client.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/client/echo/echo_client.c?rev=375001&r1=375000&r2=375001&view=diff ============================================================================== --- webservices/axis2/trunk/c/samples/client/echo/echo_client.c (original) +++ webservices/axis2/trunk/c/samples/client/echo/echo_client.c Sun Feb 5 03:10:19 2006 @@ -66,6 +66,7 @@ client_home); AXIS2_STUB_SET_TRANSPORT_INFO(stub, &env, AXIS2_TRANSPORT_HTTP, AXIS2_TRANSPORT_HTTP, AXIS2_FALSE); + AXIS2_STUB_SET_SOAP_VERSION(stub, &env, AXIS2_SOAP_11); /* create node and invoke echo */ ret_node = axis2_echo_stub_echo(stub, &env, node); if(ret_node)