ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r472393 - in /webservices/sandesha/trunk/c: include/ samples/rm_echo/ src/msgprocessors/ src/util/ src/wsrm/
Date Wed, 08 Nov 2006 05:08:44 GMT
Author: damitha
Date: Tue Nov  7 21:08:43 2006
New Revision: 472393

URL: http://svn.apache.org/viewvc?view=rev&rev=472393
Log:
Removing unneccessary OO code and macros

Modified:
    webservices/sandesha/trunk/c/include/sandesha2_accept.h
    webservices/sandesha/trunk/c/include/sandesha2_ack_range.h
    webservices/sandesha/trunk/c/include/sandesha2_iom_rm_element.h
    webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c
    webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.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/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/wsrm/Makefile.am
    webservices/sandesha/trunk/c/src/wsrm/accept.c
    webservices/sandesha/trunk/c/src/wsrm/ack_range.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/close_seq.c
    webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
    webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
    webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
    webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
    webservices/sandesha/trunk/c/src/wsrm/sequence.c
    webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
    webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c

Modified: webservices/sandesha/trunk/c/include/sandesha2_accept.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_accept.h?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_accept.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_accept.h Tue Nov  7 21:08:43 2006
@@ -37,47 +37,33 @@
  * @ingroup sandesha2_wsrm
  * @{
  */
-typedef struct sandesha2_accept_ops sandesha2_accept_ops_t;
 typedef struct sandesha2_accept sandesha2_accept_t;
  
 /**
- * @brief Accept ops struct
- * Encapsulator struct for ops of sandesha2_accept
- */
-AXIS2_DECLARE_DATA struct sandesha2_accept_ops
-{
-    axis2_status_t (AXIS2_CALL *
-        set_acks_to) 
-		    (sandesha2_accept_t *accept, const axis2_env_t *env, 
-            sandesha2_acks_to_t *acks_to);
-            
-    sandesha2_acks_to_t* (AXIS2_CALL *
-        get_acks_to) 
-		    (sandesha2_accept_t *accept, const axis2_env_t *env);
-};
-
-/**
  * @brief sandesha2_accept
  *    sandesha2_accept
  */
 AXIS2_DECLARE_DATA struct sandesha2_accept
 {
     sandesha2_iom_rm_element_t element;
-    sandesha2_accept_ops_t *ops;
 };
 
 AXIS2_EXTERN sandesha2_accept_t* AXIS2_CALL
 sandesha2_accept_create(
-						const axis2_env_t *env, 
-					    axis2_char_t *rm_ns_value, 
-					    axis2_char_t *addr_ns_value);
+    const axis2_env_t *env, 
+    axis2_char_t *rm_ns_value, 
+    axis2_char_t *addr_ns_value);
                         
-/************************** Start of function macros **************************/
-#define SANDESHA2_ACCEPT_SET_ACKS_TO(accept, env, acks_to) \
-    ((accept)->ops->set_acks_to (accept, env, acks_to))
-#define SANDESHA2_ACCEPT_GET_ACKS_TO(accept, env) \
-    ((accept)->ops->get_acks_to (accept, env))
-/************************** End of function macros ****************************/
+axis2_status_t AXIS2_CALL
+sandesha2_accept_set_acks_to(
+    sandesha2_accept_t *accept,
+    const axis2_env_t *env, 
+    sandesha2_acks_to_t *acks_to);
+
+sandesha2_acks_to_t * AXIS2_CALL
+sandesha2_accept_get_acks_to(
+    sandesha2_accept_t *accept,
+    const axis2_env_t *env);                    	 
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/sandesha/trunk/c/include/sandesha2_ack_range.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_range.h?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_range.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_range.h Tue Nov  7 21:08:43 2006
@@ -39,35 +39,6 @@
 typedef struct sandesha2_ack_range sandesha2_ack_range_t;
  
 /**
- * @brief Acknowledgement Range ops struct
- * Encapsulator struct for ops of sandesha2_ack_range
- */
-AXIS2_DECLARE_DATA struct sandesha2_ack_range_ops
-{
-    long (AXIS2_CALL *
-        get_lower_value)
-            (sandesha2_ack_range_t *ack_range,
-            const axis2_env_t *env);
-
-    axis2_status_t (AXIS2_CALL *
-        set_lower_value)
-            (sandesha2_ack_range_t *ack_range,
-            const axis2_env_t *env, 
-            long value);
-
-    long (AXIS2_CALL *
-        get_upper_value)
-            (sandesha2_ack_range_t *ack_range,
-            const axis2_env_t *env);
-                    	
-    axis2_status_t (AXIS2_CALL *
-        set_upper_value)
-            (sandesha2_ack_range_t *ack_range,
-            const axis2_env_t *env, 
-            long value);
-};
-
-/**
  * @brief sandesha2_ack_range
  *    sandesha2_ack_range
  */
@@ -82,17 +53,29 @@
     const axis2_env_t *env, 
     axis2_char_t *ns_value,
     axis2_char_t *prefix);
