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/10 10:51:10 UTC

svn commit: r473292 [2/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/

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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Fri Nov 10 01:51:08 2006
@@ -399,9 +399,9 @@
         report_transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
     }
     if(internal_seq_find_bean) 
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(internal_seq_find_bean, env, 
+        sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env, 
                 SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-    collection = SANDESHA2_SEQ_PROPERTY_MGR_FIND(seq_prop_mgr, env, internal_seq_find_bean);
+    collection = sandesha2_seq_property_mgr_find(seq_prop_mgr, env, internal_seq_find_bean);
     if(AXIS2_SUCCESS != SANDESHA2_ERROR_GET_STATUS_CODE(env->error))
     {
         if(AXIS2_TRUE != within_transaction && report_transaction != NULL)
@@ -430,9 +430,9 @@
 
         bean = (sandesha2_seq_property_bean_t *) AXIS2_ARRAY_LIST_GET(
                 collection, env, i);
-        seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(bean, env);
+        seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
         SANDESHA2_REPORT_ADD_TO_OUTGOING_SEQ_LIST(sandesha2_report, env, seq_id);
-        value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(bean, env);
+        value = sandesha2_seq_property_bean_get_value(bean, env);
         SANDESHA2_REPORT_ADD_TO_OUTGOING_INTERNAL_SEQ_MAP(sandesha2_report, env,  
                 seq_id, value);
         report = sandesha2_client_get_outgoing_seq_report_with_internal_seq_id(
@@ -448,9 +448,9 @@
 	/* incoming sequences */
     svr_completed_msgs_find_bean = sandesha2_seq_property_bean_create(env);
     if(svr_completed_msgs_find_bean)
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(svr_completed_msgs_find_bean, env, 
+        sandesha2_seq_property_bean_set_name(svr_completed_msgs_find_bean, env, 
                 SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
-    svr_completed_msgs_beans = SANDESHA2_SEQ_PROPERTY_MGR_FIND(seq_prop_mgr, 
+    svr_completed_msgs_beans = sandesha2_seq_property_mgr_find(seq_prop_mgr, 
             env, svr_completed_msgs_find_bean);
     if(AXIS2_SUCCESS != SANDESHA2_ERROR_GET_STATUS_CODE(env->error))
     {
@@ -480,10 +480,10 @@
 
         svr_completed_msgs_bean = (sandesha2_seq_property_bean_t *) 
             AXIS2_ARRAY_LIST_GET(svr_completed_msgs_beans, env, i);
-        seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(svr_completed_msgs_bean, 
+        seq_id = sandesha2_seq_property_bean_get_seq_id(svr_completed_msgs_bean, 
                 env);
         SANDESHA2_REPORT_ADD_TO_INCOMING_SEQ_LIST(sandesha2_report, env, seq_id);
-        value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(svr_completed_msgs_bean, 
+        value = sandesha2_seq_property_bean_get_value(svr_completed_msgs_bean, 
                 env);
         seq_report = sandesha2_client_get_incoming_seq_report(env, value, 
                 conf_ctx);
@@ -974,7 +974,7 @@
     conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
     seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
-    seq_id_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
     if(!seq_id_bean)
     {
@@ -982,7 +982,7 @@
                 AXIS2_FAILURE);
         return NULL;
     }
-    seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_id_bean, env);
+    seq_id = sandesha2_seq_property_bean_get_value(seq_id_bean, env);
     return seq_id;
 }
 
@@ -1086,7 +1086,7 @@
     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_ACK_REQUESTED_SET_IDENTIFIER(ack_requested, env, identifier);
+    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);
     header = AXIOM_SOAP_ENVELOPE_GET_HEADER(dummy_envelope, env);
@@ -1208,7 +1208,7 @@
     conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
     seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
-    seq_id_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
     if(!seq_id_bean)
     {
@@ -1216,7 +1216,7 @@
                 AXIS2_FAILURE);
         return NULL;
     }
-    seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_id_bean, env);
+    seq_id = sandesha2_seq_property_bean_get_value(seq_id_bean, env);
     if(!seq_id)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID, 
@@ -1279,11 +1279,11 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FALSE;
     }
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env, 
             internal_seq_id);
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env, 
            SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-    internal_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_FIND_UNIQUE(seq_prop_mgr, 
+    internal_seq_bean = sandesha2_seq_property_mgr_find_unique(seq_prop_mgr, 
             env, internal_seq_find_bean);
     if(!internal_seq_bean)
     {
@@ -1291,10 +1291,10 @@
                 "Internal sequence bean is not available for the given sequence.");
         return AXIS2_FALSE;
     }
-    out_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(internal_seq_bean, env);
-    seq_terminated_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    out_seq_id = sandesha2_seq_property_bean_get_seq_id(internal_seq_bean, env);
+    seq_terminated_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             out_seq_id, SANDESHA2_SEQ_PROP_SEQ_TERMINATED);
-    value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_terminated_bean, env);
+    value = sandesha2_seq_property_bean_get_value(seq_terminated_bean, env);
     if(seq_terminated_bean != NULL && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, value))
     {
         return AXIS2_TRUE;
@@ -1321,11 +1321,11 @@
         AXIS2_SET_ERROR(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FALSE;
     }
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env, 
             internal_seq_id);
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env, 
            SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-    internal_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_FIND_UNIQUE(seq_prop_mgr, 
+    internal_seq_bean = sandesha2_seq_property_mgr_find_unique(seq_prop_mgr, 
             env, internal_seq_find_bean);
     if(!internal_seq_bean)
     {
@@ -1333,10 +1333,10 @@
                 "Internal sequence bean is not available for the given sequence.");
         return AXIS2_FALSE;
     }
-    out_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(internal_seq_bean, env);
-    seq_terminated_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    out_seq_id = sandesha2_seq_property_bean_get_seq_id(internal_seq_bean, env);
+    seq_terminated_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             out_seq_id, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT);
-    value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_terminated_bean, env);
+    value = sandesha2_seq_property_bean_get_value(seq_terminated_bean, env);
     if(seq_terminated_bean != NULL && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, value))
     {
         return AXIS2_TRUE;
@@ -1362,11 +1362,11 @@
         AXIS2_SET_ERROR(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FALSE;
     }
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env, 
             internal_seq_id);
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env, 
            SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-    internal_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_FIND_UNIQUE(seq_prop_mgr, 
+    internal_seq_bean = sandesha2_seq_property_mgr_find_unique(seq_prop_mgr, 
             env, internal_seq_find_bean);
     if(!internal_seq_bean)
     {
@@ -1378,7 +1378,7 @@
     }
     SANDESHA2_SEQ_REPORT_SET_SEQ_STATUS(report, env, 
             SANDESHA2_SEQ_STATUS_TERMINATED);
-    out_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(internal_seq_bean, env);
+    out_seq_id = sandesha2_seq_property_bean_get_seq_id(internal_seq_bean, env);
     sandesha2_client_fill_outgoing_seq_info(env, report, out_seq_id, seq_prop_mgr);
     return AXIS2_SUCCESS; 
 }
