You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/04/11 14:51:23 UTC

svn commit: r527478 [2/2] - in /webservices/sandesha/trunk/c: samples/RMSampleService/ samples/rm_echo_1_1/ samples/rm_echo_single_1_0/ samples/rm_echo_single_1_1/ samples/rm_mtom_1_0/ samples/rm_report/ src/client/ src/core/ src/handlers/ src/msgproce...

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Apr 11 05:51:19 2007
@@ -81,7 +81,7 @@
     {
         return AXIS2_FAILURE;
     }
-    body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
+    body_element = axiom_node_get_data_element(body_node, env);
     if(!body_element)
     {
         return AXIS2_FAILURE;
@@ -238,7 +238,7 @@
     {
         axis2_char_t *ret_str = NULL;
 
-        ret_str = axis2_strcat(env, "Invalid String Array", str, NULL);
+        ret_str = axutil_strcat(env, "Invalid String Array", str, NULL);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str);
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY, 
             AXIS2_FAILURE);
@@ -252,21 +252,21 @@
     {
         axis2_char_t *ret_str = NULL;
 
-        ret_str = axis2_strcat(env, "Invalid String Array", str, NULL);
+        ret_str = axutil_strcat(env, "Invalid String Array", str, NULL);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str);
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY, 
             AXIS2_FAILURE);
         AXIS2_FREE(env->allocator, ret_str);
         return NULL;
     }
-    dup_str = axis2_strdup(env, temp_str);
+    dup_str = axutil_strdup(env, temp_str);
     if(']' == dup_str[axis2_strlen(dup_str) - 1])
         dup_str[axis2_strlen(dup_str) - 1] = '\0';
     else
     {
         axis2_char_t *ret_str = NULL;
 
-        ret_str = axis2_strcat(env, "Invalid String Array", str, NULL);
+        ret_str = axutil_strcat(env, "Invalid String Array", str, NULL);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str);
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY, 
             AXIS2_FAILURE);
@@ -281,7 +281,7 @@
     {
         if(!sandesha2_utils_array_list_contains(env, ret, temp_str))
         {
-            axis2_char_t *temp_element = axis2_strdup(env, temp_str);
+            axis2_char_t *temp_element = axutil_strdup(env, temp_str);
             axutil_array_list_add(ret, env, temp_element);
         }
         temp_str = strtok(NULL, ",");
@@ -322,7 +322,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, list, NULL);
     
-    list_str = axis2_strdup(env, "[");
+    list_str = axutil_strdup(env, "[");
     size = axutil_array_list_size(list, env);
     for(i = 0; i < size; i++)
     {
@@ -330,8 +330,8 @@
         {
             axis2_char_t *element = axutil_array_list_get(list, env, i);
             if(0 == i)
-                list_str = axis2_strcat(env, list_str, element, NULL);
-            list_str = axis2_strcat(env, list_str, ",", element, NULL);
+                list_str = axutil_strcat(env, list_str, element, NULL);
+            list_str = axutil_strcat(env, list_str, ",", element, NULL);
         }
         else if(SANDESHA2_ARRAY_LIST_LONG == type)
         {
@@ -339,11 +339,11 @@
             axis2_char_t value[32];
             sprintf(value, "%ld", *element);
             if(0 == i)
-                list_str = axis2_strcat(env, list_str, value, NULL);
-            list_str = axis2_strcat(env, list_str, ",", value, NULL);
+                list_str = axutil_strcat(env, list_str, value, NULL);
+            list_str = axutil_strcat(env, list_str, ",", value, NULL);
         } 
     }
-    list_str = axis2_strcat(env, list_str, "]", NULL);
+    list_str = axutil_strcat(env, list_str, "]", NULL);
     
     return list_str;
 }
@@ -445,7 +445,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, seq_id, NULL);
     
-    return axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":",
+    return axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":",
                         seq_id, NULL);
 }
 
@@ -541,11 +541,11 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, incoming_seq_id, NULL);
     
-    start_str = axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", NULL);
+    start_str = axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", NULL);
     start_len = axis2_strlen(start_str);
     if(0 != axis2_strncmp(incoming_seq_id, start_str, start_len))
         return NULL;