-                        
-/************************** Start of function macros **************************/
-#define SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, value) \
-    ((ack_range)->ops->set_lower_value (ack_range, env, value))
-#define SANDESHA2_ACK_RANGE_GET_LOWER_VALUE(ack_range, env) \
-    ((ack_range)->ops->get_lower_value (ack_range, env))
-#define SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, value) \
-    ((ack_range)->ops->set_upper_value(ack_range, env, value))
-#define SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env) \
-    ((ack_range)->ops->get_upper_value (ack_range, env))
-/************************** End of function macros ****************************/    
+                         	
+long AXIS2_CALL
+sandesha2_ack_range_get_lower_value(
+    sandesha2_ack_range_t *ack_range,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL                 
+sandesha2_ack_range_set_lower_value(
+    sandesha2_ack_range_t *ack_range,
+    const axis2_env_t *env, 
+    long value);
+
+long AXIS2_CALL                    	
+sandesha2_ack_range_get_upper_value(
+    sandesha2_ack_range_t *ack_range,
+    const axis2_env_t *env);
+                    	
+axis2_status_t AXIS2_CALL
+sandesha2_ack_range_set_upper_value(
+    sandesha2_ack_range_t *ack_range,
+    const axis2_env_t *env, 
+    long value);
+                    
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/include/sandesha2_iom_rm_element.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_iom_rm_element.h?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_iom_rm_element.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_iom_rm_element.h Tue Nov  7 21:08:43 2006
@@ -48,23 +48,25 @@
 AXIS2_DECLARE_DATA struct sandesha2_iom_rm_element_ops
 {
     axis2_char_t* (AXIS2_CALL *get_namespace_value) 
-						(sandesha2_iom_rm_element_t *element,
-                    	const axis2_env_t *env);
+        (sandesha2_iom_rm_element_t *element,
+        const axis2_env_t *env);
 
-    void* (AXIS2_CALL *from_om_node) (sandesha2_iom_rm_element_t *element,
-                    	const axis2_env_t *env, axiom_node_t *om_node);
+    void* (AXIS2_CALL *from_om_node) 
+        (sandesha2_iom_rm_element_t *element,
+        const axis2_env_t *env, axiom_node_t *om_node);
 
     axiom_node_t* (AXIS2_CALL *to_om_node) 
-    					(sandesha2_iom_rm_element_t *element,
-                    	const axis2_env_t *env, 
-                        void *om_node);
+        (sandesha2_iom_rm_element_t *element,
+        const axis2_env_t *env, 
+        void *om_node);
 
 	axis2_bool_t (AXIS2_CALL *is_namespace_supported) 
-    					(sandesha2_iom_rm_element_t *element,
-                    	const axis2_env_t *env, axis2_char_t *namespace);
+        (sandesha2_iom_rm_element_t *element,
+        const axis2_env_t *env, axis2_char_t *ns);
                     	
-    axis2_status_t (AXIS2_CALL *free) (sandesha2_iom_rm_element_t *element,
-                    const axis2_env_t *env);
+    axis2_status_t (AXIS2_CALL *free)
+        (sandesha2_iom_rm_element_t *element,
+        const axis2_env_t *env);
 };
 
 /**
@@ -76,27 +78,34 @@
     sandesha2_iom_rm_element_ops_t *ops;
 };
 
-/************************** Start of function macros **************************/
-#define SANDESHA2_IOM_RM_ELEMENT_FREE(element, env) \
-    (((sandesha2_iom_rm_element_t*)(element))->ops->free (\
-    (sandesha2_iom_rm_element_t*)element, env))
+axis2_status_t AXIS2_CALL
+sandesha2_iom_rm_element_free(
+    sandesha2_iom_rm_element_t *element,
+    const axis2_env_t *env);
     
-#define SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(element, env) \
-    (((sandesha2_iom_rm_element_t*)(element))->ops->get_namespace_value (\
-    (sandesha2_iom_rm_element_t*)element, env))
-    
-#define SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(element, env, om_node) \
-    (((sandesha2_iom_rm_element_t*)(element))->ops->from_om_node (\
-    (sandesha2_iom_rm_element_t*)element, env, om_node))
-    
-#define SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(element, env, om_node) \
-    (((sandesha2_iom_rm_element_t*)(element))->ops->to_om_node(\
-    (sandesha2_iom_rm_element_t*)element, env, om_node))
-    
-#define SANDESHA2_IOM_RM_ELEMENT_IS_NAMESPACE_SUPPORTED(element, env, ns) \
-    (((sandesha2_iom_rm_element_t*)(element))->ops->is_namespace_supported (\
-    (sandesha2_iom_rm_element_t*)element, env, ns))
-/************************** End of function macros ****************************/    
+axis2_char_t* AXIS2_CALL
+sandesha2_iom_rm_element_get_namespace_value( 
+    sandesha2_iom_rm_element_t *element,
+    const axis2_env_t *env);
+
+void* AXIS2_CALL
+sandesha2_iom_rm_element_from_om_node(
+    sandesha2_iom_rm_element_t *element,
+    const axis2_env_t *env, 
+    axiom_node_t *om_node);
+
+axiom_node_t * AXIS2_CALL
+sandesha2_iom_rm_element_to_om_node(
+    sandesha2_iom_rm_element_t *element,
+    const axis2_env_t *env, 
+    void *om_node);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_iom_rm_element_is_namespace_supported( 
+    sandesha2_iom_rm_element_t *element,
+    const axis2_env_t *env, 
+    axis2_char_t *ns);
+
  /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c Tue Nov  7 21:08:43 2006
@@ -22,7 +22,7 @@
 #include <axis2_conf_ctx.h>
 #include <axis2_op_client.h>
 #include <axis2_listener_manager.h>
-#include <callback_recv.h>
+#include <axis2_callback_recv.h>
 #include <axis2_svc_client.h>
 
 /* on_complete callback function */

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=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Tue Nov  7 21:08:43 2006
@@ -160,8 +160,6 @@
     sandesha2_fault_mgr_t *fault_mgr = NULL;
     sandesha2_msg_ctx_t *fault_msg_ctx = NULL;
     axis2_char_t *int_seq_id = NULL;
-    sandesha2_seq_property_bean_t *int_seq_bean = NULL;
-    axis2_char_t *internal_seq_id = NULL;
     axis2_property_t *property = NULL;
     sandesha2_sender_bean_t *input_bean = NULL;
     axis2_array_list_t *retrans_list = NULL;
@@ -237,16 +235,6 @@
                         SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
     sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id, 
                         storage_mgr);
-    int_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
-                        out_seq_id, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-    if(!int_seq_bean || NULL == SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
-                        int_seq_bean, env))
-    {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] TempSequenceId "
-                        "is not set correctly");
-        return AXIS2_FAILURE;
-    }
-    internal_seq_id  = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(int_seq_bean, env);
     property = axis2_property_create(env);
     AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
     AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, 
@@ -274,8 +262,8 @@
         long j = 0;
         
         ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
-        lower = SANDESHA2_ACK_RANGE_GET_LOWER_VALUE(ack_range, env);
-        upper = SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env);
+        lower = sandesha2_ack_range_get_lower_value(ack_range, env);
+        upper = sandesha2_ack_range_get_upper_value(ack_range, env);
         for(j = lower; j <= upper; j++)
         {
             sandesha2_sender_bean_t *retrans_bean = NULL;
@@ -354,7 +342,7 @@
             axis2_bool_t completed = AXIS2_FALSE;
             completed = sandesha2_ack_mgr_verify_seq_completion(env, 
                         ack_range_list, highest_out_msg_no);
-            if(AXIS2_TRUE == completed)
+            if(completed)
                 sandesha2_terminate_mgr_add_terminate_seq_msg(env, rm_msg_ctx,
                         out_seq_id, int_seq_id, storage_mgr);
         }
@@ -379,7 +367,6 @@
     return AXIS2_SUCCESS;
 }
 