@@ -1400,11 +1400,11 @@
         AXIS2_SET_ERROR(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FALSE;
     }
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env, 
             internal_seq_id);
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(internal_seq_find_bean, env, 
+    sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env, 
            SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-    internal_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_FIND_UNIQUE(seq_prop_mgr, 
+    internal_seq_bean = sandesha2_seq_property_mgr_find_UNIQUE(seq_prop_mgr, 
             env, internal_seq_find_bean);
     if(!internal_seq_bean)
     {
@@ -1416,7 +1416,7 @@
     }
     SANDESHA2_SEQ_REPORT_SET_SEQ_STATUS(report, env, 
             SANDESHA2_SEQ_STATUS_TIMED_OUT);
-    out_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(internal_seq_bean, env);
+    out_seq_id = sandesha2_seq_property_bean_get_seq_id(internal_seq_bean, env);
     sandesha2_client_fill_outgoing_seq_info(env, report, out_seq_id, seq_prop_mgr);
     return AXIS2_SUCCESS; 
 }*/
@@ -1460,20 +1460,20 @@
     sandesha2_next_msg_bean_t *next_msg_bean = NULL;
     
     seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
-    terminated_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    terminated_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             seq_id, SANDESHA2_SEQ_PROP_SEQ_TERMINATED);
     if(terminated_bean != NULL)
     {
         return SANDESHA2_SEQ_STATUS_TERMINATED;
     }
-    timedout_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    timedout_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             seq_id, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT);
     if(timedout_bean != NULL)
     {
         return SANDESHA2_SEQ_STATUS_TIMED_OUT;
     }
     next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_mgr, env);
-    next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_msg_mgr, env, seq_id);
+    next_msg_bean = sandesha2_next_msg_mgr_retrieve(next_msg_mgr, env, seq_id);
     if(next_msg_bean)
     {
         return SANDESHA2_SEQ_STATUS_ESTABLISHED;
@@ -1616,7 +1616,7 @@
     conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
     seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
-    seq_id_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
+    seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, 
             internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
     if(!seq_id_bean)
     {
@@ -1624,7 +1624,7 @@
                 AXIS2_FAILURE);
         return NULL;
     }
-    seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_id_bean, env);
+    seq_id = sandesha2_seq_property_bean_get_value(seq_id_bean, env);
     if(!seq_id)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID, 

Modified: webservices/sandesha/trunk/c/src/core/msg_validator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/msg_validator.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/core/msg_validator.c (original)
+++ webservices/sandesha/trunk/c/src/core/msg_validator.c Fri Nov 10 01:51:08 2006
@@ -34,7 +34,7 @@
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
     
