ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r473292 [1/6] - in /webservices/sandesha/trunk/c: include/ src/client/ src/core/ src/handlers/ src/msgprocessors/ src/storage/beans/ src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
Date Fri, 10 Nov 2006 09:51:10 GMT
Author: damitha
Date: Fri Nov 10 01:51:08 2006
New Revision: 473292

URL: http://svn.apache.org/viewvc?view=rev&rev=473292
Log:
Almost all of the sandesha2 unwanted macros removed. OO code is reduced to minimum

Modified:
    webservices/sandesha/trunk/c/include/sandesha2_ack_final.h
    webservices/sandesha/trunk/c/include/sandesha2_ack_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_ack_none.h
    webservices/sandesha/trunk/c/include/sandesha2_ack_requested.h
    webservices/sandesha/trunk/c/include/sandesha2_acks_to.h
    webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h
    webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h
    webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_sender_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_seq_fault.h
    webservices/sandesha/trunk/c/include/sandesha2_seq_offer.h
    webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h
    webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h
    webservices/sandesha/trunk/c/src/client/client.c
    webservices/sandesha/trunk/c/src/core/msg_validator.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_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/msg_processor_creator.c
    webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
    webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
    webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
    webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
    webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_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_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/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_requested.c
    webservices/sandesha/trunk/c/src/wsrm/acks_to.c
    webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
    webservices/sandesha/trunk/c/src/wsrm/seq_offer.c

Modified: webservices/sandesha/trunk/c/include/sandesha2_ack_final.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_final.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_final.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_final.h Fri Nov 10 01:51:08 2006
@@ -47,8 +47,8 @@
           
 AXIS2_EXTERN sandesha2_ack_final_t* AXIS2_CALL
 sandesha2_ack_final_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_ack_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_mgr.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_mgr.h Fri Nov 10 01:51:08 2006
@@ -38,9 +38,9 @@
 
 AXIS2_EXTERN sandesha2_msg_ctx_t *AXIS2_CALL
 sandesha2_ack_mgr_generate_ack_msg(const axis2_env_t *env,
-                        sandesha2_msg_ctx_t *ref_rm_msg,
-                        axis2_char_t *seq_id,
-                        sandesha2_storage_mgr_t *storage_mgr);
+    sandesha2_msg_ctx_t *ref_rm_msg,
+    axis2_char_t *seq_id,
+    sandesha2_storage_mgr_t *storage_mgr);
 
 /**
  * This is used to get the acked messages of a sequence. If this is an outgoing 
@@ -52,25 +52,27 @@
  */
 AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
 sandesha2_ack_mgr_get_client_completed_msgs_list(
-        const axis2_env_t *env,
-        axis2_char_t *seq_id,
-        sandesha2_seq_property_mgr_t *seq_prop_mgr);
+    const axis2_env_t *env,
+    axis2_char_t *seq_id,
+    sandesha2_seq_property_mgr_t *seq_prop_mgr);
  
 AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
 sandesha2_ack_mgr_get_svr_completed_msgs_list(
-        const axis2_env_t *env,
-        axis2_char_t *seq_id,
-        sandesha2_seq_property_mgr_t *seq_prop_mgr);
+    const axis2_env_t *env,
+    axis2_char_t *seq_id,
+    sandesha2_seq_property_mgr_t *seq_prop_mgr);
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_ack_mgr_verify_seq_completion(const axis2_env_t *env,
-        axis2_array_list_t *ack_ranges,
-        long last_msg_no);
+sandesha2_ack_mgr_verify_seq_completion(
+    const axis2_env_t *env,
+    axis2_array_list_t *ack_ranges,
+    long last_msg_no);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_ack_mgr_piggyback_acks_if_present(const axis2_env_t *env,
-        sandesha2_msg_ctx_t *rm_msg_ctx,
-        sandesha2_storage_mgr_t *storage_mgr);
+sandesha2_ack_mgr_piggyback_acks_if_present(
+    const axis2_env_t *env,
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    sandesha2_storage_mgr_t *storage_mgr);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/sandesha/trunk/c/include/sandesha2_ack_none.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_none.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_none.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_none.h Fri Nov 10 01:51:08 2006
@@ -49,8 +49,8 @@
 };    
 AXIS2_EXTERN sandesha2_ack_none_t * AXIS2_CALL
 sandesha2_ack_none_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_ack_requested.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_requested.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_requested.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_requested.h Fri Nov 10 01:51:08 2006