-
 static sandesha2_sender_bean_t* AXIS2_CALL 
 sandesha2_ack_msg_processor_get_retrans_entry(
     const axis2_env_t *env, 
@@ -420,8 +407,8 @@
         long diff = 0;
         
         ack_range = AXIS2_ARRAY_LIST_GET(list, env, i);
-        lower = SANDESHA2_ACK_RANGE_GET_LOWER_VALUE(ack_range, env);
-        upper = SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env);
+        lower = sandesha2_ack_range_get_lower_value(ack_range, env);
+        upper = sandesha2_ack_range_get_upper_value(ack_range, env);
         
         diff = upper - lower;
         if(diff > 0)

Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Tue Nov  7 21:08:43 2006
@@ -303,7 +303,7 @@
         offered_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(offerd_seq_bean,
                         env);
         acks_to_epr = SANDESHA2_ADDRESS_GET_EPR(SANDESHA2_ACKS_TO_GET_ADDRESS(
-                        SANDESHA2_ACCEPT_GET_ACKS_TO(accept, env), env), env);
+                        sandesha2_accept_get_acks_to(accept, env), env), env);
         acks_to_bean = sandesha2_seq_property_bean_create(env);
         SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(acks_to_bean, env, 
                         SANDESHA2_SEQ_PROP_ACKS_TO_EPR);

Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Tue Nov  7 21:08:43 2006
@@ -340,7 +340,7 @@
     completed_msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, 
             env, seq_id, 
             SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
-    if(completed_msgs_bean != NULL)
+    if(completed_msgs_bean)
     {
         axis2_char_t *value = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
                 completed_msgs_bean, env);
@@ -376,7 +376,7 @@
         sandesha2_ack_range_t *ack_range = NULL;
         
         ack_range = AXIS2_ARRAY_LIST_GET(ack_ranges, env, i);
-        sprintf(tmp, "%ld", SANDESHA2_ACK_RANGE_GET_LOWER_VALUE(ack_range, env));
+        sprintf(tmp, "%ld", sandesha2_ack_range_get_lower_value(ack_range, env));
         axis2_hash_set(hash, tmp, AXIS2_HASH_KEY_STRING, ack_range);
     }
     
@@ -390,9 +390,9 @@
         {
             break;
         }
-        if(SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env) >= last_msg_no)
+        if(sandesha2_ack_range_get_upper_value(ack_range, env) >= last_msg_no)
             return AXIS2_TRUE;
-        start = SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env) + 1;        
+        start = sandesha2_ack_range_get_upper_value(ack_range, env) + 1;        
     }
     return AXIS2_FALSE;
 }

Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Tue Nov  7 21:08:43 2006
@@ -429,8 +429,8 @@
             long upper = -1;
             long lower = -1;
             ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
-            lower = SANDESHA2_ACK_RANGE_GET_LOWER_VALUE(ack_range, env);
-            upper = SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env);
+            lower = sandesha2_ack_range_get_lower_value(ack_range, env);
+            upper = sandesha2_ack_range_get_upper_value(ack_range, env);
             if(lower > upper)
             {
                 invalid_ack = AXIS2_TRUE;
@@ -462,7 +462,7 @@
                         SANDESHA2_SOAP_FAULT_SUBCODE_INVALID_ACKNOWLEDGEMENT);
         dummy_ele = axiom_element_create(env, NULL, "dummy_ele", NULL, 
                         &dummy_node);
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack, env, dummy_node);
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack, env, dummy_node);
         qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK, 
                         NULL, NULL);
         detail_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(dummy_ele, env,

Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Tue Nov  7 21:08:43 2006
@@ -330,7 +330,7 @@
             acks_to = sandesha2_acks_to_create(env, address, rm_ns_value, addressing_ns_value);
             SANDESHA2_ADDRESS_SET_EPR(address, env, acks_to_epr);
             SANDESHA2_ACKS_TO_SET_ADDRESS(acks_to, env, address);
-            SANDESHA2_ACCEPT_SET_ACKS_TO(accept, env, acks_to);
+            sandesha2_accept_set_acks_to(accept, env, acks_to);
             SANDESHA2_CREATE_SEQ_RES_SET_ACCEPT(response, env, accept);
         }
     }
@@ -339,7 +339,7 @@
     envelope = axiom_soap_envelope_create_default_soap_envelope(env, soap_version);
     temp_soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
     temp_om_node = AXIOM_SOAP_BODY_GET_BASE_NODE(temp_soap_body, env);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE((sandesha2_iom_rm_element_t *) response, 
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)(sandesha2_iom_rm_element_t *) response, 
             env, temp_om_node);
     temp_action = sandesha2_spec_specific_consts_get_create_seq_res_action(
             env, rm_version);
@@ -444,11 +444,11 @@
  */
 sandesha2_msg_ctx_t *AXIS2_CALL
 sandesha2_msg_creator_create_terminate_seq_msg(
-        const axis2_env_t *env,
-        sandesha2_msg_ctx_t *ref_rm_msg, 
-        axis2_char_t *seq_id,
-        axis2_char_t *internal_seq_id,
-        sandesha2_storage_mgr_t *storage_mgr)
+    const axis2_env_t *env,
+    sandesha2_msg_ctx_t *ref_rm_msg, 
+    axis2_char_t *seq_id,
+    axis2_char_t *internal_seq_id,
+    sandesha2_storage_mgr_t *storage_mgr)
 {
     axis2_msg_ctx_t *ref_msg_ctx = NULL;
     axis2_msg_ctx_t *terminate_seq_msg_ctx = NULL;
@@ -469,20 +469,20 @@
     sandesha2_identifier_t *identifier = NULL;
 
     ref_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(ref_rm_msg, env);
-    if(ref_msg_ctx == NULL)
+    if(!ref_msg_ctx)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
                 AXIS2_FAILURE);
         return NULL;
     }
     terminate_seq_op = axis2_op_create(env);
-    if(terminate_seq_op == NULL)
+    if(!terminate_seq_op)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(ref_msg_ctx, env);
-    if(conf_ctx == NULL)
+    if(!conf_ctx)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
         return NULL;
@@ -888,7 +888,7 @@
             (sandesha2_iom_rm_part_t *) seq_ack);
     soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
 
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack, env, soap_header);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack, env, soap_header);
 
     rm_version = sandesha2_utils_get_rm_version(env, seq_id, storage_mgr);
     ack_req_action = sandesha2_spec_specific_consts_get_seq_ack_action(env, 

Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Tue Nov  7 21:08:43 2006
@@ -147,7 +147,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_CREATE_SEQ, (sandesha2_iom_rm_part_t *) 
                 create_seq);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) create_seq, env);
     }
     create_seq_res = SANDESHA2_RM_ELEMENTS_GET_CREATE_SEQ_RES(elements, env);
