Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 83822 invoked from network); 14 Nov 2005 05:22:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Nov 2005 05:22:05 -0000 Received: (qmail 67841 invoked by uid 500); 14 Nov 2005 05:22:04 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 67789 invoked by uid 500); 14 Nov 2005 05:22:04 -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 67778 invoked by uid 500); 14 Nov 2005 05:22:04 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 67775 invoked by uid 99); 14 Nov 2005 05:22:03 -0000 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, 13 Nov 2005 21:22:03 -0800 Received: (qmail 83685 invoked by uid 65534); 14 Nov 2005 05:21:43 -0000 Message-ID: <20051114052143.83684.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r344043 - in /webservices/axis2/trunk/c: include/axis2_handler.h include/axis2_msg_ctx.h modules/core/engine/src/handler.c Date: Mon, 14 Nov 2005 05:21:42 -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 Nov 13 21:21:31 2005 New Revision: 344043 URL: http://svn.apache.org/viewcvs?rev=344043&view=rev Log: Dropped the derived referance as the engine is supposed to be sate less and the invoke method implementation is not state sensitive Modified: webservices/axis2/trunk/c/include/axis2_handler.h webservices/axis2/trunk/c/include/axis2_msg_ctx.h webservices/axis2/trunk/c/modules/core/engine/src/handler.c Modified: webservices/axis2/trunk/c/include/axis2_handler.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_handler.h?rev=344043&r1=344042&r2=344043&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_handler.h (original) +++ webservices/axis2/trunk/c/include/axis2_handler.h Sun Nov 13 21:21:31 2005 @@ -121,14 +121,15 @@ /** * derived struct accessor */ - void* (AXIS2_CALL *get_derived)(struct axis2_handler * handler, + /*void* (AXIS2_CALL *get_derived)(struct axis2_handler * handler, axis2_env_t **env); - + */ /** * derived struct mutator */ - axis2_status_t (AXIS2_CALL *set_derived)(struct axis2_handler * handler, + /*axis2_status_t (AXIS2_CALL *set_derived)(struct axis2_handler * handler, axis2_env_t **env, void* derived); + */ } axis2_handler_ops_t; /** @@ -153,8 +154,9 @@ #define AXIS2_HANDLER_GET_NAME(handler, env) ((handler)->ops->get_name(handler, env)) #define AXIS2_HANDLER_GET_PARAM(handler, env, name) ((handler)->ops->get_param(handler, env, name)) #define AXIS2_HANDLER_GET_HANDLER_DESC(handler, env) ((handler)->ops->get_handler_desc(handler, env)) -#define AXIS2_HANDLER_GET_DERIVED(handler, env) ((handler)->ops->get_derived(handler, env)) +/*#define AXIS2_HANDLER_GET_DERIVED(handler, env) ((handler)->ops->get_derived(handler, env)) #define AXIS2_HANDLER_SET_DERIVED(handler, env, derived) ((handler)->ops->set_derived(handler, env, derived)) + */ /** @} */ #ifdef __cplusplus 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=344043&r1=344042&r2=344043&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original) +++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Sun Nov 13 21:21:31 2005 @@ -60,6 +60,9 @@ */ axis2_bool_t (AXIS2_CALL *is_paused)(axis2_msg_ctx_t *msg_ctx, axis2_env_t **env); + /* TODO change void* to real return type */ + void* (AXIS2_CALL *get_relates_to)(axis2_msg_ctx_t *msg_ctx, + axis2_env_t **env); }; /** @@ -79,6 +82,7 @@ #define AXIS2_MSG_CTX_FREE(msg_ctx, env) ((msg_ctx)->ops->free (msg_ctx, env)) #define AXIS2_MSG_CTX_SET_PAUSED_PHASE_NAME(msg_ctx, env, name) ((msg_ctx)->ops->set_paused_phase_name(msg_ctx, env, name)) #define AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env) ((msg_ctx)->ops->is_paused (msg_ctx, env)) +#define AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env) ((msg_ctx)->ops->get_relates_to(msg_ctx, env)) /************************** End of function macros ****************************/ Modified: webservices/axis2/trunk/c/modules/core/engine/src/handler.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/handler.c?rev=344043&r1=344042&r2=344043&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/src/handler.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/src/handler.c Sun Nov 13 21:21:31 2005 @@ -22,7 +22,7 @@ /** Handler struct */ axis2_handler_t handler; /** Derived struct */ - void* derived; + /*void* derived;*/ /** Handler description. This is a referance, hence a shallow copy. */ axis2_handler_desc_t *handler_desc; } axis2_handler_impl_t; @@ -50,11 +50,11 @@ struct axis2_handler_desc *handler_desc); axis2_handler_desc_t* AXIS2_CALL axis2_handler_get_handler_desc (struct axis2_handler * handler, axis2_env_t **env); -void* AXIS2_CALL axis2_handler_get_derived(struct axis2_handler * handler, +/*void* AXIS2_CALL axis2_handler_get_derived(struct axis2_handler * handler, axis2_env_t **env); axis2_status_t AXIS2_CALL axis2_handler_set_derived(struct axis2_handler * handler, axis2_env_t **env, void* derived); - +*/ axis2_handler_t* AXIS2_CALL axis2_handler_create(axis2_env_t **env) { @@ -70,7 +70,7 @@ return NULL; } - handler_impl->derived = NULL; + /*handler_impl->derived = NULL;*/ handler_impl->handler_desc = NULL; /* initialize operations */ @@ -91,9 +91,9 @@ handler_impl->handler.ops->get_name = axis2_handler_get_name; handler_impl->handler.ops->get_param = axis2_handler_get_param; handler_impl->handler.ops->get_handler_desc = axis2_handler_get_handler_desc; - handler_impl->handler.ops->get_derived= axis2_handler_get_derived; + /*handler_impl->handler.ops->get_derived= axis2_handler_get_derived; handler_impl->handler.ops->set_derived= axis2_handler_set_derived; - + */ return &(handler_impl->handler); } @@ -183,7 +183,7 @@ return AXIS2_INTF_TO_IMPL(handler)->handler_desc; } -void* AXIS2_CALL axis2_handler_get_derived(struct axis2_handler * handler, +/*void* AXIS2_CALL axis2_handler_get_derived(struct axis2_handler * handler, axis2_env_t **env) { AXIS2_FUNC_PARAM_CHECK(handler, env, NULL); @@ -197,3 +197,4 @@ return AXIS2_SUCCESS; } +*/