-    ret = axis2_strdup(env, (incoming_seq_id + start_len * sizeof(axis2_char_t)));
+    ret = axutil_strdup(env, (incoming_seq_id + start_len * sizeof(axis2_char_t)));
     
     return ret;    
 }
@@ -588,15 +588,15 @@
     }
     else if(!to)
     {
-        return axis2_strdup(env, seq_key);
+        return axutil_strdup(env, seq_key);
     }
     else if(!seq_key)
     {
-        return axis2_strdup(env, to);
+        return axutil_strdup(env, to);
     }
     else
     {
-        ret = axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", to, ":", 
+        ret = axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", to, ":", 
                         seq_key, NULL);
         return ret;
     }
@@ -888,7 +888,7 @@
     if(soap_header)
     {
         header_node = axiom_soap_header_get_base_node(soap_header, env);
-        header_element = AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
+        header_element = axiom_node_get_data_element(header_node, env);
     
         qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ,
                         SANDESHA2_SPEC_2005_02_NS_URI, NULL);
@@ -1116,7 +1116,7 @@
     axis2_char_t *dup_str = NULL;
     axis2_char_t *temp_str = NULL;
 
-    dup_str = axis2_strdup(env, msg_no_str);
+    dup_str = axutil_strdup(env, msg_no_str);
     msg_numbers = axutil_array_list_create(env, 0);
     temp_str = strtok(dup_str, delim);
     while(temp_str)
@@ -1265,9 +1265,9 @@
     const axutil_env_t *env,
     const axis2_char_t *reply_to)
 {
-    /*if (reply_to && axis2_strstr(reply_to, SANDESHA2_WSRM_ANON_URI_PREFIX))
+    /*if (reply_to && axutil_strstr(reply_to, SANDESHA2_WSRM_ANON_URI_PREFIX))
         return AXIS2_TRUE;*/
-    if (reply_to && axis2_strstr(reply_to, "anonymous"))
+    if (reply_to && axutil_strstr(reply_to, "anonymous"))
         return AXIS2_TRUE;
     else
         return AXIS2_FALSE;
@@ -1281,7 +1281,7 @@
     axis2_char_t *address_l = NULL;
     if(!address)
         return AXIS2_TRUE;
-    address_l = axis2_strtrim(env, address, NULL);
+    address_l = axutil_strtrim(env, address, NULL);
 
     if(0 == axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL, address_l))
         return AXIS2_TRUE;
@@ -1302,16 +1302,16 @@
     axutil_array_list_t *list = axutil_array_list_create(env, 0);
     axis2_char_t *ptr = NULL;
     axis2_char_t *value = NULL;
-    ptr = axis2_strstr(str, pattern);
+    ptr = axutil_strstr(str, pattern);
     while(ptr)
     {
         ptr[0] = AXIS2_EOLN;
-        value = axis2_strdup(env, str);
+        value = axutil_strdup(env, str);
         axutil_array_list_add(list, env, value);
         str = ptr + 3;
-        ptr = axis2_strstr(str, pattern);
+        ptr = axutil_strstr(str, pattern);
     }
-    value = axis2_strdup(env, str);
+    value = axutil_strdup(env, str);
     axutil_array_list_add(list, env, value);
 
     return list;

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Apr 11 05:51:19 2007
@@ -87,7 +87,7 @@
     axis2_char_t *address = NULL;
     axis2_char_t *reply_to_addr = NULL;
 