@@ -156,7 +156,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE, 
                 (sandesha2_iom_rm_part_t *) create_seq_res);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) create_seq_res, env);
         add_op_if_null(env, msg_ctx);
     }
@@ -165,7 +165,7 @@
     {
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_SEQ, (sandesha2_iom_rm_part_t *) seq);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) seq, env);
     }
     seq_ack = SANDESHA2_RM_ELEMENTS_GET_SEQ_ACK(elements, env);
@@ -174,7 +174,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT, 
                 (sandesha2_iom_rm_part_t *) seq_ack);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) seq_ack, env);
         add_op_if_null(env, msg_ctx);
     }
@@ -184,7 +184,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_TERMINATE_SEQ, 
                 (sandesha2_iom_rm_part_t *) terminate_seq);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) terminate_seq, env);
         add_op_if_null(env, msg_ctx);
     }
@@ -194,7 +194,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE, 
                 (sandesha2_iom_rm_part_t *) terminate_seq_res);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) terminate_seq_res, env);
     }
     ack_request = SANDESHA2_RM_ELEMENTS_GET_ACK_REQUESTED(elements, env);
@@ -203,7 +203,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_ACK_REQUEST, 
                 (sandesha2_iom_rm_part_t *) ack_request);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) ack_request, env);
     }
     close_seq = SANDESHA2_RM_ELEMENTS_GET_CLOSE_SEQ(elements, env);
@@ -212,7 +212,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_CLOSE_SEQ, 
                 (sandesha2_iom_rm_part_t *) close_seq);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) close_seq, env);
     }
     close_seq_res = SANDESHA2_RM_ELEMENTS_GET_CLOSE_SEQ_RES(elements, env);
@@ -221,7 +221,7 @@
         SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, 
                 SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE, 
                 (sandesha2_iom_rm_part_t *) close_seq_res);
-        rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+        rm_ns = sandesha2_iom_rm_element_get_namespace_value(
                 (sandesha2_iom_rm_element_t *) close_seq_res, env);
     }
     SANDESHA2_MSG_CTX_SET_RM_NS_VAL(rm_msg_ctx, env, rm_ns);

Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Tue Nov  7 21:08:43 2006
@@ -187,10 +187,9 @@
                         storage_mgr, env);
     seq_prop_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
                         env, incoming_seq_id, name);
-    if(NULL == seq_prop_bean)
+    if(!seq_prop_bean)
         return NULL;
     return  SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_prop_bean, env);
-    return NULL;
 }
 
 AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
@@ -584,10 +583,10 @@
     options = axis2_options_create(env);
     AXIS2_MSG_CTX_SET_OPTIONS(new_msg, env, options);
     svc_grp = AXIS2_MSG_CTX_GET_SVC_GRP(ref_msg, env); 
-    if(NULL != svc_grp)
+    if(svc_grp)
     {
         AXIS2_MSG_CTX_SET_SVC_GRP(new_msg, env, svc_grp);
-        if(NULL != AXIS2_MSG_CTX_GET_SVC_GRP_CTX(ref_msg, env))
+        if(AXIS2_MSG_CTX_GET_SVC_GRP_CTX(ref_msg, env))
         {
             AXIS2_MSG_CTX_SET_SVC_GRP_CTX(new_msg, env, 
                     AXIS2_MSG_CTX_GET_SVC_GRP_CTX(ref_msg, env));
@@ -612,7 +611,7 @@
         AXIS2_MSG_CTX_SET_SVC_GRP(new_msg, env, svc_grp);
         AXIS2_MSG_CTX_SET_SVC_GRP_CTX(new_msg, env, svc_grp_ctx);
     }
-    if(NULL != AXIS2_MSG_CTX_GET_SVC(ref_msg, env))
+    if(AXIS2_MSG_CTX_GET_SVC(ref_msg, env))
     {
         AXIS2_MSG_CTX_SET_SVC(new_msg, env, AXIS2_MSG_CTX_GET_SVC(ref_msg, env));
         if(NULL != AXIS2_MSG_CTX_GET_SVC_CTX(ref_msg, env))
@@ -652,7 +651,7 @@
     AXIS2_MSG_CTX_SET_OP(new_msg, env, op);
     svc = AXIS2_MSG_CTX_GET_SVC(new_msg, env);
     
-    if(NULL != svc && NULL != op)
+    if(svc && op)
     {
         AXIS2_SVC_ADD_OP(svc, env, op);
         AXIS2_OP_SET_PARENT(op, env, svc);
@@ -670,7 +669,7 @@
     
     property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_TRANSPORT_URL,
                         AXIS2_FALSE);
-    if(NULL != property && NULL != AXIS2_PROPERTY_GET_VALUE(property, env))
+    if(property && AXIS2_PROPERTY_GET_VALUE(property, env))
     {
         axis2_char_t *val = AXIS2_PROPERTY_GET_VALUE(property, env);
         property = axis2_property_create(env);
@@ -681,18 +680,18 @@
     }
     property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_WSA_VERSION,
                         AXIS2_FALSE);
-    if(NULL == property)
+    if(!property)
     {
         axis2_msg_ctx_t *req_msg = NULL;
         axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(ref_msg, env);
         
         req_msg = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, 
                         AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
-        if(NULL != req_msg)
+        if(req_msg)
         {
             property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg, env, 
                         AXIS2_WSA_VERSION, AXIS2_FALSE);
-            if(NULL != property)
+            if(property)
                 addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
         }
     }
@@ -994,8 +993,8 @@
              sandesha2_ack_range_t *ack_range = NULL;
              
              ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
-             SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, lower);
-             SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, upper);
+             sandesha2_ack_range_set_lower_value(ack_range, env, lower);
+             sandesha2_ack_range_set_upper_value(ack_range, env, upper);
              AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
              lower = *temp;
              upper = *temp;
@@ -1007,8 +1006,8 @@
          sandesha2_ack_range_t *ack_range = NULL;
          
          ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
-         SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, lower);
-         SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, upper);
+         sandesha2_ack_range_set_lower_value(ack_range, env, lower);
+         sandesha2_ack_range_set_upper_value(ack_range, env, upper);
          AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
          completed = AXIS2_TRUE;
     }

Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Tue Nov  7 21:08:43 2006
@@ -165,7 +165,7 @@
                 AXIS2_FAILURE);
         return NULL;
     }
