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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/sender.c (original) +++ webservices/sandesha/trunk/c/src/workers/sender.c Wed Apr 11 21:45:25 2007 @@ -148,7 +148,7 @@ { axis2_char_t *tmp_id = NULL; tmp_id = axutil_array_list_get(sender->working_seqs, env, i); - if(0 == axis2_strcmp(seq_id, tmp_id)) + if(0 == axutil_strcmp(seq_id, tmp_id)) { axutil_array_list_remove(sender->working_seqs, env, i); break; @@ -228,7 +228,7 @@ "failed sandesha2_sender_run"); return AXIS2_FAILURE; } - AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread); + axutil_thread_pool_thread_detach(env->thread_pool, worker_thread); AXIS2_LOG_INFO(env->log, "End:sandesha2_sender_run"); return AXIS2_SUCCESS; }
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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original) +++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Wed Apr 11 21:45:25 2007 @@ -228,7 +228,7 @@ "failed sandesha2_sender_worker_run"); return AXIS2_FAILURE; } - AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread); + axutil_thread_pool_thread_detach(env->thread_pool, worker_thread); AXIS2_LOG_INFO(env->log, "Exit:sandesha2_sender_worker_run"); return AXIS2_SUCCESS; } @@ -291,10 +291,10 @@ key = sandesha2_sender_bean_get_msg_ctx_ref_key(sender_worker_bean, env); if(!msg_ctx) { - axis2_allocator_switch_to_global_pool(env->allocator); + axutil_allocator_switch_to_global_pool(env->allocator); msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env, key, sender_worker->conf_ctx); - axis2_allocator_switch_to_local_pool(env->allocator); + axutil_allocator_switch_to_local_pool(env->allocator); } if(!msg_ctx) { @@ -340,7 +340,7 @@ SANDESHA2_QUALIFIED_FOR_SENDING); if(property) qualified_for_sending = axutil_property_get_value(property, env); - if(qualified_for_sending && 0 != axis2_strcmp( + if(qualified_for_sending && 0 != axutil_strcmp( qualified_for_sending, AXIS2_VALUE_TRUE)) { printf("not qualified for sending\n"); 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/accept.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/accept.c Wed Apr 11 21:45:25 2007 @@ -238,7 +238,7 @@ } 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); + axiom_node_add_child((axiom_node_t*)om_node, env, accept_node); return (axiom_node_t*)om_node; } @@ -247,11 +247,11 @@ sandesha2_accept_is_namespace_supported(sandesha2_iom_rm_element_t *accept, const axutil_env_t *env, axis2_char_t *namespace) { - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_final.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_final.c Wed Apr 11 21:45:25 2007 @@ -197,7 +197,7 @@ } af_element = axiom_element_create(env, NULL, SANDESHA2_WSRM_COMMON_FINAL, rm_ns, &af_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, af_node); + axiom_node_add_child((axiom_node_t*)om_node, env, af_node); return (axiom_node_t*)om_node; } @@ -209,11 +209,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_none.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_none.c Wed Apr 11 21:45:25 2007 @@ -202,7 +202,7 @@ { return NULL; } - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, an_node); + axiom_node_add_child((axiom_node_t*)om_node, env, an_node); return (axiom_node_t*)om_node; } @@ -214,11 +214,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Wed Apr 11 21:45:25 2007 @@ -295,11 +295,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_range_impl = SANDESHA2_INTF_TO_IMPL(ack_range); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Wed Apr 11 21:45:25 2007 @@ -281,11 +281,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_requested_impl = SANDESHA2_INTF_TO_IMPL(ack_requested); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Wed Apr 11 21:45:25 2007 @@ -232,7 +232,7 @@ return NULL; } 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); + axiom_node_add_child((axiom_node_t*)om_node, env, at_node); return (axiom_node_t*)om_node; } @@ -244,11 +244,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FALSE); acks_to_impl = SANDESHA2_INTF_TO_IMPL(acks_to); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/address.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/address.c Wed Apr 11 21:45:25 2007 @@ -177,7 +177,7 @@ return NULL; } str_address = axiom_element_get_text(addr_part, env, addr_node); - if(!str_address || 0 == axis2_strlen(str_address)) + if(!str_address || 0 == axutil_strlen(str_address)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT, AXIS2_FAILURE); @@ -207,7 +207,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); address_impl = SANDESHA2_INTF_TO_IMPL(address); if(!address_impl->epr || !axis2_endpoint_ref_get_address( - address_impl->epr, env) || 0 == axis2_strlen( + address_impl->epr, env) || 0 == axutil_strlen( axis2_endpoint_ref_get_address(address_impl->epr, env))) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -229,7 +229,7 @@ axiom_element_set_text(addr_element, env, axis2_endpoint_ref_get_address(address_impl->epr, env), addr_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, addr_node); + axiom_node_add_child((axiom_node_t*)om_node, env, addr_node); return (axiom_node_t*)om_node; } @@ -242,11 +242,11 @@ sandesha2_address_impl_t *address_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); address_impl = SANDESHA2_INTF_TO_IMPL(address); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Wed Apr 11 21:45:25 2007 @@ -242,7 +242,7 @@ } 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); + axiom_node_add_child((axiom_node_t*)om_node, env, cs_node); return (axiom_node_t*)om_node; } @@ -256,11 +256,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); close_seq_impl = SANDESHA2_INTF_TO_IMPL(close_seq); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Wed Apr 11 21:45:25 2007 @@ -242,7 +242,7 @@ } 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); + axiom_node_add_child((axiom_node_t*)om_node, env, csr_node); return (axiom_node_t*)om_node; } @@ -255,11 +255,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); close_seq_res_impl = SANDESHA2_INTF_TO_IMPL(close_seq_res); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Wed Apr 11 21:45:25 2007 @@ -321,7 +321,7 @@ 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); + axiom_node_add_child((axiom_node_t*)om_node, env, cs_node); return (axiom_node_t*)om_node; } @@ -335,11 +335,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Wed Apr 11 21:45:25 2007 @@ -317,7 +317,7 @@ 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); + axiom_node_add_child((axiom_node_t*)om_node, env, csr_node); return (axiom_node_t*)om_node; } @@ -331,11 +331,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); create_seq_res_impl = SANDESHA2_INTF_TO_IMPL(create_seq_res); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/expires.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/expires.c Wed Apr 11 21:45:25 2007 @@ -225,7 +225,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); expires_impl = SANDESHA2_INTF_TO_IMPL(expires); - if(NULL == expires_impl->duration || 0 == axis2_strlen( + if(NULL == expires_impl->duration || 0 == axutil_strlen( expires_impl->duration)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -246,7 +246,7 @@ } axiom_element_set_text(exp_element, env, expires_impl->duration, exp_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, exp_node); + axiom_node_add_child((axiom_node_t*)om_node, env, exp_node); return (axiom_node_t*)om_node; } @@ -260,11 +260,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); expires_impl = SANDESHA2_INTF_TO_IMPL(expires); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/fault_code.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/fault_code.c Wed Apr 11 21:45:25 2007 @@ -214,7 +214,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); fault_code_impl = SANDESHA2_INTF_TO_IMPL(fault_code); - if(NULL == fault_code_impl->str_fault_code || 0 == axis2_strlen( + if(NULL == fault_code_impl->str_fault_code || 0 == axutil_strlen( fault_code_impl->str_fault_code)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -236,7 +236,7 @@ } axiom_element_set_text(fc_element, env, fault_code_impl->str_fault_code, fc_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, fc_node); + axiom_node_add_child((axiom_node_t*)om_node, env, fc_node); return (axiom_node_t*)om_node; } @@ -249,11 +249,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); fault_code_impl = SANDESHA2_INTF_TO_IMPL(fault_code); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/identifier.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/identifier.c Wed Apr 11 21:45:25 2007 @@ -225,7 +225,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier); - if(!identifier_impl->str_id || 0 == axis2_strlen( + if(!identifier_impl->str_id || 0 == axutil_strlen( identifier_impl->str_id)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -246,7 +246,7 @@ } axiom_element_set_text(id_element, env, identifier_impl->str_id, id_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, id_node); + axiom_node_add_child((axiom_node_t*)om_node, env, id_node); return (axiom_node_t*)om_node; } @@ -260,11 +260,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/last_msg.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/last_msg.c Wed Apr 11 21:45:25 2007 @@ -209,7 +209,7 @@ { return NULL; } - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, lm_node); + axiom_node_add_child((axiom_node_t*)om_node, env, lm_node); return (axiom_node_t*)om_node; } @@ -223,11 +223,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); last_msg_impl = SANDESHA2_INTF_TO_IMPL(last_msg); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/make_connection.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/make_connection.c Wed Apr 11 21:45:25 2007 @@ -325,11 +325,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); make_conn_impl = SANDESHA2_INTF_TO_IMPL(make_conn); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } @@ -422,7 +422,7 @@ * Detach if already exists */ if(node) - AXIOM_NODE_DETACH(node, env); + axiom_node_detach(node, env); sandesha2_make_connection_to_om_node((sandesha2_iom_rm_element_t*)make_conn, env, soap_body); return AXIS2_SUCCESS; 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/msg_number.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/msg_number.c Wed Apr 11 21:45:25 2007 @@ -257,7 +257,7 @@ str_num = AXIS2_MALLOC(env->allocator, 32*sizeof(axis2_char_t)); sprintf(str_num, "%ld", msg_number_impl->msg_num); axiom_element_set_text(mn_element, env, str_num, mn_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, mn_node); + axiom_node_add_child((axiom_node_t*)om_node, env, mn_node); return (axiom_node_t*)om_node; } @@ -270,11 +270,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); msg_number_impl = SANDESHA2_INTF_TO_IMPL(msg_num); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Wed Apr 11 21:45:25 2007 @@ -218,9 +218,9 @@ AXIS2_FAILURE); } value = axiom_attribute_get_value(pending_attr, env); - if(0 == axis2_strcmp(value, AXIS2_VALUE_TRUE)) + if(0 == axutil_strcmp(value, AXIS2_VALUE_TRUE)) pending = AXIS2_TRUE; - if(0 == axis2_strcmp(value, AXIS2_VALUE_FALSE)) + if(0 == axutil_strcmp(value, AXIS2_VALUE_FALSE)) pending = AXIS2_FALSE; else { @@ -291,11 +291,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); msg_pending_impl = SANDESHA2_INTF_TO_IMPL(msg_pending); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/nack.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/nack.c Wed Apr 11 21:45:25 2007 @@ -252,7 +252,7 @@ str_num = AXIS2_MALLOC(env->allocator, 32*sizeof(axis2_char_t)); sprintf(str_num, "%ld", nack_impl->nack_num); axiom_element_set_text(nack_element, env, str_num, nack_node); - AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, nack_node); + axiom_node_add_child((axiom_node_t*)om_node, env, nack_node); return (axiom_node_t*)om_node; } @@ -265,11 +265,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); nack_impl = SANDESHA2_INTF_TO_IMPL(nack); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Wed Apr 11 21:45:25 2007 @@ -623,30 +623,30 @@ if(!action) return NULL; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ_RESPONSE)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION)) + if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION)) return SANDESHA2_SPEC_2006_08_NS_URI; return NULL; 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Wed Apr 11 21:45:25 2007 @@ -470,11 +470,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Wed Apr 11 21:45:25 2007 @@ -230,7 +230,7 @@ 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); + axiom_node_add_child((axiom_node_t*)om_node, env, sf_node); return (axiom_node_t*)om_node; } @@ -243,11 +243,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_fault_impl = SANDESHA2_INTF_TO_IMPL(seq_fault); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Wed Apr 11 21:45:25 2007 @@ -259,7 +259,7 @@ 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); + axiom_node_add_child((axiom_node_t*)om_node, env, so_node); return (axiom_node_t*)om_node; } @@ -273,11 +273,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_offer_impl = SANDESHA2_INTF_TO_IMPL(seq_offer); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Wed Apr 11 21:45:25 2007 @@ -306,11 +306,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_impl = SANDESHA2_INTF_TO_IMPL(seq); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Wed Apr 11 21:45:25 2007 @@ -232,7 +232,7 @@ } 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); + axiom_node_add_child((axiom_node_t*)om_node, env, ts_node); return (axiom_node_t*)om_node; } @@ -245,11 +245,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } 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=527768&r1=527767&r2=527768 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Wed Apr 11 21:45:25 2007 @@ -240,7 +240,7 @@ } 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); + axiom_node_add_child((axiom_node_t*)om_node, env, tsr_node); return (axiom_node_t*)om_node; } @@ -254,7 +254,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res); - if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