@@ -37,78 +37,55 @@
  * @{
  */
 
-typedef struct sandesha2_ack_requested_ops sandesha2_ack_requested_ops_t;
 typedef struct sandesha2_ack_requested sandesha2_ack_requested_t;
  
 /**
- * @brief AckRequested ops struct
- * Encapsulator struct for ops of sandesha2_ack_requested
- */
-AXIS2_DECLARE_DATA struct sandesha2_ack_requested_ops
-{
-    sandesha2_identifier_t * (AXIS2_CALL *
-        get_identifier)
-            (sandesha2_ack_requested_t *ack_requested,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_identifier)
-            (sandesha2_ack_requested_t *ack_requested,
-            const axis2_env_t *env, 
-            sandesha2_identifier_t *identifier);
-
-    sandesha2_msg_number_t * (AXIS2_CALL *
-        get_msg_number)
-            (sandesha2_ack_requested_t *ack_requested,
-            const axis2_env_t *env);
-                    	
-    axis2_status_t (AXIS2_CALL *
-        set_msg_number)
-            (sandesha2_ack_requested_t *ack_requested,
-            const axis2_env_t *env, 
-            sandesha2_msg_number_t *msg_number);
-
-    axis2_bool_t (AXIS2_CALL *
-        is_must_understand)
-            (sandesha2_ack_requested_t *ack_requested,
-            const axis2_env_t *env);
-                    	
-    axis2_status_t (AXIS2_CALL *
-        set_must_understand)
-            (sandesha2_ack_requested_t *ack_requested,
-            const axis2_env_t *env, 
-            axis2_bool_t mu);
-};
-
-/**
  * @brief sandesha2_ack_requested
  *    sandesha2_ack_requested
  */
 AXIS2_DECLARE_DATA struct sandesha2_ack_requested
 {
     sandesha2_iom_rm_part_t part;
-    sandesha2_ack_requested_ops_t *ops;
 };
 
 AXIS2_EXTERN sandesha2_ack_requested_t* AXIS2_CALL
 sandesha2_ack_requested_create(
-						const axis2_env_t *env, 
-					    axis2_char_t *ns_value);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_ACK_REQUESTED_SET_IDENTIFIER(ack_requested, env, identifier) \
-    ((ack_requested)->ops->set_identifier (ack_requested, env, identifier))
-#define SANDESHA2_ACK_REQUESTED_GET_IDENTIFIER(ack_requested, env) \
-    ((ack_requested)->ops->get_identifier (ack_requested, env))
-#define SANDESHA2_ACK_REQUESTED_SET_MSG_NUMBER(ack_requested, env, msg_number) \
-    ((ack_requested)->ops->set_msg_number (ack_requested, env, msg_number))
-#define SANDESHA2_ACK_REQUESTED_GET_MSG_NUMBER(ack_requested, env) \
-    ((ack_requested)->ops->get_msg_number (ack_requested, env))
-#define SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env, mu) \
-    ((ack_requested)->ops->set_must_understand (ack_requested, env, mu))
-#define SANDESHA2_ACK_REQUESTED_IS_MUST_UNDERSTAND(ack_requested, env) \
-    ((ack_requested)->ops->is_must_understand (ack_requested, env))
-/************************** End of function macros ****************************/
+    const axis2_env_t *env, 
+    axis2_char_t *ns_value);
+                    	
+sandesha2_identifier_t * AXIS2_CALL
+sandesha2_ack_requested_get_identifier(
+    sandesha2_ack_requested_t *ack_requested,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL                 
+sandesha2_ack_requested_set_identifier(
+    sandesha2_ack_requested_t *ack_requested,
+    const axis2_env_t *env, 
+    sandesha2_identifier_t *identifier);
+
+sandesha2_msg_number_t * AXIS2_CALL                    	
+sandesha2_ack_requested_get_msg_number(
+    sandesha2_ack_requested_t *ack_requested,
+    const axis2_env_t *env);
+                    	
+axis2_status_t AXIS2_CALL
+sandesha2_ack_requested_set_msg_number(
+    sandesha2_ack_requested_t *ack_requested,
+    const axis2_env_t *env, 
+    sandesha2_msg_number_t *msg_number);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_ack_requested_is_must_understand(
+    sandesha2_ack_requested_t *ack_requested,
+    const axis2_env_t *env);
+                    	
+axis2_status_t AXIS2_CALL
+sandesha2_ack_requested_set_must_understand(
+    sandesha2_ack_requested_t *ack_requested,
+    const axis2_env_t *env, 
+    axis2_bool_t mu);
+                    	
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/sandesha/trunk/c/include/sandesha2_acks_to.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_acks_to.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_acks_to.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_acks_to.h Fri Nov 10 01:51:08 2006
@@ -38,51 +38,35 @@
  * @ingroup sandesha2_wsrm
  * @{
  */
-typedef struct sandesha2_acks_to_ops sandesha2_acks_to_ops_t;
 typedef struct sandesha2_acks_to sandesha2_acks_to_t;
 
 /**
- * @brief Acks To ops struct
- * Encapsulator struct for ops of sandesha2_acks_to
- */
-AXIS2_DECLARE_DATA struct sandesha2_acks_to_ops
-{
-    sandesha2_address_t * (AXIS2_CALL *
-        get_address)
-            (sandesha2_acks_to_t *acks_to,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_address)
-            (sandesha2_acks_to_t *acks_to,
-            const axis2_env_t *env, 
-            sandesha2_address_t *address);
-};
-
-/**
  * @brief sandesha2_acks_to
  *    sandesha2_acks_to
  */
 AXIS2_DECLARE_DATA struct sandesha2_acks_to
 {
     sandesha2_iom_rm_element_t element;
-    sandesha2_acks_to_ops_t *ops;
 };
 
 AXIS2_EXTERN sandesha2_acks_to_t * AXIS2_CALL
 sandesha2_acks_to_create(
-						const axis2_env_t *env, 
-                        sandesha2_address_t *address,
-					    axis2_char_t *rm_ns_value, 
-					    axis2_char_t *addr_ns_value);
-
-/************************** Start of function macros **************************/
-#define SANDESHA2_ACKS_TO_GET_ADDRESS(acks_to, env)\
-    ((acks_to)->ops->get_address(acks_to, env))
-#define SANDESHA2_ACKS_TO_SET_ADDRESS(acks_to, env, str_id)\
-    ((acks_to)->ops->set_address(acks_to, env, address))
-/************************** End of function macros ****************************/
-
+    const axis2_env_t *env, 
+    sandesha2_address_t *address,
+    axis2_char_t *rm_ns_value, 
+    axis2_char_t *addr_ns_value);
+
+sandesha2_address_t * AXIS2_CALL
+sandesha2_acks_to_get_address(
+    sandesha2_acks_to_t *acks_to,
+    const axis2_env_t *env);
+                    	
+axis2_status_t AXIS2_CALL 
+sandesha2_acks_to_set_address (
+    sandesha2_acks_to_t *acks_to, 
+    const axis2_env_t *env, 
+    sandesha2_address_t *address);								
+ 
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h Fri Nov 10 01:51:08 2006
@@ -37,61 +37,11 @@
  * @{
  */
  
- typedef struct sandesha2_in_order_invoker_ops sandesha2_in_order_invoker_ops_t;
- typedef struct sandesha2_in_order_invoker sandesha2_in_order_invoker_t;
- /**
- * @brief Sandesha2 InOrder Invoker ops struct
- * Encapsulator struct for ops of sandesha2_in_order_invoker
- */
-AXIS2_DECLARE_DATA struct sandesha2_in_order_invoker_ops
-{
-    
-    axis2_status_t (AXIS2_CALL *
-        stop_invoker_for_seq) 
-            (sandesha2_in_order_invoker_t *invoker,
-            const axis2_env_t *env,
-            axis2_char_t *seq_id);
-            
-    axis2_status_t (AXIS2_CALL *
-        stop_invoking) 
-            (sandesha2_in_order_invoker_t *invoker,
-            const axis2_env_t *env);
-            
-    axis2_bool_t (AXIS2_CALL *
-        is_invoker_started) 
-            (sandesha2_in_order_invoker_t *invoker,
-            const axis2_env_t *env);
-            
-    axis2_status_t (AXIS2_CALL *
-        run_invoker_for_seq) 
-            (sandesha2_in_order_invoker_t *invoker,
-            const axis2_env_t *env,
-            axis2_conf_ctx_t *conf_ctx,
-            axis2_char_t *seq_id);
-            
-    axis2_status_t (AXIS2_CALL *
-        run) 
-            (sandesha2_in_order_invoker_t *invoker,
-            const axis2_env_t *env);
-    
-    axis2_status_t (AXIS2_CALL *
-        free) 
-            (sandesha2_in_order_invoker_t *invoker,
-            const axis2_env_t *env);
-};
-
-/**
- * @brief sandesha2_in_order_invoker_ops
- *    sandesha2_in_order_invoker_ops
- */
-AXIS2_DECLARE_DATA struct sandesha2_in_order_invoker
-{
-    sandesha2_in_order_invoker_ops_t *ops;
-};
+typedef struct sandesha2_in_order_invoker_t sandesha2_in_order_invoker_t;
 
 AXIS2_EXTERN sandesha2_in_order_invoker_t* AXIS2_CALL
 sandesha2_in_order_invoker_create(
-						const axis2_env_t *env);
+    const axis2_env_t *env);
  
 /**
  * Frees the in_order_invoker given as a void pointer. This method would cast the 
@@ -105,27 +55,46 @@
     void *invoker,
     const axis2_env_t *env);
 
-                       
-/************************** Start of function macros **************************/
-#define SANDESHA2_IN_ORDER_INVOKER_FREE(invoker, env) \
-    ((invoker)->ops->free (invoker, env))
-    
-#define SANDESHA2_IN_ORDER_INVOKER_STOP_FOR_SEQ(invoker, env, id) \
-    ((invoker)->ops->stop_invoker_for_seq(invoker, env, id))
-    
-#define SANDESHA2_IN_ORDER_INVOKER_STOP_INVOKING(invoker, env) \
-    ((invoker)->ops->stop_invoking(invoker, env))
-    
-#define SANDESHA2_IN_ORDER_INVOKER_IS_INVOKER_STARTED(invoker, env) \
-    ((invoker)->ops->is_invoker_started(invoker, env))
-    
-#define SANDESHA2_IN_ORDER_INVOKER_RUN_FOR_SEQ(invoker, env, \
-    conf_ctx, id) \
-    ((invoker)->ops->run_invoker_for_seq(invoker, env, conf_ctx, id))
+axis2_status_t AXIS2_CALL 
+sandesha2_in_order_invoker_stop_invoker_for_seq(
+    sandesha2_in_order_invoker_t *invoker, 
+    const axis2_env_t *env, axis2_char_t *seq_id);
+            
+axis2_status_t AXIS2_CALL 
+sandesha2_in_order_invoker_stop_invoking (
+    sandesha2_in_order_invoker_t *invoker,
+    const axis2_env_t *env);
+            
+axis2_bool_t AXIS2_CALL 
+sandesha2_in_order_invoker_is_invoker_started(
+    sandesha2_in_order_invoker_t *invoker, 
+    const axis2_env_t *env);
+            
+axis2_status_t AXIS2_CALL 
+sandesha2_in_order_invoker_run_for_seq(
+    sandesha2_in_order_invoker_t *invoker, 
+    const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx, 
+    axis2_char_t *seq_id);
+            
+axis2_status_t AXIS2_CALL 
+sandesha2_in_order_invoker_run (
+    sandesha2_in_order_invoker_t *invoker,
+    const axis2_env_t *env);
+                        
+axis2_status_t AXIS2_CALL
+sandesha2_in_order_invoker_make_msg_ready_for_reinjection(
+    sandesha2_in_order_invoker_t *invoker, 
+    const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx);
+
+void * AXIS2_THREAD_FUNC
+sandesha2_in_order_invoker_worker_func(
+    axis2_thread_t *thd, void *data);
+
+axis2_status_t AXIS2_CALL 
+sandesha2_in_order_invoker_free(
+    sandesha2_in_order_invoker_t *invoker, 
+    const axis2_env_t *env);								
 