-    msg_rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
+    msg_rm_ns = sandesha2_iom_rm_element_get_namespace_value(
             (sandesha2_iom_rm_element_t *) create_seq, env);
     if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_2005_02_NS_URI, msg_rm_ns))
     {

Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue Nov  7 21:08:43 2006
@@ -34,10 +34,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(
-                        const axis2_env_t *env,
-                        axis2_conf_ctx_t *conf_ctx,
-                        axis2_char_t *seq_id,
-                        sandesha2_storage_mgr_t *storage_man)
+    const axis2_env_t *env,
+    axis2_conf_ctx_t *conf_ctx,
+    axis2_char_t *seq_id,
+    sandesha2_storage_mgr_t *storage_man)
 {
     axis2_bool_t in_order_invoke = AXIS2_FALSE;
     sandesha2_property_bean_t *prop_bean = NULL;
@@ -74,10 +74,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 sandesha2_terminate_mgr_clean_recv_side_after_invocation(
-                        const axis2_env_t *env,
-                        axis2_conf_ctx_t *conf_ctx,
-                        axis2_char_t *seq_id,
-                        sandesha2_storage_mgr_t *storage_man)
+    const axis2_env_t *env,
+    axis2_conf_ctx_t *conf_ctx,
+    axis2_char_t *seq_id,
+    sandesha2_storage_mgr_t *storage_man)
 {
      sandesha2_invoker_mgr_t *invoker_mgr = NULL;
     sandesha2_invoker_bean_t *find_bean = NULL;
@@ -133,10 +133,10 @@
                         
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 sandesha2_terminate_mgr_complete_term_on_recv_side(
-                        const axis2_env_t *env,
-                        axis2_conf_ctx_t *conf_ctx,
-                        axis2_char_t *seq_id,
-                        sandesha2_storage_mgr_t *storage_man)
+    const axis2_env_t *env,
+    axis2_conf_ctx_t *conf_ctx,
+    axis2_char_t *seq_id,
+    sandesha2_storage_mgr_t *storage_man)
 {
     sandesha2_next_msg_mgr_t *next_mgr = NULL;
     sandesha2_next_msg_bean_t *find_bean = NULL;
@@ -167,10 +167,10 @@
                         
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 sandesha2_terminate_mgr_remove_recv_side_propertis(
-                        const axis2_env_t *env,
-                        axis2_conf_ctx_t *conf_ctx,
-                        axis2_char_t *seq_id,
-                        sandesha2_storage_mgr_t *storage_man)
+    const axis2_env_t *env,
+    axis2_conf_ctx_t *conf_ctx,
+    axis2_char_t *seq_id,
+    sandesha2_storage_mgr_t *storage_man)
 {
     sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
     sandesha2_seq_property_bean_t *all_seq_bean = NULL;
@@ -338,11 +338,11 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 sandesha2_terminate_mgr_clean_sending_side_data(
-                        const axis2_env_t *env,
-                        axis2_conf_ctx_t *conf_ctx,
-                        axis2_char_t *seq_id,
-                        axis2_bool_t svr_side,
-                        sandesha2_storage_mgr_t *storage_man)
+    const axis2_env_t *env,
+    axis2_conf_ctx_t *conf_ctx,
+    axis2_char_t *seq_id,
+    axis2_bool_t svr_side,
+    sandesha2_storage_mgr_t *storage_man)
 {
     sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
     sandesha2_sender_mgr_t *retrans_mgr = NULL;
@@ -487,10 +487,9 @@
     seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
     terminated = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, 
                         out_seq_id, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
-    if(NULL != terminated && NULL != SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(
-                        terminated, env) && 0 == AXIS2_STRCMP(
-                        SANDESHA2_VALUE_TRUE, 
-                        SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(terminated, env)))
+    if(terminated && SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(terminated, env) 
+            && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, 
+            SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(terminated, env)))
     {
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was"
                         " added previously");
@@ -509,7 +508,7 @@
                         SANDESHA2_SEQ_PROP_TO_EPR);
     to_epr = axis2_endpoint_ref_create(env, 
                         SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(to_bean, env));
-    if(NULL == to_epr)
+    if(!to_epr)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] To EPR has an "
                         "invalid value");
@@ -518,7 +517,7 @@
     SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, to_epr);
     SANDESHA2_MSG_CTX_SET_TO(terminate_rm_msg, env, to_epr);
     rm_ver = sandesha2_utils_get_rm_version(env, int_seq_id, storage_man);
-    if(NULL == rm_ver)
+    if(!rm_ver)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot find the "
                         "rm version for msg");
@@ -532,7 +531,7 @@
                         (env, rm_ver));
     transport_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
                         int_seq_id, SANDESHA2_SEQ_PROP_TRANSPORT_TO);
-    if(NULL != transport_to_bean)
+    if(transport_to_bean)
     {
         property = axis2_property_create(env);
         AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);

Modified: webservices/sandesha/trunk/c/src/wsrm/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/Makefile.am?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/wsrm/Makefile.am Tue Nov  7 21:08:43 2006
@@ -24,7 +24,8 @@
                                seq_fault.c\
                                terminate_seq.c\
                                terminate_seq_res.c\
-                               rm_elements.c
+                               rm_elements.c \
+                               iom_rm_element.c
 
 INCLUDES = -I$(top_builddir)/include \
             @AXIS2INC@

Modified: webservices/sandesha/trunk/c/src/wsrm/accept.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/accept.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/accept.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/accept.c Tue Nov  7 21:08:43 2006
@@ -49,14 +49,6 @@
 axis2_bool_t AXIS2_CALL 
 sandesha2_accept_is_namespace_supported(sandesha2_iom_rm_element_t *accept,
                     	const axis2_env_t *env, axis2_char_t *namespace);
-
-axis2_status_t AXIS2_CALL
-sandesha2_accept_set_acks_to(sandesha2_accept_t *accept,
-                    	const axis2_env_t *env, sandesha2_acks_to_t *acks_to);
-
-sandesha2_acks_to_t * AXIS2_CALL
-sandesha2_accept_get_acks_to(sandesha2_accept_t *accept,
-                    	const axis2_env_t *env);                    	 
      
 axis2_status_t AXIS2_CALL 
 sandesha2_accept_free (sandesha2_iom_rm_element_t *accept, const axis2_env_t *env);								