-    seq_id = axis2_uuid_gen(env);
+    seq_id = axutil_uuid_gen(env);
     to = sandesha2_msg_ctx_get_to(create_seq_msg, env);
     if(!to)
     {
@@ -175,11 +175,11 @@
             (sandesha2_iom_rm_element_t *) create_seq, env);
     if(0 == axis2_strcmp(SANDESHA2_SPEC_2005_02_NS_URI, msg_rm_ns))
     {
-        spec_version = axis2_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
+        spec_version = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
     }
     else if(0 == axis2_strcmp(SANDESHA2_SPEC_2006_08_NS_URI, msg_rm_ns))
     {
-        spec_version = axis2_strdup(env, SANDESHA2_SPEC_VERSION_1_1);
+        spec_version = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_1);
     }
     else
     {

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Apr 11 05:51:19 2007
@@ -99,7 +99,7 @@
     {
         axis2_allocator_switch_to_global_pool(env->allocator);
         axutil_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
-            AXIS2_HASH_KEY_STRING, axis2_strdup(env, SANDESHA2_CLEANED_ON_TERMINATE_MSG));
+            AXIS2_HASH_KEY_STRING, axutil_strdup(env, SANDESHA2_CLEANED_ON_TERMINATE_MSG));
         axis2_allocator_switch_to_local_pool(env->allocator);
         sandesha2_terminate_mgr_clean_recv_side_after_invocation(env, conf_ctx,
             seq_id, storage_mgr);
@@ -121,7 +121,7 @@
         {
             axis2_allocator_switch_to_global_pool(env->allocator);
             axutil_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
-                AXIS2_HASH_KEY_STRING, axis2_strdup(env, 
+                AXIS2_HASH_KEY_STRING, axutil_strdup(env, 
                 SANDESHA2_CLEANED_ON_TERMINATE_MSG));
             axis2_allocator_switch_to_local_pool(env->allocator);
         }
@@ -193,7 +193,7 @@
     {
         axis2_allocator_switch_to_global_pool(env->allocator);
         axutil_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
-            AXIS2_HASH_KEY_STRING, axis2_strdup(env, 
+            AXIS2_HASH_KEY_STRING, axutil_strdup(env, 
                 SANDESHA2_CLEANED_AFTER_INVOCATION));
         axis2_allocator_switch_to_local_pool(env->allocator);
     }
@@ -735,7 +735,7 @@
         }
         return AXIS2_SUCCESS;
     }
-    key = axis2_uuid_gen(env);
+    key = axutil_uuid_gen(env);
     terminate_bean = sandesha2_sender_bean_create(env);
     sandesha2_sender_bean_set_msg_ctx_ref_key(terminate_bean, env, key);
     terminate_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(terminate_rm_msg, env);

Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Wed Apr 11 05:51:19 2007
@@ -200,8 +200,8 @@
                         sandesha2_in_order_invoker_args_t)); 
     args->impl = invoker;
     args->env = (axutil_env_t*)env;
-    worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
-                        sandesha2_in_order_invoker_worker_func, (void*)args);
+    worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
+        sandesha2_in_order_invoker_worker_func, (void*)args);
     if(NULL == worker_thread)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
@@ -247,7 +247,7 @@
     axutil_env_t *env = NULL;
     
     args = (sandesha2_in_order_invoker_args_t*)data;
-    env = axis2_init_thread_env(args->env);
+    env = axutil_init_thread_env(args->env);
     invoker = args->impl;
     
     while(invoker->run_invoker)

Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Wed Apr 11 05:51:19 2007
@@ -220,7 +220,7 @@
     args->impl = sender;
     args->env = (axutil_env_t*)env;
 
-    worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+    worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
         sandesha2_sender_worker_func, (void*)args);
     if(NULL == worker_thread)
     {
@@ -249,7 +249,7 @@
     axis2_bool_t do_sleep = AXIS2_FALSE;
     
     args = (sandesha2_sender_args_t*)data;
-    env = axis2_init_thread_env(args->env);
+    env = axutil_init_thread_env(args->env);
     sender = args->impl;
     sender = (sandesha2_sender_t*)sender;
     

Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Wed Apr 11 05:51:19 2007
@@ -126,7 +126,7 @@
     sender_worker->conf_ctx = conf_ctx;
     sender_worker->mutex = NULL;
     sender_worker->counter = 0;
-    sender_worker->msg_id = axis2_strdup(env, msg_id);
+    sender_worker->msg_id = axutil_strdup(env, msg_id);
     sender_worker->msg_ctx = NULL;
     sender_worker->transport_out = NULL;
     sender_worker->status = AXIS2_FAILURE;
@@ -158,7 +158,7 @@
     sender_worker->conf_ctx = conf_ctx;
     sender_worker->mutex = NULL;
     sender_worker->counter = 0;
-    sender_worker->msg_id = axis2_strdup(env, msg_id);
+    sender_worker->msg_id = axutil_strdup(env, msg_id);
     sender_worker->msg_ctx = msg_ctx;
     sender_worker->transport_out = NULL;
     sender_worker->status = AXIS2_FAILURE;
@@ -220,7 +220,7 @@
     args->impl = sender_worker;
     args->env = (axutil_env_t*)env;
 
-    worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+    worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
         sandesha2_sender_worker_worker_func, (void*)args);
     if(!worker_thread)
     {
@@ -264,7 +264,7 @@
     axis2_char_t *msg_id = NULL;
 
     args = (sandesha2_sender_worker_args_t*)data;
-    env = axis2_init_thread_env(args->env);
+    env = axutil_init_thread_env(args->env);
     sender_worker = args->impl;
     msg_id = sender_worker->msg_id;
     msg_ctx = sender_worker->msg_ctx;

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/accept.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/accept.c Wed Apr 11 05:51:19 2007
@@ -94,8 +94,8 @@
         return NULL;
 	}
     
