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 10:50:07 UTC
svn commit: r472834 [1/3] - in /webservices/sandesha/trunk/c: include/
src/client/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
Author: damitha
Date: Thu Nov 9 01:50:04 2006
New Revision: 472834
URL: http://svn.apache.org/viewvc?view=rev&rev=472834
Log:
Removed unneccessary OO and removed macros
Modified:
webservices/sandesha/trunk/c/include/sandesha2_ack_range.h
webservices/sandesha/trunk/c/include/sandesha2_close_seq.h
webservices/sandesha/trunk/c/include/sandesha2_create_seq.h
webservices/sandesha/trunk/c/include/sandesha2_create_seq_bean.h
webservices/sandesha/trunk/c/include/sandesha2_create_seq_res.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_identifier.h
webservices/sandesha/trunk/c/include/sandesha2_invoker_bean.h
webservices/sandesha/trunk/c/include/sandesha2_invoker_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_msg_creator.h
webservices/sandesha/trunk/c/include/sandesha2_msg_init.h
webservices/sandesha/trunk/c/include/sandesha2_msg_retrans_adjuster.h
webservices/sandesha/trunk/c/include/sandesha2_msg_validator.h
webservices/sandesha/trunk/c/include/sandesha2_property_bean.h
webservices/sandesha/trunk/c/include/sandesha2_property_mgr.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_transport_sender.h
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_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/beans/create_seq_bean.c
webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.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/property_bean.c
webservices/sandesha/trunk/c/src/util/property_mgr.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/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/ack_range.c
webservices/sandesha/trunk/c/src/wsrm/create_seq.c
webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
webservices/sandesha/trunk/c/src/wsrm/identifier.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_ack_range.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_range.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_range.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_range.h Thu Nov 9 01:50:04 2006
@@ -45,7 +45,6 @@
AXIS2_DECLARE_DATA struct sandesha2_ack_range
{
sandesha2_iom_rm_element_t element;
- sandesha2_ack_range_ops_t *ops;
};
AXIS2_EXTERN sandesha2_ack_range_t* AXIS2_CALL
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_close_seq.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_close_seq.h Thu Nov 9 01:50:04 2006
@@ -53,8 +53,8 @@
AXIS2_EXTERN sandesha2_close_seq_t* AXIS2_CALL
sandesha2_close_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_close_seq_set_identifier(
Modified: webservices/sandesha/trunk/c/include/sandesha2_create_seq.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_create_seq.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_create_seq.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_create_seq.h Thu Nov 9 01:50:04 2006
@@ -41,63 +41,46 @@
* @{
*/
-typedef struct sandesha2_create_seq_ops sandesha2_create_seq_ops_t;
typedef struct sandesha2_create_seq sandesha2_create_seq_t;
/**
- * @brief CreateSequence ops struct
- * Encapsulator struct for ops of sandesha2_create_seq
- */
-AXIS2_DECLARE_DATA struct sandesha2_create_seq_ops
-{
- sandesha2_acks_to_t * (AXIS2_CALL *
- get_acks_to)
- (sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_acks_to)
- (sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env,
- sandesha2_acks_to_t *acks_to);
-
- sandesha2_seq_offer_t * (AXIS2_CALL *
- get_seq_offer)
- (sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_seq_offer)
- (sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env,
- sandesha2_seq_offer_t *seq_offer);
-};
-
-/**
* @brief sandesha2_create_seq
* sandesha2_create_seq
*/
AXIS2_DECLARE_DATA struct sandesha2_create_seq
{
sandesha2_iom_rm_part_t part;
- sandesha2_create_seq_ops_t *ops;
};
AXIS2_EXTERN sandesha2_create_seq_t* AXIS2_CALL
sandesha2_create_seq_create(
- const axis2_env_t *env,
- axis2_char_t *addr_ns_value,
- axis2_char_t *rm_ns_value);
-/************************** Start of function macros **************************/
-#define SANDESHA2_CREATE_SEQ_SET_ACKS_TO(create_seq, env, acks_to) \
- ((create_seq)->ops->set_acks_to (create_seq, env, acks_to))
-#define SANDESHA2_CREATE_SEQ_GET_ACKS_TO(create_seq, env) \
- ((create_seq)->ops->get_acks_to (create_seq, env))
-#define SANDESHA2_CREATE_SEQ_SET_SEQ_OFFER(create_seq, env, seq_offer) \
- ((create_seq)->ops->set_seq_offer(create_seq, env, seq_offer))
-#define SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq, env) \
- ((create_seq)->ops->get_seq_offer (create_seq, env))
-/************************** End of function macros ****************************/
+ const axis2_env_t *env,
+ axis2_char_t *addr_ns_value,
+ axis2_char_t *rm_ns_value);
+
+sandesha2_acks_to_t * AXIS2_CALL
+sandesha2_create_seq_get_acks_to(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_create_seq_set_acks_to(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env,
+ sandesha2_acks_to_t *acks_to);
+
+sandesha2_seq_offer_t * AXIS2_CALL
+sandesha2_create_seq_get_seq_offer(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_create_seq_set_seq_offer(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env,
+ sandesha2_seq_offer_t *seq_offer);
+
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_create_seq_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_create_seq_bean.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_create_seq_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_create_seq_bean.h Thu Nov 9 01:50:04 2006
@@ -28,77 +28,57 @@
{
#endif
-typedef struct sandesha2_create_seq_bean sandesha2_create_seq_bean_t;
-typedef struct sandesha2_create_seq_bean_ops sandesha2_create_seq_bean_ops_t;
-
-AXIS2_DECLARE_DATA struct sandesha2_create_seq_bean_ops
-{
- axis2_status_t (AXIS2_CALL *
- free) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
- axis2_char_t* (AXIS2_CALL *
- get_create_seq_msg_id) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_create_seq_msg_id) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* seq_msg_id) ;
-
- axis2_char_t* (AXIS2_CALL *
- get_seq_id) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_seq_id) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* seq_id) ;
-
- axis2_char_t* (AXIS2_CALL *
- get_internal_seq_id) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_internal_seq_id) (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* int_seq_id);
-};
-
-AXIS2_DECLARE_DATA struct sandesha2_create_seq_bean
-{
- sandesha2_create_seq_bean_ops_t *ops;
-};
+typedef struct sandesha2_create_seq_bean_t sandesha2_create_seq_bean_t;
/* constructors
*/
AXIS2_EXTERN sandesha2_create_seq_bean_t* AXIS2_CALL
- sandesha2_create_seq_bean_create(const axis2_env_t *env);
+sandesha2_create_seq_bean_create(
+ const axis2_env_t *env);
AXIS2_EXTERN sandesha2_create_seq_bean_t* AXIS2_CALL
- sandesha2_create_seq_bean_create_with_data(const axis2_env_t *env,
- axis2_char_t *internal_seq_id,
- axis2_char_t *create_seq_msg_id,
- axis2_char_t *seq_id);
-
-
-#define SANDESHA2_CREATE_SEQ_BEAN_FREE(create_seq_bean, env) \
- ((create_seq_bean)->ops->free(create_seq_bean, env))
-
-#define SANDESHA2_CREATE_SEQ_BEAN_GET_CREATE_SEQ_MSG_ID(create_seq_bean,env) \
- ((create_seq_bean)->ops->get_create_seq_msg_id(create_seq_bean, env))
-
-#define SANDESHA2_CREATE_SEQ_BEAN_SET_CREATE_SEQ_MSG_ID(create_seq_bean, env, create_msg_seq_id) \
- ((create_seq_bean)->ops->set_create_seq_msg_id(create_seq_bean, env, create_msg_seq_id))
-
-#define SANDESHA2_CREATE_SEQ_BEAN_GET_SEQ_ID(create_seq_bean, env) \
- ((create_seq_bean)->ops->get_seq_id(create_seq_bean, env))
-
-#define SANDESHA2_CREATE_SEQ_BEAN_SET_SEQ_ID(create_seq_bean, env, seq_id) \
- ((create_seq_bean)->ops->set_seq_id(create_seq_bean, env, seq_id))
+sandesha2_create_seq_bean_create_with_data(
+ const axis2_env_t *env,
+ axis2_char_t *internal_seq_id,
+ axis2_char_t *create_seq_msg_id,
+ axis2_char_t *seq_id);
+
+axis2_status_t AXIS2_CALL
+sandesha2_create_seq_bean_free (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_create_seq_bean_get_create_seq_msg_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_create_seq_bean_set_create_seq_msg_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env, axis2_char_t* seq_msg_id) ;
+
+axis2_char_t* AXIS2_CALL
+sandesha2_create_seq_bean_get_seq_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_create_seq_bean_set_seq_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env, axis2_char_t* seq_id) ;
+
+axis2_char_t* AXIS2_CALL
+sandesha2_create_seq_bean_get_internal_seq_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_create_seq_bean_set_internal_seq_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env, axis2_char_t* int_seq_id);
-#define SANDESHA2_CREATE_SEQ_BEAN_GET_INTERNAL_SEQ_ID(create_seq_bean, env) \
- ((create_seq_bean)->ops->get_internal_seq_id(create_seq_bean, env))
-#define SANDESHA2_CREATE_SEQ_BEAN_SET_INTERNAL_SEQ_ID(create_seq_bean, env, int_seq_id) \
- ((create_seq_bean)->ops->set_internal_seq_id(create_seq_bean, env, int_seq_id))
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_create_seq_res.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_create_seq_res.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_create_seq_res.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_create_seq_res.h Thu Nov 9 01:50:04 2006
@@ -39,78 +39,55 @@
* @{
*/
-typedef struct sandesha2_create_seq_res_ops sandesha2_create_seq_res_ops_t;
typedef struct sandesha2_create_seq_res sandesha2_create_seq_res_t;
/**
- * @brief CreateSequenceResponse ops struct
- * Encapsulator struct for ops of sandesha2_create_seq_res
- */
-AXIS2_DECLARE_DATA struct sandesha2_create_seq_res_ops
-{
- sandesha2_identifier_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-
- axis2_status_t (AXIS2_CALL *
- set_accept)
- (sandesha2_create_seq_res_t *element,
- const axis2_env_t *env,
- sandesha2_accept_t *accept);
-
- sandesha2_accept_t * (AXIS2_CALL *
- get_accept)
- (sandesha2_create_seq_res_t *element,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_expires)
- (sandesha2_create_seq_res_t *element,
- const axis2_env_t *env,
- sandesha2_expires_t *expires);
-
- sandesha2_expires_t * (AXIS2_CALL *
- get_expires)
- (sandesha2_create_seq_res_t *element,
- const axis2_env_t *env);
-};
-
-/**
* @brief sandesha2_create_seq_res
* sandesha2_create_seq_res
*/
AXIS2_DECLARE_DATA struct sandesha2_create_seq_res
{
sandesha2_iom_rm_part_t part;
- sandesha2_create_seq_res_ops_t *ops;
};
AXIS2_EXTERN sandesha2_create_seq_res_t* AXIS2_CALL
sandesha2_create_seq_res_create(
- const axis2_env_t *env,
- axis2_char_t *rm_ns_value,
- axis2_char_t *addr_ns_value);
-/************************** Start of function macros **************************/
-#define SANDESHA2_CREATE_SEQ_RES_SET_IDENTIFIER(create_seq_res, env, identifier)\
- ((create_seq_res)->ops->set_identifier (create_seq_res, env, identifier))
-#define SANDESHA2_CREATE_SEQ_RES_GET_IDENTIFIER(create_seq_res, env) \
- ((create_seq_res)->ops->get_identifier (create_seq_res, env))
-#define SANDESHA2_CREATE_SEQ_RES_SET_ACCEPT(create_seq_res, env, accept) \
- ((create_seq_res)->ops->set_accept (create_seq_res, env, accept))
-#define SANDESHA2_CREATE_SEQ_RES_GET_ACCEPT(create_seq_res, env) \
- ((create_seq_res)->ops->get_accept (create_seq_res, env))
-#define SANDESHA2_CREATE_SEQ_RES_EXPIRES (create_seq_res, env, expires) \
- ((create_seq_res)->ops->set_expires (create_seq_res, env, expires))
-#define SANDESHA2_CREATE_SEQ_RES_GET_EXPIRES(create_seq_res, env) \
- ((create_seq_res)->ops->get_expires (create_seq_res, env))
-/************************** End of function macros ****************************/
+ const axis2_env_t *env,
+ axis2_char_t *rm_ns_value,
+ axis2_char_t *addr_ns_value);
+
+axis2_status_t AXIS2_CALL
+sandesha2_create_seq_res_set_identifier(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier);
+
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_create_seq_res_get_identifier(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_create_seq_res_set_accept(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env, sandesha2_accept_t *accept);
+
+sandesha2_accept_t * AXIS2_CALL
+sandesha2_create_seq_res_get_accept(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_create_seq_res_set_expires(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env, sandesha2_expires_t *expires);
+
+sandesha2_expires_t * AXIS2_CALL
+sandesha2_create_seq_res_get_expires(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env);
+
+
/** @} */
#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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_fault_data.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_fault_data.h Thu Nov 9 01:50:04 2006
@@ -38,9 +38,7 @@
* @{
*/
-typedef struct sandesha2_fault_data sandesha2_fault_data_t;
-
-AXIS2_DECLARE_DATA struct sandesha2_fault_data{};
+typedef struct sandesha2_fault_data_t sandesha2_fault_data_t;
AXIS2_EXTERN sandesha2_fault_data_t* AXIS2_CALL
sandesha2_fault_data_create(
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h Thu Nov 9 01:50:04 2006
@@ -41,77 +41,51 @@
* @{
*/
- typedef struct sandesha2_fault_mgr sandesha2_fault_mgr_t;
-
-/**
- * @brief sandesha2_fault_mgr_ops
- * sandesha2_fault_mgr_ops
- */
-AXIS2_DECLARE_DATA struct sandesha2_fault_mgr
-{
-};
-
-AXIS2_EXTERN sandesha2_fault_mgr_t* AXIS2_CALL
-sandesha2_fault_mgr_create(
- const axis2_env_t *env);
-
sandesha2_msg_ctx_t* AXIS2_CALL
-sandesha2_fault_mgr_check_for_create_seq_refused
- (sandesha2_fault_mgr_t *fault_mgr,
+sandesha2_fault_mgr_check_for_create_seq_refused(
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,
+sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
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,
+sandesha2_fault_mgr_check_for_msg_num_rollover(
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,
+sandesha2_fault_mgr_check_for_unknown_seq(
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,
+sandesha2_fault_mgr_check_for_invalid_ack(
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,
+sandesha2_fault_mgr_check_for_seq_closed(
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,
+sandesha2_fault_mgr_get_fault(
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_identifier.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_identifier.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_identifier.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_identifier.h Thu Nov 9 01:50:04 2006
@@ -38,49 +38,33 @@
* @ingroup sandesha2_wsrm
* @{
*/
-typedef struct sandesha2_identifier_ops sandesha2_identifier_ops_t;
typedef struct sandesha2_identifier sandesha2_identifier_t;
/**
- * @brief Identifier ops struct
- * Encapsulator struct for ops of sandesha2_identifier
- */
-AXIS2_DECLARE_DATA struct sandesha2_identifier_ops
-{
- axis2_char_t * (AXIS2_CALL *
- get_identifier)
- (sandesha2_identifier_t *identifier,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_identifier)
- (sandesha2_identifier_t *identifier,
- const axis2_env_t *env,
- axis2_char_t *str_id);
-};
-
-/**
* @brief sandesha2_identifier
* sandesha2_identifier
*/
AXIS2_DECLARE_DATA struct sandesha2_identifier
{
sandesha2_iom_rm_element_t element;
- sandesha2_identifier_ops_t *ops;
};
AXIS2_EXTERN sandesha2_identifier_t* AXIS2_CALL
sandesha2_identifier_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_identifier_get_identifier(
+ sandesha2_identifier_t *identifier,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_identifier_set_identifier(
+ sandesha2_identifier_t *identifier,
+ const axis2_env_t *env, axis2_char_t *str_id);
+
-/************************** Start of function macros **************************/
-#define SANDESHA2_IDENTIFIER_GET_IDENTIFIER(identifier, env)\
- ((identifier)->ops->get_identifier(identifier, env))
-#define SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, str_id)\
- ((identifier)->ops->set_identifier(identifier, env, str_id))
-/************************** End of function macros ****************************/
-
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_invoker_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_invoker_bean.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_invoker_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_invoker_bean.h Thu Nov 9 01:50:04 2006
@@ -26,98 +26,66 @@
{
#endif
-typedef struct sandesha2_invoker_bean_ops sandesha2_invoker_bean_ops_t;
-typedef struct sandesha2_invoker_bean sandesha2_invoker_bean_t;
-
-AXIS2_DECLARE_DATA struct sandesha2_invoker_bean_ops
-{
- axis2_status_t (AXIS2_CALL *
- free) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
- axis2_char_t * (AXIS2_CALL *
- get_msg_context_ref_key) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_msg_context_ref_key) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env,
- axis2_char_t* context_ref_id);
-
- long (AXIS2_CALL *
- get_msg_no) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_msg_no) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env,
- long msg_no);
-
- axis2_char_t* (AXIS2_CALL *
- get_seq_id) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_seq_id) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *seq_id);
- axis2_bool_t (AXIS2_CALL *
- is_invoked) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env);
-
- void (AXIS2_CALL *
- set_invoked) (sandesha2_invoker_bean_t *invoker,
- const axis2_env_t *env,
- axis2_bool_t invoked);
-
-};
-
-
-AXIS2_DECLARE_DATA struct sandesha2_invoker_bean{
- /* ops related to invoker_bean */
- sandesha2_invoker_bean_ops_t *ops;
-
-};
+typedef struct sandesha2_invoker_bean_t sandesha2_invoker_bean_t;
/* constructors
*/
AXIS2_EXTERN sandesha2_invoker_bean_t* AXIS2_CALL
sandesha2_invoker_bean_create(
- const axis2_env_t *env);
+ const axis2_env_t *env);
AXIS2_EXTERN sandesha2_invoker_bean_t* AXIS2_CALL
sandesha2_invoker_bean_create_with_data(const axis2_env_t *env,
- axis2_char_t * ref_key,
- long msg_no,
- axis2_char_t *seq_id,
- axis2_bool_t invoked);
-
-#define SANDESHA2_INVOKER_BEAN_FREE(invoker_bean, env) \
- ((invoker_bean)->ops->free(invoker_bean, env))
-
-#define SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(invoker_bean, env) \
- ((invoker_bean)->ops->get_msg_context_ref_key(invoker_bean, env))
-
-#define SANDESHA2_INVOKER_BEAN_SET_MSG_CONTEXT_REF_KEY(invoker_bean, env, ref_id) \
- ((invoker_bean)->ops->set_msg_context_ref_key(invoker_bean, env, ref_id))
-
-#define SANDESHA2_INVOKER_BEAN_GET_MSG_NO(invoker_bean, env) \
- ((invoker_bean)->ops->get_msg_no(invoker_bean, env))
-
-#define SANDESHA2_INVOKER_BEAN_SET_MSG_NO(invoker_bean, env, msg_no) \
- ((invoker_bean)->ops->set_msg_no(invoker_bean, env, msg_no))
-
-#define SANDESHA2_INVOKER_BEAN_GET_SEQ_ID(invoker_bean, env) \
- ((invoker_bean)->ops->get_seq_id(invoker_bean, env))
-
-#define SANDESHA2_INVOKER_BEAN_SET_SEQ_ID(invoker_bean, env, seq_id) \
- ((invoker_bean)->ops->set_seq_id(invoker_bean, env, seq_id))
-
-#define SANDESHA2_INVOKER_BEAN_IS_INVOKED(invoker_bean, env) \
- ((invoker_bean)->ops->is_invoked(invoker_bean, env))
-
-#define SANDESHA2_INVOKER_BEAN_SET_INVOKED(invoker_bean, env, invoked) \
- ((invoker_bean)->ops->set_invoked(invoker_bean, env, invoked))
+ axis2_char_t * ref_key,
+ long msg_no,
+ axis2_char_t *seq_id,
+ axis2_bool_t invoked);
+
+axis2_status_t AXIS2_CALL
+sandesha2_invoker_bean_free (
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_invoker_bean_get_msg_ctx_ref_key(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_invoker_bean_set_msg_context_ref_key(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env, axis2_char_t* context_ref_id) ;
+
+long AXIS2_CALL
+sandesha2_invoker_bean_get_msg_no(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_invoker_bean_set_msg_no(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env, long msgno) ;
+
+axis2_char_t* AXIS2_CALL
+sandesha2_invoker_bean_get_seq_id(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_invoker_bean_set_seq_id(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env, axis2_char_t* int_seq_id);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_invoker_bean_is_invoked (
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_invoker_bean_set_invoked(
+ sandesha2_invoker_bean_t *invoker,
+ const axis2_env_t *env,
+ axis2_bool_t invoked);
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_invoker_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_invoker_mgr.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_invoker_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_invoker_mgr.h Thu Nov 9 01:50:04 2006
@@ -36,100 +36,53 @@
{
#endif
-typedef struct sandesha2_invoker_mgr sandesha2_invoker_mgr_t;
-typedef struct sandesha2_invoker_mgr_ops sandesha2_invoker_mgr_ops_t;
-
-/** @defgroup sandesha2_invoker_mgr In Memory Invoker Manager
- * @ingroup sandesha2
- * @{
- */
-
-struct sandesha2_invoker_mgr_ops
-{
- /**
- * Deallocate memory
- * @return status code
- */
- axis2_status_t (AXIS2_CALL *
- free) (
- void *invoker,
- const axis2_env_t *env);
-
- axis2_bool_t (AXIS2_CALL *
- insert) (
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
- axis2_bool_t (AXIS2_CALL *
- remove) (
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *ref_key);
-
- sandesha2_invoker_bean_t *(AXIS2_CALL *
- retrieve) (
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- axis2_char_t *ref_key);
-
- axis2_bool_t (AXIS2_CALL *
- update) (
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
- axis2_array_list_t *(AXIS2_CALL *
- find) (
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
- sandesha2_invoker_bean_t *(AXIS2_CALL *
- find_unique) (
- sandesha2_invoker_mgr_t *invoker,
- const axis2_env_t *env,
- sandesha2_invoker_bean_t *bean);
-
-
-};
-
-struct sandesha2_invoker_mgr
-{
- sandesha2_invoker_mgr_ops_t *ops;
-};
+typedef struct sandesha2_invoker_mgr_t sandesha2_invoker_mgr_t;
AXIS2_EXTERN sandesha2_invoker_mgr_t * AXIS2_CALL
sandesha2_invoker_mgr_create(
- const axis2_env_t *env,
- axis2_ctx_t *ctx);
-
-#define SANDESHA2_INVOKER_MGR_FREE(invoker, env) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->free (invoker, env))
+ const axis2_env_t *env,
+ axis2_ctx_t *ctx);
-#define SANDESHA2_INVOKER_MGR_INSERT(invoker, env, bean) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->\
- insert (invoker, env, bean))
-
-#define SANDESHA2_INVOKER_MGR_REMOVE(invoker, env, ref_key) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->\
- remove (invoker, env, ref_key))
-
-#define SANDESHA2_INVOKER_MGR_RETRIEVE(invoker, env, ref_key) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->\
- retrieve (invoker, env, ref_key))
-
-#define SANDESHA2_INVOKER_MGR_UPDATE(invoker, env, bean) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->\
- update (invoker, env, bean))
-
-#define SANDESHA2_INVOKER_MGR_FIND(invoker, env, bean) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->\
- find (invoker, env, bean))
-
-#define SANDESHA2_INVOKER_MGR_FIND_UNIQUE(invoker, env, bean) \
- (((sandesha2_invoker_mgr_t *) invoker)->ops->\
- find_unique (invoker, env, bean))
+axis2_status_t AXIS2_CALL
+sandesha2_invoker_mgr_free(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *envv);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_invoker_mgr_insert(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_invoker_mgr_remove(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ axis2_char_t *ref_key);
+
+sandesha2_invoker_bean_t *AXIS2_CALL
+sandesha2_invoker_mgr_retrieve(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ axis2_char_t *ref_key);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_invoker_mgr_update(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_invoker_mgr_find(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean);
+
+sandesha2_invoker_bean_t *AXIS2_CALL
+sandesha2_invoker_mgr_find_unique(
+ sandesha2_invoker_mgr_t *invoker,
+ const axis2_env_t *env,
+ sandesha2_invoker_bean_t *bean);
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_creator.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_creator.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_creator.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_creator.h Thu Nov 9 01:50:04 2006
@@ -53,11 +53,11 @@
*/
sandesha2_msg_ctx_t *AXIS2_CALL
sandesha2_msg_creator_create_create_seq_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *application_rm_msg,
- axis2_char_t *internal_seq_id,
- axis2_char_t *acks_to,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *application_rm_msg,
+ axis2_char_t *internal_seq_id,
+ axis2_char_t *acks_to,
+ sandesha2_storage_mgr_t *storage_mgr);
/**
* Create a new create_seq_response message.
@@ -68,11 +68,11 @@
*/
sandesha2_msg_ctx_t *
sandesha2_msg_creator_create_create_seq_res_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- axis2_msg_ctx_t *out_msg,
- axis2_char_t *new_seq_id,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *create_seq_msg,
+ axis2_msg_ctx_t *out_msg,
+ axis2_char_t *new_seq_id,
+ sandesha2_storage_mgr_t *storage_mgr);
/**
* Create a new close_seq_response message.
@@ -83,27 +83,27 @@
*/
sandesha2_msg_ctx_t *
sandesha2_msg_creator_create_close_seq_res_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *close_seq_msg,
- axis2_msg_ctx_t *out_msg,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *close_seq_msg,
+ axis2_msg_ctx_t *out_msg,
+ sandesha2_storage_mgr_t *storage_mgr);
sandesha2_msg_ctx_t *AXIS2_CALL
sandesha2_msg_creator_create_terminate_seq_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *ref_rm_msg,
- axis2_char_t *seq_id,
- axis2_char_t *internal_seq_id,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *ref_rm_msg,
+ axis2_char_t *seq_id,
+ axis2_char_t *internal_seq_id,
+ sandesha2_storage_mgr_t *storage_mgr);
sandesha2_msg_ctx_t *AXIS2_CALL
sandesha2_msg_creator_create_terminate_seq_res_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *ref_rm_msg,
- axis2_msg_ctx_t *out_msg,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *ref_rm_msg,
+ axis2_msg_ctx_t *out_msg,
+ sandesha2_storage_mgr_t *storage_mgr);
/**
* Adds an ack message to the given application message.
@@ -113,10 +113,10 @@
*/
axis2_status_t AXIS2_CALL
sandesha2_msg_creator_add_ack_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *app_msg,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *app_msg,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_mgr);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_init.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_init.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_init.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_init.h Thu Nov 9 01:50:04 2006
@@ -38,9 +38,6 @@
{
#endif
-typedef struct sandesha2_msg_init sandesha2_msg_init_t;
-typedef struct sandesha2_msg_init_ops sandesha2_msg_init_ops_t;
-
/** @defgroup sandesha2_msg_init In Memory Message init
* @ingroup sandesha2
* @{
@@ -60,8 +57,8 @@
*/
sandesha2_msg_ctx_t *
sandesha2_msg_init_init_msg(
- const axis2_env_t *env,
- axis2_msg_ctx_t *ctx);
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *ctx);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_retrans_adjuster.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_retrans_adjuster.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_retrans_adjuster.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_retrans_adjuster.h Thu Nov 9 01:50:04 2006
@@ -44,10 +44,10 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_msg_retrans_adjuster_adjust_retrans(
- const axis2_env_t *env,
- sandesha2_sender_bean_t *retrans_bean,
- axis2_conf_ctx_t *conf_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_sender_bean_t *retrans_bean,
+ axis2_conf_ctx_t *conf_ctx,
+ sandesha2_storage_mgr_t *storage_mgr);
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_validator.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_validator.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_validator.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_validator.h Thu Nov 9 01:50:04 2006
@@ -43,9 +43,9 @@
axis2_status_t AXIS2_CALL
sandesha2_msg_validator_validate_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr);
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_property_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_property_bean.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_property_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_property_bean.h Thu Nov 9 01:50:04 2006
@@ -36,213 +36,130 @@
* @{
*/
- typedef struct sandesha2_property_bean_ops sandesha2_property_bean_ops_t;
- typedef struct sandesha2_property_bean sandesha2_property_bean_t;
- /**
- * @brief Sandesha2 Property Bean ops struct
- * Encapsulator struct for ops of sandesha2_property_bean
- */
-AXIS2_DECLARE_DATA struct sandesha2_property_bean_ops
-{
-
- long (AXIS2_CALL *
- get_inactive_timeout_interval)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_inactive_timeout_interval)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- long interval);
-
- axis2_status_t (AXIS2_CALL *
- set_inactive_timeout_interval_with_units)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- long interval,
- axis2_char_t *units);
-
- long (AXIS2_CALL *
- get_ack_interval)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_ack_interval)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- long interval);
-
- long (AXIS2_CALL *
- get_retrans_interval)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_retrans_interval)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- long interval);
-
- axis2_bool_t (AXIS2_CALL *
- is_exp_backoff)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_exp_backoff)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- axis2_bool_t exp_backoff);
-
- axis2_char_t* (AXIS2_CALL *
- get_in_mem_storage_mgr)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_in_mem_storage_mgr)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- axis2_char_t *mgr);
-
- axis2_char_t* (AXIS2_CALL *
- get_permanent_storage_mgr)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_permanent_storage_mgr)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- axis2_char_t *mgr);
-
- axis2_bool_t (AXIS2_CALL *
- is_in_order)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_in_order)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- axis2_bool_t in_order);
-
- axis2_array_list_t* (AXIS2_CALL *
- get_msg_types_to_drop)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_msg_types_to_drop)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- axis2_array_list_t *msg_types);
-
- axis2_status_t (AXIS2_CALL *
- add_msg_type_to_drop)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- int msg_type);
-
- int (AXIS2_CALL *
- get_max_retrans_count)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_max_retrans_count)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env,
- int count);
-
- axis2_status_t (AXIS2_CALL *
- free)
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-};
-
-/**
- * @brief sandesha2_property_bean_ops
- * sandesha2_property_bean_ops
- */
-AXIS2_DECLARE_DATA struct sandesha2_property_bean
-{
- sandesha2_property_bean_ops_t *ops;
-};
+typedef struct sandesha2_property_bean_t sandesha2_property_bean_t;
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
sandesha2_property_bean_create(
- const axis2_env_t *env);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_PROPERTY_BEAN_FREE(bean, env) \
- ((bean)->ops->free (bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_INACTIVE_TIMEOUT_INTERVAL(bean, env)\
- ((bean)->ops->get_inactive_timeout_interval(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_INACTIVE_TIMEOUT_INTERVAL(bean, env, interval)\
- ((bean)->ops->set_inactive_timeout_interval(bean, env, interval))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_INACTIVE_TIMEOUT_INTERVAL_WITH_UNITS(bean, \
- env, interval, units)\
- ((bean)->ops->set_inactive_timeout_interval_with_units(bean, \
- env, interval, units))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_ACK_INTERVAL(bean, env)\
- ((bean)->ops->get_ack_interval(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_ACK_INTERVAL(bean, env, interval)\
- ((bean)->ops->set_ack_interval(bean, env, interval))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_RETRANS_INTERVAL(bean, env)\
- ((bean)->ops->get_retrans_interval(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_RETRANS_INTERVAL(bean, env, interval)\
- ((bean)->ops->set_retrans_interval(bean, env, interval))
-
-#define SANDESHA2_PROPERTY_BEAN_IS_EXP_BACKOFF(bean, env)\
- ((bean)->ops->is_exp_backoff(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_EXP_BACKOFF(bean, env, backoff)\
- ((bean)->ops->set_exp_backoff(bean, env, backoff))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_IN_MEM_STORAGE_MGR(bean, env)\
- ((bean)->ops->get_in_mem_storage_mgr(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_IN_MEM_STORAGE_MGR(bean, env, mgr)\
- ((bean)->ops->set_in_mem_storage_mgr(bean, env, mgr))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_PERMENENT_STORAGE_MGR(bean, env)\
- ((bean)->ops->get_permanent_storage_mgr(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_PERMENENT_STORAGE_MGR(bean, env, mgr)\
- ((bean)->ops->set_permanent_storage_mgr(bean, env, mgr))
-
-#define SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(bean, env)\
- ((bean)->ops->is_in_order(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_IN_ORDER(bean, env, in_order)\
- ((bean)->ops->set_in_order(bean, env, in_order))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_MSG_TYPES_TO_DROP(bean, env)\
- ((bean)->ops->get_msg_types_to_drop(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_MSG_TYPES_TO_DROP(bean, env, msg_types)\
- ((bean)->ops->set_msg_types_to_drop(bean, env, msg_types))
-
-#define SANDESHA2_PROPERTY_BEAN_ADD_MSG_TYPE_TO_DROP(bean, env, msg_type)\
- ((bean)->ops->add_msg_type_to_drop(bean, env, msg_type))
-
-#define SANDESHA2_PROPERTY_BEAN_GET_MAX_RETRANS_COUNT(bean, env)\
- ((bean)->ops->get_max_retrans_count(bean, env))
-
-#define SANDESHA2_PROPERTY_BEAN_SET_MAX_RETRANS_COUNT(bean, env, count)\
- ((bean)->ops->set_max_retrans_count(bean, env, count))
-/************************** End of function macros ****************************/
+ const axis2_env_t *env);
+
+long AXIS2_CALL
+sandesha2_property_bean_get_inactive_timeout_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_inactive_timeout_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ long interval);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_inactive_timeout_interval_with_units(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ long interval,
+ axis2_char_t *units);
+
+long AXIS2_CALL
+sandesha2_property_bean_get_ack_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_ack_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ long interval);
+
+long AXIS2_CALL
+sandesha2_property_bean_get_retrans_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_retrans_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ long interval);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_property_bean_is_exp_backoff(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_exp_backoff(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ axis2_bool_t exp_backoff);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_property_bean_get_in_mem_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_in_mem_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ axis2_char_t *manager);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_property_bean_get_permanant_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_permanant_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ axis2_char_t *manager);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_property_bean_is_in_order(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_in_order(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ axis2_bool_t in_order);
+
+axis2_array_list_t* AXIS2_CALL
+sandesha2_property_bean_get_msg_types_to_drop(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_msg_types_to_drop(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ axis2_array_list_t *msg_types);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_add_msg_type_to_drop(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ int msg_type);
+
+int AXIS2_CALL
+sandesha2_property_bean_get_max_retrans_count(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_set_max_retrans_count(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env,
+ int count);
+
+axis2_status_t AXIS2_CALL
+sandesha2_property_bean_free(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_property_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_property_mgr.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_property_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_property_mgr.h Thu Nov 9 01:50:04 2006
@@ -44,11 +44,13 @@
* @{
*/
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
-sandesha2_property_mgr_load_properties_from_def_values(const axis2_env_t *env);
+sandesha2_property_mgr_load_properties_from_def_values(
+ const axis2_env_t *env);
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
-sandesha2_property_mgr_load_properties_from_module_desc(const axis2_env_t *env,
- axis2_module_desc_t *module_desc);
+sandesha2_property_mgr_load_properties_from_module_desc(
+ const axis2_env_t *env,
+ axis2_module_desc_t *module_desc);
/** @} */
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_mgr.h Thu Nov 9 01:50:04 2006
@@ -36,9 +36,6 @@
{
#endif
-typedef struct sandesha2_seq_mgr sandesha2_seq_mgr_t;
-typedef struct sandesha2_seq_mgr_ops sandesha2_seq_mgr_ops_t;
-
/** @defgroup sandesha2_seq_mgr In Memory Sequence Manager
* @ingroup sandesha2
* @{
@@ -62,13 +59,15 @@
sandesha2_storage_mgr_t *storage_mgr);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_seq_mgr_has_seq_timedout(const axis2_env_t *env,
+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_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_seq_mgr_setup_new_client_seq(const axis2_env_t *env,
+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,
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Thu Nov 9 01:50:04 2006
@@ -45,13 +45,7 @@
* @{
*/
-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{};
+typedef struct sandesha2_storage_mgr_t sandesha2_storage_mgr_t;
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
sandesha2_storage_mgr_create(
@@ -78,7 +72,7 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_free(
- void *storage,
+ sandesha2_storage_mgr_t *storage,
const axis2_env_t *envv);
sandesha2_transaction_t *AXIS2_CALL
Modified: webservices/sandesha/trunk/c/include/sandesha2_transport_sender.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_transport_sender.h?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_transport_sender.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_transport_sender.h Thu Nov 9 01:50:04 2006
@@ -39,7 +39,7 @@
AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL
sandesha2_transport_sender_create(
- const axis2_env_t *env);
+ const axis2_env_t *env);
/** @} */
#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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Thu Nov 9 01:50:04 2006
@@ -247,7 +247,7 @@
env);
SANDESHA2_SEQ_REPORT_SET_INTERNAL_SEQ_ID(seq_report, env, internal_seq_id);
create_seq_find_bean = sandesha2_create_seq_bean_create(env);
- SANDESHA2_CREATE_SEQ_BEAN_SET_INTERNAL_SEQ_ID(create_seq_find_bean,
+ sandesha2_create_seq_bean_set_internal_seq_id(create_seq_find_bean,
env, internal_seq_id);
create_seq_bean = SANDESHA2_CREATE_SEQ_MGR_FIND_UNIQUE(create_seq_mgr, env,
create_seq_find_bean);
@@ -284,7 +284,7 @@
/* returning the current seq report.*/
return seq_report;
}
- out_seq_id = SANDESHA2_CREATE_SEQ_BEAN_GET_SEQ_ID(create_seq_bean, env);
+ out_seq_id = sandesha2_create_seq_bean_get_seq_id(create_seq_bean, env);
if(!out_seq_id)
{
SANDESHA2_SEQ_REPORT_SET_INTERNAL_SEQ_ID(seq_report, env,
@@ -1085,7 +1085,7 @@
rm_ns_value = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_spec_version);
ack_requested = sandesha2_ack_requested_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, out_seq_id);
+ 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 *)
ack_requested, env, dummy_envelope);
@@ -1252,7 +1252,7 @@
rm_ns_value = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_spec_version);
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_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,
env, dummy_envelope);
@@ -1656,7 +1656,7 @@
rm_ns_value = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_spec_version);
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_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 *)
terminate_seq, env, dummy_envelope);
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Thu Nov 9 01:50:04 2006
@@ -270,7 +270,7 @@
env, SANDESHA2_MSG_PART_SEQ);
if(sequence)
{
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ 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(
sequence, env), env);
@@ -419,7 +419,7 @@
sequence = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ);
if(sequence)
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(sequence, env), env);
if(seq_id)
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -157,7 +157,6 @@
axis2_array_list_t *ack_range_list = NULL;
axis2_array_list_t *nack_list = NULL;
axis2_char_t *out_seq_id = NULL;
- sandesha2_fault_mgr_t *fault_mgr = NULL;
sandesha2_msg_ctx_t *fault_msg_ctx = NULL;
axis2_char_t *int_seq_id = NULL;
axis2_property_t *property = NULL;
@@ -201,7 +200,7 @@
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(
+ out_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_ack_get_identifier(seq_ack, env), env);
if(!out_seq_id || 0 == AXIS2_STRLEN(out_seq_id))
{
@@ -210,8 +209,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_SEQ, AXIS2_FAILURE);
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(env,
rm_msg_ctx, out_seq_id, storage_mgr);
if(fault_msg_ctx)
{
@@ -221,8 +219,8 @@
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,
- rm_msg_ctx, storage_mgr);
+ fault_msg_ctx = sandesha2_fault_mgr_check_for_invalid_ack(env, rm_msg_ctx,
+ storage_mgr);
if(fault_msg_ctx)
{
axis2_engine_t *engine = NULL;
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -175,7 +175,7 @@
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
SANDESHA2_ACK_REQUESTED_GET_IDENTIFIER(ack_requested,
env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
@@ -326,7 +326,7 @@
prop_bean = sandesha2_utils_get_property_bean_from_op(env,
AXIS2_MSG_CTX_GET_OP(msg_ctx, env));
- ack_interval = SANDESHA2_PROPERTY_BEAN_GET_ACK_INTERVAL(prop_bean, env);
+ ack_interval = sandesha2_property_bean_get_ack_interval(prop_bean, env);
time_to_send = sandesha2_utils_get_current_time_in_millis(env) +
ack_interval;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -185,7 +185,6 @@
axis2_property_t *property = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
- sandesha2_fault_mgr_t *fault_mgr = NULL;
sandesha2_seq_t *seq = NULL;
axis2_char_t *str_seq_id = NULL;
sandesha2_seq_property_bean_t *msgs_bean = NULL;
@@ -265,9 +264,8 @@
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));
- fault_mgr = sandesha2_fault_mgr_create(env);
fault_ctx = sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
- fault_mgr, env, rm_msg_ctx, storage_mgr);
+ env, rm_msg_ctx, storage_mgr);
if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -286,11 +284,11 @@
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
sandesha2_seq_set_must_understand(seq, env, AXIS2_FALSE);
- str_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ str_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(seq, env), env);
AXIS2_LOG_INFO(env->log, "[sandesha2] str_seq_id :%s.........", str_seq_id);
- fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
- rm_msg_ctx, str_seq_id, storage_mgr);
+ fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,rm_msg_ctx,
+ str_seq_id, storage_mgr);
if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -306,8 +304,8 @@
}
sandesha2_seq_set_must_understand(seq, env, AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
- fault_ctx = sandesha2_fault_mgr_check_for_seq_closed(fault_mgr, env,
- rm_msg_ctx, str_seq_id, storage_mgr);
+ fault_ctx = sandesha2_fault_mgr_check_for_seq_closed(env, rm_msg_ctx,
+ str_seq_id, storage_mgr);
if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -418,7 +416,7 @@
}
storage_map_mgr = sandesha2_storage_mgr_get_storage_map_mgr(
storage_mgr, env);
- in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(
+ in_order_invoke = sandesha2_property_bean_is_in_order(
sandesha2_utils_get_property_bean(env,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env)), env);
if(in_order_invoke)
@@ -477,7 +475,7 @@
msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
msg_no, str_seq_id, AXIS2_FALSE);
- SANDESHA2_INVOKER_MGR_INSERT(storage_map_mgr, env, invoker_bean);
+ sandesha2_invoker_mgr_insert(storage_map_mgr, env, invoker_bean);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
@@ -585,7 +583,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- incoming_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ incoming_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(req_seq, env), env);
if(!incoming_seq_id)
{
@@ -728,7 +726,7 @@
seq = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
- req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ req_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(seq, env), env);
spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
@@ -935,7 +933,7 @@
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(seq, env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx,
env), env);
@@ -1012,13 +1010,13 @@
mgr, env);
retransmitter_man = sandesha2_storage_mgr_get_retrans_mgr
(mgr, env);
- seq_offer = SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq_part, env);
+ seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part, env);
if(NULL != seq_offer)
{
axis2_char_t *seq_offer_id = NULL;
sandesha2_seq_property_bean_t *offer_seq_bean = NULL;
- seq_offer_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_offer_id = sandesha2_identifier_get_identifier(
SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env),
env);
offer_seq_bean = sandesha2_seq_property_bean_create(env);
@@ -1262,7 +1260,7 @@
str_identifier = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(out_seq_bean, env);
identifier = sandesha2_identifier_create(env, rm_ns_val);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, str_identifier);
+ sandesha2_identifier_set_identifier(identifier, env, str_identifier);
sandesha2_seq_set_identifier(seq, env, identifier);
SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
(sandesha2_iom_rm_part_t*)seq);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -138,7 +138,6 @@
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_close_seq_t *close_seq = NULL;
axis2_char_t *seq_id = NULL;
- sandesha2_fault_mgr_t *fault_mgr = NULL;
sandesha2_msg_ctx_t *fault_rm_msg_ctx = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *close_seq_bean = NULL;
@@ -163,11 +162,10 @@
close_seq = (sandesha2_close_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_close_seq_get_identifier(close_seq, env), env);
- fault_mgr = sandesha2_fault_mgr_create(env);
- fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
+ fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,
rm_msg_ctx, seq_id, storage_mgr);
if(NULL != fault_rm_msg_ctx)
{
@@ -235,3 +233,4 @@
return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -152,7 +152,6 @@
sandesha2_create_seq_t *create_seq_part = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
- sandesha2_fault_mgr_t *fault_mgr = NULL;
sandesha2_msg_ctx_t *fault_rm_msg_ctx = NULL;
axis2_msg_ctx_t *out_msg_ctx = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
@@ -191,9 +190,8 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- fault_mgr = sandesha2_fault_mgr_create(env);
fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_create_seq_refused(
- fault_mgr, env, msg_ctx, storage_mgr);
+ env, msg_ctx, storage_mgr);
if(NULL != fault_rm_msg_ctx)
{
axis2_engine_t *engine = NULL;
@@ -224,7 +222,7 @@
create_seq_res_part = (sandesha2_create_seq_res_t*)
SANDESHA2_MSG_CTX_GET_MSG_PART(create_seq_res_msg,
env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
- seq_offer = SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq_part,
+ seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part,
env);
if(NULL != seq_offer)
@@ -234,7 +232,7 @@
axis2_bool_t offer_accepted = AXIS2_FALSE;
- accept = SANDESHA2_CREATE_SEQ_RES_GET_ACCEPT(create_seq_res_part, env);
+ accept = sandesha2_create_seq_res_get_accept(create_seq_res_part, env);
if(NULL == accept)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Accept part "
@@ -243,7 +241,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- offer_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ offer_seq_id = sandesha2_identifier_get_identifier(
SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env), env);
offer_accepted = sandesha2_create_seq_msg_processor_offer_accepted(
env, offer_seq_id, rm_msg_ctx,
@@ -256,13 +254,13 @@
sandesha2_seq_property_bean_t *out_seq_bean = NULL;
create_seq_bean = sandesha2_create_seq_bean_create(env);
- SANDESHA2_CREATE_SEQ_BEAN_SET_SEQ_ID(create_seq_bean, env,
+ sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env,
offer_seq_id);
int_seq_id = sandesha2_utils_get_outgoing_internal_seq_id(env,
new_seq_id);
- SANDESHA2_CREATE_SEQ_BEAN_SET_INTERNAL_SEQ_ID(create_seq_bean, env,
+ sandesha2_create_seq_bean_set_internal_seq_id(create_seq_bean, env,
int_seq_id);
- SANDESHA2_CREATE_SEQ_BEAN_SET_CREATE_SEQ_MSG_ID(create_seq_bean, env,
+ sandesha2_create_seq_bean_set_create_seq_msg_id(create_seq_bean, env,
axis2_uuid_gen(env));
create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(
storage_mgr, env);
@@ -280,12 +278,12 @@
}
else
{
- SANDESHA2_CREATE_SEQ_RES_SET_ACCEPT(create_seq_res_part, env, NULL);
+ sandesha2_create_seq_res_set_accept(create_seq_res_part, env, NULL);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(create_seq_res_msg, env);
}
}
acks_to = SANDESHA2_ADDRESS_GET_EPR(SANDESHA2_ACKS_TO_GET_ADDRESS(
- SANDESHA2_CREATE_SEQ_GET_ACKS_TO(create_seq_part, env),
+ sandesha2_create_seq_get_acks_to(create_seq_part, env),
env), env);
if(NULL == acks_to || NULL == AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to,
env))
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -208,8 +208,8 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- new_out_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_CREATE_SEQ_RES_GET_IDENTIFIER(csr_part, env),
+ new_out_seq_id = sandesha2_identifier_get_identifier(
+ sandesha2_create_seq_res_get_identifier(csr_part, env),
env);
if(NULL == new_out_seq_id)
{
@@ -239,7 +239,7 @@
"entry is not found");
return AXIS2_FAILURE;
}
- int_seq_id = SANDESHA2_CREATE_SEQ_BEAN_GET_INTERNAL_SEQ_ID(create_seq_bean,
+ int_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(create_seq_bean,
env);
if(NULL == int_seq_id)
{
@@ -249,7 +249,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- SANDESHA2_CREATE_SEQ_BEAN_SET_SEQ_ID(create_seq_bean, env, new_out_seq_id);
+ sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env, new_out_seq_id);
SANDESHA2_CREATE_SEQ_MGR_UPDATE(create_seq_mgr, env, create_seq_bean);
create_seq_sender_bean = SANDESHA2_SENDER_MGR_RETRIEVE(retrans_mgr,
@@ -276,7 +276,7 @@
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, out_seq_bean);
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, int_seq_bean);
- accept = SANDESHA2_CREATE_SEQ_RES_GET_ACCEPT(csr_part, env);
+ accept = sandesha2_create_seq_res_get_accept(csr_part, env);
if(NULL != accept)
{
sandesha2_seq_property_bean_t *offerd_seq_bean = NULL;
@@ -394,7 +394,7 @@
return AXIS2_FAILURE;
}
ident = sandesha2_identifier_create(env, assumed_rm_ns);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(ident, env, new_out_seq_id);
+ sandesha2_identifier_set_identifier(ident, env, new_out_seq_id);
sandesha2_seq_set_identifier(seq_part, env, ident);
ack_req_part = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
@@ -403,7 +403,7 @@
{
sandesha2_identifier_t *ident1 = NULL;
ident1 = sandesha2_identifier_create(env, assumed_rm_ns);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(ident1, env, new_out_seq_id);
+ sandesha2_identifier_set_identifier(ident1, env, new_out_seq_id);
SANDESHA2_ACK_REQUESTED_SET_IDENTIFIER(ack_req_part, env, ident1);
}
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(app_rm_msg, env);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Thu Nov 9 01:50:04 2006
@@ -166,7 +166,6 @@
axis2_char_t *seq_id = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_man = NULL;
- sandesha2_fault_mgr_t *fault_mgr = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *term_rcvd_bean = NULL;
@@ -200,7 +199,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(term_seq, env), env);
if(NULL == seq_id || 0 == AXIS2_STRLEN(seq_id))
{
@@ -211,8 +210,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- fault_mgr = sandesha2_fault_mgr_create(env);
- fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(fault_mgr, env,
+ fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,
rm_msg_ctx, seq_id, storage_man);
if(fault_ctx)
{
@@ -512,7 +510,7 @@
}
term_seq_part = (sandesha2_terminate_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
- SANDESHA2_IDENTIFIER_SET_IDENTIFIER(sandesha2_terminate_seq_get_identifier(
+ sandesha2_identifier_set_identifier(sandesha2_terminate_seq_get_identifier(
term_seq_part, env), env, out_seq_id);
SANDESHA2_MSG_CTX_SET_FLOW(rm_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create(env);
Modified: webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c Thu Nov 9 01:50:04 2006
@@ -23,12 +23,9 @@
/*create_seq_bean struct */
-typedef struct sandesha2_create_seq_bean_impl sandesha2_create_seq_bean_impl_t;
-struct sandesha2_create_seq_bean_impl
+struct sandesha2_create_seq_bean_t
{
- sandesha2_create_seq_bean_t o_bean;
-
/* a unique identifier that can be used to identify the messages of a certain seq */
axis2_char_t *internal_seq_id;
@@ -40,48 +37,18 @@
};
-
-#define AXIS2_INTF_TO_IMPL(create_bean) ((sandesha2_create_seq_bean_impl_t*)create_bean)
/* FUNCTION prototypes */
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_bean_free (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
-sandesha2_create_seq_bean_get_create_seq_msg_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_create_seq_bean_set_create_seq_msg_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* seq_msg_id) ;
-
-axis2_char_t* AXIS2_CALL
-sandesha2_create_seq_bean_get_seq_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_create_seq_bean_set_seq_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* seq_id) ;
-
-axis2_char_t* AXIS2_CALL
-sandesha2_create_seq_bean_get_internal_seq_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env);
-
-void AXIS2_CALL
-sandesha2_create_seq_bean_set_internal_seq_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* int_seq_id);
-
-
AXIS2_EXTERN sandesha2_create_seq_bean_t * AXIS2_CALL
-sandesha2_create_seq_bean_create(const axis2_env_t *env )
+sandesha2_create_seq_bean_create(
+ const axis2_env_t *env )
{
- sandesha2_create_seq_bean_impl_t *bean = NULL;
+ sandesha2_create_seq_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean = (sandesha2_create_seq_bean_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_create_seq_bean_impl_t) );
+ bean = (sandesha2_create_seq_bean_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_create_seq_bean_t) );
if (!bean)
{
@@ -94,42 +61,24 @@
bean->create_seq_msg_id = NULL;
bean->seq_id = NULL;
-
- bean->o_bean.ops = NULL;
- bean->o_bean.ops = (sandesha2_create_seq_bean_ops_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_create_seq_bean_ops_t));
-
- if(!bean->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean);
- return NULL;
- }
-
- bean->o_bean.ops->free = sandesha2_create_seq_bean_free;
- bean->o_bean.ops->get_create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id;
- bean->o_bean.ops->set_create_seq_msg_id = sandesha2_create_seq_bean_set_create_seq_msg_id ;
- bean->o_bean.ops->get_seq_id = sandesha2_create_seq_bean_get_seq_id;
- bean->o_bean.ops->set_seq_id = sandesha2_create_seq_bean_set_seq_id;
- bean->o_bean.ops->get_internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id;
- bean->o_bean.ops->set_internal_seq_id = sandesha2_create_seq_bean_set_internal_seq_id;
-
- return &(bean->o_bean);
+ return bean;
}
AXIS2_EXTERN sandesha2_create_seq_bean_t* AXIS2_CALL
-sandesha2_create_seq_bean_create_with_data(const axis2_env_t *env,
- axis2_char_t *internal_seq_id,
- axis2_char_t *create_seq_msg_id,
- axis2_char_t *seq_id)
+sandesha2_create_seq_bean_create_with_data(
+ const axis2_env_t *env,
+ axis2_char_t *internal_seq_id,
+ axis2_char_t *create_seq_msg_id,
+ axis2_char_t *seq_id)
{
- sandesha2_create_seq_bean_impl_t *bean = NULL;
+ sandesha2_create_seq_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- bean = (sandesha2_create_seq_bean_impl_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_create_seq_bean_impl_t));
+ bean = (sandesha2_create_seq_bean_t*) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_create_seq_bean_t));
if (!bean)
{
@@ -142,112 +91,84 @@
bean->create_seq_msg_id = create_seq_msg_id;
bean->seq_id = seq_id;
-
- bean->o_bean.ops = NULL;
- bean->o_bean.ops = (sandesha2_create_seq_bean_ops_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_create_seq_bean_ops_t));
-
- if(!bean->o_bean.ops)
- {
- AXIS2_FREE(env->allocator, bean);
- return NULL;
- }
-
- bean->o_bean.ops->free = sandesha2_create_seq_bean_free;
- bean->o_bean.ops->get_create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id;
- bean->o_bean.ops->set_create_seq_msg_id = sandesha2_create_seq_bean_set_create_seq_msg_id ;
- bean->o_bean.ops->get_seq_id = sandesha2_create_seq_bean_get_seq_id;
- bean->o_bean.ops->set_seq_id = sandesha2_create_seq_bean_set_seq_id;
- bean->o_bean.ops->get_internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id;
- bean->o_bean.ops->set_internal_seq_id = sandesha2_create_seq_bean_set_internal_seq_id;
- bean->o_bean.ops->free = sandesha2_create_seq_bean_free;
- bean->o_bean.ops->free = sandesha2_create_seq_bean_free;
-
- return &(bean->o_bean);
+ return bean;
}
axis2_status_t AXIS2_CALL
-sandesha2_create_seq_bean_free (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env)
+sandesha2_create_seq_bean_free (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
-
- if(bean_impl->internal_seq_id)
+ if(create_seq->internal_seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->internal_seq_id);
- bean_impl->internal_seq_id = NULL;
+ AXIS2_FREE(env->allocator, create_seq->internal_seq_id);
+ create_seq->internal_seq_id = NULL;
}
- if(bean_impl->create_seq_msg_id)
+ if(create_seq->create_seq_msg_id)
{
- AXIS2_FREE(env->allocator, bean_impl->create_seq_msg_id);
- bean_impl->create_seq_msg_id= NULL;
+ AXIS2_FREE(env->allocator, create_seq->create_seq_msg_id);
+ create_seq->create_seq_msg_id= NULL;
}
- if(bean_impl->seq_id)
+ if(create_seq->seq_id)
{
- AXIS2_FREE(env->allocator, bean_impl->seq_id);
- bean_impl->seq_id= NULL;
+ AXIS2_FREE(env->allocator, create_seq->seq_id);
+ create_seq->seq_id= NULL;
}
return AXIS2_SUCCESS;
}
axis2_char_t * AXIS2_CALL
-sandesha2_create_seq_bean_get_create_seq_msg_id( sandesha2_create_seq_bean_t* create_seq,
- const axis2_env_t *env)
+sandesha2_create_seq_bean_get_create_seq_msg_id(
+ sandesha2_create_seq_bean_t* create_seq,
+ const axis2_env_t *env)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
- return bean_impl->create_seq_msg_id;
+ return create_seq->create_seq_msg_id;
}
void AXIS2_CALL
-sandesha2_create_seq_bean_set_create_seq_msg_id (sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t* seq_msg_id)
+sandesha2_create_seq_bean_set_create_seq_msg_id (
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env,
+ axis2_char_t* seq_msg_id)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
- bean_impl->create_seq_msg_id = AXIS2_STRDUP(seq_msg_id, env);
+ create_seq->create_seq_msg_id = AXIS2_STRDUP(seq_msg_id, env);
}
axis2_char_t * AXIS2_CALL
-sandesha2_create_seq_bean_get_seq_id(sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env)
+sandesha2_create_seq_bean_get_seq_id(
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
- return bean_impl->seq_id;
+ return create_seq->seq_id;
}
void AXIS2_CALL
-sandesha2_create_seq_bean_set_seq_id(sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t *seq_id)
+sandesha2_create_seq_bean_set_seq_id(
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env, axis2_char_t *seq_id)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
- bean_impl->seq_id = AXIS2_STRDUP(seq_id, env);
+ create_seq->seq_id = AXIS2_STRDUP(seq_id, env);
}
axis2_char_t * AXIS2_CALL
-sandesha2_create_seq_bean_get_internal_seq_id( sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env)
+sandesha2_create_seq_bean_get_internal_seq_id(
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
- return bean_impl->internal_seq_id;
+ return create_seq->internal_seq_id;
}
void AXIS2_CALL
-sandesha2_create_seq_bean_set_internal_seq_id( sandesha2_create_seq_bean_t *create_seq,
- const axis2_env_t *env, axis2_char_t *int_seq_id)
+sandesha2_create_seq_bean_set_internal_seq_id(
+ sandesha2_create_seq_bean_t *create_seq,
+ const axis2_env_t *env, axis2_char_t *int_seq_id)
{
- sandesha2_create_seq_bean_impl_t *bean_impl = NULL;
- bean_impl = (sandesha2_create_seq_bean_impl_t*)create_seq;
- bean_impl->internal_seq_id = AXIS2_STRDUP(int_seq_id, env);
+ create_seq->internal_seq_id = AXIS2_STRDUP(int_seq_id, env);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org