@@ -92,7 +84,6 @@
     accept_impl->addr_ns_val = NULL;
     accept_impl->acks_to = NULL;
     accept_impl->accept.element.ops = NULL;
-    accept_impl->accept.ops = NULL;
     
     accept_impl->accept.element.ops = AXIS2_MALLOC(env->allocator,
         sizeof(sandesha2_iom_rm_element_ops_t));
@@ -102,14 +93,6 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    accept_impl->accept.ops = AXIS2_MALLOC(env->allocator,
-        sizeof(sandesha2_accept_ops_t));
-    if(NULL == accept_impl->accept.ops)
-	{
-		sandesha2_accept_free((sandesha2_iom_rm_element_t*)accept_impl, env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-	}
     
     accept_impl->rm_ns_val = (axis2_char_t *)AXIS2_STRDUP(rm_ns_val, env);
     accept_impl->addr_ns_val = (axis2_char_t *)AXIS2_STRDUP(addr_ns_val, env);
@@ -121,8 +104,6 @@
     accept_impl->accept.element.ops->to_om_node = sandesha2_accept_to_om_node;
     accept_impl->accept.element.ops->is_namespace_supported = 
     					sandesha2_accept_is_namespace_supported;
-    accept_impl->accept.ops->set_acks_to = sandesha2_accept_set_acks_to;
-    accept_impl->accept.ops->get_acks_to = sandesha2_accept_get_acks_to;
     accept_impl->accept.element.ops->free = sandesha2_accept_free;
                         
 	return &(accept_impl->accept);
@@ -215,7 +196,7 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(accept_impl->acks_to, env, 
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)accept_impl->acks_to, env, 
                         child_om_node))
     {
         return NULL;
@@ -255,8 +236,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(accept_impl->acks_to,
-                        env, accept_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+            accept_impl->acks_to, env, accept_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, accept_node);
 
     return (axiom_node_t*)om_node;
@@ -279,8 +260,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-sandesha2_accept_set_acks_to(sandesha2_accept_t *accept,
-                    	const axis2_env_t *env, sandesha2_acks_to_t *acks_to)
+sandesha2_accept_set_acks_to(
+    sandesha2_accept_t *accept,
+    const axis2_env_t *env, 
+    sandesha2_acks_to_t *acks_to)
 {
 	sandesha2_accept_impl_t *accept_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -293,8 +276,9 @@
 
 
 sandesha2_acks_to_t * AXIS2_CALL
-sandesha2_accept_get_acks_to(sandesha2_accept_t *accept,
-                    	const axis2_env_t *env)
+sandesha2_accept_get_acks_to(
+    sandesha2_accept_t *accept,
+    const axis2_env_t *env)
 {
 	sandesha2_accept_impl_t *accept_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_range.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_range.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Tue Nov  7 21:08:43 2006
@@ -52,23 +52,7 @@
 axis2_bool_t AXIS2_CALL 
 sandesha2_ack_range_is_namespace_supported(sandesha2_iom_rm_element_t *ack_range,
                     	const axis2_env_t *env, axis2_char_t *namespace);
-                    	
-long AXIS2_CALL
-sandesha2_ack_range_get_lower_value(sandesha2_ack_range_t *ack_range,
-                    	const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL                 
-sandesha2_ack_range_set_lower_value(sandesha2_ack_range_t *ack_range,
-                    	const axis2_env_t *env, long value);
-
-long AXIS2_CALL                    	
-sandesha2_ack_range_get_upper_value(sandesha2_ack_range_t *ack_range,
-                    	const axis2_env_t *env);
-                    	
-axis2_status_t AXIS2_CALL
-sandesha2_ack_range_set_upper_value(sandesha2_ack_range_t *ack_range,
-                    	const axis2_env_t *env, long value);
-                    	
+                   	
 axis2_status_t AXIS2_CALL 
 sandesha2_ack_range_free (sandesha2_iom_rm_element_t *ack_range, 
 						const axis2_env_t *env);								
@@ -118,16 +102,6 @@
         return NULL;
 	}
     
-    ack_range_impl->ack_range.ops = AXIS2_MALLOC(env->allocator,
-        sizeof(sandesha2_ack_range_ops_t));
-    if(NULL == ack_range_impl->ack_range.ops)
-	{
-		sandesha2_ack_range_free((sandesha2_iom_rm_element_t*)
-                         ack_range_impl, env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-	}
-        
     ack_range_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env);
     ack_range_impl->prefix = (axis2_char_t *)AXIS2_STRDUP(prefix, env);
     ack_range_impl->upper_val = 0;
@@ -141,14 +115,6 @@
     					sandesha2_ack_range_to_om_node;
     ack_range_impl->ack_range.element.ops->is_namespace_supported = 
     					sandesha2_ack_range_is_namespace_supported;
-    ack_range_impl->ack_range.ops->get_lower_value = 
-                        sandesha2_ack_range_get_lower_value;
-    ack_range_impl->ack_range.ops->set_lower_value = 
-                        sandesha2_ack_range_set_lower_value;
-    ack_range_impl->ack_range.ops->get_upper_value = 
-                        sandesha2_ack_range_get_upper_value;
-    ack_range_impl->ack_range.ops->set_upper_value = 
-                        sandesha2_ack_range_set_upper_value;
     ack_range_impl->ack_range.element.ops->free = sandesha2_ack_range_free;
                         
 	return &(ack_range_impl->ack_range);

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_requested.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Tue Nov  7 21:08:43 2006
@@ -272,7 +272,7 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
                         ack_requested_impl->identifier, env, requested_node))
     {
         return NULL;
@@ -293,7 +293,7 @@
         {
             return NULL;
         }
-        if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
+        if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
                         ack_requested_impl->msg_num, env, requested_node))
         {
             return NULL;
@@ -337,12 +337,12 @@
     AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(ar_header_blk, env,
                         ack_requested_impl->must_understand);
     ar_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(ar_header_blk, env);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(ack_requested_impl->identifier, env, 
-                        ar_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+            ack_requested_impl->identifier, env, ar_node);
     if(NULL != ack_requested_impl->msg_num)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(ack_requested_impl->msg_num, env, 
-                        ar_node);
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+                ack_requested_impl->msg_num, env, ar_node);
     }
     return ar_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/acks_to.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/acks_to.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Tue Nov  7 21:08:43 2006
@@ -222,8 +222,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(acks_to_impl->address, env,
-                        acks_to_node))
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *) 
+                acks_to_impl->address, env, acks_to_node))
     {
         return NULL;
     }