-    accept_impl->rm_ns_val = (axis2_char_t *)axis2_strdup(env ,rm_ns_val);
-    accept_impl->addr_ns_val = (axis2_char_t *)axis2_strdup(env, addr_ns_val);
+    accept_impl->rm_ns_val = (axis2_char_t *)axutil_strdup(env ,rm_ns_val);
+    accept_impl->addr_ns_val = (axis2_char_t *)axutil_strdup(env, addr_ns_val);
     accept_impl->acks_to = NULL;
     
     accept_impl->accept.element.ops->get_namespace_value = 
@@ -175,7 +175,7 @@
     {
         return NULL;
     }
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env); 
+    om_element = axiom_node_get_data_element(om_node, env); 
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT, 

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_final.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_final.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_final.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_final.c Wed Apr 11 05:51:19 2007
@@ -89,7 +89,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    ack_final_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    ack_final_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     ack_final_impl->ack_final.element.ops->get_namespace_value = 
                         sandesha2_ack_final_get_namespace_value;
@@ -157,7 +157,7 @@
     {
         return NULL;
     }
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env); 
+    om_element = axiom_node_get_data_element(om_node, env); 
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT, 

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_none.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_none.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_none.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_none.c Wed Apr 11 05:51:19 2007
@@ -89,7 +89,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    ack_none_impl->ns_val = (axis2_char_t *)axis2_strdup( env , ns_val);
+    ack_none_impl->ns_val = (axis2_char_t *)axutil_strdup( env , ns_val);
     ack_none_impl->ack_none.element.ops->get_namespace_value = 
                         sandesha2_ack_none_get_namespace_value;
     ack_none_impl->ack_none.element.ops->from_om_node = 
@@ -158,7 +158,7 @@
     {
         return NULL;
     }
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Wed Apr 11 05:51:19 2007
@@ -101,8 +101,8 @@
         return NULL;
 	}
     
-    ack_range_impl->ns_val = (axis2_char_t *)axis2_strdup(env ,ns_val);
-    ack_range_impl->prefix = (axis2_char_t *)axis2_strdup(env, prefix);
+    ack_range_impl->ns_val = (axis2_char_t *)axutil_strdup(env ,ns_val);
+    ack_range_impl->prefix = (axis2_char_t *)axutil_strdup(env, prefix);
     ack_range_impl->upper_val = 0;
     ack_range_impl->lower_val = 0;
     