-#define SANDESHA2_IN_ORDER_INVOKER_RUN(invoker, env) \
-    ((invoker)->ops->run(invoker, env))
-/************************** End of function macros ****************************/
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h Fri Nov 10 01:51:08 2006
@@ -41,334 +41,208 @@
  * @{
  */
  
- typedef struct sandesha2_msg_ctx_ops sandesha2_msg_ctx_ops_t;
- typedef struct sandesha2_msg_ctx sandesha2_msg_ctx_t;
- /**
- * @brief Sandesha2 Msg Context ops struct
- * Encapsulator struct for ops of sandesha2_msg_ctx
- */
-AXIS2_DECLARE_DATA struct sandesha2_msg_ctx_ops
-{
-    axis2_status_t (AXIS2_CALL *
-        set_msg_ctx) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_msg_ctx_t *msg_ctx);
-            
-    axis2_msg_ctx_t *(AXIS2_CALL *
-        get_msg_ctx) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-    
-    axis2_status_t (AXIS2_CALL *
-        add_soap_envelope) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-            
-    int (AXIS2_CALL *
-        get_msg_type) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-            
-    axis2_status_t (AXIS2_CALL *
-        set_msg_type) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            int msg_type);
-            
-    axis2_status_t (AXIS2_CALL *
-        set_msg_part) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            int part_id,
-            sandesha2_iom_rm_part_t *part);
-            
-    sandesha2_iom_rm_part_t *(AXIS2_CALL *
-        get_msg_part) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            int part_id);
-    
-    axis2_endpoint_ref_t *(AXIS2_CALL *
-        get_from) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_from) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_endpoint_ref_t *from);
-    
-    axis2_endpoint_ref_t *(AXIS2_CALL *
-        get_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_endpoint_ref_t *to);
-    
-    axis2_endpoint_ref_t *(AXIS2_CALL *
-        get_reply_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_reply_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_endpoint_ref_t *reply_to);
-    
-    axis2_endpoint_ref_t *(AXIS2_CALL *
-        get_fault_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_fault_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_endpoint_ref_t *fault_to);
-    
-    axis2_relates_to_t *(AXIS2_CALL *
-        get_relates_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_relates_to) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_relates_to_t *relates_to);
-    
-    axis2_char_t *(AXIS2_CALL *
-        get_msg_id) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_msg_id) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *msg_id);
-    
-    axiom_soap_envelope_t *(AXIS2_CALL *
-        get_soap_envelope) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_soap_envelope) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axiom_soap_envelope_t *soap_envelope);
-            
-    axis2_char_t *(AXIS2_CALL *
-        get_wsa_action) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_wsa_action) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *action);
-            
-    void *(AXIS2_CALL *
-        get_property) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *key);
-
-    axis2_status_t (AXIS2_CALL *
-        set_property) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *key,
-            void *val);
-    
-    axis2_status_t (AXIS2_CALL *
-        set_soap_action) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *soap_action);
-    
-    axis2_status_t (AXIS2_CALL *
-        set_paused) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_bool_t paused);
-    
-    axis2_char_t *(AXIS2_CALL *
-        get_rm_ns_val) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_rm_ns_val) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *ns_val);
-    
-    axis2_char_t *(AXIS2_CALL *
-        get_addr_ns_val) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_addr_ns_val) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            axis2_char_t *ns_val);
-            
-    int (AXIS2_CALL *
-        get_flow) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_flow) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env,
-            int flow);
-            
-    axis2_char_t *(AXIS2_CALL *
-    get_rm_spec_ver)
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-                        
-    axis2_status_t (AXIS2_CALL *
-        free) 
-            (sandesha2_msg_ctx_t *rm_msg_ctx,
-            const axis2_env_t *env);
-};
-
-/**
- * @brief sandesha2_msg_ctx_ops
- *    sandesha2_msg_ctx_ops
- */
-AXIS2_DECLARE_DATA struct sandesha2_msg_ctx
-{
-    sandesha2_msg_ctx_ops_t *ops;
-};
+typedef struct sandesha2_msg_ctx_t sandesha2_msg_ctx_t;
 
 AXIS2_EXTERN sandesha2_msg_ctx_t* AXIS2_CALL
 sandesha2_msg_ctx_create(
-						const axis2_env_t *env, 
-					    axis2_msg_ctx_t *msg_ctx);
+    const axis2_env_t *env, 
+    axis2_msg_ctx_t *msg_ctx);
+ 
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_msg_ctx(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env, 
+    axis2_msg_ctx_t *msg_ctx);
+            
+axis2_msg_ctx_t *AXIS2_CALL
+sandesha2_msg_ctx_get_msg_ctx(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env);
+    
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_add_soap_envelope(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+        
+int AXIS2_CALL
+sandesha2_msg_ctx_get_msg_type (
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+        
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_msg_type (
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    int msg_type);
+            
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_msg_part (
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    int part_id,
+    sandesha2_iom_rm_part_t *part);
+        
+sandesha2_iom_rm_part_t *AXIS2_CALL
+sandesha2_msg_ctx_get_msg_part(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    int part_id);
+    
+axis2_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_from(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_from(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_endpoint_ref_t *from);
+    
+axis2_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_to (
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env, 
+    axis2_endpoint_ref_t *to);
+    
+axis2_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_reply_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_reply_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_endpoint_ref_t *reply_to);
+    
+axis2_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_fault_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_fault_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_endpoint_ref_t *fault_to);
+    
+axis2_relates_to_t *AXIS2_CALL
+sandesha2_msg_ctx_get_relates_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_relates_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_relates_to_t *relates_to);
+    
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_msg_id(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_msg_id(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env, 
+    axis2_char_t *msg_id);
+    
+axiom_soap_envelope_t *AXIS2_CALL
+sandesha2_msg_ctx_get_soap_envelope(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_soap_envelope(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axiom_soap_envelope_t *soap_envelope);
+            
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_wsa_action(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_wsa_action(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_char_t *action);
+            
+void *AXIS2_CALL
+sandesha2_msg_ctx_get_property(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_char_t *key);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_property(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_char_t *key, 
+    void *val);
+    
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_soap_action(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_char_t *soap_action);
+    
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_paused(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_bool_t paused);
+    
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_rm_ns_val(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_rm_ns_val(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_char_t *ns_val);
+    
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_addr_ns_val(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_addr_ns_val(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    axis2_char_t *ns_val);
+            
+int AXIS2_CALL
+sandesha2_msg_ctx_get_flow(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_flow(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, 
+    int flow);
                         
-/************************** Start of function macros **************************/
-#define SANDESHA2_MSG_CTX_FREE(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->free (rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_SET_MSG_CTX(rm_msg_ctx, env, msg_ctx) \
-    ((rm_msg_ctx)->ops->set_msg_ctx(rm_msg_ctx, env, msg_ctx))
-    
-#define SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_msg_ctx(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->add_soap_envelope(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_SET_MSG_TYPE(rm_msg_ctx, env, msg_type) \
-    ((rm_msg_ctx)->ops->set_msg_type(rm_msg_ctx, env, msg_type))
-    
-#define SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_msg_type(rm_msg_ctx, env))
-
-#define SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, id, part) \
-    ((rm_msg_ctx)->ops->set_msg_part(rm_msg_ctx, env, id, part))
-    
-#define SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env, id) \
-    ((rm_msg_ctx)->ops->get_msg_part(rm_msg_ctx, env, id))
-
-#define SANDESHA2_MSG_CTX_SET_FROM(rm_msg_ctx, env, from) \
-    ((rm_msg_ctx)->ops->set_from(rm_msg_ctx, env, from))
-    
-#define SANDESHA2_MSG_CTX_GET_FROM(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_from(rm_msg_ctx, env))
-
-#define SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, to) \
-    ((rm_msg_ctx)->ops->set_to(rm_msg_ctx, env, to))
-
-#define SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, to) \
-    ((rm_msg_ctx)->ops->set_to(rm_msg_ctx, env, to))
-    
-#define SANDESHA2_MSG_CTX_GET_TO(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_to(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_GET_REPLY_TO(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_reply_to(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_SET_REPLY_TO(rm_msg_ctx, env, reply_to) \
-    ((rm_msg_ctx)->ops->set_reply_to(rm_msg_ctx, env, reply_to))
-
-#define SANDESHA2_MSG_CTX_SET_FAULT_TO(rm_msg_ctx, env, fault_to) \
-    ((rm_msg_ctx)->ops->set_fault_to(rm_msg_ctx, env, fault_to))
-    
-#define SANDESHA2_MSG_CTX_GET_FAULT_TO(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_fault_to(rm_msg_ctx, env))     
-
-#define SANDESHA2_MSG_CTX_SET_RELATES_TO(rm_msg_ctx, env, relates_to) \
-    ((rm_msg_ctx)->ops->set_relates_to(rm_msg_ctx, env, relates_to))
-    
-#define SANDESHA2_MSG_CTX_GET_RELATES_TO(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_relates_to(rm_msg_ctx, env))
-
-#define SANDESHA2_MSG_CTX_SET_MSG_ID(rm_msg_ctx, env, msg_id) \
-    ((rm_msg_ctx)->ops->set_msg_id(rm_msg_ctx, env, msg_id))
-    
-#define SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_msg_id(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx, env, soap_envelope) \
-    ((rm_msg_ctx)->ops->set_soap_envelope(rm_msg_ctx, env, soap_envelope))
-    
-#define SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_soap_envelope(rm_msg_ctx, env))
-
-#define SANDESHA2_MSG_CTX_SET_WSA_ACTION(rm_msg_ctx, env, wsa_action) \
-    ((rm_msg_ctx)->ops->set_wsa_action(rm_msg_ctx, env, wsa_action))
-    
-#define SANDESHA2_MSG_CTX_GET_WSA_ACTION(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_wsa_action(rm_msg_ctx, env))
-
-#define SANDESHA2_MSG_CTX_SET_PROPERTY(rm_msg_ctx, env, key, value) \
-    ((rm_msg_ctx)->ops->set_property(rm_msg_ctx, env, key, value))
-    
-#define SANDESHA2_MSG_CTX_GET_PROPERTY(rm_msg_ctx, env, key) \
-    ((rm_msg_ctx)->ops->get_property(rm_msg_ctx, env, key))
-    
-#define SANDESHA2_MSG_CTX_SET_SOAP_ACTION(rm_msg_ctx, env, soap_action) \
-    ((rm_msg_ctx)->ops->set_soap_action(rm_msg_ctx, env, soap_action))
-    
-#define SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, paused) \
-    ((rm_msg_ctx)->ops->set_paused(rm_msg_ctx, env, paused))
-    
-#define SANDESHA2_MSG_CTX_SET_RM_NS_VAL(rm_msg_ctx, env, ns_val) \
-    ((rm_msg_ctx)->ops->set_rm_ns_val(rm_msg_ctx, env, ns_val))
-    
-#define SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_rm_ns_val(rm_msg_ctx, env))
-
-#define SANDESHA2_MSG_CTX_SET_ADDR_NS_VAL(rm_msg_ctx, env, ns_val) \
-    ((rm_msg_ctx)->ops->set_addr_ns_val(rm_msg_ctx, env, ns_val))
-    
-#define SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_addr_ns_val(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_SET_FLOW(rm_msg_ctx, env, flow) \
-    ((rm_msg_ctx)->ops->set_flow(rm_msg_ctx, env, flow))
-    
-#define SANDESHA2_MSG_CTX_GET_FLOW(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_flow(rm_msg_ctx, env))
-    
-#define SANDESHA2_MSG_CTX_GET_RM_SPEC_VER(rm_msg_ctx, env) \
-    ((rm_msg_ctx)->ops->get_rm_spec_ver(rm_msg_ctx, env))
-/************************** End of function macros ****************************/
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_rm_spec_ver(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env);
+            
+axis2_status_t AXIS2_CALL 
+sandesha2_msg_ctx_free(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env);								
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_next_msg_bean.h Fri Nov 10 01:51:08 2006
@@ -25,61 +25,43 @@
 {
 #endif
 
-typedef struct sandesha2_next_msg_bean sandesha2_next_msg_bean_t;
-typedef struct sandesha2_next_msg_bean_ops sandesha2_next_msg_bean_ops_t;
-
-AXIS2_DECLARE_DATA struct sandesha2_next_msg_bean_ops
-{
-	axis2_status_t (AXIS2_CALL *
-		free) (struct sandesha2_next_msg_bean *next_msg_bean,
-				const axis2_env_t *env);
-
-	axis2_char_t* (AXIS2_CALL *
-		get_seq_id) (struct sandesha2_next_msg_bean *next_msg_bean,
-				const axis2_env_t *env);
-	void (AXIS2_CALL *
-		set_seq_id) (struct sandesha2_next_msg_bean *next_msg_bean,
-				const axis2_env_t *env, axis2_char_t *seq_id);
-
-	long (AXIS2_CALL *
-		get_next_msg_no_to_process) (struct sandesha2_next_msg_bean *next_msg_bean,
-				const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_next_msg_no_to_process) (struct sandesha2_next_msg_bean *next_msg_bean,
-				const axis2_env_t *env, long next_msg_no);
-
-};
-
-AXIS2_DECLARE_DATA struct sandesha2_next_msg_bean{
-	sandesha2_next_msg_bean_ops_t *ops;
-};
-
+typedef struct sandesha2_next_msg_bean_t sandesha2_next_msg_bean_t;
 /* constructors 
  */
 AXIS2_EXTERN sandesha2_next_msg_bean_t* AXIS2_CALL
-	sandesha2_next_msg_bean_create(const axis2_env_t *env);
+	sandesha2_next_msg_bean_create(
+    const axis2_env_t *env);
 
 AXIS2_EXTERN sandesha2_next_msg_bean_t* AXIS2_CALL
-	sandesha2_next_msg_bean_create_with_data(const axis2_env_t *env, 
-			axis2_char_t *seq_id,
-			long msg_no);
-
-#define SANDESHA2_NEXT_MSG_BEAN_FREE(next_msg_bean, env) \
-	(next_msg_bean)->ops->free(next_msg_bean, env)
-
-#define SANDESHA2_NEXT_MSG_BEAN_GET_SEQ_ID(next_msg_bean, env) \
-	(next_msg_bean)->ops->get_seq_id(next_msg_bean, env)
-
-#define SANDESHA2_NEXT_MSG_BEAN_SET_SEQ_ID(next_msg_bean, env, seq_id) \
-	(next_msg_bean)->ops->set_seq_id(next_msg_bean, env, seq_id)
-
-#define SANDESHA2_NEXT_MSG_BEAN_GET_NEXT_MSG_NO_TO_PROCESS(next_msg_bean, env) \
-	(next_msg_bean)->ops->get_next_msg_no_to_process(next_msg_bean, env)
-
-#define SANDESHA2_NEXT_MSG_BEAN_SET_NEXT_MSG_NO_TO_PROCESS(next_msg_bean, env, seq_no) \
-	(next_msg_bean)->ops->set_next_msg_no_to_process(next_msg_bean, env, seq_no)
-
+sandesha2_next_msg_bean_create_with_data(
+    const axis2_env_t *env, 
+    axis2_char_t *seq_id,
+    long msg_no);
+
+axis2_status_t AXIS2_CALL
+sandesha2_next_msg_bean_free (
+     sandesha2_next_msg_bean_t *next_msg_bean,
+     const axis2_env_t *env);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_next_msg_bean_get_seq_id(
+    sandesha2_next_msg_bean_t *next_msg_bean,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_next_msg_bean_set_seq_id(
+    sandesha2_next_msg_bean_t *next_msg_bean,
+    const axis2_env_t *env, axis2_char_t *seq_id);
+
+long AXIS2_CALL
+sandesha2_next_msg_bean_get_next_msg_no_to_process(
+    sandesha2_next_msg_bean_t *next_msg_bean,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_next_msg_bean_set_next_msg_no_to_process(
+    sandesha2_next_msg_bean_t *next_msg_bean,
+    const axis2_env_t *env, long next_msg_no);
 
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h Fri Nov 10 01:51:08 2006
@@ -36,108 +36,58 @@
 {
 #endif
 
-typedef struct sandesha2_next_msg_mgr sandesha2_next_msg_mgr_t;
-typedef struct sandesha2_next_msg_mgr_ops sandesha2_next_msg_mgr_ops_t;
-
-/** @defgroup sandesha2_next_msg_mgr In Memory Next Message Manager
-  * @ingroup sandesha2
-  * @{
-  */
-
-struct sandesha2_next_msg_mgr_ops
-{
-   /** 
-     * Deallocate memory
-     * @return status code
-     */
-    axis2_status_t (AXIS2_CALL *
-    free) (
-            void *next_msg,
-            const axis2_env_t *env);
-     
-    axis2_bool_t (AXIS2_CALL *
-    insert) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env,
-            sandesha2_next_msg_bean_t *bean);
-
-    axis2_bool_t (AXIS2_CALL *
-    remove) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env,
-            axis2_char_t *msg_id);
-
-    sandesha2_next_msg_bean_t *(AXIS2_CALL *
-    retrieve) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env,
-            axis2_char_t *msg_id);
-
-    axis2_bool_t (AXIS2_CALL *
-    update) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env,
-            sandesha2_next_msg_bean_t *bean);
-
-    axis2_array_list_t *(AXIS2_CALL *
-    find) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env,
-            sandesha2_next_msg_bean_t *bean);
-
-    sandesha2_next_msg_bean_t *(AXIS2_CALL *
-    find_unique) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env,
-            sandesha2_next_msg_bean_t *bean);
-
-    axis2_array_list_t *(AXIS2_CALL *
-    retrieve_all) (
-            sandesha2_next_msg_mgr_t *next_msg,
-            const axis2_env_t *env);
-};
-
-struct sandesha2_next_msg_mgr
-{
-    sandesha2_next_msg_mgr_ops_t *ops;
-};
+typedef struct sandesha2_next_msg_mgr_t sandesha2_next_msg_mgr_t;
 
 AXIS2_EXTERN sandesha2_next_msg_mgr_t * AXIS2_CALL
 sandesha2_next_msg_mgr_create(
-        const axis2_env_t *env,
-        axis2_ctx_t *ctx);
-
-#define SANDESHA2_NEXT_MSG_MGR_FREE(next_msg, env) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->free (next_msg, env))
-
-#define SANDESHA2_NEXT_MSG_MGR_INSERT(next_msg, env, bean) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       insert (next_msg, env, bean))
-
-#define SANDESHA2_NEXT_MSG_MGR_REMOVE(next_msg, env, msg_id) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       remove (next_msg, env, msg_id))
-
-#define SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_msg, env, msg_id) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       retrieve (next_msg, env, msg_id))
-
-#define SANDESHA2_NEXT_MSG_MGR_UPDATE(next_msg, env, bean) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       update (next_msg, env, bean))
-
-#define SANDESHA2_NEXT_MSG_MGR_FIND(next_msg, env, bean) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       find (next_msg, env, bean))
-
-#define SANDESHA2_NEXT_MSG_MGR_FIND_UNIQUE(next_msg, env, bean) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       find_unique (next_msg, env, bean))
-
-#define SANDESHA2_NEXT_MSG_MGR_RETRIEVE_ALL(next_msg, env) \
-      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
-       retrieve_all (next_msg, env))
+    const axis2_env_t *env,
+    axis2_ctx_t *ctx);
 
+axis2_status_t AXIS2_CALL 
+sandesha2_next_msg_mgr_free(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_next_msg_mgr_insert(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env,
+    sandesha2_next_msg_bean_t *bean);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_next_msg_mgr_remove(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env,
+    axis2_char_t *seq_id);
+
+sandesha2_next_msg_bean_t *AXIS2_CALL
+sandesha2_next_msg_mgr_retrieve(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env,
+    axis2_char_t *seq_id);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_next_msg_mgr_update(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env,
+    sandesha2_next_msg_bean_t *bean);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_next_msg_mgr_find(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env,
+    sandesha2_next_msg_bean_t *bean);
+
+sandesha2_next_msg_bean_t *AXIS2_CALL
+sandesha2_next_msg_mgr_find_unique(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env,
+    sandesha2_next_msg_bean_t *bean);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_next_msg_mgr_retrieve_all(
+    sandesha2_next_msg_mgr_t *next_msg,
+    const axis2_env_t *env);
 
 
 /** @} */

Modified: webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sender_bean.h Fri Nov 10 01:51:08 2006
@@ -25,192 +25,139 @@
 {
 #endif
 
-typedef struct sandesha2_sender_bean sandesha2_sender_bean_t;
-typedef struct sandesha2_sender_bean_ops sandesha2_sender_bean_ops_t;
-
-AXIS2_DECLARE_DATA struct sandesha2_sender_bean_ops
-{
-	axis2_status_t (AXIS2_CALL *
-		free) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	axis2_char_t *(AXIS2_CALL *
-		get_msg_context_ref_key) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_msg_context_ref_key) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env, 
-			axis2_char_t *ref_key);
-
-	axis2_char_t *(AXIS2_CALL *
-		get_msg_id) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_msg_id) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env, 
-			axis2_char_t *msg_id);
-
-	axis2_bool_t (AXIS2_CALL *
-		is_send) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_send) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env, 
-			axis2_bool_t send);	
-
-	axis2_char_t *(AXIS2_CALL *
-		get_internal_seq_id) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_internal_seq_id) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env, 
-			axis2_char_t *int_seq_id);
-
-	int (AXIS2_CALL *
-		get_sent_count) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_sent_count) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env, 
-			int sent_count);
-
-	long (AXIS2_CALL *
-		get_msg_no) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_msg_no) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env, 
-			long msg_no);
-
-	axis2_bool_t (AXIS2_CALL *
-		is_resend) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);	
-
-	void (AXIS2_CALL *
-		set_resend) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env,
-			axis2_bool_t resend);
-
-	long (AXIS2_CALL *
-		get_time_to_send) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_time_to_send) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env,
-			long time_to_send);
-
-	int (AXIS2_CALL *
-		get_msg_type) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void(AXIS2_CALL *
-		set_msg_type) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env,
-			int msg_type);
-
-	axis2_char_t *(AXIS2_CALL *
-		get_seq_id)(sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_seq_id) (sandesha2_sender_bean_t *sender,
-			const axis2_env_t *env,
-			axis2_char_t *seq_id);
-
-};
-
-AXIS2_DECLARE_DATA struct sandesha2_sender_bean{
-	sandesha2_sender_bean_ops_t *ops;
-};
+typedef struct sandesha2_sender_bean_t sandesha2_sender_bean_t;
 
 /* constructors 
  */
 AXIS2_EXTERN sandesha2_sender_bean_t* AXIS2_CALL