@@ -262,7 +262,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(acks_to_impl->address, env, at_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *) acks_to_impl->address, env, at_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, at_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Tue Nov  7 21:08:43 2006
@@ -237,8 +237,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(close_seq_impl->identifier,
-                        env, close_seq_node))
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+                close_seq_impl->identifier, env, close_seq_node))
     {
         return NULL;   
     }
@@ -278,7 +278,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(close_seq_impl->identifier, env, cs_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+            close_seq_impl->identifier, env, cs_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, cs_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Tue Nov  7 21:08:43 2006
@@ -244,8 +244,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        close_seq_res_impl->identifier, env, csr_node))
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+        close_seq_res_impl->identifier, env, csr_node))
     {
         return NULL;
     }
@@ -285,7 +285,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(close_seq_res_impl->identifier, env, csr_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+            close_seq_res_impl->identifier, env, csr_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, csr_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Tue Nov  7 21:08:43 2006
@@ -276,8 +276,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(create_seq_impl->acks_to, 
-                        env, seq_node))
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->acks_to, 
+        env, seq_node))
     {
         return NULL;
     }
@@ -297,8 +297,8 @@
         {
             return NULL;
         }
-        if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        create_seq_impl->seq_offer, env, seq_node))
+        if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+            create_seq_impl->seq_offer, env, seq_node))
         {
             return NULL;
         } 
@@ -319,7 +319,7 @@
         {
             return NULL;
         }
-        if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
+        if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
                         create_seq_impl->expires,
                         env, seq_node))
         {
@@ -361,15 +361,15 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_impl->acks_to, env, cs_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->acks_to, env, cs_node);
     if(NULL != create_seq_impl->expires)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_impl->expires, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->expires, env, 
                         cs_node);
     }
     if(NULL != create_seq_impl->seq_offer)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_impl->seq_offer, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->seq_offer, env, 
                         cs_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, cs_node);
@@ -418,7 +418,7 @@
 	create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
  	if(NULL != create_seq_impl->acks_to)
 	{
-		SANDESHA2_IOM_RM_ELEMENT_FREE((sandesha2_iom_rm_element_t*)
+		sandesha2_iom_rm_element_free((sandesha2_iom_rm_element_t*)
                         create_seq_impl->acks_to, env);
 		create_seq_impl->acks_to = NULL;
 	}
@@ -449,7 +449,7 @@
 	create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
  	if(NULL != create_seq_impl->seq_offer)
 	{
-		SANDESHA2_IOM_RM_ELEMENT_FREE((sandesha2_iom_rm_element_t*)
+		sandesha2_iom_rm_element_free((sandesha2_iom_rm_element_t*)
                         create_seq_impl->seq_offer, env);
 		create_seq_impl->seq_offer = NULL;
 	}

Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Tue Nov  7 21:08:43 2006
@@ -290,8 +290,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        create_seq_res_impl->identifier, env, csr_node))
+    if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->identifier, 
+                env, csr_node))
     {
         return NULL;
     }
@@ -311,8 +311,8 @@
         {
             return NULL;
         }
-        if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        create_seq_res_impl->expires, env, csr_node))
+        if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+            create_seq_res_impl->expires, env, csr_node))
         {
             return NULL;
         }
@@ -334,7 +334,7 @@
         {
             return NULL;
         }
-        if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
+        if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
                         create_seq_res_impl->accept, env, csr_node))
         {
             return NULL;
@@ -376,16 +376,16 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_res_impl->identifier, env,
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->identifier, env,
                         csr_node);
     if(NULL != create_seq_res_impl->accept)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_res_impl->accept, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->accept, env, 
                         csr_node);
     }
     if(NULL != create_seq_res_impl->expires)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_res_impl->expires, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->expires, env, 
                         csr_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, csr_node);

Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Tue Nov  7 21:08:43 2006
@@ -379,7 +379,7 @@
     if(NULL != seq_node)
     {
         elements_impl->seq = sandesha2_seq_create(env, rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->seq, env, 
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->seq, env, 
                         header_node);
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK, rm_ns_val, 
@@ -389,7 +389,7 @@
     if(NULL != seq_ack_element)
     {
         elements_impl->seq_ack = sandesha2_seq_ack_create(env, rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->seq_ack, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->seq_ack, env,
                         header_node);
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ, rm_ns_val,
@@ -400,7 +400,7 @@
     {
         elements_impl->create_seq = sandesha2_create_seq_create(env,
                         addr_ns_val, rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->create_seq, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->create_seq, env,
                         body_node);
     }
     
@@ -413,7 +413,7 @@
     {
         elements_impl->create_seq_res = sandesha2_create_seq_res_create(env, 
                         rm_ns_val, addr_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->create_seq_res, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->create_seq_res, env,
                         body_node);
     }
     
@@ -426,7 +426,7 @@
     {
         elements_impl->terminate_seq = sandesha2_terminate_seq_create(env, 
                         rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->terminate_seq, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->terminate_seq, env,
                         body_node);
     }
     
@@ -439,7 +439,7 @@
     {
         elements_impl->terminate_seq_res = sandesha2_terminate_seq_res_create(
                         env, rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->terminate_seq_res, 
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->terminate_seq_res, 
                         env, body_node);
     }
     
@@ -452,7 +452,7 @@
     {
         elements_impl->close_seq = sandesha2_close_seq_create(env, 
                         rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->close_seq, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->close_seq, env,
                         body_node);
     }
     
@@ -465,7 +465,7 @@
     {
         elements_impl->close_seq_res = sandesha2_close_seq_res_create(env, 
                         rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->close_seq_res, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->close_seq_res, env,
                         body_node);
     }
     
@@ -478,7 +478,7 @@
     {
         elements_impl->ack_requested = sandesha2_ack_requested_create(env, 
                         rm_ns_val);
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->ack_requested, env,
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)elements_impl->ack_requested, env,
                         header_node);
     }
     return AXIS2_SUCCESS;