@@ -198,7 +198,7 @@
     {
         return NULL;
     }
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(!om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Wed Apr 11 05:51:19 2007
@@ -111,7 +111,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    ack_requested_impl->ns_val = (axis2_char_t *)axis2_strdup(env , ns_val);
+    ack_requested_impl->ns_val = (axis2_char_t *)axutil_strdup(env , ns_val);
     
     ack_requested_impl->ack_requested.part.element.ops->get_namespace_value = 
                         sandesha2_ack_requested_get_namespace_value;
@@ -184,7 +184,7 @@
     AXIS2_PARAM_CHECK(env->error, requested_node, NULL);
     
     ack_requested_impl = SANDESHA2_INTF_TO_IMPL(ack_requested);
-    requested_part = AXIOM_NODE_GET_DATA_ELEMENT(requested_node, env);
+    requested_part = axiom_node_get_data_element(requested_node, env);
     if(!requested_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Wed Apr 11 05:51:19 2007
@@ -81,8 +81,8 @@
 		AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    acks_to_impl->rm_ns_val = (axis2_char_t *)axis2_strdup(env, rm_ns_val);
-    acks_to_impl->addr_ns_val = (axis2_char_t *)axis2_strdup(env, addr_ns_val);
+    acks_to_impl->rm_ns_val = (axis2_char_t *)axutil_strdup(env, rm_ns_val);
+    acks_to_impl->addr_ns_val = (axis2_char_t *)axutil_strdup(env, addr_ns_val);
     acks_to_impl->address = address;
     
     acks_to_impl->acks_to.element.ops = AXIS2_MALLOC(env->allocator,
@@ -164,7 +164,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
      
     acks_to_impl = SANDESHA2_INTF_TO_IMPL(acks_to);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

Modified: webservices/sandesha/trunk/c/src/wsrm/address.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/address.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/address.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/address.c Wed Apr 11 05:51:19 2007
@@ -77,7 +77,7 @@
 		AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    address_impl->ns_val = axis2_strdup(env, ns_val);
+    address_impl->ns_val = axutil_strdup(env, ns_val);
     address_impl->epr = epr;
     address_impl->address.element.ops = NULL;
     
@@ -155,7 +155,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     address_impl = SANDESHA2_INTF_TO_IMPL(address);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(!om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Wed Apr 11 05:51:19 2007
@@ -108,7 +108,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    close_seq_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    close_seq_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     close_seq_impl->close_seq.part.element.ops->get_namespace_value = 
                         sandesha2_close_seq_get_namespace_value;
@@ -185,7 +185,7 @@
     AXIS2_PARAM_CHECK(env->error, close_seq_node, NULL);
     
     close_seq_impl = SANDESHA2_INTF_TO_IMPL(close_seq);
-    close_seq_part = AXIOM_NODE_GET_DATA_ELEMENT(close_seq_node, env);
+    close_seq_part = axiom_node_get_data_element(close_seq_node, env);
     if(!close_seq_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Wed Apr 11 05:51:19 2007
@@ -113,7 +113,7 @@
         return NULL;
 	}
     
-    close_seq_res_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    close_seq_res_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     close_seq_res_impl->close_seq_res.part.element.ops->get_namespace_value = 
                         sandesha2_close_seq_res_get_namespace_value;
@@ -186,7 +186,7 @@
     AXIS2_PARAM_CHECK(env->error, csr_node, NULL);
     
     close_seq_res_impl = SANDESHA2_INTF_TO_IMPL(close_seq_res);
-    csr_part = AXIOM_NODE_GET_DATA_ELEMENT(csr_node, env);
+    csr_part = axiom_node_get_data_element(csr_node, env);
     if(!csr_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Wed Apr 11 05:51:19 2007
@@ -94,8 +94,8 @@
 		AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    create_seq_impl->rm_ns_val = (axis2_char_t*)axis2_strdup(env, rm_ns_val);
-    create_seq_impl->addr_ns_val = (axis2_char_t*)axis2_strdup(env, addr_ns_val);
+    create_seq_impl->rm_ns_val = (axis2_char_t*)axutil_strdup(env, rm_ns_val);
+    create_seq_impl->addr_ns_val = (axis2_char_t*)axutil_strdup(env, addr_ns_val);
     create_seq_impl->acks_to = NULL;
     create_seq_impl->expires = NULL;
     create_seq_impl->seq_offer = NULL;
@@ -211,7 +211,7 @@
     AXIS2_PARAM_CHECK(env->error, seq_node, NULL);
     
     create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
-    seq_part = AXIOM_NODE_GET_DATA_ELEMENT(seq_node, env);
+    seq_part = axiom_node_get_data_element(seq_node, env);
     if(!seq_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Wed Apr 11 05:51:19 2007
@@ -125,8 +125,8 @@
         return NULL;
 	}
     
-    create_seq_res_impl->rm_ns_val = (axis2_char_t *)axis2_strdup(env, rm_ns_val);
-    create_seq_res_impl->addr_ns_val = (axis2_char_t *)axis2_strdup(env, addr_ns_val);
+    create_seq_res_impl->rm_ns_val = (axis2_char_t *)axutil_strdup(env, rm_ns_val);
+    create_seq_res_impl->addr_ns_val = (axis2_char_t *)axutil_strdup(env, addr_ns_val);
     
     create_seq_res_impl->create_seq_res.part.element.ops->get_namespace_value = 
                         sandesha2_create_seq_res_get_namespace_value;
@@ -205,7 +205,7 @@
     AXIS2_PARAM_CHECK(env->error, csr_node, NULL);
     
     create_seq_res_impl = SANDESHA2_INTF_TO_IMPL(create_seq_res);
-    csr_part =AXIOM_NODE_GET_DATA_ELEMENT(csr_node, env);
+    csr_part =axiom_node_get_data_element(csr_node, env);
     if(!csr_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

Modified: webservices/sandesha/trunk/c/src/wsrm/expires.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/expires.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/expires.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/expires.c Wed Apr 11 05:51:19 2007
@@ -92,7 +92,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    expires_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    expires_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     expires_impl->expires.element.ops->get_namespace_value = 
                         sandesha2_expires_get_namespace_value;
@@ -166,7 +166,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     expires_impl = SANDESHA2_INTF_TO_IMPL(expires);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
@@ -179,7 +179,7 @@
     {
         return NULL;
     }
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
@@ -201,7 +201,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    expires_impl->duration = axis2_strdup(env, text); 
+    expires_impl->duration = axutil_strdup(env, text); 
     if(NULL == expires_impl->duration)
     {
         return NULL;

Modified: webservices/sandesha/trunk/c/src/wsrm/fault_code.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/fault_code.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/fault_code.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/fault_code.c Wed Apr 11 05:51:19 2007
@@ -93,7 +93,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    fault_code_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    fault_code_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     fault_code_impl->fault_code.element.ops->get_namespace_value = 
                         sandesha2_fault_code_get_namespace_value;
@@ -164,7 +164,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     fault_code_impl = SANDESHA2_INTF_TO_IMPL(fault_code);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
@@ -192,7 +192,7 @@
                         AXIS2_FAILURE)
         return NULL;
     }
-    fault_code_impl->str_fault_code = axis2_strdup(env, fault_text);
+    fault_code_impl->str_fault_code = axutil_strdup(env, fault_text);
     if(NULL == fault_code_impl->str_fault_code)
     {
         return NULL;
@@ -285,6 +285,6 @@
     {
         AXIS2_FREE(env->allocator, fault_code_impl->str_fault_code);
     }
-	fault_code_impl->str_fault_code = axis2_strdup(env, str_fault_code);
+	fault_code_impl->str_fault_code = axutil_strdup(env, str_fault_code);
 	return AXIS2_SUCCESS;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/identifier.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/identifier.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/identifier.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/identifier.c Wed Apr 11 05:51:19 2007
@@ -100,7 +100,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    identifier_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    identifier_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     identifier_impl->identifier.element.ops->get_namespace_value = 
                         sandesha2_identifier_get_namespace_value;
@@ -174,7 +174,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
@@ -202,7 +202,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    identifier_impl->str_id = axis2_strdup(env, ident_str);
+    identifier_impl->str_id = axutil_strdup(env, ident_str);
     if(NULL == identifier_impl->str_id)
     {
         return NULL;
@@ -300,7 +300,7 @@
 		identifier_impl->str_id = NULL;
 	}
 	
-	identifier_impl->str_id = (axis2_char_t *)axis2_strdup(env, str_id);
+	identifier_impl->str_id = (axis2_char_t *)axutil_strdup(env, str_id);
  	return AXIS2_SUCCESS;
 }
 

Modified: webservices/sandesha/trunk/c/src/wsrm/last_msg.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/last_msg.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/last_msg.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/last_msg.c Wed Apr 11 05:51:19 2007
@@ -93,7 +93,7 @@
         return NULL;
 	}
     
-    last_msg_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    last_msg_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     last_msg_impl->last_msg.element.ops->get_namespace_value = 
                         sandesha2_last_msg_get_namespace_value;
@@ -157,7 +157,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     last_msg_impl = SANDESHA2_INTF_TO_IMPL(last_msg);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

Modified: webservices/sandesha/trunk/c/src/wsrm/make_connection.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/make_connection.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/make_connection.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/make_connection.c Wed Apr 11 05:51:19 2007
@@ -125,7 +125,7 @@
         return NULL;
 	}
     
-    make_conn_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    make_conn_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     make_conn_impl->make_conn.part.element.ops->get_namespace_value = 
                         sandesha2_make_connection_get_namespace_value;
@@ -209,7 +209,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     make_conn_impl = SANDESHA2_INTF_TO_IMPL(make_conn);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(!om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
@@ -408,7 +408,7 @@
     if(soap_body)
         body_node = axiom_soap_body_get_base_node(soap_body, env);
     if(body_node)
-        body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
+        body_element = axiom_node_get_data_element(body_node, env);
     make_conn_qname = axutil_qname_create(env, 
         SANDESHA2_WSRM_COMMON_MAKE_CONNECTION, make_conn_impl->ns_val, NULL);
     if(!make_conn_qname)

Modified: webservices/sandesha/trunk/c/src/wsrm/msg_number.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_number.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_number.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_number.c Wed Apr 11 05:51:19 2007
@@ -112,7 +112,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    msg_number_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    msg_number_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     msg_number_impl->msg_number.element.ops->get_namespace_value = 
                         sandesha2_msg_number_get_namespace_value;
@@ -188,7 +188,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     msg_number_impl = SANDESHA2_INTF_TO_IMPL(msg_num);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

Modified: webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_pending.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Wed Apr 11 05:51:19 2007
@@ -91,7 +91,7 @@
 		AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    msg_pending_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    msg_pending_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     msg_pending_impl->pending = AXIS2_TRUE;
     msg_pending_impl->msg_pending.part.ops = NULL;
     msg_pending_impl->msg_pending.part.element.ops = NULL;
@@ -194,7 +194,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_pending_node, NULL);
     
     msg_pending_impl = SANDESHA2_INTF_TO_IMPL(msg_pending);
-    msg_pending_element = AXIOM_NODE_GET_DATA_ELEMENT(msg_pending_node, env);
+    msg_pending_element = axiom_node_get_data_element(msg_pending_node, env);
     if(!msg_pending_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
@@ -269,7 +269,7 @@
     }
     msg_pending_node = axiom_soap_header_block_get_base_node(msg_pending_block, 
         env);
-    msg_pending_element = AXIOM_NODE_GET_DATA_ELEMENT(msg_pending_node, env);
+    msg_pending_element = axiom_node_get_data_element(msg_pending_node, env);
     if(pending)
         attr_value = AXIS2_VALUE_TRUE;
     else if(!pending)

Modified: webservices/sandesha/trunk/c/src/wsrm/nack.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/nack.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/nack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/nack.c Wed Apr 11 05:51:19 2007
@@ -111,7 +111,7 @@
         return NULL;
 	}
     
-    nack_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    nack_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     nack_impl->nack.element.ops->get_namespace_value = 
                         sandesha2_nack_get_namespace_value;
@@ -185,7 +185,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     nack_impl = SANDESHA2_INTF_TO_IMPL(nack);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Wed Apr 11 05:51:19 2007
@@ -76,7 +76,7 @@
     rm_elements->make_connection = NULL;
     rm_elements->msg_pending = NULL;
     
-    rm_elements->addr_ns_val = axis2_strdup(env, addr_ns_val);
+    rm_elements->addr_ns_val = axutil_strdup(env, addr_ns_val);
     
 	return rm_elements;
 }
@@ -160,11 +160,11 @@
     }
     soap_header = axiom_soap_envelope_get_header(soap_envelope, env);    
     header_node = axiom_soap_header_get_base_node(soap_header, env);