-    msg_type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
+    msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
     if(SANDESHA2_MSG_TYPE_CREATE_SEQ != msg_type && 
                         SANDESHA2_MSG_TYPE_UNKNOWN != msg_type)
     {
@@ -52,8 +52,8 @@
             addr_ns_seq = sandesha2_utils_get_seq_property(env, seq_id, 
                         SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, 
                         storage_mgr);
-            rm_ns_msg = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx, env);
-            addr_ns_msg = SANDESHA2_MSG_CTX_GET_ADDR_NS_VAL(rm_msg_ctx, env);
+            rm_ns_msg = sandesha2_msg_ctx_get_rm_ns_val(rm_msg_ctx, env);
+            addr_ns_msg = sandesha2_msg_ctx_get_addr_ns_val(rm_msg_ctx, env);
             
             if(NULL != rm_ver_seq)
                 rm_ns_seq = sandesha2_spec_specific_consts_get_rm_ns_val(env,

Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Fri Nov 10 01:51:08 2006
@@ -25,11 +25,8 @@
  * @brief Msg Ctx struct impl
  *	Sandesha2 Message Context
  */
-typedef struct sandesha2_msg_ctx_impl sandesha2_msg_ctx_impl_t;  
-  
-struct sandesha2_msg_ctx_impl
+struct sandesha2_msg_ctx_t
 {
-    sandesha2_msg_ctx_t rm_msg_ctx;
     axis2_hash_t *msg_parts;
     int msg_type;
     axis2_char_t *rm_ns_val;
@@ -38,380 +35,112 @@
 	axis2_msg_ctx_t *msg_ctx;
 };
 
-#define SANDESHA2_INTF_TO_IMPL(rm_msg_ctx) \
-                        ((sandesha2_msg_ctx_impl_t *)(rm_msg_ctx))
-
-/***************************** Function headers *******************************/
-static 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);
-            
-static axis2_msg_ctx_t *AXIS2_CALL
-sandesha2_msg_ctx_get_msg_ctx(
-    sandesha2_msg_ctx_t *rm_msg_ctx, 
-    const axis2_env_t *env);
-    
-static axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_add_soap_envelope(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-        
-static int AXIS2_CALL
-sandesha2_msg_ctx_get_msg_type (
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-        
-static 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);
-            
-static 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);
-        
-static 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);
-    
-static axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_from(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-    
-static axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_to (
-    sandesha2_msg_ctx_t *rm_msg_ctx, 
-    const axis2_env_t *env);
-
-static 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);
-    
-static axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_reply_to(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-    
-static axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_fault_to(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-    
-static axis2_relates_to_t *AXIS2_CALL
-sandesha2_msg_ctx_get_relates_to(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-    
-static axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_msg_id(
-    sandesha2_msg_ctx_t *rm_msg_ctx, 
-    const axis2_env_t *env);
-
-static 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);
-    
-static axiom_soap_envelope_t *AXIS2_CALL
-sandesha2_msg_ctx_get_soap_envelope(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-            
-static axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_wsa_action(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-            
-static void *AXIS2_CALL
-sandesha2_msg_ctx_get_property(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env, 
-    axis2_char_t *key);
-
-static 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);
-    
-static 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);
-    
-static 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);
-    
-static axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_rm_ns_val(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-    
-static axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_addr_ns_val(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static 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);
-            
-static int AXIS2_CALL
-sandesha2_msg_ctx_get_flow(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-
-static axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_flow(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env, 
-    int flow);
-                        
-static axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_rm_spec_ver(
-    sandesha2_msg_ctx_t *rm_msg_ctx,
-    const axis2_env_t *env);
-            
-static axis2_status_t AXIS2_CALL 
-sandesha2_msg_ctx_free(
-    sandesha2_msg_ctx_t *rm_msg_ctx, 
-    const axis2_env_t *env);								
-
-/***************************** End of function headers ************************/
-
 AXIS2_EXTERN sandesha2_msg_ctx_t* AXIS2_CALL
 sandesha2_msg_ctx_create(
     const axis2_env_t *env, 
     axis2_msg_ctx_t *msg_ctx)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
+    sandesha2_msg_ctx_t *rm_msg_ctx = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl =  (sandesha2_msg_ctx_impl_t *)AXIS2_MALLOC 
-                        (env->allocator, sizeof(sandesha2_msg_ctx_impl_t));
+    rm_msg_ctx =  (sandesha2_msg_ctx_t *)AXIS2_MALLOC 
+                        (env->allocator, sizeof(sandesha2_msg_ctx_t));
 	
-    if(NULL == msg_ctx_impl)
+    if(!rm_msg_ctx)
 	{
 		AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    msg_ctx_impl->rm_ns_val = NULL;
-    msg_ctx_impl->addr_ns_val = NULL;
-    msg_ctx_impl->msg_parts = NULL;
-    msg_ctx_impl->msg_ctx = NULL;
-    msg_ctx_impl->spec_ver = NULL;
-    msg_ctx_impl->rm_msg_ctx.ops = NULL;
-    
-    msg_ctx_impl->rm_msg_ctx.ops = AXIS2_MALLOC(env->allocator,
-                        sizeof(sandesha2_msg_ctx_ops_t));
-    if(NULL == msg_ctx_impl->rm_msg_ctx.ops)
-	{
-		sandesha2_msg_ctx_free((sandesha2_msg_ctx_t*)msg_ctx_impl, env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-	}
+    rm_msg_ctx->rm_ns_val = NULL;
+    rm_msg_ctx->addr_ns_val = NULL;
+    rm_msg_ctx->msg_parts = NULL;
+    rm_msg_ctx->msg_ctx = NULL;
+    rm_msg_ctx->spec_ver = NULL;
     
-    msg_ctx_impl->msg_parts = axis2_hash_make(env);
-    msg_ctx_impl->msg_type = SANDESHA2_MSG_TYPE_UNKNOWN;
-    msg_ctx_impl->msg_ctx = msg_ctx;
-
-    
-    msg_ctx_impl->rm_msg_ctx.ops->set_msg_ctx = sandesha2_msg_ctx_set_msg_ctx;
-    msg_ctx_impl->rm_msg_ctx.ops->get_msg_ctx = sandesha2_msg_ctx_get_msg_ctx;
-    msg_ctx_impl->rm_msg_ctx.ops->add_soap_envelope = 
-                        sandesha2_msg_ctx_add_soap_envelope;
-    msg_ctx_impl->rm_msg_ctx.ops->get_msg_type = sandesha2_msg_ctx_get_msg_type;
-    msg_ctx_impl->rm_msg_ctx.ops->set_msg_type = sandesha2_msg_ctx_set_msg_type;
-    msg_ctx_impl->rm_msg_ctx.ops->set_msg_part = sandesha2_msg_ctx_set_msg_part;
-    msg_ctx_impl->rm_msg_ctx.ops->get_msg_part = sandesha2_msg_ctx_get_msg_part;
-    msg_ctx_impl->rm_msg_ctx.ops->get_from = sandesha2_msg_ctx_get_from;
-    msg_ctx_impl->rm_msg_ctx.ops->set_from = sandesha2_msg_ctx_set_from;
-    msg_ctx_impl->rm_msg_ctx.ops->get_to = sandesha2_msg_ctx_get_to;
-    msg_ctx_impl->rm_msg_ctx.ops->set_to = sandesha2_msg_ctx_set_to;
-    msg_ctx_impl->rm_msg_ctx.ops->get_reply_to = sandesha2_msg_ctx_get_reply_to;
-    msg_ctx_impl->rm_msg_ctx.ops->set_reply_to = sandesha2_msg_ctx_set_reply_to;
-    msg_ctx_impl->rm_msg_ctx.ops->get_fault_to = sandesha2_msg_ctx_get_fault_to;
-    msg_ctx_impl->rm_msg_ctx.ops->set_fault_to = sandesha2_msg_ctx_set_fault_to;
-    msg_ctx_impl->rm_msg_ctx.ops->get_relates_to = 
-                        sandesha2_msg_ctx_get_relates_to;
-    msg_ctx_impl->rm_msg_ctx.ops->set_relates_to = 
-                        sandesha2_msg_ctx_set_relates_to;
-    msg_ctx_impl->rm_msg_ctx.ops->get_msg_id = sandesha2_msg_ctx_get_msg_id;
-    msg_ctx_impl->rm_msg_ctx.ops->set_msg_id = sandesha2_msg_ctx_set_msg_id;
-    msg_ctx_impl->rm_msg_ctx.ops->get_soap_envelope = 
-                        sandesha2_msg_ctx_get_soap_envelope;
-    msg_ctx_impl->rm_msg_ctx.ops->set_soap_envelope = 
-                        sandesha2_msg_ctx_set_soap_envelope;
-    msg_ctx_impl->rm_msg_ctx.ops->get_wsa_action = 
-                        sandesha2_msg_ctx_get_wsa_action;
-    msg_ctx_impl->rm_msg_ctx.ops->set_wsa_action = 
-                        sandesha2_msg_ctx_set_wsa_action;
-    msg_ctx_impl->rm_msg_ctx.ops->get_property = sandesha2_msg_ctx_get_property;
-    msg_ctx_impl->rm_msg_ctx.ops->set_property = sandesha2_msg_ctx_set_property;
-    msg_ctx_impl->rm_msg_ctx.ops->set_soap_action = 
-                        sandesha2_msg_ctx_set_soap_action;
-    msg_ctx_impl->rm_msg_ctx.ops->set_paused = sandesha2_msg_ctx_set_paused;
-    msg_ctx_impl->rm_msg_ctx.ops->get_rm_ns_val = 
-                        sandesha2_msg_ctx_get_rm_ns_val;
-    msg_ctx_impl->rm_msg_ctx.ops->set_rm_ns_val = 
-                        sandesha2_msg_ctx_set_rm_ns_val;
-    msg_ctx_impl->rm_msg_ctx.ops->get_addr_ns_val = 
-                        sandesha2_msg_ctx_get_addr_ns_val;
-    msg_ctx_impl->rm_msg_ctx.ops->set_addr_ns_val = 
-                        sandesha2_msg_ctx_set_addr_ns_val;
-    msg_ctx_impl->rm_msg_ctx.ops->get_flow = sandesha2_msg_ctx_get_flow;
-    msg_ctx_impl->rm_msg_ctx.ops->set_flow = sandesha2_msg_ctx_set_flow;
-    msg_ctx_impl->rm_msg_ctx.ops->get_rm_spec_ver = 
-                        sandesha2_msg_ctx_get_rm_spec_ver;
-    msg_ctx_impl->rm_msg_ctx.ops->free = sandesha2_msg_ctx_free;
-                        
-	return &(msg_ctx_impl->rm_msg_ctx);
+    rm_msg_ctx->msg_parts = axis2_hash_make(env);
+    rm_msg_ctx->msg_type = SANDESHA2_MSG_TYPE_UNKNOWN;
+    rm_msg_ctx->msg_ctx = msg_ctx;
+
+	return rm_msg_ctx;
 }
 
 
-static axis2_status_t AXIS2_CALL 
-sandesha2_msg_ctx_free(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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
 	AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
     
-    if(NULL != msg_ctx_impl->addr_ns_val)
-    {
-        AXIS2_FREE(env->allocator, msg_ctx_impl->addr_ns_val);
-        msg_ctx_impl->addr_ns_val = NULL;
-    }
-    if(NULL != msg_ctx_impl->rm_ns_val)
+    if(rm_msg_ctx->addr_ns_val)
     {
-        AXIS2_FREE(env->allocator, msg_ctx_impl->rm_ns_val);
-        msg_ctx_impl->rm_ns_val = NULL;
+        AXIS2_FREE(env->allocator, rm_msg_ctx->addr_ns_val);
+        rm_msg_ctx->addr_ns_val = NULL;
     }
-    if(NULL != msg_ctx_impl->spec_ver)
+    if(rm_msg_ctx->rm_ns_val)
     {
-        AXIS2_FREE(env->allocator, msg_ctx_impl->spec_ver);
-        msg_ctx_impl->spec_ver = NULL;
+        AXIS2_FREE(env->allocator, rm_msg_ctx->rm_ns_val);
+        rm_msg_ctx->rm_ns_val = NULL;
     }
-    if(NULL != msg_ctx_impl->msg_parts)
+    if(rm_msg_ctx->spec_ver)
     {
-        axis2_hash_free(msg_ctx_impl->msg_parts, env);
-        msg_ctx_impl->msg_parts = NULL;
+        AXIS2_FREE(env->allocator, rm_msg_ctx->spec_ver);
+        rm_msg_ctx->spec_ver = NULL;
     }
-    if(NULL != rm_msg_ctx->ops)
+    if(rm_msg_ctx->msg_parts)
     {
-        AXIS2_FREE(env->allocator, rm_msg_ctx->ops);
-        rm_msg_ctx->ops = NULL;
+        axis2_hash_free(rm_msg_ctx->msg_parts, env);
+        rm_msg_ctx->msg_parts = NULL;
     }
-	AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(rm_msg_ctx));
+	AXIS2_FREE(env->allocator, rm_msg_ctx);
 	return AXIS2_SUCCESS;
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    msg_ctx_impl->msg_ctx = msg_ctx;
+    rm_msg_ctx->msg_ctx = msg_ctx;
     return AXIS2_SUCCESS;
 }
             
-static 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_msg_ctx_t *AXIS2_CALL
+sandesha2_msg_ctx_get_msg_ctx(
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return SANDESHA2_INTF_TO_IMPL(rm_msg_ctx)->msg_ctx;
+    return rm_msg_ctx->msg_ctx;
 }
     
-static axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
 sandesha2_msg_ctx_add_soap_envelope(
     sandesha2_msg_ctx_t *rm_msg_ctx,
     const axis2_env_t *env)
 {
     int soap_ver = AXIOM_SOAP11;
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     axis2_hash_index_t *hi = NULL;
     axiom_soap_envelope_t *soap_envelope = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
     
-    if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx_impl->msg_ctx, env))
+    if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_IS_SOAP_11(rm_msg_ctx->msg_ctx, env))
         soap_ver = AXIOM_SOAP12;
-    soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx_impl->msg_ctx, env);
+    soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env);
     if(NULL == soap_envelope)
     {
         soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
                         soap_ver);