@@ -506,42 +506,42 @@
     
     if(NULL != rm_elements_impl->seq)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->seq, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->seq, env, 
                         soap_header);
     }
     if(NULL != rm_elements_impl->seq_ack)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->seq_ack, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->seq_ack, env, 
                         soap_header);
     }
     if(NULL != rm_elements_impl->create_seq)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->create_seq, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->create_seq, env, 
                         body_node);
     }
     if(NULL != rm_elements_impl->create_seq_res)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->create_seq_res, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->create_seq_res, 
                         env, body_node);
     }
     if(NULL != rm_elements_impl->terminate_seq)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->terminate_seq, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->terminate_seq, 
                         env, body_node);
     }
     if(NULL != rm_elements_impl->terminate_seq_res)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->terminate_seq_res, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->terminate_seq_res, 
                         env, body_node);
     }
     if(NULL != rm_elements_impl->close_seq)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->close_seq, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->close_seq, 
                         env, body_node);
     }
     if(NULL != rm_elements_impl->close_seq_res)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(rm_elements_impl->close_seq_res, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)rm_elements_impl->close_seq_res, 
                         env, body_node);
     }
     return soap_envelope;

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Tue Nov  7 21:08:43 2006
@@ -328,7 +328,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->identifier, 
+    sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->identifier, 
                         env, sa_node);
     ack_range_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_RANGE,
                         seq_ack_impl->ns_val, prefix);
@@ -355,7 +355,7 @@
             {
                 return NULL;
             } 
-            if(SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(ack_range, env, ack_node))
+            if(sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)ack_range, env, ack_node))
                 AXIS2_ARRAY_LIST_ADD(seq_ack_impl->ack_range_list, env, ack_range);
         }
     }
@@ -384,7 +384,7 @@
             {
                 return NULL;
             }
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(nack, env, nack_node);
+            sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)nack, env, nack_node);
             AXIS2_ARRAY_LIST_ADD(seq_ack_impl->nack_list, env, nack);
         }
     }
@@ -413,7 +413,7 @@
             {
                 return NULL;
             }
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->ack_final, env,
+            sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->ack_final, env,
                         sa_node);
         }
     }
@@ -440,7 +440,7 @@
             {
                 return NULL;
             }
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->ack_none, env, 
+            sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->ack_none, env, 
                         sa_node);
         }
     }
@@ -487,21 +487,21 @@
     AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(sa_block, env, 
                         seq_ack_impl->must_understand);
     sa_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(sa_block, env);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack_impl->identifier, env, sa_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->identifier, env, sa_node);
 
     for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->ack_range_list, env); i++)
     {
         sandesha2_ack_range_t *ack_range = NULL;
         ack_range = (sandesha2_ack_range_t*)AXIS2_ARRAY_LIST_GET(
                         seq_ack_impl->ack_range_list, env, i);
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(ack_range, env, sa_node);
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)ack_range, env, sa_node);
     }
     for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->nack_list, env); i++)
     {
         sandesha2_nack_t *nack = NULL;
         nack = (sandesha2_nack_t*)AXIS2_ARRAY_LIST_GET(
                         seq_ack_impl->nack_list, env, i);
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(nack, env, sa_node);
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)nack, env, sa_node);
     }
     rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
                         seq_ack_impl->ns_val);
@@ -532,7 +532,7 @@
         }
         else
         {
-            SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack_impl->ack_none, env, 
+            sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->ack_none, env, 
                         sa_node);   
         }                            
     }
@@ -548,7 +548,7 @@
         }
         else
         {
-            SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack_impl->ack_final, env, 
+            sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->ack_final, env, 
                         sa_node);  
         }
     }

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_fault.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Tue Nov  7 21:08:43 2006
@@ -226,7 +226,7 @@
         {
             return NULL;
         }
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_fault_impl->fault_code, env, 
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_fault_impl->fault_code, env, 
                         sf_node);
     }    
     return seq_fault;    
@@ -260,7 +260,7 @@
     }
     if(NULL != seq_fault_impl->fault_code)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_fault_impl->fault_code, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_fault_impl->fault_code, env, 
                         sf_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, sf_node);

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_offer.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Tue Nov  7 21:08:43 2006
@@ -231,7 +231,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_offer_impl->identifier, env, so_node);
+    sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+            seq_offer_impl->identifier, env, so_node);
     exp_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_EXPIRES,
                         seq_offer_impl->ns_val, NULL);
     if(NULL == exp_qname)
@@ -248,8 +249,8 @@
         {
             return NULL;
         }
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_offer_impl->expires, env, 
-                        exp_node);
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+                seq_offer_impl->expires, env, exp_node);
     }
     return seq_offer;
 }
@@ -286,11 +287,12 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_offer_impl->identifier, env, so_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+            seq_offer_impl->identifier, env, so_node);
     if(NULL != seq_offer_impl->expires)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_offer_impl->expires, env, 
-                        so_node);
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+                seq_offer_impl->expires, env, so_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, so_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Tue Nov  7 21:08:43 2006
@@ -287,7 +287,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_impl->identifier, env, 
+    sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_impl->identifier, env, 
                         seq_node);
     seq_impl->msg_num= sandesha2_msg_number_create(env, 
                         seq_impl->ns_val);
@@ -295,7 +295,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_impl->msg_num, env, seq_node);
+    sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_impl->msg_num, env, seq_node);
     lm_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_LAST_MSG,
                         seq_impl->ns_val, NULL);
     if(NULL == lm_qname)
@@ -312,7 +312,7 @@
         {
             return NULL;
         }
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_impl->last_msg, env, 
+        sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_impl->last_msg, env, 
                         lm_node);
     }
     return seq;
@@ -356,10 +356,10 @@
     AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(seq_block, env, 
                         seq_impl->must_understand);
     seq_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(seq_block, env);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_impl->identifier, env, seq_node);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_impl->msg_num, env, seq_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_impl->identifier, env, seq_node);
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_impl->msg_num, env, seq_node);
     if(NULL != seq_impl->last_msg)
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_impl->last_msg, env, 
+        sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_impl->last_msg, env, 
                         seq_node);
     return seq_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Tue Nov  7 21:08:43 2006
@@ -240,7 +240,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(terminate_seq_impl->identifier, env,
+    sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)terminate_seq_impl->identifier, env,
                         ts_node);
     return terminate_seq;
 }
@@ -278,7 +278,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(terminate_seq_impl->identifier, env, 
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)terminate_seq_impl->identifier, env, 
                         ts_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, ts_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c?view=diff&rev=472393&r1=472392&r2=472393
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Tue Nov  7 21:08:43 2006
@@ -260,7 +260,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(terminate_seq_res_impl->identifier, 
+    sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)terminate_seq_res_impl->identifier, 
                         env, tsr_node);
     return terminate_seq_res;
 }
@@ -299,7 +299,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(terminate_seq_res_impl->identifier, 
+    sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)terminate_seq_res_impl->identifier, 
                         env, tsr_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, tsr_node);
     return (axiom_node_t*)om_node;



---------------------------------------------------------------------
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