Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 16889 invoked from network); 12 Dec 2005 01:51:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Dec 2005 01:51:56 -0000 Received: (qmail 23143 invoked by uid 500); 12 Dec 2005 01:51:55 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 23120 invoked by uid 500); 12 Dec 2005 01:51:55 -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 23097 invoked by uid 500); 12 Dec 2005 01:51:55 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 23085 invoked by uid 99); 12 Dec 2005 01:51:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Dec 2005 17:51:54 -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, 11 Dec 2005 17:51:54 -0800 Received: (qmail 16763 invoked by uid 65534); 12 Dec 2005 01:51:33 -0000 Message-ID: <20051212015133.16762.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r356101 - in /webservices/axis2/trunk/c: include/axis2_disp.h include/axis2_msg_ctx.h modules/core/context/src/msg_ctx.c modules/core/engine/src/Makefile.am modules/core/engine/src/disp.c Date: Mon, 12 Dec 2005 01:51:32 -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 Dec 11 17:51:13 2005 New Revision: 356101 URL: http://svn.apache.org/viewcvs?rev=356101&view=rev Log: Changes to get the dispather hierarchy working Modified: webservices/axis2/trunk/c/include/axis2_disp.h webservices/axis2/trunk/c/include/axis2_msg_ctx.h webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am webservices/axis2/trunk/c/modules/core/engine/src/disp.c Modified: webservices/axis2/trunk/c/include/axis2_disp.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_disp.h?rev=356101&r1=356100&r2=356101&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_disp.h (original) +++ webservices/axis2/trunk/c/include/axis2_disp.h Sun Dec 11 17:51:13 2005 @@ -25,6 +25,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?rev=356101&r1=356100&r2=356101&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original) +++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Sun Dec 11 17:51:13 2005 @@ -131,9 +131,8 @@ /** * @return */ - /*axis2_char_t* (AXIS2_CALL *get_msg_id)(struct axis2_msg_ctx *msg_ctx, + axis2_char_t* (AXIS2_CALL *get_msg_id)(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env); - */ /** * @return @@ -144,9 +143,8 @@ /** * @return */ - /*RelatesTo (AXIS2_CALL *get_relates_to)(struct axis2_msg_ctx *msg_ctx, - axis2_env_t **env); - */ + axis2_relates_to_t* (AXIS2_CALL *get_relates_to)(struct axis2_msg_ctx *msg_ctx, + axis2_env_t **env); /** * @return @@ -618,13 +616,11 @@ */ #define AXIS2_MSG_CTX_GET_IN_FAULT_FLOW(msg_ctx, env) ((msg_ctx)->ops->get_in_fault_flow(msg_ctx, env)) #define AXIS2_MSG_CTX_GET_IN_GET_SOAP_ENVELOPE(msg_ctx, env) ((msg_ctx)->ops->get_soap_envelope(msg_ctx, env)) -/* #define AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env) ((msg_ctx)->ops->get_msg_id(msg_ctx, env)) -*/ #define AXIS2_MSG_CTX_GET_PROCESS_FAULT(msg_ctx, env) ((msg_ctx)->ops->get_process_fault(msg_ctx, env)) -/* + #define AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env) ((msg_ctx)->ops->get_relates_to(msg_ctx, env)) -*/ + /* #define AXIS2_MSG_CTX_GET_REPLY_TO(msg_ctx, env) ((msg_ctx)->ops->get_reply_to(msg_ctx, env)) */ Modified: webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c?rev=356101&r1=356100&r2=356101&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c (original) +++ webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c Sun Dec 11 17:51:13 2005 @@ -144,17 +144,16 @@ struct axis2_soap_envelope* AXIS2_CALL axis2_msg_ctx_get_soap_envelope(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env); -/*axis2_char_t* AXIS2_CALL +axis2_char_t* AXIS2_CALL axis2_msg_ctx_get_msg_id(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env); -*/ axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_process_fault(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env); -/*RelatesTo AXIS2_CALL +axis2_relates_to_t* AXIS2_CALL axis2_msg_ctx_get_relates_to(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env); -*/ + /*axis2_endpoint_ref_t *AXIS2_CALL axis2_msg_ctx_get_reply_to(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env); @@ -530,14 +529,12 @@ */ msg_ctx_impl->msg_ctx.ops->get_in_fault_flow = axis2_msg_ctx_get_in_fault_flow; msg_ctx_impl->msg_ctx.ops->get_soap_envelope = axis2_msg_ctx_get_soap_envelope; -/* msg_ctx_impl->msg_ctx.ops->get_msg_id = axis2_msg_ctx_get_msg_id; -*/ msg_ctx_impl->msg_ctx.ops->get_process_fault = axis2_msg_ctx_get_process_fault; -/* + msg_ctx_impl->msg_ctx.ops->get_relates_to = axis2_msg_ctx_get_relates_to; -*/ + /* msg_ctx_impl->msg_ctx.ops->get_reply_to = axis2_msg_ctx_get_reply_to; */ @@ -814,13 +811,22 @@ /** * @return */ -/*axis2_char_t *AXIS2_CALL axis2_msg_ctx_get_msg_id(struct axis2_msg_ctx *msg_ctx, +axis2_char_t *AXIS2_CALL axis2_msg_ctx_get_msg_id(struct axis2_msg_ctx *msg_ctx, axis2_env_t **env) { + axis2_msg_ctx_impl_t *msg_ctx_impl = NULL; + AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL); - return AXIS2_INTF_TO_IMPL(msg_ctx)->msg_info_headers.getMessageId(); + + msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx); + + if (msg_ctx_impl->msg_info_headers) + { + return AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID(msg_ctx_impl->msg_info_headers, env); + } + + return NULL; } -*/ /** * @return @@ -835,11 +841,23 @@ /** * @return */ -/*RelatesTo AXIS2_CALL axis2_msg_ctx_get_relates_to(struct axis2_msg_ctx *msg_ctx, - axis2_env_t **env) { - return msg_info_headersgetRelatesTo(); +axis2_relates_to_t* AXIS2_CALL axis2_msg_ctx_get_relates_to(struct axis2_msg_ctx *msg_ctx, + axis2_env_t **env) +{ + axis2_msg_ctx_impl_t *msg_ctx_impl = NULL; + + AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL); + + msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx); + + if (msg_ctx_impl->msg_info_headers) + { + return AXIS2_MSG_INFO_HEADERS_GET_RELATES_TO(msg_ctx_impl->msg_info_headers, env); + } + + return NULL; } -*/ + /** * @return @@ -891,7 +909,6 @@ AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL); msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx); - if (msg_ctx_impl->msg_info_headers) { Modified: webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am?rev=356101&r1=356100&r2=356101&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am Sun Dec 11 17:51:13 2005 @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libaxis2_engine.la AM_CPPFLAGS = $(CPPFLAGS) -libaxis2_engine_la_SOURCES = handler.c msg_recv.c engine_config.c phase.c disp_checker.c event.c +libaxis2_engine_la_SOURCES = handler.c msg_recv.c engine_config.c phase.c disp_checker.c event.c addr_disp.c libaxis2_engine_la_LIBADD = $(LDFLAGS) INCLUDES = -I${CUTEST_HOME}/include \ Modified: webservices/axis2/trunk/c/modules/core/engine/src/disp.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/disp.c?rev=356101&r1=356100&r2=356101&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/src/disp.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/src/disp.c Sun Dec 11 17:51:13 2005 @@ -177,7 +177,6 @@ axis2_env_t **env, struct axis2_msg_ctx *msg_ctx) { - axis2_relates_to_t *relates_to = NULL; axis2_svc_t *axis_service = NULL; axis2_operation_t *operation = NULL;