-        AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx_impl->msg_ctx, env, 
+        AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env, 
                         soap_envelope);
     }
     
-    for(hi = axis2_hash_first(msg_ctx_impl->msg_parts, env); NULL != hi;
+    for(hi = axis2_hash_first(rm_msg_ctx->msg_parts, env); NULL != hi;
                         hi = axis2_hash_next(env, hi))
     {
         sandesha2_iom_rm_part_t *part = NULL;
@@ -424,403 +153,374 @@
     return AXIS2_SUCCESS;
 }
             
-static int AXIS2_CALL
-sandesha2_msg_ctx_get_msg_type (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_ENV_CHECK(env, -1);
-    return SANDESHA2_INTF_TO_IMPL(rm_msg_ctx)->msg_type;
+    return rm_msg_ctx->msg_type;
 }
             
-static 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_type (
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, int msg_type)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    msg_ctx_impl->msg_type = msg_type;
+    rm_msg_ctx->msg_type = msg_type;
     return AXIS2_SUCCESS;
 }
             
-static 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)
+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)
 {
     axis2_char_t *part_id_str = NULL;
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, part, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
     part_id_str = AXIS2_MALLOC(env->allocator, 32 * sizeof(axis2_char_t));
     sprintf(part_id_str, "%d", part_id);
-    axis2_hash_set(msg_ctx_impl->msg_parts, part_id_str, AXIS2_HASH_KEY_STRING,
+    axis2_hash_set(rm_msg_ctx->msg_parts, part_id_str, AXIS2_HASH_KEY_STRING,
                         (const void*)part);
     return AXIS2_SUCCESS;
 }
             
-static sandesha2_iom_rm_part_t *AXIS2_CALL
+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_char_t part_id_str[32];
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
     sprintf(part_id_str, "%d", part_id);
-    return axis2_hash_get(msg_ctx_impl->msg_parts, part_id_str, 
+    return axis2_hash_get(rm_msg_ctx->msg_parts, part_id_str, 
                         AXIS2_HASH_KEY_STRING);
 }
     
-static axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_from(sandesha2_msg_ctx_t *rm_msg_ctx,
-                        const axis2_env_t *env)
+axis2_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_from(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_FROM(msg_ctx_impl->msg_ctx, env);
+    return AXIS2_MSG_CTX_GET_FROM(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, from, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_TO(msg_ctx_impl->msg_ctx, env, from);;
+    return AXIS2_MSG_CTX_SET_TO(rm_msg_ctx->msg_ctx, env, from);;
 }
     
-static axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_to (sandesha2_msg_ctx_t *rm_msg_ctx, 
-                        const axis2_env_t *env)
+axis2_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_to (
+    sandesha2_msg_ctx_t *rm_msg_ctx, 
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_TO(msg_ctx_impl->msg_ctx, env);
+    return AXIS2_MSG_CTX_GET_TO(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, to, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_TO(msg_ctx_impl->msg_ctx, env, to);
+    return AXIS2_MSG_CTX_SET_TO(rm_msg_ctx->msg_ctx, env, to);
 }
     
-static 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_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_reply_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_REPLY_TO(msg_ctx_impl->msg_ctx, env);
+    return AXIS2_MSG_CTX_GET_REPLY_TO(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, reply_to, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_REPLY_TO(msg_ctx_impl->msg_ctx, env, reply_to);
+    return AXIS2_MSG_CTX_SET_REPLY_TO(rm_msg_ctx->msg_ctx, env, reply_to);
 }
     
-static 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_endpoint_ref_t *AXIS2_CALL
+sandesha2_msg_ctx_get_fault_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_FAULT_TO(msg_ctx_impl->msg_ctx, env);
+    return AXIS2_MSG_CTX_GET_FAULT_TO(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault_to, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_FAULT_TO(msg_ctx_impl->msg_ctx, env, fault_to);
+    return AXIS2_MSG_CTX_SET_FAULT_TO(rm_msg_ctx->msg_ctx, env, fault_to);
 }
     
-static 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_relates_to_t *AXIS2_CALL
+sandesha2_msg_ctx_get_relates_to(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx_impl->msg_ctx, env);
+    return AXIS2_MSG_CTX_GET_RELATES_TO(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, relates_to, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_RELATES_TO(msg_ctx_impl->msg_ctx, env, relates_to);
+    return AXIS2_MSG_CTX_SET_RELATES_TO(rm_msg_ctx->msg_ctx, env, relates_to);
 }
     
-static axis2_char_t *AXIS2_CALL
+axis2_char_t *AXIS2_CALL
 sandesha2_msg_ctx_get_msg_id(
     sandesha2_msg_ctx_t *rm_msg_ctx, 
     const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
     return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
-                        msg_ctx_impl->msg_ctx, env);
+                        rm_msg_ctx->msg_ctx, env);
 }
 
-static axis2_status_t AXIS2_CALL
+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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx_impl->msg_ctx, env, msg_id);
+    return AXIS2_MSG_CTX_SET_MESSAGE_ID(rm_msg_ctx->msg_ctx, env, msg_id);
 }
     