-    header_element = AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
+    header_element = axiom_node_get_data_element(header_node, env);
     
     soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
     body_node = axiom_soap_body_get_base_node(soap_body, env);
-    body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
+    body_element = axiom_node_get_data_element(body_node, env);
                         
     rm_ns_val = rm_elements->rm_ns_val;
     addr_ns_val = rm_elements->addr_ns_val;
@@ -685,7 +685,7 @@
             return AXIS2_WSA_NAMESPACE_SUBMISSION;
 
         soap_header_node = axiom_soap_header_get_base_node(soap_header, env);
-        soap_header_element = AXIOM_NODE_GET_DATA_ELEMENT(soap_header_node, 
+        soap_header_element = axiom_node_get_data_element(soap_header_node, 
             env);
         addr_ns = axiom_element_get_namespace(soap_header_element, env, 
             soap_header_node);

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Wed Apr 11 05:51:19 2007
@@ -125,7 +125,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    seq_ack_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    seq_ack_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     seq_ack_impl->ack_range_list = axutil_array_list_create(env, 
     					AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
     seq_ack_impl->nack_list = axutil_array_list_create(env, 
@@ -217,7 +217,7 @@
     AXIS2_PARAM_CHECK(env->error, sa_node, NULL);
     
     seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack);
-    sa_part = AXIOM_NODE_GET_DATA_ELEMENT(sa_node, env);
+    sa_part = axiom_node_get_data_element(sa_node, env);
     if(!sa_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Wed Apr 11 05:51:19 2007
@@ -94,7 +94,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    seq_fault_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    seq_fault_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     seq_fault_impl->seq_fault.element.ops->get_namespace_value = 
                         sandesha2_seq_fault_get_namespace_value;
@@ -156,7 +156,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     seq_fault_impl = SANDESHA2_INTF_TO_IMPL(seq_fault);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Wed Apr 11 05:51:19 2007
@@ -83,7 +83,7 @@
 		AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    seq_offer_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    seq_offer_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     seq_offer_impl->identifier = NULL;
     seq_offer_impl->expires = NULL;
     seq_offer_impl->seq_offer.element.ops = NULL;
@@ -168,7 +168,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     seq_offer_impl = SANDESHA2_INTF_TO_IMPL(seq_offer);
-    om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+    om_element = axiom_node_get_data_element(om_node, env);
     if(NULL == om_element)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Wed Apr 11 05:51:19 2007
@@ -125,7 +125,7 @@
         return NULL;
 	}
     
-    seq_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    seq_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     seq_impl->seq.part.element.ops->get_namespace_value = 
                         sandesha2_seq_get_namespace_value;
@@ -208,7 +208,7 @@
     AXIS2_PARAM_CHECK(env->error, seq_node, NULL);
     
     seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
-    seq_part = AXIOM_NODE_GET_DATA_ELEMENT(seq_node, env);
+    seq_part = axiom_node_get_data_element(seq_node, env);
     if(!seq_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Wed Apr 11 05:51:19 2007
@@ -111,7 +111,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
 	}
-    terminate_seq_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    terminate_seq_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     terminate_seq_impl->terminate_seq.part.element.ops->get_namespace_value = 
                         sandesha2_terminate_seq_get_namespace_value;
@@ -179,7 +179,7 @@
     AXIS2_PARAM_CHECK(env->error, ts_node, NULL);
     
     terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq);
-    ts_part = AXIOM_NODE_GET_DATA_ELEMENT(ts_node, env);
+    ts_part = axiom_node_get_data_element(ts_node, env);
     if(!ts_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,

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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Wed Apr 11 05:51:19 2007
@@ -115,7 +115,7 @@
     						env->allocator,
         					sizeof(sandesha2_iom_rm_element_ops_t));
     
-    terminate_seq_res_impl->ns_val = (axis2_char_t *)axis2_strdup(env, ns_val);
+    terminate_seq_res_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
     
     terminate_seq_res_impl->terminate_seq_res.part.element.ops->
                         get_namespace_value = 
@@ -186,7 +186,7 @@
     AXIS2_PARAM_CHECK(env->error, tsr_node, NULL);
     
     terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res);
-    tsr_part = AXIOM_NODE_GET_DATA_ELEMENT(tsr_node, env);
+    tsr_part = axiom_node_get_data_element(tsr_node, env);
     if(!tsr_part)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,



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