-	sandesha2_sender_bean_create(const axis2_env_t *env);
+sandesha2_sender_bean_create(
+    const axis2_env_t *env);
 
 AXIS2_EXTERN sandesha2_sender_bean_t* AXIS2_CALL
-	sandesha2_sender_bean_create_with_data(const axis2_env_t *env,
-			axis2_char_t *msg_id,
-			axis2_char_t *key,
-			axis2_bool_t send,
-			long	time_to_send,
-			axis2_char_t *int_seq_id,
-			long msg_no);
-
-
-#define SANDESHA2_SENDER_BEAN_FREE(sender_bean, env) \
-	((sender_bean)->ops->free(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(sender, env) \
-      (((sandesha2_sender_bean_t *) sender)->ops->\
-       get_msg_context_ref_key (sender, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(sender_bean, env, ref_key) \
-	((sender_bean)->ops->set_msg_context_ref_key(sender_bean, env, ref_key))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_MSG_ID(sender, env) \
-	(((sandesha2_sender_bean_t *)sender)->ops->\
-     get_msg_id(sender, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_MSG_ID(sender_bean, env, msg_id) \
-	((sender_bean)->ops->set_msg_id(sender_bean, env, msg_id))
-	 
-#define SANDESHA2_SENDER_BEAN_IS_SEND(sender_bean, env) \
-	((sender_bean)->ops->is_send(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_SEND(sender_bean, env, send) \
-	((sender_bean)->ops->set_send(sender_bean, env, send))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_INTERNAL_SEQ_ID(sender, env) \
-      (((sandesha2_sender_bean_t *) sender)->ops->\
-       get_internal_seq_id (sender, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(sender_bean, env, int_seq_id) \
-	((sender_bean)->ops->set_internal_seq_id(sender_bean, env, int_seq_id))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_SENT_COUNT(sender_bean, env) \
-	((sender_bean)->ops->get_sent_count(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_SENT_COUNT(sender_bean, env, sent_count) \
-	((sender_bean)->ops->set_sent_count(sender_bean, env, sent_count))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_MSG_NO(sender_bean, env) \
-	((sender_bean)->ops->get_msg_no(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_MSG_NO(sender_bean, env, msg_no) \
-	((sender_bean)->ops->set_msg_no(sender_bean, env, msg_no))
-	 
-#define SANDESHA2_SENDER_BEAN_IS_RESEND(sender_bean, env) \
-	((sender_bean)->ops->is_resend(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_RESEND(sender_bean, env, resend) \
-	((sender_bean)->ops->set_resend(sender_bean, env, resend))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(sender_bean, env) \
-	((sender_bean)->ops->get_time_to_send(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(sender_bean, env, time_to_send) \
-	((sender_bean)->ops->set_time_to_send(sender_bean, env, time_to_send))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_MSG_TYPE(sender_bean, env) \
-	((sender_bean)->ops->get_msg_type(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(sender_bean, env, msg_type) \
-	((sender_bean)->ops->set_msg_type(sender_bean, env, msg_type))
-	 
-#define SANDESHA2_SENDER_BEAN_GET_SEQ_ID(sender_bean, env) \
-	((sender_bean)->ops->get_seq_id(sender_bean, env))
-	 
-#define SANDESHA2_SENDER_BEAN_SET_SEQ_ID(sender_bean, env, seq_id) \
-	((sender_bean)->ops->set_seq_id(sender_bean, env, seq_id))
-	 
+sandesha2_sender_bean_create_with_data(
+    const axis2_env_t *env,
+    axis2_char_t *msg_id,
+    axis2_char_t *key,
+    axis2_bool_t send,
+    long	time_to_send,
+    axis2_char_t *int_seq_id,
+    long msg_no);
+
+axis2_status_t AXIS2_CALL
+sandesha2_sender_bean_free (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_sender_bean_get_msg_ctx_ref_key (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_msg_ctx_ref_key (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    axis2_char_t *ref_key);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_sender_bean_get_msg_id (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL 
+sandesha2_sender_bean_set_msg_id (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+axis2_char_t *msg_id);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_sender_bean_is_send (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL 
+sandesha2_sender_bean_set_send (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+axis2_bool_t send);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_sender_bean_get_internal_seq_id (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL 
+sandesha2_sender_bean_set_internal_seq_id (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    axis2_char_t *int_seq_id);
+
+int AXIS2_CALL 
+sandesha2_sender_bean_get_sent_count (
+    sandesha2_sender_bean_t *sender,
+	const axis2_env_t *env);
+
+void AXIS2_CALL 
+sandesha2_sender_bean_set_sent_count (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    int sent_count);
+
+long AXIS2_CALL
+sandesha2_sender_bean_get_msg_no (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_msg_no (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    long msg_no);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_sender_bean_is_resend (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_resend (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    axis2_bool_t resend);
+
+long AXIS2_CALL
+sandesha2_sender_bean_get_time_to_send (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_time_to_send (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    long time_to_send);
+
+int AXIS2_CALL
+sandesha2_sender_bean_get_msg_type (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_msg_type (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    int msg_type);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_sender_bean_get_seq_id(
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_seq_id (
+    sandesha2_sender_bean_t *sender,
+    const axis2_env_t *env,
+    axis2_char_t *seq_id);
+
 
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/include/sandesha2_sender_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sender_mgr.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_sender_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sender_mgr.h Fri Nov 10 01:51:08 2006
@@ -36,128 +36,79 @@
 {
 #endif
 
-typedef struct sandesha2_sender_mgr sandesha2_sender_mgr_t;
-typedef struct sandesha2_sender_mgr_ops sandesha2_sender_mgr_ops_t;
-
-/** @defgroup sandesha2_sender_mgr In Memory Sender Manager
-  * @ingroup sandesha2
-  * @{
-  */
-
-struct sandesha2_sender_mgr_ops
-{
-   /** 
-     * Deallocate memory
-     * @return status code
-     */
-    axis2_status_t (AXIS2_CALL *
-    free) (
-            void *sender,
-            const axis2_env_t *env);
-     
-    axis2_bool_t (AXIS2_CALL *
-    insert) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            sandesha2_sender_bean_t *bean);
-
-    axis2_bool_t (AXIS2_CALL *
-    remove) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            const axis2_char_t *msg_id);
-
-    sandesha2_sender_bean_t *(AXIS2_CALL *
-    retrieve) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            const axis2_char_t *msg_id);
-
-    axis2_bool_t (AXIS2_CALL *
-    update) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            sandesha2_sender_bean_t *bean);
-
-    axis2_array_list_t *(AXIS2_CALL *
-    find_by_internal_seq_id) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            axis2_char_t *internal_seq_id);
-
-    axis2_array_list_t *(AXIS2_CALL *
-    find_by_sender_bean) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            sandesha2_sender_bean_t *bean);
-
-    sandesha2_sender_bean_t *(AXIS2_CALL *
-    find_unique) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            sandesha2_sender_bean_t *bean);
-
-    sandesha2_sender_bean_t *(AXIS2_CALL *
-    get_next_msg_to_send) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env);
-
-    sandesha2_sender_bean_t *(AXIS2_CALL *
-    retrieve_from_msg_ref_key) (
-            sandesha2_sender_mgr_t *sender,
-            const axis2_env_t *env,
-            axis2_char_t *msg_ctx_ref_key);
-};
-
-struct sandesha2_sender_mgr
-{
-    sandesha2_sender_mgr_ops_t *ops;
-};
+typedef struct sandesha2_sender_mgr_t sandesha2_sender_mgr_t;
 
 AXIS2_EXTERN sandesha2_sender_mgr_t * AXIS2_CALL
 sandesha2_sender_mgr_create(
-        const axis2_env_t *env,
-        axis2_ctx_t *ctx);
-
-#define SANDESHA2_SENDER_MGR_FREE(sender, env) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->free (sender, env))
-
-#define SANDESHA2_SENDER_MGR_INSERT(sender, env, bean) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       insert (sender, env, bean))
-
-#define SANDESHA2_SENDER_MGR_REMOVE(sender, env, msg_id) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       remove (sender, env, msg_id))
-
-#define SANDESHA2_SENDER_MGR_RETRIEVE(sender, env, msg_id) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       retrieve (sender, env, msg_id))
-
-#define SANDESHA2_SENDER_MGR_UPDATE(sender, env, bean) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       update (sender, env, bean))
-
-#define SANDESHA2_SENDER_MGR_FIND_BY_INTERNAL_SEQ_ID(sender, env, internal_seq_id) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       find_by_internal_seq_id (sender, env, internal_seq_id))
-
-#define SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(sender, env, bean) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       find_by_sender_bean (sender, env, bean))
-
-#define SANDESHA2_SENDER_MGR_FIND_UNIQUE(sender, env, bean) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       find_unique (sender, env, bean))
-
-#define SANDESHA2_SENDER_MGR_GET_NEXT_MSG_TO_SEND(sender, env) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       get_next_msg_to_send (sender, env))
-
-#define SANDESHA2_SENDER_MGR_RETRIEVE_FROM_MSG_REF_KEY(sender, env, ref_key) \
-      (((sandesha2_sender_mgr_t *) sender)->ops->\
-       retrieve_from_msg_ref_key (sender, env, ref_key))
+    const axis2_env_t *env,
+    axis2_ctx_t *ctx);
 
+axis2_status_t AXIS2_CALL 
+sandesha2_sender_mgr_free(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *envv);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_sender_mgr_insert(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    sandesha2_sender_bean_t *bean);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_sender_mgr_remove(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    const axis2_char_t *msg_id);
+
+sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_sender_mgr_retrieve(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    const axis2_char_t *msg_id);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_sender_mgr_update(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    sandesha2_sender_bean_t *bean);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_sender_mgr_find_by_internal_seq_id(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    axis2_char_t *internal_seq_id);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_sender_mgr_find_by_sender_bean(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    sandesha2_sender_bean_t *bean);
+
+sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_sender_mgr_find_unique(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    sandesha2_sender_bean_t *bean);
+
+sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_sender_mgr_get_next_msg_to_send(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env);
+
+sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_sender_mgr_retrieve_from_msg_ref_key(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    axis2_char_t *msg_ctx_ref_key);
+
+/*
+static axis2_array_list_t *
+sandesha2_sender_mgr_find_beans_with_msg_no(
+    sandesha2_sender_mgr_t *sender,
+    const axis2_env_t *env,
+    axis2_array_list_t *list,
+    long msg_no);
+*/
 
 
 /** @} */

Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_fault.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_fault.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_fault.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_fault.h Fri Nov 10 01:51:08 2006
@@ -39,48 +39,34 @@
  * @{
  */
     
-typedef struct sandesha2_seq_fault_ops sandesha2_seq_fault_ops_t;
 typedef struct sandesha2_seq_fault sandesha2_seq_fault_t;
  
 /**
- * @brief Sequence Fault ops struct
- * Encapsulator struct for ops of sandesha2_seq_fault
- */
-AXIS2_DECLARE_DATA struct sandesha2_seq_fault_ops
-{
-    sandesha2_fault_code_t* (AXIS2_CALL *
-        get_fault_code)
-            (sandesha2_seq_fault_t *seq_fault,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_fault_code)
-            (sandesha2_seq_fault_t *seq_fault,
-            const axis2_env_t *env, 
-            sandesha2_fault_code_t *fault_code);
-};
-
-/**
  * @brief sandesha2_seq_fault
  *    sandesha2_seq_fault
  */
 AXIS2_DECLARE_DATA struct sandesha2_seq_fault
 {
     sandesha2_iom_rm_element_t element;
-    sandesha2_seq_fault_ops_t *ops;
 };
     
 AXIS2_EXTERN sandesha2_seq_fault_t* AXIS2_CALL
 sandesha2_seq_fault_create(
-						const axis2_env_t *env, 
-					    axis2_char_t *ns_value);
+    const axis2_env_t *env, 
+    axis2_char_t *ns_value);
+
+sandesha2_fault_code_t * AXIS2_CALL
+sandesha2_seq_fault_get_fault_code(
+    sandesha2_seq_fault_t *seq_fault,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL                 
+sandesha2_seq_fault_set_fault_code(
+    sandesha2_seq_fault_t *seq_fault,
+    const axis2_env_t *env, 
+    sandesha2_fault_code_t *fault_code);
+
 
-/************************** Start of function macros **************************/
-#define SANDESHA2_SEQ_FAULT_SET_FAULT_CODE(seq_fault, env, fault_code) \
-    ((seq_fault)->ops->set_fault_code (seq_fault, env, fault_code))
-#define SANDESHA2_SEQ_FAULT_GET_FAULT_CODE(seq_fault, env) \
-    ((seq_fault)->ops->get_fault_code (seq_fault, env))
-/************************** End of function macros ****************************/
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_offer.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_offer.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_offer.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_offer.h Fri Nov 10 01:51:08 2006
@@ -37,63 +37,43 @@
  * @{
  */
     
-typedef struct sandesha2_seq_offer_ops sandesha2_seq_offer_ops_t;
 typedef struct sandesha2_seq_offer sandesha2_seq_offer_t;
  
 /**
- * @brief SequenceOffer ops struct
- * Encapsulator struct for ops of sandesha2_seq_offer
- */
-AXIS2_DECLARE_DATA struct sandesha2_seq_offer_ops
-{
-    sandesha2_identifier_t * (AXIS2_CALL *
-        get_identifier)
-            (sandesha2_seq_offer_t *seq_offer,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_identifier)
-            (sandesha2_seq_offer_t *seq_offer,
-            const axis2_env_t *env, 
-            sandesha2_identifier_t *identifier);
-            
-    sandesha2_expires_t * (AXIS2_CALL *
-        get_expires)
-            (sandesha2_seq_offer_t *element,
-            const axis2_env_t *env);
-                    	
-    axis2_status_t (AXIS2_CALL *
-        set_expires)
-            (sandesha2_seq_offer_t *element,
-            const axis2_env_t *env, 
-            sandesha2_expires_t *expires);
-};
-
-/**
  * @brief sandesha2_seq_offer
  *    sandesha2_seq_offer
  */
 AXIS2_DECLARE_DATA struct sandesha2_seq_offer
 {
     sandesha2_iom_rm_element_t element;
-    sandesha2_seq_offer_ops_t *ops;
 };
 
 AXIS2_EXTERN sandesha2_seq_offer_t* AXIS2_CALL
 sandesha2_seq_offer_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_offer_get_identifier(
+    sandesha2_seq_offer_t *seq_offer,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL                 
+sandesha2_seq_offer_set_identifier(
+    sandesha2_seq_offer_t *seq_offer,
+    const axis2_env_t *env, 
+    sandesha2_identifier_t *identifier);
 
-/************************** Start of function macros **************************/
-#define SANDESHA2_SEQ_OFFER_SET_IDENTIFIER(seq_offer, env, identifier) \
-    ((seq_offer)->ops->set_identifier (seq_offer, env, identifier))
-#define SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env) \
-    ((seq_offer)->ops->get_identifier (seq_offer, env))
-#define SANDESHA2_SEQ_OFFER_SET_EXPIRES(seq_offer, env, expires) \
-    ((seq_offer)->ops->set_expires (seq_offer, env, expires))
-#define SANDESHA2_SEQ_OFFER_GET_EXPIRES(seq_offer, env) \
-    ((seq_offer)->ops->get_expires (seq_offer, env))
-/************************** End of function macros ****************************/
+sandesha2_expires_t * AXIS2_CALL                    	
+sandesha2_seq_offer_get_expires(
+    sandesha2_seq_offer_t *seq_offer,
+    const axis2_env_t *env);
+                    	
+axis2_status_t AXIS2_CALL
+sandesha2_seq_offer_set_expires(
+    sandesha2_seq_offer_t *seq_offer,
+    const axis2_env_t *env, sandesha2_expires_t *expires);
+ 
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_property_bean.h Fri Nov 10 01:51:08 2006
@@ -25,81 +25,59 @@
 {
 #endif
 
-typedef struct sandesha2_seq_property_bean sandesha2_seq_property_bean_t ;
-typedef struct sandesha2_seq_property_bean_ops sandesha2_seq_property_bean_ops_t;
-
-AXIS2_DECLARE_DATA struct sandesha2_seq_property_bean_ops
-{
-	axis2_status_t (AXIS2_CALL *
-		free) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env);
-	
-	axis2_char_t *(AXIS2_CALL *
-		get_name) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_name) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env,
-			axis2_char_t *name);
-
-	axis2_char_t *(AXIS2_CALL *
-		get_seq_id) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_seq_id) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env,
-			axis2_char_t *seq_id);
-	
-	axis2_char_t *(AXIS2_CALL *
-		get_value) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env);
-
-	void (AXIS2_CALL *
-		set_value) (struct sandesha2_seq_property_bean *seq_property,
-			const axis2_env_t *env,
-			axis2_char_t *value);
-
-};
-
-AXIS2_DECLARE_DATA struct sandesha2_seq_property_bean{
-	sandesha2_seq_property_bean_ops_t *ops;
-};
+typedef struct sandesha2_seq_property_bean_t sandesha2_seq_property_bean_t ;
 
 /* constructors 
  */
 
 AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
-	sandesha2_seq_property_bean_create(const axis2_env_t *env);
+sandesha2_seq_property_bean_create(
+    const axis2_env_t *env);
 
 AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
-	sandesha2_seq_property_bean_create_with_data(const axis2_env_t *env,
-			axis2_char_t *seq_id,
-			axis2_char_t *prop_name,
-			axis2_char_t *value);
-
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_FREE(seq_prop_bean, env) \
-	((seq_prop_bean)->ops->free(seq_prop_bean, env))
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_GET_NAME(seq_prop_bean, env) \
-	((seq_prop_bean)->ops->get_name(seq_prop_bean, env))
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(seq_prop_bean, env, name) \
-	((seq_prop_bean)->ops->set_name(seq_prop_bean, env, name))
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(seq_prop_bean, env) \
-	((seq_prop_bean)->ops->get_seq_id(seq_prop_bean, env))
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(seq_prop_bean, env, seq_id) \
-	((seq_prop_bean)->ops->set_seq_id(seq_prop_bean, env, seq_id))
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_prop_bean, env) \
-	((seq_prop_bean)->ops->get_value(seq_prop_bean, env))
-
-#define SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(seq_prop_bean, env, value) \
-	((seq_prop_bean)->ops->set_value(seq_prop_bean, env, value))
+sandesha2_seq_property_bean_create_with_data(
+    const axis2_env_t *env,
+    axis2_char_t *seq_id,
+    axis2_char_t *prop_name,
+    axis2_char_t *value);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_property_bean_free (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_seq_property_bean_get_name (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env);
+
+void AXIS2_CALL 
+sandesha2_seq_property_bean_set_name (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env,
+    axis2_char_t *name);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_seq_property_bean_get_seq_id (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_seq_property_bean_set_seq_id (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env,
+    axis2_char_t *seq_id);
+
+axis2_char_t* AXIS2_CALL
+sandesha2_seq_property_bean_get_value (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_seq_property_bean_set_value (
+    sandesha2_seq_property_bean_t *seq_property,
+    const axis2_env_t *env,
+    axis2_char_t *value);
 
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h Fri Nov 10 01:51:08 2006
@@ -36,120 +36,66 @@
 {
 #endif
 
-typedef struct sandesha2_seq_property_mgr sandesha2_seq_property_mgr_t;
-typedef struct sandesha2_seq_property_mgr_ops sandesha2_seq_property_mgr_ops_t;
-
-/** @defgroup sandesha2_seq_property_mgr In Memory Sequence Property Manager
-  * @ingroup sandesha2
-  * @{
-  */
-
-struct sandesha2_seq_property_mgr_ops
-{
-   /** 
-     * Deallocate memory
-     * @return status code
-     */
-    axis2_status_t (AXIS2_CALL *
-    free) (
-            void *seq_property,
-            const axis2_env_t *env);
-     
-    axis2_bool_t (AXIS2_CALL *
-    insert) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            sandesha2_seq_property_bean_t *bean);
-
-    axis2_bool_t (AXIS2_CALL *
-    remove) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            axis2_char_t *seq_id,
-            axis2_char_t *name);
-
-    sandesha2_seq_property_bean_t *(AXIS2_CALL *
-    retrieve) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            axis2_char_t *seq_id,
-            axis2_char_t *name);
-
-    axis2_bool_t (AXIS2_CALL *
-    update) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            sandesha2_seq_property_bean_t *bean);
-
-    axis2_array_list_t *(AXIS2_CALL *
-    find) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            sandesha2_seq_property_bean_t *bean);
-
-    sandesha2_seq_property_bean_t *(AXIS2_CALL *
-    find_unique) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            sandesha2_seq_property_bean_t *bean);
-
-    axis2_array_list_t *(AXIS2_CALL *
-    retrieve_all) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env);
-
-    axis2_bool_t (AXIS2_CALL *
-    update_or_insert) (
-            sandesha2_seq_property_mgr_t *seq_property,
-            const axis2_env_t *env,
-            sandesha2_seq_property_bean_t *bean);
-};
-
-struct sandesha2_seq_property_mgr
-{
-    sandesha2_seq_property_mgr_ops_t *ops;
-};
+typedef struct sandesha2_seq_property_mgr_t sandesha2_seq_property_mgr_t;
 
 AXIS2_EXTERN sandesha2_seq_property_mgr_t * AXIS2_CALL
 sandesha2_seq_property_mgr_create(
-        const axis2_env_t *env,
-        axis2_ctx_t *ctx);
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_FREE(seq_property, env) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->free (seq_property, env))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_property, env, bean) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       insert (seq_property, env, bean))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_REMOVE(seq_property, env, seq_id, name) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       remove (seq_property, env, seq_id, name))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_property, env, seq_id, name) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       retrieve (seq_property, env, seq_id, name))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_property, env, bean) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       update (seq_property, env, bean))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_FIND(seq_property, env, bean) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       find (seq_property, env, bean))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_FIND_UNIQUE(seq_property, env, bean) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       find_unique (seq_property, env, bean))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_UPDATE_OR_INSERT(seq_property, env, bean) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       update_or_insert (seq_property, env, bean))
-
-#define SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE_ALL(seq_property, env) \
-      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
-       retrieve_all (seq_property, env))
+    const axis2_env_t *env,
+    axis2_ctx_t *ctx);
 
+axis2_status_t AXIS2_CALL 
+sandesha2_seq_property_mgr_free(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *envv);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_seq_property_mgr_insert(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    sandesha2_seq_property_bean_t *bean);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_seq_property_mgr_remove(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    axis2_char_t *seq_id,
+    axis2_char_t *name);
+
+sandesha2_seq_property_bean_t *AXIS2_CALL
+sandesha2_seq_property_mgr_retrieve(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    axis2_char_t *seq_id,
+    axis2_char_t *name);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_seq_property_mgr_update(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    sandesha2_seq_property_bean_t *bean);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_seq_property_mgr_find(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    sandesha2_seq_property_bean_t *bean);
+
+sandesha2_seq_property_bean_t *AXIS2_CALL
+sandesha2_seq_property_mgr_find_unique(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    sandesha2_seq_property_bean_t *bean);
+
+axis2_array_list_t *AXIS2_CALL
+sandesha2_seq_property_mgr_retrieve_all(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_seq_property_mgr_update_or_insert(
+    sandesha2_seq_property_mgr_t *seq_property,
+    const axis2_env_t *env,
+    sandesha2_seq_property_bean_t *bean);
 
 
 /** @} */



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org


Mime
View raw message