-static axiom_soap_envelope_t *AXIS2_CALL
-sandesha2_msg_ctx_get_soap_envelope(sandesha2_msg_ctx_t *rm_msg_ctx,
-                        const axis2_env_t *env)
+axiom_soap_envelope_t *AXIS2_CALL
+sandesha2_msg_ctx_get_soap_envelope(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx_impl->msg_ctx, env);
+    return AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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_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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx_impl->msg_ctx, env, 
+    return AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx->msg_ctx, env, 
                         soap_envelope);
 }
             
-static axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_wsa_action(sandesha2_msg_ctx_t *rm_msg_ctx,
-                        const axis2_env_t *env)
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_wsa_action(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
         
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    
-    return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx_impl->msg_ctx, env);
+    return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(rm_msg_ctx->msg_ctx, env);
 }
 
-static 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)
+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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    
-    return AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx_impl->msg_ctx, env, action);
+    return AXIS2_MSG_CTX_SET_WSA_ACTION(rm_msg_ctx->msg_ctx, env, action);
 }
             
-static void *AXIS2_CALL
-sandesha2_msg_ctx_get_property(sandesha2_msg_ctx_t *rm_msg_ctx,
-                        const axis2_env_t *env, axis2_char_t *key)
+void *AXIS2_CALL
+sandesha2_msg_ctx_get_property(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, axis2_char_t *key)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, key, NULL);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx_impl->msg_ctx, env, key,
+    return AXIS2_MSG_CTX_GET_PROPERTY(rm_msg_ctx->msg_ctx, env, key,
                         AXIS2_FALSE);
 }
 
-static axis2_status_t AXIS2_CALL
+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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, key, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    return AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx_impl->msg_ctx, env, key, val,
+    return AXIS2_MSG_CTX_SET_PROPERTY(rm_msg_ctx->msg_ctx, env, key, val,
                         AXIS2_FALSE);
 }
     
-static 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_soap_action(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, axis2_char_t *soap_action)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, soap_action, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    if(NULL == msg_ctx_impl->msg_ctx)
+    if(NULL == rm_msg_ctx->msg_ctx)
         return AXIS2_FAILURE;
     
-    return AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx_impl->msg_ctx, env, 
+    return AXIS2_MSG_CTX_SET_SOAP_ACTION(rm_msg_ctx->msg_ctx, env, 
                         soap_action);
 }
     
-static axis2_status_t AXIS2_CALL
+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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    if(NULL == msg_ctx_impl->msg_ctx)
+    if(NULL == rm_msg_ctx->msg_ctx)
         return AXIS2_FAILURE;
-    return AXIS2_MSG_CTX_SET_PAUSED(msg_ctx_impl->msg_ctx, env, paused);    
+    return AXIS2_MSG_CTX_SET_PAUSED(rm_msg_ctx->msg_ctx, env, paused);    
 }
     
-static 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_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_rm_ns_val(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return SANDESHA2_INTF_TO_IMPL(rm_msg_ctx)->rm_ns_val;
+    return rm_msg_ctx->rm_ns_val;
 }
 
-static axis2_status_t AXIS2_CALL
+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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ns_val, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    if(NULL != msg_ctx_impl->rm_ns_val)
+    if(NULL != rm_msg_ctx->rm_ns_val)
     {
-        AXIS2_FREE(env->allocator, msg_ctx_impl->rm_ns_val);
-        msg_ctx_impl->rm_ns_val = NULL;
+        AXIS2_FREE(env->allocator, rm_msg_ctx->rm_ns_val);
+        rm_msg_ctx->rm_ns_val = NULL;
     }
-    msg_ctx_impl->rm_ns_val = AXIS2_STRDUP(ns_val, env);
+    rm_msg_ctx->rm_ns_val = AXIS2_STRDUP(ns_val, env);
     if(0 == AXIS2_STRCMP(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
-        msg_ctx_impl->spec_ver = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_0, env);
+        rm_msg_ctx->spec_ver = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_0, env);
     if(0 == AXIS2_STRCMP(ns_val, SANDESHA2_SPEC_2005_10_NS_URI))
