Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 89266 invoked from network); 19 Mar 2008 08:26:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Mar 2008 08:26:37 -0000 Received: (qmail 59234 invoked by uid 500); 19 Mar 2008 08:26:35 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 59017 invoked by uid 500); 19 Mar 2008 08:26:35 -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 59006 invoked by uid 500); 19 Mar 2008 08:26:35 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 59000 invoked by uid 99); 19 Mar 2008 08:26:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2008 01:26:35 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2008 08:25:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A45011A9832; Wed, 19 Mar 2008 01:26:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r638744 - in /webservices/axis2/trunk/c: include/axis2_addr.h src/modules/mod_addr/addr_in_handler.c Date: Wed, 19 Mar 2008 08:26:13 -0000 To: axis2-cvs@ws.apache.org From: kaushalye@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080319082613.A45011A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kaushalye Date: Wed Mar 19 01:26:12 2008 New Revision: 638744 URL: http://svn.apache.org/viewvc?rev=638744&view=rev Log: Axis2C hackthon : core refactoring Modified: webservices/axis2/trunk/c/include/axis2_addr.h webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c Modified: webservices/axis2/trunk/c/include/axis2_addr.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_addr.h?rev=638744&r1=638743&r2=638744&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_addr.h (original) +++ webservices/axis2/trunk/c/include/axis2_addr.h Wed Mar 19 01:26:12 2008 @@ -145,19 +145,19 @@ #define AXIS2_WSA_DEFAULT_PREFIX "wsa" /** WS-Addressing Prefixes for faults*/ -#define AXIS2_WSA_PREFIX_FAULT_TO "wsa:FaultTo" +#define AXIS2_WSA_PREFIX_FAULT_TO AXIS2_WSA_DEFAULT_PREFIX":"AXIS2_WSA_FAULT_TO /** WS-Addressing Prefixes for faults*/ -#define AXIS2_WSA_PREFIX_REPLY_TO "wsa:ReplyTo" +#define AXIS2_WSA_PREFIX_REPLY_TO AXIS2_WSA_DEFAULT_PREFIX":"AXIS2_WSA_REPLY_TO /** WS-Addressing Prefixes for faults*/ -#define AXIS2_WSA_PREFIX_TO "wsa:To" +#define AXIS2_WSA_PREFIX_TO AXIS2_WSA_DEFAULT_PREFIX":"AXIS2_WSA_TO /** WS-Addressing Prefixes for faults*/ -#define AXIS2_WSA_PREFIX_MESSAGE_ID "wsa:MessageID" +#define AXIS2_WSA_PREFIX_MESSAGE_ID AXIS2_WSA_DEFAULT_PREFIX":"AXIS2_WSA_MESSAGE_ID /** WS-Addressing Prefixes for faults*/ -#define AXIS2_WSA_PREFIX_ACTION "wsa:Action" +#define AXIS2_WSA_PREFIX_ACTION AXIS2_WSA_DEFAULT_PREFIX":"AXIS2_WSA_ACTION /* ======================================================================= */ 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=638744&r1=638743&r2=638744&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 Wed Mar 19 01:26:12 2008 @@ -50,14 +50,14 @@ 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, @@ -77,14 +77,14 @@ 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( +/* +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, @@ -151,11 +151,17 @@ { addr_ns_str = axutil_strdup(env, AXIS2_WSA_NAMESPACE_SUBMISSION); - status = + /*status = axis2_addr_in_extract_addr_submission_info(env, soap_header, &msg_info_headers, addr_headers, - msg_ctx); + msg_ctx);*/ + status = axis2_addr_in_extract_addr_params(env, + soap_header, + &msg_info_headers, + addr_headers, + AXIS2_WSA_NAMESPACE_SUBMISSION, + msg_ctx); } else { @@ -165,11 +171,17 @@ if (addr_headers) { addr_ns_str = axutil_strdup(env, AXIS2_WSA_NAMESPACE); - status = axis2_addr_in_extract_addr_final_info(env, + /*status = axis2_addr_in_extract_addr_final_info(env, soap_header, &msg_info_headers, addr_headers, - msg_ctx); + msg_ctx);*/ + status = axis2_addr_in_extract_addr_params(env, + soap_header, + &msg_info_headers, + addr_headers, + AXIS2_WSA_NAMESPACE, msg_ctx); + axis2_addr_in_extract_ref_params(env, soap_header, axis2_msg_ctx_get_msg_info_headers (msg_ctx, env)); @@ -213,12 +225,12 @@ axiom_node_t *node = NULL; axiom_element_t *element = NULL; - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - node = axiom_soap_header_get_base_node(soap_header, env); + 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); qname = axutil_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI, AXIS2_NAMESPACE_PREFIX); @@ -226,12 +238,14 @@ { 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); if (child_element) { axis2_conf_ctx_t *conf_ctx = NULL; + axis2_char_t *grp_id = axiom_element_get_text(child_element, env, child_node); @@ -249,6 +263,7 @@ 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; } } @@ -257,7 +272,7 @@ } return AXIS2_FAILURE; } - +/* axis2_status_t axis2_addr_in_extract_addr_final_info( const axutil_env_t * env, @@ -288,7 +303,7 @@ AXIS2_WSA_NAMESPACE_SUBMISSION, msg_ctx); } - +*/ axis2_status_t axis2_addr_in_extract_addr_params( const axutil_env_t * env, --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org