You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/11/09 04:48:05 UTC
svn commit: r472762 [1/3] - in /webservices/sandesha/trunk/c: include/
src/client/ src/core/ src/handlers/ src/msgprocessors/
src/storage/inmemory/ src/transport/ src/util/ src/workers/ src/wsrm/
Author: damitha
Date: Wed Nov 8 19:48:04 2006
New Revision: 472762
URL: http://svn.apache.org/viewvc?view=rev&rev=472762
Log:
Removing macros and removing unncessary OO
Modified:
webservices/sandesha/trunk/c/include/sandesha2_close_seq.h
webservices/sandesha/trunk/c/include/sandesha2_close_seq_res.h
webservices/sandesha/trunk/c/include/sandesha2_expires.h
webservices/sandesha/trunk/c/include/sandesha2_fault_code.h
webservices/sandesha/trunk/c/include/sandesha2_fault_data.h
webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_iom_rm_part.h
webservices/sandesha/trunk/c/include/sandesha2_last_msg.h
webservices/sandesha/trunk/c/include/sandesha2_module.h
webservices/sandesha/trunk/c/include/sandesha2_seq.h
webservices/sandesha/trunk/c/include/sandesha2_seq_ack.h
webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_terminate_seq.h
webservices/sandesha/trunk/c/include/sandesha2_terminate_seq_res.h
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_data.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/wsrm/Makefile.am
webservices/sandesha/trunk/c/src/wsrm/close_seq.c
webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
webservices/sandesha/trunk/c/src/wsrm/expires.c
webservices/sandesha/trunk/c/src/wsrm/fault_code.c
webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
webservices/sandesha/trunk/c/src/wsrm/sequence.c
webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_close_seq.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_close_seq.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_close_seq.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_close_seq.h Wed Nov 8 19:48:04 2006
@@ -40,48 +40,33 @@
* @{
*/
-typedef struct sandesha2_close_seq_ops sandesha2_close_seq_ops_t;
typedef struct sandesha2_close_seq sandesha2_close_seq_t;
/**
- * @brief CloseSequence ops struct
- * Encapsulator struct for ops of sandesha2_close_seq
- */
-AXIS2_DECLARE_DATA struct sandesha2_close_seq_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_close_seq_t *close_seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_close_seq_t *close_seq,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-};
-
-/**
* @brief sandesha2_close_seq
* sandesha2_close_seq
*/
AXIS2_DECLARE_DATA struct sandesha2_close_seq
{
sandesha2_iom_rm_part_t part;
- sandesha2_close_seq_ops_t *ops;
};
AXIS2_EXTERN sandesha2_close_seq_t* AXIS2_CALL
sandesha2_close_seq_create(
const axis2_env_t *env,
axis2_char_t *ns_value);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_CLOSE_SEQ_SET_IDENTIFIER(close_seq, env, identifier) \
- ((close_seq)->ops->set_identifier (close_seq, env, identifier))
-#define SANDESHA2_CLOSE_SEQ_GET_IDENTIFIER(close_seq, env) \
- ((close_seq)->ops->get_identifier (close_seq, env))
-/************************** End of function macros ****************************/
+
+axis2_status_t AXIS2_CALL
+sandesha2_close_seq_set_identifier(
+ sandesha2_close_seq_t *close_seq,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_close_seq_get_identifier(
+ sandesha2_close_seq_t *close_seq,
+ const axis2_env_t *env);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_close_seq_res.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_close_seq_res.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_close_seq_res.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_close_seq_res.h Wed Nov 8 19:48:04 2006
@@ -40,48 +40,33 @@
* @{
*/
-typedef struct sandesha2_close_seq_res_ops sandesha2_close_seq_res_ops_t;
typedef struct sandesha2_close_seq_res sandesha2_close_seq_res_t;
/**
- * @brief CloseSequenceResponse ops struct
- * Encapsulator struct for ops of sandesha2_close_seq_res
- */
-AXIS2_DECLARE_DATA struct sandesha2_close_seq_res_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_close_seq_res_t *close_seq_res,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_close_seq_res_t *close_seq_res,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-};
-
-/**
* @brief sandesha2_close_seq_res
* sandesha2_close_seq_res
*/
AXIS2_DECLARE_DATA struct sandesha2_close_seq_res
{
sandesha2_iom_rm_part_t part;
- sandesha2_close_seq_res_ops_t *ops;
};
AXIS2_EXTERN sandesha2_close_seq_res_t* AXIS2_CALL
sandesha2_close_seq_res_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_CLOSE_SEQ_RES_SET_IDENTIFIER(close_seq_res, env, identifier) \
- ((close_seq_res)->ops->set_identifier (close_seq_res, env, identifier))
-#define SANDESHA2_CLOSE_SEQ_RES_GET_IDENTIFIER(close_seq_res, env) \
- ((close_seq_res)->ops->get_identifier (close_seq_res, env))
-/************************** End of function macros ****************************/
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
+
+axis2_status_t AXIS2_CALL
+sandesha2_close_seq_res_set_identifier(
+ sandesha2_close_seq_res_t *close_seq_res,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_close_res_seq_get_identifier(
+ sandesha2_close_seq_res_t *close_seq_res,
+ const axis2_env_t *env);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_expires.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_expires.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_expires.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_expires.h Wed Nov 8 19:48:04 2006
@@ -37,26 +37,18 @@
* @ingroup sandesha2_wsrm
* @{
*/
-typedef struct sandesha2_expires_ops sandesha2_expires_ops_t;
typedef struct sandesha2_expires sandesha2_expires_t;
-/**
- * @brief Expires ops struct
- * Encapsulator struct for ops of sandesha2_expires
- */
-AXIS2_DECLARE_DATA struct sandesha2_expires_ops
-{
- axis2_char_t * (AXIS2_CALL *
- get_duration)
- (sandesha2_expires_t *expires,
- const axis2_env_t *env);
+axis2_char_t *AXIS2_CALL
+sandesha2_expires_get_duration(
+ sandesha2_expires_t *expires,
+ const axis2_env_t *env);
- axis2_status_t (AXIS2_CALL *
- set_duration)
- (sandesha2_expires_t *expires,
- const axis2_env_t *env,
- axis2_char_t *duration);
-};
+axis2_status_t AXIS2_CALL
+sandesha2_expires_set_duration(
+ sandesha2_expires_t *expires,
+ const axis2_env_t *env,
+ axis2_char_t *duration);
/**
* @brief sandesha2_expires
@@ -65,20 +57,12 @@
AXIS2_DECLARE_DATA struct sandesha2_expires
{
sandesha2_iom_rm_element_t element;
- sandesha2_expires_ops_t *ops;
};
AXIS2_EXTERN sandesha2_expires_t* AXIS2_CALL
sandesha2_expires_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_EXPIRES_SET_ACKS_TO(expires, env, duration) \
- ((expires)->ops->set_duration (expires, env, duration))
-#define SANDESHA2_EXPIRES_GET_ACKS_TO(expires, env) \
- ((expires)->ops->get_duration (expires, env))
-/************************** End of function macros ****************************/
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_fault_code.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_fault_code.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_fault_code.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_fault_code.h Wed Nov 8 19:48:04 2006
@@ -37,48 +37,33 @@
* @ingroup sandesha2_wsrm
* @{
*/
-typedef struct sandesha2_fault_code_ops sandesha2_fault_code_ops_t;
typedef struct sandesha2_fault_code sandesha2_fault_code_t;
/**
- * @brief Fault Code ops struct
- * Encapsulator struct for ops of sandesha2_fault_code
- */
-AXIS2_DECLARE_DATA struct sandesha2_fault_code_ops
-{
- axis2_char_t * (AXIS2_CALL *
- get_fault_code)
- (sandesha2_fault_code_t *fault_code,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_fault_code)
- (sandesha2_fault_code_t *fault_code,
- const axis2_env_t *env,
- axis2_char_t *str_fault_code);
-};
-
-/**
* @brief sandesha2_fault_code
* sandesha2_fault_code
*/
AXIS2_DECLARE_DATA struct sandesha2_fault_code
{
sandesha2_iom_rm_element_t element;
- sandesha2_fault_code_ops_t *ops;
};
AXIS2_EXTERN sandesha2_fault_code_t* AXIS2_CALL
sandesha2_fault_code_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
+
+axis2_char_t * AXIS2_CALL
+sandesha2_fault_code_get_fault_code(
+ sandesha2_fault_code_t *fault_code,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_code_set_fault_code(
+ sandesha2_fault_code_t *fault_code,
+ const axis2_env_t *env,
+ axis2_char_t *str_fault_code);
-/************************** Start of function macros **************************/
-#define SANDESHA2_FAULT_CODE_SET_FAULT_CODE(fault_code, env, str_fault_code) \
- ((fault_code)->ops->set_fault_code (fault_code, env, str_fault_code))
-#define SANDESHA2_FAULT_CODE_GET_FAULT_CODE(fault_code, env) \
- ((fault_code)->ops->get_fault_code (fault_code, env))
-/************************** End of function macros ****************************/
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_fault_data.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_fault_data.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_fault_data.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_fault_data.h Wed Nov 8 19:48:04 2006
@@ -38,140 +38,84 @@
* @{
*/
- typedef struct sandesha2_fault_data_ops sandesha2_fault_data_ops_t;
- typedef struct sandesha2_fault_data sandesha2_fault_data_t;
- /**
- * @brief Sandesha2 Fault Data ops struct
- * Encapsulator struct for ops of sandesha2_fault_data
- */
-AXIS2_DECLARE_DATA struct sandesha2_fault_data_ops
-{
-
- axiom_node_t *(AXIS2_CALL *
- get_detail)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_detail)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axiom_node_t *detail);
-
- axis2_char_t *(AXIS2_CALL *
- get_reason)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_reason)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *reason);
-
- axis2_char_t *(AXIS2_CALL *
- get_sub_code)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_sub_code)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *sub_code);
-
- axis2_char_t *(AXIS2_CALL *
- get_code)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_code)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *code);
-
- int (AXIS2_CALL *
- get_type)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_type)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- int type);
-
- axis2_char_t *(AXIS2_CALL *
- get_seq_id)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_seq_id)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
-
- axis2_status_t (AXIS2_CALL *
- free)
- (sandesha2_fault_data_t *data,
- const axis2_env_t *env);
-};
+typedef struct sandesha2_fault_data sandesha2_fault_data_t;
-/**
- * @brief sandesha2_fault_data_ops
- * sandesha2_fault_data_ops
- */
-AXIS2_DECLARE_DATA struct sandesha2_fault_data
-{
- sandesha2_fault_data_ops_t *ops;
-};
+AXIS2_DECLARE_DATA struct sandesha2_fault_data{};
AXIS2_EXTERN sandesha2_fault_data_t* AXIS2_CALL
sandesha2_fault_data_create(
- const axis2_env_t *env);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_FAULT_DATA_FREE(data, env) \
- ((data)->ops->free (data, env))
-
-#define SANDESHA2_FAULT_DATA_GET_DETAIL(data, env) \
- ((data)->ops->get_detail(data, env))
-
-#define SANDESHA2_FAULT_DATA_SET_DETAIL(data, env, detail) \
- ((data)->ops->set_detail(data, env, detail))
-
-#define SANDESHA2_FAULT_DATA_GET_REASON(data, env) \
- ((data)->ops->get_reason(data, env))
-
-#define SANDESHA2_FAULT_DATA_SET_REASON(data, env, reason) \
- ((data)->ops->set_reason(data, env, reason))
-
-#define SANDESHA2_FAULT_DATA_GET_SUB_CODE(data, env) \
- ((data)->ops->get_sub_code(data, env))
-
-#define SANDESHA2_FAULT_DATA_SET_SUB_CODE(data, env, sub_code) \
- ((data)->ops->set_sub_code(data, env, sub_code))
-
-#define SANDESHA2_FAULT_DATA_GET_CODE(data, env) \
- ((data)->ops->get_sub_code(data, env))
-
-#define SANDESHA2_FAULT_DATA_SET_CODE(data, env, code) \
- ((data)->ops->set_code(data, env, code))
-
-#define SANDESHA2_FAULT_DATA_GET_TYPE(data, env) \
- ((data)->ops->get_type(data, env))
-
-#define SANDESHA2_FAULT_DATA_SET_TYPE(data, env, type) \
- ((data)->ops->set_type(data, env, type))
+ const axis2_env_t *env);
+
+axiom_node_t *AXIS2_CALL
+sandesha2_fault_data_get_detail(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_detail(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axiom_node_t *detail);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_reason(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_reason(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *reason);
-#define SANDESHA2_FAULT_DATA_GET_SEQ_ID(data, env) \
- ((data)->ops->get_seq_id(data, env))
-
-#define SANDESHA2_FAULT_DATA_SET_SEQ_ID(data, env, seq_id) \
- ((data)->ops->set_seq_id(data, env, seq_id)
-/************************** End of function macros ****************************/
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_sub_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_sub_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *sub_code);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_code(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *code);
+
+int AXIS2_CALL
+sandesha2_fault_data_get_type(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_type(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ int type);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_seq_id(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_seq_id(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_free(
+ sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h Wed Nov 8 19:48:04 2006
@@ -41,73 +41,7 @@
* @{
*/
- typedef struct sandesha2_fault_mgr_ops sandesha2_fault_mgr_ops_t;
typedef struct sandesha2_fault_mgr sandesha2_fault_mgr_t;
- /**
- * @brief Sandesha2 Fault Manager ops struct
- * Encapsulator struct for ops of sandesha2_fault_mgr
- */
-AXIS2_DECLARE_DATA struct sandesha2_fault_mgr_ops
-{
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- check_for_create_seq_refused)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- axis2_msg_ctx_t *create_seq_msg,
- sandesha2_storage_mgr_t *storage_man);
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- check_for_last_msg_num_exceeded)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *app_rm_msg,
- sandesha2_storage_mgr_t *storage_man);
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- check_for_msg_num_rollover)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- sandesha2_storage_mgr_t *storage_man);
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- check_for_unknown_seq)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- check_for_invalid_ack)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *ack_rm_msg,
- sandesha2_storage_mgr_t *storage_man);
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- check_for_seq_closed)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
-
- sandesha2_msg_ctx_t* (AXIS2_CALL *
- get_fault)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- sandesha2_fault_data_t *fault_data,
- axis2_char_t *addr_ns_uri,
- sandesha2_storage_mgr_t *storage_man);
-
- axis2_status_t (AXIS2_CALL *
- free)
- (sandesha2_fault_mgr_t *fault_mgr,
- const axis2_env_t *env);
-};
/**
* @brief sandesha2_fault_mgr_ops
@@ -115,51 +49,69 @@
*/
AXIS2_DECLARE_DATA struct sandesha2_fault_mgr
{
- sandesha2_fault_mgr_ops_t *ops;
};
AXIS2_EXTERN sandesha2_fault_mgr_t* AXIS2_CALL
sandesha2_fault_mgr_create(
const axis2_env_t *env);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_FAULT_MGR_FREE(fault_mgr, env) \
- ((fault_mgr)->ops->free (fault_mgr, env))
-
-#define SANDESHA2_FAULT_MGR_CHECK_FOR_CREATE_SEQ_REFUSED(fault_mgr, env, \
- msg, storage_man) \
- ((fault_mgr)->ops->check_for_create_seq_refused(fault_mgr, env, msg, \
- storage_man))
-
-#define SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(fault_mgr, \
- env, msg, storage_man) \
- ((fault_mgr)->ops->check_for_last_msg_num_exceeded(fault_mgr, env, msg, \
- storage_man))
-
-#define SANDESHA2_FAULT_MGR_CHECK_FOR_MSG_NUM_ROLLOVER(fault_mgr, \
- env, msg, storage_man) \
- ((fault_mgr)->ops->check_for_msg_num_rollover(fault_mgr, env, msg, \
- storage_man))
-
-#define SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env, msg, \
- seq_id, storage_man) \
- ((fault_mgr)->ops->check_for_unknown_seq(fault_mgr, env, msg, seq_id, \
- storage_man))
-
-#define SANDESHA2_FAULT_MGR_CHECK_FOR_INVALID_ACK(fault_mgr, env, msg, \
- storage_man) \
- ((fault_mgr)->ops->check_for_invalid_ack(fault_mgr, env, msg, storage_man))
-
-#define SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_mgr, env, msg, \
- seq_id, storage_man) \
- ((fault_mgr)->ops->check_for_seq_closed(fault_mgr, env, msg, seq_id, \
- storage_man))
-
-#define SANDESHA2_FAULT_MGR_GET_FAULT(fault_mgr, env, msg, fault_data,\
- addr_ns_uri, storage_man) \
- ((fault_mgr)->ops->get_fault(fault_mgr, env, msg, fault_data, addr_ns_uri, \
- storage_man))
-/************************** End of function macros ****************************/
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_check_for_create_seq_refused
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *create_seq_msg,
+ sandesha2_storage_mgr_t *storage_man);
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_check_for_last_msg_num_exceeded
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *app_rm_msg,
+ sandesha2_storage_mgr_t *storage_man);
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_check_for_msg_num_rollover
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_man);
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_check_for_unknown_seq
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_man);
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_check_for_invalid_ack
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *ack_rm_msg,
+ sandesha2_storage_mgr_t *storage_man);
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_check_for_seq_closed
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_man);
+
+sandesha2_msg_ctx_t* AXIS2_CALL
+sandesha2_fault_mgr_get_fault
+ (sandesha2_fault_mgr_t *fault_mgr,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_fault_data_t *fault_data,
+ axis2_char_t *addr_ns_uri,
+ sandesha2_storage_mgr_t *storage_man);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_mgr_free(
+ sandesha2_fault_mgr_t *mgr,
+ const axis2_env_t *env);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_iom_rm_part.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_iom_rm_part.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_iom_rm_part.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_iom_rm_part.h Wed Nov 8 19:48:04 2006
@@ -63,13 +63,17 @@
sandesha2_iom_rm_part_ops_t *ops;
};
-/************************** Start of function macros **************************/
-#define SANDESHA2_IOM_RM_PART_TO_SOAP_ENVELOPE(part, env, envelope) \
- ((part)->ops->to_soap_env(part, env, envelope))
-#define SANDESHA2_IOM_RM_PART_FREE(part, env) \
- ((part)->element.ops->free (part, env))
-/************************** End of function macros ****************************/
-
+axis2_status_t AXIS2_CALL
+sandesha2_iom_rm_part_free(
+ sandesha2_iom_rm_part_t *part,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_iom_rm_part_to_soap_envelope(
+ sandesha2_iom_rm_part_t *part,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_last_msg.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_last_msg.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_last_msg.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_last_msg.h Wed Nov 8 19:48:04 2006
@@ -50,8 +50,9 @@
AXIS2_EXTERN sandesha2_last_msg_t* AXIS2_CALL
sandesha2_last_msg_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_module.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_module.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_module.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_module.h Wed Nov 8 19:48:04 2006
@@ -29,19 +29,23 @@
{
#endif
AXIS2_EXTERN axis2_module_t * AXIS2_CALL
-mod_sandesha2_create(const axis2_env_t *env);
+mod_sandesha2_create(
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-sandesha2_global_in_handler_create(const axis2_env_t *env,
- axis2_qname_t *qname);
+sandesha2_global_in_handler_create(
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-sandesha2_in_handler_create(const axis2_env_t *env,
- axis2_qname_t *qname);
+sandesha2_in_handler_create(
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-sandesha2_out_handler_create(const axis2_env_t *env,
- axis2_qname_t *qname);
+sandesha2_out_handler_create(
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_seq.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq.h Wed Nov 8 19:48:04 2006
@@ -40,98 +40,71 @@
* @{
*/
-typedef struct sandesha2_seq_ops sandesha2_seq_ops_t;
typedef struct sandesha2_seq sandesha2_seq_t;
/**
- * @brief Sequence ops struct
- * Encapsulator struct for ops of sandesha2_seq
- */
-AXIS2_DECLARE_DATA struct sandesha2_seq_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-
- sandesha2_msg_number_t * (AXIS2_CALL *
- get_msg_num)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_msg_num)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env,
- sandesha2_msg_number_t *msg_num);
-
- sandesha2_last_msg_t * (AXIS2_CALL *
- get_last_msg)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_last_msg)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env,
- sandesha2_last_msg_t *last_msg);
-
- axis2_bool_t (AXIS2_CALL *
- is_must_understand)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_must_understand)
- (sandesha2_seq_t *seq,
- const axis2_env_t *env,
- axis2_bool_t mu);
-};
-
-/**
* @brief sandesha2_seq
* sandesha2_seq
*/
AXIS2_DECLARE_DATA struct sandesha2_seq
{
sandesha2_iom_rm_part_t part;
- sandesha2_seq_ops_t *ops;
};
AXIS2_EXTERN sandesha2_seq_t* AXIS2_CALL
sandesha2_seq_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
axis2_status_t AXIS2_CALL
sandesha2_seq_free_void_arg(
void *seq,
const axis2_env_t *env);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_seq_get_identifier(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_set_identifier(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+sandesha2_msg_number_t * AXIS2_CALL
+sandesha2_seq_get_msg_num(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_set_msg_num(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env,
+ sandesha2_msg_number_t *msg_num);
+
+sandesha2_last_msg_t * AXIS2_CALL
+sandesha2_seq_get_last_msg(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_set_last_msg(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env,
+ sandesha2_last_msg_t *last_msg);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_seq_is_must_understand(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_set_must_understand(
+ sandesha2_seq_t *seq,
+ const axis2_env_t *env, axis2_bool_t mu);
+
-/************************** Start of function macros **************************/
-#define SANDESHA2_SEQ_SET_IDENTIFIER(seq, env, identifier) \
- ((seq)->ops->set_identifier (seq, env, identifier))
-#define SANDESHA2_SEQ_GET_IDENTIFIER(seq, env) \
- ((seq)->ops->get_identifier (seq, env))
-#define SANDESHA2_SEQ_GET_MSG_NUM(seq, env) \
- ((seq)->ops->get_msg_num (seq, env))
-#define SANDESHA2_SEQ_SET_MSG_NUM(seq, env, msg_num) \
- ((seq)->ops->set_msg_num (seq, env, msg_num))
-#define SANDESHA2_SEQ_SET_LAST_MSG(seq, env, last_msg) \
- ((seq)->ops->set_last_msg (seq, env, last_msg))
-#define SANDESHA2_SEQ_GET_LAST_MSG(seq, env) \
- ((seq)->ops->get_last_msg (seq, env))
-#define SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, mu) \
- ((seq)->ops->set_must_understand (seq, env, mu))
-#define SANDESHA2_SEQ_IS_MUST_UNDERSTAND(seq, env) \
- ((seq)->ops->is_must_understand (seq, env))
-/************************** End of function macros ****************************/
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_ack.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_ack.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_ack.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_ack.h Wed Nov 8 19:48:04 2006
@@ -45,60 +45,7 @@
* @{
*/
-typedef struct sandesha2_seq_ack_ops sandesha2_seq_ack_ops_t;
typedef struct sandesha2_seq_ack sandesha2_seq_ack_t;
-
-/**
- * @brief SequenceAck ops struct
- * Encapsulator struct for ops of sandesha2_seq_ack
- */
-AXIS2_DECLARE_DATA struct sandesha2_seq_ack_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_seq_ack_t *seq_ack,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_seq_ack_t *seq_ack,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-
- axis2_array_list_t * (AXIS2_CALL *
- get_nack_list)
- (sandesha2_seq_ack_t *seq_ack,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_ack_final)
- (sandesha2_seq_ack_t *seq_ack,
- const axis2_env_t *env,
- sandesha2_ack_final_t *ack_final);
-
- axis2_array_list_t * (AXIS2_CALL *
- get_ack_range_list)
- (sandesha2_seq_ack_t *seq_ack,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- add_ack_range)
- (sandesha2_seq_ack_t *seq_ack,
- const axis2_env_t *env,
- sandesha2_ack_range_t *ack_range);
-
- axis2_bool_t (AXIS2_CALL *
- is_must_understand)
- (sandesha2_seq_ack_t *element,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_must_understand)
- (sandesha2_seq_ack_t *element,
- const axis2_env_t *env,
- axis2_bool_t mu);
-};
-
/**
* @brief sandesha2_seq_ack
* sandesha2_seq_ack
@@ -106,32 +53,57 @@
AXIS2_DECLARE_DATA struct sandesha2_seq_ack
{
sandesha2_iom_rm_part_t part;
- sandesha2_seq_ack_ops_t *ops;
};
AXIS2_EXTERN sandesha2_seq_ack_t* AXIS2_CALL
sandesha2_seq_ack_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_seq_ack_get_identifier(
+ sandesha2_seq_ack_t *seq_ack,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_ack_set_identifier(
+ sandesha2_seq_ack_t *seq_ack,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+axis2_array_list_t * AXIS2_CALL
+sandesha2_seq_ack_get_nack_list(
+ sandesha2_seq_ack_t *seq_ack,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_ack_set_ack_final(
+ sandesha2_seq_ack_t *seq_ack,
+ const axis2_env_t *env,
+ sandesha2_ack_final_t *ack_final);
+
+axis2_array_list_t * AXIS2_CALL
+sandesha2_seq_ack_get_ack_range_list(
+ sandesha2_seq_ack_t *seq_ack,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_ack_add_ack_range(
+ sandesha2_seq_ack_t *seq_ack,
+ const axis2_env_t *env,
+ sandesha2_ack_range_t *ack_range);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_seq_ack_is_must_understand(
+ sandesha2_seq_ack_t *element,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_ack_set_must_understand(
+ sandesha2_seq_ack_t *element,
+ const axis2_env_t *env,
+ axis2_bool_t mu);
-/************************** Start of function macros **************************/
-#define SANDESHA2_SEQ_ACK_SET_IDENTIFIER(seq_ack, env, identifier) \
- ((seq_ack)->ops->set_identifier (seq_ack, env, identifier))
-#define SANDESHA2_SEQ_ACK_GET_IDENTIFIER(seq_ack, env) \
- ((seq_ack)->ops->get_identifier (seq_ack, env))
-#define SANDESHA2_SEQ_ACK_GET_NACK_LIST(seq_ack, env) \
- ((seq_ack)->ops->get_nack_list (seq_ack, env))
-#define SANDESHA2_SEQ_ACK_SET_ACK_FINAL(seq_ack, env, ack_final) \
- ((seq_ack)->ops->set_ack_final (seq_ack, env, ack_final))
-#define SANDESHA2_SEQ_ACK_GET_ACK_RANGE_LIST(seq_ack, env) \
- ((seq_ack)->ops->get_ack_range_list (seq_ack, env))
-#define SANDESHA2_SEQ_ACK_ADD_ACK_RANGE(seq_ack, env, ack_range) \
- ((seq_ack)->ops->add_ack_range (seq_ack, env, ack_range))
-#define SANDESHA2_SEQ_ACK_IS_MUST_UNDERSTAND(seq_ack, env) \
- ((seq_ack)->ops->is_must_understand (seq_ack, env))
-#define SANDESHA2_SEQ_ACK_SET_MUST_UNDERSTAND(seq_ack, env, mu) \
- ((seq_ack)->ops->set_must_understand (seq_ack, env, mu))
-/************************** End of function macros ****************************/
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h Wed Nov 8 19:48:04 2006
@@ -46,9 +46,9 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
sandesha2_seq_mgr_setup_new_seq(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *create_seq_msg,
+ sandesha2_storage_mgr_t *storage_mgr);
/**
* Takes the internal_seq_id as the param. Not the seq_id
@@ -57,22 +57,22 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_seq_mgr_update_last_activated_time(
- const axis2_env_t *env,
- axis2_char_t *property_key,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ axis2_char_t *property_key,
+ sandesha2_storage_mgr_t *storage_mgr);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_seq_mgr_has_seq_timedout(const axis2_env_t *env,
- axis2_char_t *property_key,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
+ axis2_char_t *property_key,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_seq_mgr_setup_new_client_seq(const axis2_env_t *env,
- axis2_msg_ctx_t *first_app_msg,
- axis2_char_t *int_seq_id,
- axis2_char_t *spec_version,
- sandesha2_storage_mgr_t *storage_mgr);
+ axis2_msg_ctx_t *first_app_msg,
+ axis2_char_t *int_seq_id,
+ axis2_char_t *spec_version,
+ sandesha2_storage_mgr_t *storage_mgr);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Wed Nov 8 19:48:04 2006
@@ -45,128 +45,18 @@
* @{
*/
- typedef struct sandesha2_storage_mgr_ops sandesha2_storage_mgr_ops_t;
- typedef struct sandesha2_storage_mgr sandesha2_storage_mgr_t;
- /**
- * @brief Sandesha2 Storage Manager ops struct
- * Encapsulator struct for ops of sandesha2_storage_mgr
- */
-AXIS2_DECLARE_DATA struct sandesha2_storage_mgr_ops
-{
-
- axis2_conf_ctx_t* (AXIS2_CALL *
- get_ctx)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_ctx)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
-
- axis2_status_t (AXIS2_CALL *
- init_storage)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env,
- axis2_module_desc_t *module_desc);
-
- sandesha2_transaction_t* (AXIS2_CALL *
- get_transaction)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- sandesha2_create_seq_mgr_t* (AXIS2_CALL *
- get_create_seq_mgr)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- sandesha2_next_msg_mgr_t* (AXIS2_CALL *
- get_next_msg_mgr)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- sandesha2_sender_mgr_t* (AXIS2_CALL *
- get_retransmitter_mgr)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- sandesha2_seq_property_mgr_t* (AXIS2_CALL *
- get_seq_property_mgr)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- sandesha2_invoker_mgr_t* (AXIS2_CALL *
- get_storage_map_mgr)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- store_msg_ctx)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env,
- axis2_char_t *storage_key,
- axis2_msg_ctx_t *msg_ctx);
-
- axis2_status_t (AXIS2_CALL *
- update_msg_ctx)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env,
- axis2_char_t *storage_key,
- axis2_msg_ctx_t *msg_ctx);
-
- axis2_msg_ctx_t* (AXIS2_CALL *
- retrieve_msg_ctx)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env,
- axis2_char_t *storage_key,
- axis2_conf_ctx_t *conf_ctx);
-
- axis2_status_t (AXIS2_CALL *
- remove_msg_ctx)
- (sandesha2_storage_mgr_t *storage_man,
- const axis2_env_t *env,
- axis2_char_t *storage_key);
-
- axis2_status_t (AXIS2_CALL *
- init) (
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
-
- axiom_soap_envelope_t *(AXIS2_CALL *
- retrieve_soap_envelope) (
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key);
-
- axis2_status_t (AXIS2_CALL *
- store_soap_envelope) (
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axiom_soap_envelope_t *soap_env,
- axis2_char_t *key);
-
-
- axis2_status_t (AXIS2_CALL *
- free)
- (void *storage_man,
- const axis2_env_t *env);
-};
+typedef struct sandesha2_storage_mgr sandesha2_storage_mgr_t;
/**
* @brief sandesha2_storage_mgr_ops
* sandesha2_storage_mgr_ops
*/
-AXIS2_DECLARE_DATA struct sandesha2_storage_mgr
-{
- sandesha2_storage_mgr_ops_t *ops;
-};
+AXIS2_DECLARE_DATA struct sandesha2_storage_mgr{};
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
sandesha2_storage_mgr_create(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
/**
* Frees the storage_mgr given as a void pointer. This method would cast the
@@ -182,67 +72,109 @@
sandesha2_storage_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_instance(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_STORAGE_MGR_FREE(storage_man, env) \
- (((sandesha2_storage_mgr_t *) storage_man)->ops->free (storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_INIT(storage_man, env, conf_ctx) \
- ((storage_man)->ops->init (storage_man, env, conf_ctx))
-
-#define SANDESHA2_STORAGE_MGR_SET_CONTEXT(storage_man, env, conf_ctx) \
- ((storage_man)->ops->set_ctx(storage_man, env, conf_ctx))
-
-#define SANDESHA2_STORAGE_MGR_GET_CONEXT(storage_man, env) \
- ((storage_man)->ops->get_ctx(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_INIT_STORAGE(storage_man, env, module_desc) \
- ((storage_man)->ops->init_storage(storage_man, env, module_desc))
-
-#define SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_man, env) \
- ((storage_man)->ops->get_transaction(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(storage_man, env)\
- ((storage_man)->ops->get_create_seq_mgr(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_man, env)\
- ((storage_man)->ops->get_next_msg_mgr(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_man, env)\
- ((storage_man)->ops->get_retransmitter_mgr(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env)\
- ((storage_man)->ops->get_seq_property_mgr(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR(storage_man, env)\
- ((storage_man)->ops->get_storage_map_mgr(storage_man, env))
-
-#define SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, storage_key, \
- msg_ctx) \
- ((storage_man)->ops->store_msg_ctx(storage_man, env, storage_key, msg_ctx))
-
-#define SANDESHA2_STORAGE_MGR_UPDATE_MSG_CTX(storage_man, env, storage_key,\
- msg_ctx) \
- ((storage_man)->ops->update_msg_ctx(storage_man, env, storage_key, msg_ctx))
-
-#define SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_man, env, \
- storage_key, conf_ctx) \
- ((storage_man)->ops->retrieve_msg_ctx(storage_man, env, storage_key, \
- conf_ctx))
-
-#define SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env, storage_key)\
- ((storage_man)->ops->remove_msg_ctx(storage_man, env, storage_key))
-
-#define SANDESHA2_STORAGE_MGR_RETRIEVE_SOAP_ENVELOPE(storage_man, env, key) \
- ((storage_man)->ops->retrieve_soap_envelope (storage_man, env, key))
-
-#define SANDESHA2_STORAGE_MGR_STORE_SOAP_ENVELOPE(storage_man, env, envelope) \
- ((storage_man)->ops->store_soap_envelope (storage_man, env, envelope))
-/************************** End of function macros ****************************/
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_free(
+ void *storage,
+ const axis2_env_t *envv);
+
+sandesha2_transaction_t *AXIS2_CALL
+sandesha2_storage_mgr_get_transaction(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_create_seq_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_create_seq_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_next_msg_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_next_msg_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_sender_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_retrans_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_seq_property_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_seq_property_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_invoker_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_storage_map_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_set_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_conf_ctx_t *AXIS2_CALL
+sandesha2_storage_mgr_get_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_init(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_msg_ctx_t *AXIS2_CALL
+sandesha2_storage_mgr_retrieve_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_store_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_update_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_remove_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_init_storage(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_module_desc_t *module_desc);
+
+axiom_soap_envelope_t *AXIS2_CALL
+sandesha2_storage_mgr_retrieve_soap_envelope(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_store_soap_envelope(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_env,
+ axis2_char_t *key);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h Wed Nov 8 19:48:04 2006
@@ -50,75 +50,75 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_clean_recv_side_after_invocation(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_complete_term_on_recv_side(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_remove_recv_side_propertis(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_terminate_sending_side(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- axis2_bool_t svr_side,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ axis2_bool_t svr_side,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_do_updates_if_needed(
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- sandesha2_seq_property_bean_t *prop_bean,
- sandesha2_seq_property_mgr_t *prop_mgr);
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ sandesha2_seq_property_bean_t *prop_bean,
+ sandesha2_seq_property_mgr_t *prop_mgr);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_terminate_mgr_is_property_deletable(
- const axis2_env_t *env,
- axis2_char_t *name);
+ const axis2_env_t *env,
+ axis2_char_t *name);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_time_out_sending_side_seq(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- axis2_bool_t svr_side,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ axis2_bool_t svr_side,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_clean_sending_side_data(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- axis2_bool_t svr_side,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ axis2_bool_t svr_side,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_add_terminate_seq_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- axis2_char_t *out_seq_id,
- axis2_char_t *int_seq_id,
- sandesha2_storage_mgr_t *storage_man);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *out_seq_id,
+ axis2_char_t *int_seq_id,
+ sandesha2_storage_mgr_t *storage_man);
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_terminate_seq.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_terminate_seq.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_terminate_seq.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_terminate_seq.h Wed Nov 8 19:48:04 2006
@@ -39,48 +39,34 @@
* @{
*/
-typedef struct sandesha2_terminate_seq_ops sandesha2_terminate_seq_ops_t;
typedef struct sandesha2_terminate_seq sandesha2_terminate_seq_t;
/**
- * @brief TerminateSequence ops struct
- * Encapsulator struct for ops of sandesha2_terminate_seq
- */
-AXIS2_DECLARE_DATA struct sandesha2_terminate_seq_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_terminate_seq_t *terminate_seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_terminate_seq_t *terminate_seq,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-};
-
-/**
* @brief sandesha2_terminate_seq
* sandesha2_terminate_seq
*/
AXIS2_DECLARE_DATA struct sandesha2_terminate_seq
{
sandesha2_iom_rm_part_t part;
- sandesha2_terminate_seq_ops_t *ops;
};
AXIS2_EXTERN sandesha2_terminate_seq_t* AXIS2_CALL
sandesha2_terminate_seq_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_TERMINATE_SEQ_SET_IDENTIFIER(terminate_seq, env, identifier) \
- ((terminate_seq)->ops->set_identifier (terminate_seq, env, identifier))
-#define SANDESHA2_TERMINATE_SEQ_GET_IDENTIFIER(terminate_seq, env) \
- ((terminate_seq)->ops->get_identifier (terminate_seq, env))
-/************************** End of function macros ****************************/
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
+
+axis2_status_t AXIS2_CALL
+sandesha2_terminate_seq_set_identifier(
+ sandesha2_terminate_seq_t *terminate_seq,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_terminate_seq_get_identifier(
+ sandesha2_terminate_seq_t *terminate_seq,
+ const axis2_env_t *env);
+
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_terminate_seq_res.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_terminate_seq_res.h?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_terminate_seq_res.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_terminate_seq_res.h Wed Nov 8 19:48:04 2006
@@ -40,50 +40,33 @@
* @{
*/
-typedef struct sandesha2_terminate_seq_res_ops sandesha2_terminate_seq_res_ops_t;
typedef struct sandesha2_terminate_seq_res sandesha2_terminate_seq_res_t;
/**
- * @brief TerminateSequenceResponse ops struct
- * Encapsulator struct for ops of sandesha2_terminate_seq_res
- */
-AXIS2_DECLARE_DATA struct sandesha2_terminate_seq_res_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_terminate_seq_res_t *terminate_seq_res,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_terminate_seq_res_t *terminate_seq_res,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-};
-
-/**
* @brief sandesha2_terminate_seq_res
* sandesha2_terminate_seq_res
*/
AXIS2_DECLARE_DATA struct sandesha2_terminate_seq_res
{
sandesha2_iom_rm_part_t part;
- sandesha2_terminate_seq_res_ops_t *ops;
};
AXIS2_EXTERN sandesha2_terminate_seq_res_t* AXIS2_CALL
sandesha2_terminate_seq_res_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *ns_value);
+
+axis2_status_t AXIS2_CALL
+sandesha2_terminate_seq_res_set_identifier(
+ sandesha2_terminate_seq_res_t *terminate_seq_res,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_terminate_seq_res_get_identifier(
+ sandesha2_terminate_seq_res_t *terminate_seq_res,
+ const axis2_env_t *env);
-/************************** Start of function macros **************************/
-#define SANDESHA2_TERMINATE_SEQ_RES_SET_IDENTIFIER(\
- terminate_seq_res, env, identifier) \
- ((terminate_seq_res)->ops->set_identifier \
- (terminate_seq_res, env, identifier))
-#define SANDESHA2_TERMINATE_SEQ_RES_GET_IDENTIFIER(terminate_seq_res, env) \
- ((terminate_seq_res)->ops->get_identifier (terminate_seq_res, env))
-/************************** End of function macros ****************************/
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Wed Nov 8 19:48:04 2006
@@ -232,8 +232,8 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
- create_seq_mgr = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
+ create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(storage_mgr, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -243,7 +243,7 @@
within_transaction = AXIS2_TRUE;
}
if(AXIS2_TRUE != within_transaction)
- report_transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr,
+ report_transaction = sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
SANDESHA2_SEQ_REPORT_SET_INTERNAL_SEQ_ID(seq_report, env, internal_seq_id);
create_seq_find_bean = sandesha2_create_seq_bean_create(env);
@@ -382,7 +382,7 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
sandesha2_report = sandesha2_report_create(env);
internal_seq_find_bean = sandesha2_seq_property_bean_create(env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
@@ -396,7 +396,7 @@
}
if(AXIS2_TRUE != within_transaction)
{
- report_transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, env);
+ report_transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
}
if(internal_seq_find_bean)
SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(internal_seq_find_bean, env,
@@ -973,7 +973,7 @@
}
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_id_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(!seq_id_bean)
@@ -1087,7 +1087,7 @@
identifier = sandesha2_identifier_create(env, rm_ns_value);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, out_seq_id);
SANDESHA2_ACK_REQUESTED_SET_IDENTIFIER(ack_requested, env, identifier);
- SANDESHA2_IOM_RM_PART_TO_SOAP_ENVELOPE((sandesha2_iom_rm_part_t *)
+ sandesha2_iom_rm_part_to_soap_envelope((sandesha2_iom_rm_part_t *)
ack_requested, env, dummy_envelope);
header = AXIOM_SOAP_ENVELOPE_GET_HEADER(dummy_envelope, env);
node = AXIOM_SOAP_HEADER_GET_BASE_NODE(header, env);
@@ -1207,7 +1207,7 @@
}
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_id_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(!seq_id_bean)
@@ -1253,8 +1253,8 @@
close_seq = sandesha2_close_seq_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
- SANDESHA2_CLOSE_SEQ_SET_IDENTIFIER(close_seq, env, identifier);
- SANDESHA2_IOM_RM_PART_TO_SOAP_ENVELOPE((sandesha2_iom_rm_part_t *) close_seq,
+ sandesha2_close_seq_set_identifier(close_seq, env, identifier);
+ sandesha2_iom_rm_part_to_soap_envelope((sandesha2_iom_rm_part_t *) close_seq,
env, dummy_envelope);
return dummy_envelope;
@@ -1459,7 +1459,7 @@
sandesha2_next_msg_mgr_t *next_msg_mgr = NULL;
sandesha2_next_msg_bean_t *next_msg_bean = NULL;
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
terminated_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
seq_id, SANDESHA2_SEQ_PROP_SEQ_TERMINATED);
if(terminated_bean != NULL)
@@ -1472,7 +1472,7 @@
{
return SANDESHA2_SEQ_STATUS_TIMED_OUT;
}
- next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr, env);
+ next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_mgr, env);
next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_msg_mgr, env, seq_id);
if(next_msg_bean)
{
@@ -1516,7 +1516,7 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -1527,7 +1527,7 @@
}
if(AXIS2_TRUE != within_transaction)
{
- report_transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr,
+ report_transaction = sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
}
seq_report = sandesha2_seq_report_create(env);
@@ -1615,7 +1615,7 @@
}
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_id_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(!seq_id_bean)
@@ -1657,8 +1657,8 @@
terminate_seq = sandesha2_terminate_seq_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
- SANDESHA2_TERMINATE_SEQ_SET_IDENTIFIER(terminate_seq, env, identifier);
- SANDESHA2_IOM_RM_PART_TO_SOAP_ENVELOPE((sandesha2_iom_rm_part_t *)
+ sandesha2_terminate_seq_set_identifier(terminate_seq, env, identifier);
+ sandesha2_iom_rm_part_to_soap_envelope((sandesha2_iom_rm_part_t *)
terminate_seq, env, dummy_envelope);
return dummy_envelope;
Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Wed Nov 8 19:48:04 2006
@@ -95,7 +95,7 @@
AXIS2_FALSE);
storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
- SANDESHA2_STORAGE_MGR_INIT_STORAGE(storage_mgr, env, module_desc);
+ sandesha2_storage_mgr_init_storage(storage_mgr, env, module_desc);
/* we need to add permenent storage mgr as well */
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] module initializing completed");
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Wed Nov 8 19:48:04 2006
@@ -419,7 +419,7 @@
axis2_hash_this(hi, NULL, NULL, &value);
part = (sandesha2_iom_rm_part_t*)value;
- SANDESHA2_IOM_RM_PART_TO_SOAP_ENVELOPE(part, env, soap_envelope);
+ sandesha2_iom_rm_part_to_soap_envelope(part, env, soap_envelope);
}
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Wed Nov 8 19:48:04 2006
@@ -168,7 +168,7 @@
{
axis2_property_t *prop = NULL;
- transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, env);
+ transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, env));
@@ -271,8 +271,8 @@
if(sequence)
{
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(sequence, env), env);
- msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(SANDESHA2_SEQ_GET_MSG_NUM(
+ sandesha2_seq_get_identifier(sequence, env), env);
+ msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(sandesha2_seq_get_msg_num(
sequence, env), env);
}
if(seq_id && 0 < msg_no)
@@ -280,7 +280,7 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *rcvd_msgs_bean = NULL;
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
rcvd_msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, seq_id,
@@ -420,7 +420,7 @@
env, SANDESHA2_MSG_PART_SEQ);
if(sequence)
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(sequence, env), env);
+ sandesha2_seq_get_identifier(sequence, env), env);
if(seq_id)
{
@@ -429,7 +429,7 @@
axis2_char_t *rcvd_msgs_str = NULL;
sandesha2_msg_processor_t *app_msg_processor = NULL;
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
rcvd_msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, seq_id,
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Nov 8 19:48:04 2006
@@ -139,7 +139,7 @@
{
axis2_property_t *prop = NULL;
- transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, env);
+ transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Wed Nov 8 19:48:04 2006
@@ -148,7 +148,7 @@
{
axis2_property_t *prop = NULL;
- transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, env);
+ transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, env));
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -193,16 +193,16 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- SANDESHA2_SEQ_ACK_SET_MUST_UNDERSTAND(seq_ack, env, AXIS2_FALSE);
+ sandesha2_seq_ack_set_must_understand(seq_ack, env, AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
- ack_range_list = SANDESHA2_SEQ_ACK_GET_ACK_RANGE_LIST(seq_ack, env);
- nack_list = SANDESHA2_SEQ_ACK_GET_NACK_LIST(seq_ack, env);
+ ack_range_list = sandesha2_seq_ack_get_ack_range_list(seq_ack, env);
+ nack_list = sandesha2_seq_ack_get_nack_list(seq_ack, env);
out_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_ACK_GET_IDENTIFIER(seq_ack, env), env);
+ sandesha2_seq_ack_get_identifier(seq_ack, env), env);
if(!out_seq_id || 0 == AXIS2_STRLEN(out_seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] OutSequenceId is"
@@ -211,7 +211,7 @@
return AXIS2_FAILURE;
}
fault_mgr = sandesha2_fault_mgr_create(env);
- fault_msg_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
+ fault_msg_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
rm_msg_ctx, out_seq_id, storage_mgr);
if(fault_msg_ctx)
{
@@ -221,7 +221,7 @@
fault_msg_ctx, env));
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
}
- fault_msg_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_INVALID_ACK(fault_mgr, env,
+ fault_msg_ctx = sandesha2_fault_mgr_check_for_invalid_ack(fault_mgr, env,
rm_msg_ctx, storage_mgr);
if(fault_msg_ctx)
{
@@ -275,7 +275,7 @@
{
SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_ID(retrans_bean, env));
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env,
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
retrans_bean, env));
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=472762&r1=472761&r2=472762
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Wed Nov 8 19:48:04 2006
@@ -181,7 +181,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
acks_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, seq_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
acks_to_str = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(acks_to_bean, env);
@@ -305,7 +305,7 @@
axis2_engine_t *engine = NULL;
axis2_transport_out_desc_t *transport_out = NULL;
- retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
key = axis2_uuid_gen(env);
ack_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(ack_bean, env, key);
@@ -353,7 +353,7 @@
}
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(ack_bean, env, time_to_send);
/*AXIS2_MSG_CTX_SET_KEEP_ALIVE(ack_msg_ctx, env, AXIS2_TRUE);*/
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, key, ack_msg_ctx);
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, ack_bean);
property = axis2_property_create(env);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org