-        msg_ctx_impl->spec_ver = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_1, env);
+        rm_msg_ctx->spec_ver = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_1, env);
         
     return AXIS2_SUCCESS;
 }
     
-static 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_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_addr_ns_val(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return SANDESHA2_INTF_TO_IMPL(rm_msg_ctx)->addr_ns_val;
+    return rm_msg_ctx->addr_ns_val;
 }
 
-static 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)
+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)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ns_val, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    if(NULL != msg_ctx_impl->addr_ns_val)
+    if(NULL != rm_msg_ctx->addr_ns_val)
     {
-        AXIS2_FREE(env->allocator, msg_ctx_impl->addr_ns_val);
-        msg_ctx_impl->addr_ns_val = NULL;
+        AXIS2_FREE(env->allocator, rm_msg_ctx->addr_ns_val);
+        rm_msg_ctx->addr_ns_val = NULL;
     }
-    msg_ctx_impl->addr_ns_val = AXIS2_STRDUP(ns_val, env);
+    rm_msg_ctx->addr_ns_val = AXIS2_STRDUP(ns_val, env);
     return AXIS2_SUCCESS;
 }
             
-static int AXIS2_CALL
-sandesha2_msg_ctx_get_flow(sandesha2_msg_ctx_t *rm_msg_ctx,
-                        const axis2_env_t *env)
+int AXIS2_CALL
+sandesha2_msg_ctx_get_flow(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, -1);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    if(NULL == msg_ctx_impl->msg_ctx)
+    if(NULL == rm_msg_ctx->msg_ctx)
         return -1;
-    return AXIS2_MSG_CTX_GET_FLOW(msg_ctx_impl->msg_ctx, env);     
+    return AXIS2_MSG_CTX_GET_FLOW(rm_msg_ctx->msg_ctx, env);     
 }
 
-static axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_flow(sandesha2_msg_ctx_t *rm_msg_ctx,
-                        const axis2_env_t *env, int flow)
+axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_flow(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env, int flow)
 {
-    sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
-    if(NULL == msg_ctx_impl->msg_ctx)
+    if(NULL == rm_msg_ctx->msg_ctx)
         return AXIS2_FAILURE;
         
-    return AXIS2_MSG_CTX_SET_FLOW(msg_ctx_impl->msg_ctx, env, flow); 
+    return AXIS2_MSG_CTX_SET_FLOW(rm_msg_ctx->msg_ctx, env, flow); 
 }
 
-static 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_char_t *AXIS2_CALL
+sandesha2_msg_ctx_get_rm_spec_ver(
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return SANDESHA2_INTF_TO_IMPL(rm_msg_ctx)->spec_ver;
+    return rm_msg_ctx->spec_ver;
 }
 

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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Fri Nov 10 01:51:08 2006
@@ -259,14 +259,14 @@
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FALSE);
     
-    if(SANDESHA2_MSG_TYPE_APPLICATION == SANDESHA2_MSG_CTX_GET_MSG_TYPE(
+    if(SANDESHA2_MSG_TYPE_APPLICATION == sandesha2_msg_ctx_get_msg_type(
                         rm_msg_ctx, env))
     {
         sandesha2_seq_t *sequence = NULL;
         long msg_no = -1;
         axis2_char_t *seq_id = NULL;
         
-        sequence = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, 
+        sequence = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, 
                         env, SANDESHA2_MSG_PART_SEQ);
         if(sequence)
         {
@@ -282,7 +282,7 @@
             
             seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
                         storage_mgr, env);
-            rcvd_msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+            rcvd_msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
                         env, seq_id, 
                         SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
             if(rcvd_msgs_bean)
@@ -291,7 +291,7 @@
                 axis2_array_list_t *msg_no_list = NULL;
                 int i = 0, size = 0;
                 
-                rcvd_msgs_str = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
+                rcvd_msgs_str = sandesha2_seq_property_bean_get_value(
                         rcvd_msgs_bean, env);
                 msg_no_list = sandesha2_utils_get_array_list_from_string(env,
                         rcvd_msgs_str);
@@ -316,7 +316,7 @@
             
             
                 soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(
-                        SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env), 
+                        sandesha2_msg_ctx_get_soap_envelope(rm_msg_ctx, env), 
                         env);
                 body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
                 body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
@@ -339,10 +339,10 @@
                         rcvd_msgs_bean = sandesha2_seq_property_bean_create_with_data
                             (env, seq_id, 
                             SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES, "");
-                        SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+                        sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
                             rcvd_msgs_bean);
                     }
-                    rcvd_msgs_str1 = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
+                    rcvd_msgs_str1 = sandesha2_seq_property_bean_get_value(
                             rcvd_msgs_bean, env);
                     sprintf(msg_no_str, "%ld", msg_no);
                     if(rcvd_msgs_str1 && 0 < AXIS2_STRLEN(rcvd_msgs_str1))
@@ -351,9 +351,9 @@
                     else
                         bean_value = AXIS2_STRDUP(msg_no_str, env);
                     
-                    SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(rcvd_msgs_bean, env,
+                    sandesha2_seq_property_bean_set_value(rcvd_msgs_bean, env,
                         bean_value);
-                    SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, 
+                    sandesha2_seq_property_mgr_update(seq_prop_mgr, env, 
                         rcvd_msgs_bean);
                     app_msg_processor = sandesha2_app_msg_processor_create(env);
                     sandesha2_app_msg_processor_send_ack_if_reqd(env, 
@@ -361,14 +361,14 @@
                 }
             }
         }        
-    } else if(SANDESHA2_MSG_TYPE_UNKNOWN == SANDESHA2_MSG_CTX_GET_MSG_TYPE(
+    } else if(SANDESHA2_MSG_TYPE_UNKNOWN == sandesha2_msg_ctx_get_msg_type(
                         rm_msg_ctx, env))
     {
         axis2_relates_to_t *relates_to = NULL;
         axis2_conf_ctx_t *conf_ctx = NULL;
         
         
-        relates_to = SANDESHA2_MSG_CTX_GET_RELATES_TO(rm_msg_ctx, env);
+        relates_to = sandesha2_msg_ctx_get_relates_to(rm_msg_ctx, env);
         if(relates_to)
         {
             const axis2_char_t *relates_to_val = NULL;
@@ -376,10 +376,10 @@
             axis2_op_ctx_t *op_ctx1 = NULL;
             
             relates_to_val = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
-            conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(
+            conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(sandesha2_msg_ctx_get_msg_ctx(
                         rm_msg_ctx, env), env);
             op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, relates_to_val);
-            op_ctx1 = AXIS2_MSG_CTX_GET_OP_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(
+            op_ctx1 = AXIS2_MSG_CTX_GET_OP_CTX(sandesha2_msg_ctx_get_msg_ctx(
                         rm_msg_ctx, env), env);
             if(!op_ctx && !op_ctx1)
             {
@@ -391,7 +391,7 @@
     }
     if(drop)
     {
-        SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+        sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
         return AXIS2_TRUE;
     }
     return AXIS2_FALSE;
@@ -410,13 +410,13 @@
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FALSE);
     
-    if(SANDESHA2_MSG_TYPE_APPLICATION == SANDESHA2_MSG_CTX_GET_MSG_TYPE(
+    if(SANDESHA2_MSG_TYPE_APPLICATION == sandesha2_msg_ctx_get_msg_type(
                         rm_msg_ctx, env))
     {
         sandesha2_seq_t *sequence = NULL;
         axis2_char_t *seq_id = NULL;
         
-        sequence = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, 
+        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(
@@ -431,10 +431,10 @@
             
             seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
                         storage_mgr, env);
-            rcvd_msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+            rcvd_msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
                         env, seq_id, 
                         SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
-            rcvd_msgs_str = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
+            rcvd_msgs_str = sandesha2_seq_property_bean_get_value(
                         rcvd_msgs_bean, env);
             app_msg_processor = sandesha2_app_msg_processor_create(env);
             sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, 

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Fri Nov 10 01:51:08 2006
@@ -166,7 +166,7 @@
     {
         dummy_msg = AXIS2_TRUE;
     }
-    msg_type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
+    msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
     if(msg_type == SANDESHA2_MSG_TYPE_UNKNOWN)
     {
         axis2_msg_ctx_t *req_msg_ctx = NULL;
@@ -181,7 +181,7 @@
             sandesha2_seq_t *seq_part = NULL;
 
             req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
-            seq_part = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
+            seq_part = (sandesha2_seq_t *) sandesha2_msg_ctx_get_msg_part(
                     req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
             
             if(seq_part)

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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Fri Nov 10 01:51:08 2006
@@ -177,7 +177,7 @@
             "[sandesha2] sandesha2_ack_msg_processor_process_in_msg .........");
     printf("sandesha2_ack_msg_processor_process_in_msg\n");
 
-    seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, 
+    seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, 
                         env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
     if(!seq_ack)
     {
@@ -187,13 +187,13 @@
                         AXIS2_FAILURE);
         return AXIS2_FAILURE;        
     }
-    msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+    msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
     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));
     sandesha2_seq_ack_set_must_understand(seq_ack, env, AXIS2_FALSE);
-    SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+    sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
     
     retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
     seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
@@ -215,7 +215,7 @@
     {
         axis2_engine_t *engine = NULL;
         engine = axis2_engine_create(env, conf_ctx);
-        AXIS2_ENGINE_SEND_FAULT(engine, env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
+        AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
                         fault_msg_ctx, env));
         AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
     }
@@ -225,7 +225,7 @@
     {
         axis2_engine_t *engine = NULL;
         engine = axis2_engine_create(env, conf_ctx);
-        AXIS2_ENGINE_SEND_FAULT(engine, env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
+        AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
                         fault_msg_ctx, env));
         AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
     }
@@ -241,9 +241,9 @@
                         AXIS2_FALSE);
                         
     input_bean = sandesha2_sender_bean_create(env);
-    SANDESHA2_SENDER_BEAN_SET_SEND(input_bean, env, AXIS2_TRUE);
-    SANDESHA2_SENDER_BEAN_SET_RESEND(input_bean, env, AXIS2_TRUE);
-    retrans_list = SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(retrans_mgr, env, 
+    sandesha2_sender_bean_set_send(input_bean, env, AXIS2_TRUE);
+    sandesha2_sender_bean_set_resend(input_bean, env, AXIS2_TRUE);
+    retrans_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env, 
                         input_bean);
    
     acked_list = axis2_array_list_create(env, 0);
@@ -271,10 +271,10 @@
                 env, retrans_list, j);
             if(retrans_bean)
             {
-                SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env, 
-                        SANDESHA2_SENDER_BEAN_GET_MSG_ID(retrans_bean, env));
+                sandesha2_sender_mgr_remove(retrans_mgr, env, 
+                        sandesha2_sender_bean_get_msg_id(retrans_bean, env));
                 sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
-                        SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
+                        sandesha2_sender_bean_get_msg_ctx_ref_key(
                         retrans_bean, env));
             }
             add_no = AXIS2_MALLOC(env->allocator, sizeof(long));
@@ -290,44 +290,44 @@
     }
     no_of_msgs_acked = sandesha2_ack_msg_processor_get_no_of_msgs_acked(
                         env, ack_range_list);
-    no_of_msgs_acked_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, 
+    no_of_msgs_acked_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, 
                         env, out_seq_id, 
                         SANDESHA2_SEQ_PROP_NO_OF_OUTGOING_MSGS_ACKED);
     sprintf(str_long, "%ld", no_of_msgs_acked);
     if(!no_of_msgs_acked_bean)
     {
         no_of_msgs_acked_bean = sandesha2_seq_property_bean_create(env);
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(no_of_msgs_acked_bean, env,
+        sandesha2_seq_property_bean_set_name(no_of_msgs_acked_bean, env,
                         SANDESHA2_SEQ_PROP_NO_OF_OUTGOING_MSGS_ACKED);
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(no_of_msgs_acked_bean, env,
+        sandesha2_seq_property_bean_set_seq_id(no_of_msgs_acked_bean, env,
                         out_seq_id);
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(no_of_msgs_acked_bean, env, 
+        sandesha2_seq_property_bean_set_value(no_of_msgs_acked_bean, env, 
                         str_long);
-        SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, 
+        sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, 
                         no_of_msgs_acked_bean); 
     }
     else
     {
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(no_of_msgs_acked_bean, env, 
+        sandesha2_seq_property_bean_set_value(no_of_msgs_acked_bean, env, 
                         str_long);
-        SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, 
+        sandesha2_seq_property_mgr_update(seq_prop_mgr, env, 
                         no_of_msgs_acked_bean); 
     }
-    completed_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, 
+    completed_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, 
                         env, int_seq_id,
                         SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
     if(!completed_bean)
     {
         completed_bean = sandesha2_seq_property_bean_create(env);
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(completed_bean, env, int_seq_id);
-        SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(completed_bean, env, 
+        sandesha2_seq_property_bean_set_seq_id(completed_bean, env, int_seq_id);
+        sandesha2_seq_property_bean_set_name(completed_bean, env, 
                         SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
-        SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, completed_bean);
+        sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, completed_bean);
     }
     str_list = sandesha2_utils_array_list_to_string(env, acked_list,
                         SANDESHA2_ARRAY_LIST_LONG);
-    SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(completed_bean, env, str_list);
-    SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, completed_bean);
+    sandesha2_seq_property_bean_set_value(completed_bean, env, str_list);
+    sandesha2_seq_property_mgr_update(seq_prop_mgr, env, completed_bean);
     
     last_out_msg_no_str = sandesha2_utils_get_seq_property(env, int_seq_id,
                         SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, storage_mgr);
@@ -345,7 +345,7 @@
                         out_seq_id, int_seq_id, storage_mgr);
         }
     }
-    SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+    sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
     AXIS2_LOG_INFO(env->log, 
             "[sandesha2] Exit: sandesha2_ack_msg_processor_process_in_msg");
     printf("[sandesha2] Exit: sandesha2_ack_msg_processor_process_in_msg\n");
@@ -380,7 +380,7 @@
     {
         sandesha2_sender_bean_t *bean = NULL;
         bean = AXIS2_ARRAY_LIST_GET(list, env, i);
-        if(SANDESHA2_SENDER_BEAN_GET_MSG_NO(bean, env) == msg_no)
+        if(sandesha2_sender_bean_get_msg_no(bean, env) == msg_no)
             return bean;
     }
     return 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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Fri Nov 10 01:51:08 2006
@@ -161,7 +161,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
     
-    ack_requested = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+    ack_requested = (sandesha2_ack_requested_t*)sandesha2_msg_ctx_get_msg_part(
                         rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
     if(NULL == ack_requested)
     {
@@ -171,20 +171,20 @@
                         AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env, AXIS2_FALSE);
-    SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
+    sandesha2_ack_requested_set_must_understand(ack_requested, env, AXIS2_FALSE);
+    sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
     
-    msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+    msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
     seq_id = sandesha2_identifier_get_identifier(
-                        SANDESHA2_ACK_REQUESTED_GET_IDENTIFIER(ack_requested, 
+                        sandesha2_ack_requested_get_identifier(ack_requested, 
                         env), env);
     conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, 
                         AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
     seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
-    acks_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, seq_id,
+    acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, seq_id,
                         SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
-    acks_to_str = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(acks_to_bean, env);
+    acks_to_str = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
     
     if(NULL == acks_to_str)
     {
@@ -216,8 +216,8 @@
                         SANDESHA2_APPLICATION_PROCESSING_DONE, property, 
                         AXIS2_FALSE);
     ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
-    SANDESHA2_MSG_CTX_SET_RM_NS_VAL(ack_rm_msg, env, 
-                        SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx, env));
+    sandesha2_msg_ctx_set_rm_ns_val(ack_rm_msg, env, 
+                        sandesha2_msg_ctx_get_rm_ns_val(rm_msg_ctx, env));
     AXIS2_MSG_CTX_SET_MESSAGE_ID(ack_msg_ctx, env, axis2_uuid_gen(env));
     
     envelope = axiom_soap_envelope_create_default_soap_envelope(env, 
@@ -308,13 +308,13 @@
         retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
         key = axis2_uuid_gen(env);
         ack_bean = sandesha2_sender_bean_create(env);
-        SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(ack_bean, env, key);
-        SANDESHA2_SENDER_BEAN_SET_MSG_ID(ack_bean, env, 
+        sandesha2_sender_bean_set_msg_ctx_ref_key(ack_bean, env, key);
+        sandesha2_sender_bean_set_msg_id(ack_bean, env, 
                         (axis2_char_t*)AXIS2_MSG_CTX_GET_MSG_ID(ack_msg_ctx, env));
-        SANDESHA2_SENDER_BEAN_SET_RESEND(ack_bean, env, AXIS2_FALSE);
-        SANDESHA2_SENDER_BEAN_SET_SEQ_ID(ack_bean, env, seq_id);
-        SANDESHA2_SENDER_BEAN_SET_SEND(ack_bean, env, AXIS2_TRUE);
-        SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(ack_bean, env, 
+        sandesha2_sender_bean_set_resend(ack_bean, env, AXIS2_FALSE);
+        sandesha2_sender_bean_set_seq_id(ack_bean, env, seq_id);
+        sandesha2_sender_bean_set_send(ack_bean, env, AXIS2_TRUE);
+        sandesha2_sender_bean_set_msg_type(ack_bean, env, 
                         SANDESHA2_MSG_TYPE_ACK);
                         
         property = axis2_property_create(env);
@@ -331,12 +331,12 @@
                         ack_interval;
                         
         find_bean = sandesha2_sender_bean_create(env);
-        SANDESHA2_SENDER_BEAN_SET_RESEND(find_bean, env, AXIS2_FALSE);
-        SANDESHA2_SENDER_BEAN_SET_SEND(find_bean, env, AXIS2_TRUE);
-        SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(find_bean, env, 
+        sandesha2_sender_bean_set_resend(find_bean, env, AXIS2_FALSE);
+        sandesha2_sender_bean_set_send(find_bean, env, AXIS2_TRUE);
+        sandesha2_sender_bean_set_msg_type(find_bean, env, 
                         SANDESHA2_MSG_TYPE_ACK);
                         
-        found_list = SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(retrans_mgr, env, 
+        found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env, 
                         find_bean);
         if(NULL != found_list)
         {
@@ -345,16 +345,16 @@
             {
                 sandesha2_sender_bean_t *old_ack_bean = NULL;
                 old_ack_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
-                time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(
+                time_to_send = sandesha2_sender_bean_get_time_to_send(
                         old_ack_bean, env);
-                SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env, 
-                        SANDESHA2_SENDER_BEAN_GET_MSG_ID(old_ack_bean, env));
+                sandesha2_sender_mgr_remove(retrans_mgr, env, 
+                        sandesha2_sender_bean_get_msg_id(old_ack_bean, env));
             }
         }
-        SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(ack_bean, env, time_to_send); 
+        sandesha2_sender_bean_set_time_to_send(ack_bean, env, time_to_send); 
         /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(ack_msg_ctx, env, AXIS2_TRUE);*/
         sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx);
-        SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, ack_bean);
+        sandesha2_sender_mgr_insert(retrans_mgr, env, ack_bean);
         
         property = axis2_property_create(env);
         AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);



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