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/12 06:45:36 UTC
svn commit: r527768 [2/3] - in /webservices/sandesha/trunk/c:
samples/RMSampleService/ samples/rm_echo_1_0/ samples/rm_echo_1_1/
samples/rm_echo_single_1_0/ samples/rm_echo_single_1_1/
samples/rm_mtom_1_0/ samples/rm_ping_1_0/ samples/rm_ping_1_1/ samp...
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Wed Apr 11 21:45:25 2007
@@ -145,7 +145,7 @@
}
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_res_get_identifier(term_seq_res, env), env);
- if(!seq_id || 0 == axis2_strlen(seq_id))
+ if(!seq_id || 0 == axutil_strlen(seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid "
"sequence id");
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Wed Apr 11 21:45:25 2007
@@ -197,7 +197,7 @@
" sandesha2_polling_mgr_run");
return AXIS2_FAILURE;
}
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+ axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c Wed Apr 11 21:45:25 2007
@@ -275,7 +275,7 @@
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
temp_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(candidate,
env);
- if(msg_id && temp_msg_id && 0 != axis2_strcmp(msg_id, temp_msg_id))
+ if(msg_id && temp_msg_id && 0 != axutil_strcmp(msg_id, temp_msg_id))
{
equal = AXIS2_FALSE;
}
@@ -283,7 +283,7 @@
(sandesha2_create_seq_bean_t *) bean, env);
temp_seq_id = sandesha2_create_seq_bean_get_seq_id(
(sandesha2_create_seq_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
@@ -291,7 +291,7 @@
(sandesha2_create_seq_bean_t *) bean, env);
temp_internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(
(sandesha2_create_seq_bean_t *) candidate, env);
- if(internal_seq_id && temp_internal_seq_id && 0 != axis2_strcmp(
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
internal_seq_id, temp_internal_seq_id))
{
equal = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c Wed Apr 11 21:45:25 2007
@@ -279,7 +279,7 @@
"[sandesha2]Entry:sandesha2_inmemory_create_invoker_mgr_match");
ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
temp_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(candidate, env);
- if(ref_key && temp_ref_key && 0 != axis2_strcmp(ref_key, temp_ref_key))
+ if(ref_key && temp_ref_key && 0 != axutil_strcmp(ref_key, temp_ref_key))
{
select = AXIS2_FALSE;
}
@@ -287,7 +287,7 @@
(sandesha2_invoker_bean_t *) bean, env);
temp_seq_id = sandesha2_invoker_bean_get_seq_id(
(sandesha2_invoker_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
select = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c Wed Apr 11 21:45:25 2007
@@ -299,7 +299,7 @@
(sandesha2_rm_bean_t *) bean, env);
temp_seq_id = sandesha2_next_msg_bean_get_seq_id(
(sandesha2_rm_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c Wed Apr 11 21:45:25 2007
@@ -324,7 +324,7 @@
(sandesha2_sender_bean_t *) bean, env);
temp_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
(sandesha2_sender_bean_t *) candidate, env);
- if(ref_key && temp_ref_key && 0 != axis2_strcmp(ref_key, temp_ref_key))
+ if(ref_key && temp_ref_key && 0 != axutil_strcmp(ref_key, temp_ref_key))
{
add = AXIS2_FALSE;
}
@@ -341,7 +341,7 @@
(sandesha2_rm_bean_t *) bean, env);
temp_msg_id = sandesha2_sender_bean_get_msg_id(
(sandesha2_rm_bean_t *) candidate, env);
- if(msg_id && temp_msg_id && 0 != axis2_strcmp(msg_id, temp_msg_id))
+ if(msg_id && temp_msg_id && 0 != axutil_strcmp(msg_id, temp_msg_id))
{
add = AXIS2_FALSE;
}
@@ -350,7 +350,7 @@
temp_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
(sandesha2_sender_bean_t *) candidate,
env);
- if(internal_seq_id && temp_internal_seq_id && 0 != axis2_strcmp(
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
internal_seq_id, temp_internal_seq_id))
{
add = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c Wed Apr 11 21:45:25 2007
@@ -326,7 +326,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_seq_id = sandesha2_seq_property_bean_get_seq_id(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
@@ -334,7 +334,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_name = sandesha2_seq_property_bean_get_name(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(name && temp_name && 0 != axis2_strcmp(name, temp_name))
+ if(name && temp_name && 0 != axutil_strcmp(name, temp_name))
{
equal = AXIS2_FALSE;
}
@@ -342,7 +342,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_value = sandesha2_seq_property_bean_get_value(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(value && temp_value && 0 != axis2_strcmp(value, temp_value))
+ if(value && temp_value && 0 != axutil_strcmp(value, temp_value))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Wed Apr 11 21:45:25 2007
@@ -83,12 +83,12 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "response_str"))
+ if(0 == axutil_strcmp(col_name[i], "response_str"))
if(argv[i])
response->response_str = axutil_strdup(env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "soap_version"))
+ if(0 == axutil_strcmp(col_name[i], "soap_version"))
if(argv[i])
- response->soap_version = axis2_atoi(argv[i]);
+ response->soap_version = axutil_atoi(argv[i]);
}
return 0;
}
@@ -118,64 +118,64 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "stored_key"))
+ if(0 == axutil_strcmp(col_name[i], "stored_key"))
if(argv[i])
{
sandesha2_msg_store_bean_set_stored_key(bean, env, argv[i]);
}
- if(0 == axis2_strcmp(col_name[i], "msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "msg_id"))
if(argv[i])
sandesha2_msg_store_bean_set_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "soap_env_str"))
+ if(0 == axutil_strcmp(col_name[i], "soap_env_str"))
if(argv[i])
sandesha2_msg_store_bean_set_soap_envelope_str(bean, env,
argv[i]);
- if(0 == axis2_strcmp(col_name[i], "soap_version"))
+ if(0 == axutil_strcmp(col_name[i], "soap_version"))
if(argv[i])
sandesha2_msg_store_bean_set_soap_version(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "transport_out"))
+ if(0 == axutil_strcmp(col_name[i], "transport_out"))
if(argv[i])
sandesha2_msg_store_bean_set_transport_out(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "op"))
+ if(0 == axutil_strcmp(col_name[i], "op"))
if(argv[i])
sandesha2_msg_store_bean_set_op(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "svc"))
+ if(0 == axutil_strcmp(col_name[i], "svc"))
if(argv[i])
sandesha2_msg_store_bean_set_svc(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "svc_grp"))
+ if(0 == axutil_strcmp(col_name[i], "svc_grp"))
if(argv[i])
sandesha2_msg_store_bean_set_svc_grp(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "op_mep"))
+ if(0 == axutil_strcmp(col_name[i], "op_mep"))
if(argv[i])
sandesha2_msg_store_bean_set_op_mep(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "to_url"))
+ if(0 == axutil_strcmp(col_name[i], "to_url"))
if(argv[i])
sandesha2_msg_store_bean_set_to_url(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "transport_to"))
- if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ if(0 == axutil_strcmp(col_name[i], "transport_to"))
+ if(argv[i] && 0 != axutil_strcmp("(null)", argv[i]))
{
sandesha2_msg_store_bean_set_transport_to(bean, env, argv[i]);
}
- if(0 == axis2_strcmp(col_name[i], "execution_chain_str"))
+ if(0 == axutil_strcmp(col_name[i], "execution_chain_str"))
if(argv[i])
sandesha2_msg_store_bean_set_execution_chain_str(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "flow"))
+ if(0 == axutil_strcmp(col_name[i], "flow"))
if(argv[i])
sandesha2_msg_store_bean_set_flow(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_recv_str"))
+ if(0 == axutil_strcmp(col_name[i], "msg_recv_str"))
if(argv[i])
sandesha2_msg_store_bean_set_msg_recv_str(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "svr_side"))
+ if(0 == axutil_strcmp(col_name[i], "svr_side"))
if(argv[i])
sandesha2_msg_store_bean_set_svr_side(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "in_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "in_msg_store_key"))
if(argv[i])
sandesha2_msg_store_bean_set_in_msg_store_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "prop_str"))
+ if(0 == axutil_strcmp(col_name[i], "prop_str"))
if(argv[i])
sandesha2_msg_store_bean_set_persistent_property_str(bean,
env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "action"))
+ if(0 == axutil_strcmp(col_name[i], "action"))
if(argv[i])
sandesha2_msg_store_bean_set_action(bean, env, argv[i]);
}
@@ -809,13 +809,13 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
- sql_size = axis2_strlen(msg_id) + axis2_strlen(stored_key) +
- axis2_strlen(soap_env_str) + sizeof(int) + sizeof(int) +
- axis2_strlen(op) + axis2_strlen(svc) + axis2_strlen(svc_grp) +
- axis2_strlen(op_mep) + axis2_strlen(to_url) + axis2_strlen(reply_to) +
- axis2_strlen(transport_to) + axis2_strlen(execution_chain_str) + sizeof(int) +
- axis2_strlen(msg_recv_str) + sizeof(int) + axis2_strlen(in_msg_store_key) +
- axis2_strlen(prop_str) + axis2_strlen(action) + 512;
+ sql_size = axutil_strlen(msg_id) + axutil_strlen(stored_key) +
+ axutil_strlen(soap_env_str) + sizeof(int) + sizeof(int) +
+ axutil_strlen(op) + axutil_strlen(svc) + axutil_strlen(svc_grp) +
+ axutil_strlen(op_mep) + axutil_strlen(to_url) + axutil_strlen(reply_to) +
+ axutil_strlen(transport_to) + axutil_strlen(execution_chain_str) + sizeof(int) +
+ axutil_strlen(msg_recv_str) + sizeof(int) + axutil_strlen(in_msg_store_key) +
+ axutil_strlen(prop_str) + axutil_strlen(action) + 512;
axutil_thread_mutex_lock(bean_mgr_impl->mutex);
dbconn = (sqlite3 *) sandesha2_permanent_storage_mgr_get_dbconn(
@@ -983,7 +983,7 @@
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
AXIS2_LOG_INFO(env->log,
"[sandesha2]Start:sandesha2_permanent_bean_mgr_store_response");
- sql_size = axis2_strlen(seq_id) + axis2_strlen(response) +
+ sql_size = axutil_strlen(seq_id) + axutil_strlen(response) +
sizeof(int) + sizeof(int) + 512;
sprintf(sql_stmt_count, "select count(seq_id)"\
" from response where seq_id = '%s' and msg_no=%d", seq_id, msg_no);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c Wed Apr 11 21:45:25 2007
@@ -66,19 +66,19 @@
bean = sandesha2_create_seq_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_id"))
sandesha2_create_seq_bean_set_create_seq_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_create_seq_msg_store_key(bean, env,
argv[i]);
- if(0 == axis2_strcmp(col_name[i], "ref_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_ref_msg_store_key(bean, env, argv[i]);
}
@@ -109,19 +109,19 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_id"))
sandesha2_create_seq_bean_set_create_seq_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_create_seq_msg_store_key(bean, env,
argv[i]);
- if(0 == axis2_strcmp(col_name[i], "ref_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_ref_msg_store_key(bean, env, argv[i]);
}
@@ -444,7 +444,7 @@
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
temp_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(candidate,
env);
- if(msg_id && temp_msg_id && 0 != axis2_strcmp(msg_id, temp_msg_id))
+ if(msg_id && temp_msg_id && 0 != axutil_strcmp(msg_id, temp_msg_id))
{
equal = AXIS2_FALSE;
}
@@ -452,7 +452,7 @@
(sandesha2_create_seq_bean_t *) bean, env);
temp_seq_id = sandesha2_create_seq_bean_get_seq_id(
(sandesha2_create_seq_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
@@ -460,7 +460,7 @@
(sandesha2_create_seq_bean_t *) bean, env);
temp_internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(
(sandesha2_create_seq_bean_t *) candidate, env);
- if(internal_seq_id && temp_internal_seq_id && 0 != axis2_strcmp(
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
internal_seq_id, temp_internal_seq_id))
{
equal = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c Wed Apr 11 21:45:25 2007
@@ -64,14 +64,14 @@
bean = sandesha2_invoker_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_invoker_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_invoker_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "is_invoked"))
+ if(0 == axutil_strcmp(col_name[i], "is_invoked"))
sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
}
axutil_array_list_add(data_list, env, bean);
@@ -101,14 +101,14 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_invoker_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_invoker_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "is_invoked"))
+ if(0 == axutil_strcmp(col_name[i], "is_invoked"))
sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
}
return 0;
@@ -409,7 +409,7 @@
"[sandesha2]Entry:sandesha2_permanent_create_invoker_mgr_match");
ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
temp_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(candidate, env);
- if(ref_key && temp_ref_key && 0 != axis2_strcmp(ref_key, temp_ref_key))
+ if(ref_key && temp_ref_key && 0 != axutil_strcmp(ref_key, temp_ref_key))
{
select = AXIS2_FALSE;
}
@@ -417,7 +417,7 @@
(sandesha2_invoker_bean_t *) bean, env);
temp_seq_id = sandesha2_invoker_bean_get_seq_id(
(sandesha2_invoker_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
select = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c Wed Apr 11 21:45:25 2007
@@ -69,21 +69,21 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
{
sandesha2_next_msg_bean_set_seq_id(bean, env, argv[i]);
}
- if(0 == axis2_strcmp(col_name[i], "ref_msg_key"))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_key"))
{
- if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ if(argv[i] && 0 != axutil_strcmp("(null)", argv[i]))
{
sandesha2_next_msg_bean_set_ref_msg_key(bean, env, argv[i]);
}
}
- if(0 == axis2_strcmp(col_name[i], "polling_mode"))
+ if(0 == axutil_strcmp(col_name[i], "polling_mode"))
sandesha2_next_msg_bean_set_polling_mode(bean, env,
AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env,
atol(argv[i]));
}
@@ -115,19 +115,19 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
sandesha2_next_msg_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "ref_msg_key"))
- if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_key"))
+ if(argv[i] && 0 != axutil_strcmp("(null)", argv[i]))
{
sandesha2_next_msg_bean_set_ref_msg_key(bean, env, argv[i]);
}
- if(0 == axis2_strcmp(col_name[i], "polling_mode"))
+ if(0 == axutil_strcmp(col_name[i], "polling_mode"))
{
sandesha2_next_msg_bean_set_polling_mode(bean, env,
AXIS2_ATOI(argv[i]));
}
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env,
atol(argv[i]));
}
@@ -467,7 +467,7 @@
}
seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
temp_seq_id = sandesha2_next_msg_bean_get_seq_id(candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c Wed Apr 11 21:45:25 2007
@@ -66,33 +66,33 @@
bean = sandesha2_sender_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "msg_id"))
sandesha2_sender_bean_set_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
if(argv[i])
sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_ID"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_ID"))
if(argv[i])
sandesha2_sender_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "sent_count"))
+ if(0 == axutil_strcmp(col_name[i], "sent_count"))
sandesha2_sender_bean_set_sent_count(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_sender_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "send"))
+ if(0 == axutil_strcmp(col_name[i], "send"))
sandesha2_sender_bean_set_send(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "resend"))
+ if(0 == axutil_strcmp(col_name[i], "resend"))
sandesha2_sender_bean_set_resend(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "time_to_send"))
+ if(0 == axutil_strcmp(col_name[i], "time_to_send"))
sandesha2_sender_bean_set_time_to_send(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_type"))
+ if(0 == axutil_strcmp(col_name[i], "msg_type"))
sandesha2_sender_bean_set_msg_type(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_sender_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "wsrm_anon_uri"))
+ if(0 == axutil_strcmp(col_name[i], "wsrm_anon_uri"))
if(argv[i])
sandesha2_sender_bean_set_wsrm_anon_uri(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "to_address"))
+ if(0 == axutil_strcmp(col_name[i], "to_address"))
if(argv[i])
sandesha2_sender_bean_set_to_address(bean, env, argv[i]);
}
@@ -123,33 +123,33 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "msg_id"))
sandesha2_sender_bean_set_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
if(argv[i])
sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_ID"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_ID"))
if(argv[i])
sandesha2_sender_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "sent_count"))
+ if(0 == axutil_strcmp(col_name[i], "sent_count"))
sandesha2_sender_bean_set_sent_count(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_sender_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "send"))
+ if(0 == axutil_strcmp(col_name[i], "send"))
sandesha2_sender_bean_set_send(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "resend"))
+ if(0 == axutil_strcmp(col_name[i], "resend"))
sandesha2_sender_bean_set_resend(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "time_to_send"))
+ if(0 == axutil_strcmp(col_name[i], "time_to_send"))
sandesha2_sender_bean_set_time_to_send(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_type"))
+ if(0 == axutil_strcmp(col_name[i], "msg_type"))
sandesha2_sender_bean_set_msg_type(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_sender_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "wsrm_anon_uri"))
+ if(0 == axutil_strcmp(col_name[i], "wsrm_anon_uri"))
if(argv[i])
sandesha2_sender_bean_set_wsrm_anon_uri(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "to_address"))
+ if(0 == axutil_strcmp(col_name[i], "to_address"))
if(argv[i])
sandesha2_sender_bean_set_to_address(bean, env, argv[i]);
}
@@ -557,7 +557,7 @@
(sandesha2_sender_bean_t *) bean, env);
temp_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
(sandesha2_sender_bean_t *) candidate, env);
- if(ref_key && temp_ref_key && 0 != axis2_strcmp(ref_key, temp_ref_key))
+ if(ref_key && temp_ref_key && 0 != axutil_strcmp(ref_key, temp_ref_key))
{
add = AXIS2_FALSE;
}
@@ -572,7 +572,7 @@
}
msg_id = sandesha2_sender_bean_get_msg_id(bean, env);
temp_msg_id = sandesha2_sender_bean_get_msg_id(candidate, env);
- if(msg_id && temp_msg_id && 0 != axis2_strcmp(msg_id, temp_msg_id))
+ if(msg_id && temp_msg_id && 0 != axutil_strcmp(msg_id, temp_msg_id))
{
add = AXIS2_FALSE;
}
@@ -581,7 +581,7 @@
temp_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
(sandesha2_sender_bean_t *) candidate,
env);
- if(internal_seq_id && temp_internal_seq_id && 0 != axis2_strcmp(
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
internal_seq_id, temp_internal_seq_id))
{
add = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c Wed Apr 11 21:45:25 2007
@@ -68,12 +68,12 @@
bean = sandesha2_seq_property_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
sandesha2_seq_property_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "name"))
+ if(0 == axutil_strcmp(col_name[i], "name"))
if(argv[i])
sandesha2_seq_property_bean_set_name(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "value"))
+ if(0 == axutil_strcmp(col_name[i], "value"))
if(argv[i])
sandesha2_seq_property_bean_set_value(bean, env, argv[i]);
}
@@ -105,12 +105,12 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
sandesha2_seq_property_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "name"))
+ if(0 == axutil_strcmp(col_name[i], "name"))
if(argv[i])
sandesha2_seq_property_bean_set_name(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "value"))
+ if(0 == axutil_strcmp(col_name[i], "value"))
if(argv[i])
sandesha2_seq_property_bean_set_value(bean, env, argv[i]);
}
@@ -452,7 +452,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_seq_id = sandesha2_seq_property_bean_get_seq_id(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
@@ -460,7 +460,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_name = sandesha2_seq_property_bean_get_name(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(name && temp_name && 0 != axis2_strcmp(name, temp_name))
+ if(name && temp_name && 0 != axutil_strcmp(name, temp_name))
{
equal = AXIS2_FALSE;
}
@@ -468,7 +468,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_value = sandesha2_seq_property_bean_get_value(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(value && temp_value && 0 != axis2_strcmp(value, temp_value))
+ if(value && temp_value && 0 != axutil_strcmp(value, temp_value))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Wed Apr 11 21:45:25 2007
@@ -268,15 +268,15 @@
storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = axutil_strdup(env, "Sandesha2MessageMap");
storage_mgr_impl->conf_ctx = conf_ctx;
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
storage_mgr_impl->transactions = axutil_hash_make(env);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
storage_mgr_impl->bean_mgr = NULL;
storage_mgr_impl->mutex = axutil_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
storage_mgr_impl->msg_ctx_map = axutil_hash_make(env);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
conf = axis2_conf_ctx_get_conf((const axis2_conf_ctx_t *) conf_ctx, env);
storage_mgr_impl->bean_mgr = sandesha2_permanent_bean_mgr_create(env,
&(storage_mgr_impl->storage_mgr), conf_ctx, NULL);
@@ -378,7 +378,7 @@
axutil_thread_mutex_lock(storage_mgr_impl->mutex);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
/*for (index = axutil_hash_first(storage_mgr_impl->transactions , env); index;
index = axutil_hash_next(env, index))
{
@@ -408,7 +408,7 @@
axutil_hash_set(storage_mgr_impl->transactions, thread_id_key,
AXIS2_HASH_KEY_STRING, transaction);
}
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
axutil_thread_mutex_unlock(storage_mgr_impl->mutex);
return transaction;
}
@@ -427,10 +427,10 @@
thread_id = (unsigned long int) sandesha2_permanent_transaction_get_thread_id(
transaction, env);
sprintf(thread_id_key, "%lu", thread_id);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
axutil_hash_set(storage_mgr_impl->transactions, thread_id_key,
AXIS2_HASH_KEY_STRING, NULL);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
}
void AXIS2_CALL
@@ -545,10 +545,10 @@
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
axutil_hash_set(storage_mgr_impl->msg_ctx_map, key, AXIS2_HASH_KEY_STRING,
msg_ctx);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
axis2_msg_ctx_set_keep_alive(msg_ctx, env, AXIS2_TRUE);
msg_store_bean = sandesha2_permanent_storage_mgr_get_msg_store_bean(
storage_mgr, env, msg_ctx);
@@ -578,7 +578,7 @@
void *entry = NULL;
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
if(storage_mgr_impl->msg_ctx_map)
entry = axutil_hash_get(storage_mgr_impl->msg_ctx_map, key,
AXIS2_HASH_KEY_STRING);
@@ -587,7 +587,7 @@
axutil_hash_set(storage_mgr_impl->msg_ctx_map, key,
AXIS2_HASH_KEY_STRING, NULL);
}
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
sandesha2_permanent_bean_mgr_remove_msg_store_bean(
storage_mgr_impl->bean_mgr, env, key);
return AXIS2_SUCCESS;
@@ -667,14 +667,14 @@
om_output = axiom_output_create(env, xml_writer);
if (!om_output)
{
- AXIOM_XML_WRITER_FREE(xml_writer, env);
+ axiom_xml_writer_free(xml_writer, env);
xml_writer = NULL;
return AXIS2_FAILURE;
}
axiom_output_set_soap11(om_output, env, axis2_msg_ctx_get_is_soap_11(
msg_ctx, env));
axiom_soap_envelope_serialize(envelope, env, om_output, AXIS2_FALSE);
- soap_str = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+ soap_str = (axis2_char_t *)axiom_xml_writer_get_xml(xml_writer, env);
if (axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
soap_version = SANDESHA2_SOAP_VERSION_1_1;
else
@@ -836,7 +836,7 @@
}
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
soap_env_str = sandesha2_msg_store_bean_get_soap_envelope_str(msg_store_bean, env);
- reader = axiom_xml_reader_create_for_memory(env, soap_env_str, axis2_strlen(
+ reader = axiom_xml_reader_create_for_memory(env, soap_env_str, axutil_strlen(
soap_env_str), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
om_builder = axiom_stax_builder_create(env, reader);
soap_version = sandesha2_msg_store_bean_get_soap_version(msg_store_bean, env);
@@ -925,7 +925,7 @@
temp = (axis2_op_t *) v;
mep = (axis2_char_t *) axis2_op_get_msg_exchange_pattern(temp,
env);
- if(0 == axis2_strcmp(mep, op_mep_str))
+ if(0 == axutil_strcmp(mep, op_mep_str))
{
op = temp;
break;
@@ -969,7 +969,7 @@
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_svc_ctx_t *svc_ctx = axis2_msg_ctx_get_svc_ctx(msg_ctx, env);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
if(op_ctx)
{
@@ -980,7 +980,7 @@
msg_id = (axis2_char_t *) axis2_msg_ctx_get_msg_id(msg_ctx, env);
/*axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, op_ctx);*/
}
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
}
axis2_msg_ctx_set_server_side(msg_ctx, env,
sandesha2_msg_store_bean_is_svr_side(msg_store_bean, env));
@@ -1017,7 +1017,7 @@
persistent_prop_str =
sandesha2_msg_store_bean_get_persistent_property_str(msg_store_bean,
env);
- if(persistent_prop_str && 0 != axis2_strcmp("", persistent_prop_str))
+ if(persistent_prop_str && 0 != axutil_strcmp("", persistent_prop_str))
{
axutil_hash_t *map =
sandesha2_permanent_storage_mgr_get_property_map_from_string(env,
@@ -1073,7 +1073,7 @@
prop_str = axutil_strcat(env, temp_str,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, AXIS2_WSA_VERSION,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
- if(temp_str && 0 < axis2_strlen(temp_str))
+ if(temp_str && 0 < axutil_strlen(temp_str))
AXIS2_FREE(env->allocator, temp_str);
}
}
@@ -1087,17 +1087,17 @@
axis2_char_t *value = NULL;
axutil_hash_this(index, &k, NULL, &v);
key = (axis2_char_t *) k;
- if(0 == axis2_strcmp(AXIS2_HTTP_OUT_TRANSPORT_INFO, key))
+ if(0 == axutil_strcmp(AXIS2_HTTP_OUT_TRANSPORT_INFO, key))
continue;
- if(0 == axis2_strcmp(AXIS2_TRANSPORT_OUT, key))
+ if(0 == axutil_strcmp(AXIS2_TRANSPORT_OUT, key))
continue;
- if(0 == axis2_strcmp(AXIS2_TRANSPORT_IN, key))
+ if(0 == axutil_strcmp(AXIS2_TRANSPORT_IN, key))
continue;
- if(0 == axis2_strcmp(AXIS2_TRANSPORT_HEADERS, key))
+ if(0 == axutil_strcmp(AXIS2_TRANSPORT_HEADERS, key))
continue;
- if(0 == axis2_strcmp(SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, key))
+ if(0 == axutil_strcmp(SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, key))
continue;
- if(0 == axis2_strcmp(AXIS2_HTTP_CLIENT, key))
+ if(0 == axutil_strcmp(AXIS2_HTTP_CLIENT, key))
continue;
property = (axutil_property_t *) v;
@@ -1110,7 +1110,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, key,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR,
value, NULL);
- if(temp_str && axis2_strlen(temp_str)> 0)
+ if(temp_str && axutil_strlen(temp_str)> 0)
AXIS2_FREE(env->allocator, temp_str);
}
}
@@ -1128,7 +1128,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR);
if(values)
size = axutil_array_list_size(values, env);
- if((size % 2 != 0) || (size == 1 && 0 == axis2_strcmp("",
+ if((size % 2 != 0) || (size == 1 && 0 == axutil_strcmp("",
axutil_array_list_get(values, env, 0))))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -1161,10 +1161,10 @@
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
/*axutil_thread_mutex_lock(storage_mgr_impl->mutex);*/
sprintf(thread_id_key, "%lu", thread_id);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
transaction = (sandesha2_transaction_t *) axutil_hash_get(
storage_mgr_impl->transactions, thread_id_key, AXIS2_HASH_KEY_STRING);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
/*transaction = sandesha2_permanent_storage_mgr_get_transaction(storage_mgr,
env);*/
if(transaction)
@@ -1208,12 +1208,12 @@
om_output = axiom_output_create(env, xml_writer);
if (!om_output)
{
- AXIOM_XML_WRITER_FREE(xml_writer, env);
+ axiom_xml_writer_free(xml_writer, env);
xml_writer = NULL;
return AXIS2_FAILURE;
}
axiom_soap_envelope_serialize(response, env, om_output, AXIS2_FALSE);
- response_str = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+ response_str = (axis2_char_t *)axiom_xml_writer_get_xml(xml_writer, env);
sandesha2_permanent_bean_mgr_store_response(storage_mgr_impl->bean_mgr,
env, seq_id, response_str, msg_no, soap_version);
@@ -1243,7 +1243,7 @@
return NULL;
}
reader = axiom_xml_reader_create_for_memory(env, response->response_str,
- axis2_strlen(response->response_str), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
+ axutil_strlen(response->response_str), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
om_builder = axiom_stax_builder_create(env, reader);
soap_version = response->soap_version;
if(SANDESHA2_SOAP_VERSION_1_1 == soap_version)
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Apr 11 21:45:25 2007
@@ -137,7 +137,7 @@
}
}
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
- if(0 == axis2_strcmp(acks_to_str, anon_uri))
+ if(0 == axutil_strcmp(acks_to_str, anon_uri))
{
axis2_op_ctx_t *op_ctx = NULL;
@@ -434,7 +434,7 @@
msg_ctx_ref_key, conf_ctx);
to = (axis2_char_t*)axis2_endpoint_ref_get_address(
axis2_msg_ctx_get_to(msg_ctx1, env), env);
- if(0 == axis2_strcmp(to, to_str))
+ if(0 == axutil_strcmp(to, to_str))
continue;
/*axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((const sandesha2_sender_bean_t *)sender_bean, env);*/
sandesha2_sender_mgr_remove(retrans_mgr, env,
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Apr 11 21:45:25 2007
@@ -218,7 +218,7 @@
next_bean = axutil_array_list_get(list, env, i);
tmp_id = sandesha2_next_msg_bean_get_seq_id(
(sandesha2_rm_bean_t *) next_bean, env);
- if(0 == axis2_strcmp(seq_id, tmp_id))
+ if(0 == axutil_strcmp(seq_id, tmp_id))
{
contains = AXIS2_TRUE;
break;
@@ -360,7 +360,7 @@
storage_man, env);
closed_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
seq_id, SANDESHA2_SEQ_PROP_SEQ_CLOSED);
- if(closed_bean && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
+ if(closed_bean && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
sandesha2_seq_property_bean_get_value(closed_bean, env)))
{
seq_closed = AXIS2_TRUE;
@@ -465,7 +465,7 @@
env);
}
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
- if(NULL!= acks_to_str && 0 != axis2_strcmp(acks_to_str, anon_uri))
+ if(NULL!= acks_to_str && 0 != axutil_strcmp(acks_to_str, anon_uri))
axis2_msg_ctx_set_to(fault_msg_ctx, env, axis2_endpoint_ref_create(env,
acks_to_str));
soap_ver = sandesha2_utils_get_soap_version(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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Apr 11 21:45:25 2007
@@ -138,9 +138,9 @@
create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg_ctx, env);
create_seq_msg_id = axutil_uuid_gen(env);
axis2_msg_ctx_set_message_id(create_seq_msg_ctx, env, create_seq_msg_id);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
axis2_conf_ctx_register_op_ctx(ctx, env, create_seq_msg_id, create_seq_op_ctx);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
app_msg_op_desc = axis2_msg_ctx_get_op(application_msg_ctx, env);
create_seq_op = axis2_msg_ctx_get_op(create_seq_msg_ctx, env);
if(app_msg_op_desc)
@@ -220,7 +220,7 @@
SANDESHA2_CLIENT_OFFERED_SEQ_ID);
if(property)
offered_seq = axutil_property_get_value(property, env);
- if(offered_seq && 0 != axis2_strcmp("", offered_seq))
+ if(offered_seq && 0 != axutil_strcmp("", offered_seq))
{
sandesha2_seq_offer_t *offer_part = NULL;
sandesha2_identifier_t *identifier = NULL;
@@ -254,7 +254,7 @@
anonymous_uri = sandesha2_spec_specific_consts_get_anon_uri(env,
addressing_ns_value);
- if(!acks_to || 0 == axis2_strcmp("", acks_to))
+ if(!acks_to || 0 == axutil_strcmp("", acks_to))
{
acks_to = axutil_strdup(env, anonymous_uri);
}
@@ -358,7 +358,7 @@
temp_identifier = sandesha2_seq_offer_get_identifier(offer, env);
out_seq_id = sandesha2_identifier_get_identifier(temp_identifier, env);
- if(out_seq_id && 0 != axis2_strcmp("", out_seq_id))
+ if(out_seq_id && 0 != axutil_strcmp("", out_seq_id))
{
sandesha2_accept_t *accept = NULL;
axis2_endpoint_ref_t *acks_to_epr = NULL;
@@ -543,11 +543,11 @@
terminate_seq_op_ctx = axis2_msg_ctx_get_op_ctx(terminate_seq_msg_ctx, env);
terminate_seq_msg_id = (axis2_char_t*)axis2_msg_ctx_get_msg_id(
terminate_seq_msg_ctx, env);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
if(terminate_seq_msg_id)
axis2_conf_ctx_register_op_ctx(conf_ctx, env, terminate_seq_msg_id,
terminate_seq_op_ctx);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
ref_msg_op = axis2_msg_ctx_get_op(ref_msg_ctx, env);
terminate_seq_op = axis2_msg_ctx_get_op(terminate_seq_msg_ctx, env);
if(ref_msg_op)
@@ -950,7 +950,7 @@
SANDESHA2_SEQ_PROP_SEQ_CLOSED);
if(seq_closed_bean)
str_value = sandesha2_seq_property_bean_get_value(seq_closed_bean, env);
- if(seq_closed_bean && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, str_value))
+ if(seq_closed_bean && 0 == axutil_strcmp(AXIS2_VALUE_TRUE, str_value))
{
axis2_bool_t is_allowed = AXIS2_FALSE;
@@ -1037,7 +1037,7 @@
{
const axis2_phase_t *phase = axutil_array_list_get(out_flow, env, i);
const axis2_char_t *phase_name = axis2_phase_get_name(phase, env);
- if(0 == axis2_strcmp(phase_name, AXIS2_PHASE_MESSAGE_OUT))
+ if(0 == axutil_strcmp(phase_name, AXIS2_PHASE_MESSAGE_OUT))
{
axutil_array_list_add(new_flow, env, phase);
}
@@ -1053,7 +1053,7 @@
{
const axis2_phase_t *phase = axutil_array_list_get(in_flow, env, i);
const axis2_char_t *phase_name = axis2_phase_get_name(phase, env);
- if(0 == axis2_strcmp(phase_name, "RMPhase"))
+ if(0 == axutil_strcmp(phase_name, "RMPhase"))
{
axutil_array_list_add(new_flow, env, phase);
}
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Wed Apr 11 21:45:25 2007
@@ -453,7 +453,7 @@
}
if(seq_rm_ns && rm_ns)
{
- if(0 != axis2_strcmp(seq_rm_ns, rm_ns))
+ if(0 != axutil_strcmp(seq_rm_ns, rm_ns))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_RM_NS_VALUE_IS_DIFFERENT_FROM_REGISTERED_NS_FOR_SEQ,
Modified: webservices/sandesha/trunk/c/src/util/property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_bean.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Wed Apr 11 21:45:25 2007
@@ -133,13 +133,13 @@
AXIS2_PARAM_CHECK(env->error, units, AXIS2_FAILURE);
- if(0 == axis2_strcmp(units, "seconds"))
+ if(0 == axutil_strcmp(units, "seconds"))
multiplier = 1000;
- else if(0 == axis2_strcmp(units, "minutes"))
+ else if(0 == axutil_strcmp(units, "minutes"))
multiplier = 60*1000;
- else if(0 == axis2_strcmp(units, "hours"))
+ else if(0 == axutil_strcmp(units, "hours"))
multiplier = 60*60*1000;
- else if(0 == axis2_strcmp(units, "days"))
+ else if(0 == axutil_strcmp(units, "days"))
multiplier = 24*60*60*1000;
else
return AXIS2_FAILURE;
Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Wed Apr 11 21:45:25 2007
@@ -254,7 +254,7 @@
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
str = sandesha2_utils_trim_string(env, value);
- if(0 == axis2_strcmp(str, AXIS2_VALUE_TRUE))
+ if(0 == axutil_strcmp(str, AXIS2_VALUE_TRUE))
sandesha2_property_bean_set_exp_backoff(property_bean, env, AXIS2_TRUE);
else
sandesha2_property_bean_set_exp_backoff(property_bean, env,
@@ -382,7 +382,7 @@
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
str = sandesha2_utils_trim_string(env, value);
- if(0 == axis2_strcmp(str, AXIS2_VALUE_TRUE))
+ if(0 == axutil_strcmp(str, AXIS2_VALUE_TRUE))
sandesha2_property_bean_set_in_order(property_bean, env, AXIS2_TRUE);
else
sandesha2_property_bean_set_in_order(property_bean, env, AXIS2_FALSE);
@@ -403,7 +403,7 @@
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
str = sandesha2_utils_trim_string(env, value);
- if(str && 0 != axis2_strcmp(str, SANDESHA2_VALUE_NONE))
+ if(str && 0 != axutil_strcmp(str, SANDESHA2_VALUE_NONE))
{
axis2_char_t *str2 = NULL;
axutil_array_list_t *list = NULL;
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Apr 11 21:45:25 2007
@@ -90,7 +90,7 @@
env, qname, body_node, &body_rm_node);
if(body_rm_element)
{
- AXIOM_NODE_DETACH(body_rm_node, env);
+ axiom_node_detach(body_rm_node, env);
}
return AXIS2_SUCCESS;
}
@@ -155,22 +155,22 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, conf, NULL);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
prop_bean = (sandesha2_property_bean_t *)sandesha2_utils_get_property_bean(
env, conf);
value = sandesha2_property_bean_get_storage_mgr(prop_bean, env);
- if(0 == axis2_strcmp(value, SANDESHA2_INMEMORY_STORAGE_MGR))
+ if(0 == axutil_strcmp(value, SANDESHA2_INMEMORY_STORAGE_MGR))
storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
- else if (0 == axis2_strcmp(value, SANDESHA2_PERMANENT_STORAGE_MGR))
+ else if (0 == axutil_strcmp(value, SANDESHA2_PERMANENT_STORAGE_MGR))
storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
else
{
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_STORAGE_MGR,
AXIS2_FAILURE);
return NULL;
}
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
return storage_mgr;
}
@@ -229,12 +229,12 @@
axutil_array_list_t *ret = NULL;
AXIS2_ENV_CHECK(env, NULL);
- if(!str || 0 == axis2_strcmp("", str))
+ if(!str || 0 == axutil_strcmp("", str))
{
ret = axutil_array_list_create(env, AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
return ret;
}
- if(2 > axis2_strlen(str))
+ if(2 > axutil_strlen(str))
{
axis2_char_t *ret_str = NULL;
@@ -260,8 +260,8 @@
return NULL;
}
dup_str = axutil_strdup(env, temp_str);
- if(']' == dup_str[axis2_strlen(dup_str) - 1])
- dup_str[axis2_strlen(dup_str) - 1] = '\0';
+ if(']' == dup_str[axutil_strlen(dup_str) - 1])
+ dup_str[axutil_strlen(dup_str) - 1] = '\0';
else
{
axis2_char_t *ret_str = NULL;
@@ -304,7 +304,7 @@
for(i = 0; i < axutil_array_list_size(list, env); i++)
{
axis2_char_t *element = axutil_array_list_get(list, env, i);
- if(element && 0 == axis2_strcmp(element, str))
+ if(element && 0 == axutil_strcmp(element, str))
return AXIS2_TRUE;
}
return AXIS2_FAILURE;
@@ -542,8 +542,8 @@
AXIS2_PARAM_CHECK(env->error, incoming_seq_id, 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))
+ start_len = axutil_strlen(start_str);
+ if(0 != axutil_strncmp(incoming_seq_id, start_str, start_len))
return NULL;
ret = axutil_strdup(env, (incoming_seq_id + start_len * sizeof(axis2_char_t)));
@@ -716,10 +716,10 @@
axis2_op_set_parent(op, env, svc);
}
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
op_ctx = axis2_op_ctx_create(env, op, axis2_msg_ctx_get_svc_ctx(new_msg,
env));
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
axis2_msg_ctx_set_op_ctx(new_msg, env, op_ctx);
axis2_op_ctx_add_msg_ctx(op_ctx, env, new_msg);
@@ -820,7 +820,7 @@
while(' ' == *tmp)
tmp++;
- tmp2 = orig_str + axis2_strlen(orig_str);
+ tmp2 = orig_str + axutil_strlen(orig_str);
while(' ' == *tmp2 && tmp2 != orig_str)
tmp2--;
@@ -848,9 +848,9 @@
if(!action)
return AXIS2_FALSE;
- if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ))
+ if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ))
ret = AXIS2_TRUE;
- else if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ))
+ else if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ))
ret = AXIS2_TRUE;
return ret;
@@ -905,26 +905,26 @@
if(seq_element)
is_global_msg = AXIS2_TRUE;
- if(0 == axis2_strcmp(action,
+ if(0 == axutil_strcmp(action,
SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT))
is_global_msg = AXIS2_TRUE;
- if(0 == axis2_strcmp(action,
+ if(0 == axutil_strcmp(action,
SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE))
is_global_msg = AXIS2_TRUE;
- if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ))
+ if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ))
is_global_msg = AXIS2_TRUE;
- if(0 == axis2_strcmp(action,
+ if(0 == axutil_strcmp(action,
SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT))
is_global_msg = AXIS2_TRUE;
- if(0 == axis2_strcmp(action,
+ if(0 == axutil_strcmp(action,
SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE))
is_global_msg = AXIS2_TRUE;
- if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ))
+ if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ))
is_global_msg = AXIS2_TRUE;
return is_global_msg;
@@ -1283,9 +1283,9 @@
return AXIS2_TRUE;
address_l = axutil_strtrim(env, address, NULL);
- if(0 == axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL, address_l))
+ if(0 == axutil_strcmp(AXIS2_WSA_ANONYMOUS_URL, address_l))
return AXIS2_TRUE;
- if(0 == axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL_SUBMISSION, address_l))
+ if(0 == axutil_strcmp(AXIS2_WSA_ANONYMOUS_URL_SUBMISSION, address_l))
return AXIS2_TRUE;
else if (sandesha2_utils_is_wsrm_anon_reply_to(env, (axis2_char_t *) address))
return AXIS2_TRUE;
@@ -1324,7 +1324,7 @@
const axis2_char_t *acks_to_addr)
{
if(sandesha2_utils_is_anon_uri(env, acks_to_addr) &&
- (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, rm_version)))
+ (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, rm_version)))
return AXIS2_TRUE;
else return AXIS2_FALSE;
}
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Apr 11 21:45:25 2007
@@ -173,11 +173,11 @@
}
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))
+ if(0 == axutil_strcmp(SANDESHA2_SPEC_2005_02_NS_URI, msg_rm_ns))
{
spec_version = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
}
- else if(0 == axis2_strcmp(SANDESHA2_SPEC_2006_08_NS_URI, msg_rm_ns))
+ else if(0 == axutil_strcmp(SANDESHA2_SPEC_2006_08_NS_URI, msg_rm_ns))
{
spec_version = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_1);
}
@@ -448,7 +448,7 @@
int_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
acks_to_str);
if(!axis2_msg_ctx_get_server_side(first_app_msg, env) &&
- 0 != axis2_strcmp(acks_to_str, anon_uri))
+ 0 != axutil_strcmp(acks_to_str, anon_uri))
{
ctx = axis2_msg_ctx_get_base(first_app_msg, env);
/* TODO currently axis2 doesn't expose the *options* at msg ctx level.
Modified: webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/spec_specific_consts.c?view=diff&rev=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/spec_specific_consts.c (original)
+++ webservices/sandesha/trunk/c/src/util/spec_specific_consts.c Wed Apr 11 21:45:25 2007
@@ -28,11 +28,11 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ns_val, NULL);
- if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
+ if(0 == axutil_strcmp(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
{
return SANDESHA2_SPEC_VERSION_1_0;
}
- else if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
+ else if(0 == axutil_strcmp(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
{
return SANDESHA2_SPEC_VERSION_1_1;
}
@@ -52,11 +52,11 @@
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, spec_ver, NULL);
- if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_ver))
+ if(0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_ver))
{
return SANDESHA2_SPEC_2005_02_NS_URI;
}
- if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_ver))
+ if(0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_ver))
{
return SANDESHA2_SPEC_2006_08_NS_URI;
}
@@ -70,11 +70,11 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_spec_ver, AXIS2_FAILURE);
- if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
+ if(0 == axutil_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
{
return AXIS2_FALSE;
}
- else if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
+ else if(0 == axutil_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
{
return AXIS2_TRUE;
}
@@ -93,11 +93,11 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_spec_ver, AXIS2_FAILURE);
- if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
+ if(0 == axutil_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
{
return AXIS2_FALSE;
}
- else if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
+ else if(0 == axutil_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
{
return AXIS2_TRUE;
}
@@ -122,9 +122,9 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
return SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ;
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -137,11 +137,11 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -154,11 +154,11 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -171,13 +171,13 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_RM_SPEC_VERSION_DOES_NOT_DEFINE_A_SEQ_CLOSE_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -190,13 +190,13 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_RM_SPEC_VERSION_DOES_NOT_DEFINE_A_SEQ_CLOSE_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -210,14 +210,14 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_ACK_REQUEST;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -232,9 +232,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, addr_ns_val, NULL);
- if(0 == axis2_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_val))
+ if(0 == axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_val))
return AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
- else if(0 == axis2_strcmp(AXIS2_WSA_NAMESPACE, addr_ns_val))
+ else if(0 == axutil_strcmp(AXIS2_WSA_NAMESPACE, addr_ns_val))
return AXIS2_WSA_ANONYMOUS_URL;
return NULL;
@@ -245,11 +245,11 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return AXIS2_FALSE;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return AXIS2_TRUE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -265,9 +265,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, spec_version, NULL);
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
return SANDESHA2_SPEC_2005_02_SOAP_ACTION_TERMINATE_SEQ;
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_SOAP_ACTION_TERMINATE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -280,14 +280,14 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if(0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_SOAP_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if(0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
{
return SANDESHA2_SPEC_2006_08_SOAP_ACTION_ACK_REQUEST;
}
@@ -307,9 +307,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, spec_version, AXIS2_FALSE);
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
return AXIS2_FALSE;
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return AXIS2_TRUE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -326,7 +326,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, spec_version, NULL);
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ_RESPONSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -340,11 +340,11 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -357,11 +357,11 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if(0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_SOAP_ACTION_SEQ_ACKNOWLEDGEMENT;
}
- else if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if(0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
{
return SANDESHA2_SPEC_2006_08_SOAP_ACTION_SEQ_ACKNOWLEDGEMENT;
}
@@ -378,13 +378,13 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_MAKE_CONNECTION_IS_NOT_SUPPORTED_IN_THIS_RM_VERSION,
AXIS2_FAILURE);
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -397,11 +397,11 @@
const axutil_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return AXIS2_TRUE;
}
- else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return AXIS2_FALSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Apr 11 21:45:25 2007
@@ -87,9 +87,9 @@
if(!sandesha2_terminate_mgr_rcv_side_clean_map)
{
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
sandesha2_terminate_mgr_rcv_side_clean_map = axutil_hash_make(env);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
}
prop_bean = sandesha2_utils_get_property_bean(env, axis2_conf_ctx_get_conf(
@@ -97,21 +97,21 @@
in_order_invoke = sandesha2_property_bean_is_in_order(prop_bean, env);
if(!in_order_invoke)
{
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
axutil_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
AXIS2_HASH_KEY_STRING, axutil_strdup(env, SANDESHA2_CLEANED_ON_TERMINATE_MSG));
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
sandesha2_terminate_mgr_clean_recv_side_after_invocation(env, conf_ctx,
seq_id, storage_mgr);
}
else
{ axis2_char_t *clean_status = NULL;
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
clean_status = axutil_hash_get(
sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
AXIS2_HASH_KEY_STRING);
- axis2_allocator_switch_to_local_pool(env->allocator);
- if(clean_status && 0 == axis2_strcmp(clean_status,
+ axutil_allocator_switch_to_local_pool(env->allocator);
+ if(clean_status && 0 == axutil_strcmp(clean_status,
SANDESHA2_CLEANED_AFTER_INVOCATION))
{
sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id,
@@ -119,11 +119,11 @@
}
else
{
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
axutil_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
AXIS2_HASH_KEY_STRING, axutil_strdup(env,
SANDESHA2_CLEANED_ON_TERMINATE_MSG));
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
}
}
AXIS2_LOG_INFO(env->log,
@@ -153,9 +153,9 @@
if(!sandesha2_terminate_mgr_rcv_side_clean_map)
{
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
sandesha2_terminate_mgr_rcv_side_clean_map = axutil_hash_make(env);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
}
invoker_mgr = sandesha2_storage_mgr_get_storage_map_mgr(storage_mgr, env);
@@ -178,12 +178,12 @@
sandesha2_invoker_bean_get_msg_ctx_ref_key((sandesha2_rm_bean_t *)
map_bean, env));
}
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
clean_status = axutil_hash_get(sandesha2_terminate_mgr_rcv_side_clean_map,
seq_id, AXIS2_HASH_KEY_STRING);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
- if(clean_status && 0 == axis2_strcmp(clean_status,
+ if(clean_status && 0 == axutil_strcmp(clean_status,
SANDESHA2_CLEANED_ON_TERMINATE_MSG))
{
sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id,
@@ -191,11 +191,11 @@
}
else
{
- axis2_allocator_switch_to_global_pool(env->allocator);
+ axutil_allocator_switch_to_global_pool(env->allocator);
axutil_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
AXIS2_HASH_KEY_STRING, axutil_strdup(env,
SANDESHA2_CLEANED_AFTER_INVOCATION));
- axis2_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);
}
@@ -299,7 +299,7 @@
for(i = 0; i < axutil_array_list_size(all_seq_list, env); i++)
{
axis2_char_t *value = axutil_array_list_get(all_seq_list, env, i);
- if(0 == axis2_strcmp(value, seq_id))
+ if(0 == axutil_strcmp(value, seq_id))
{
axutil_array_list_remove(all_seq_list, env, i);
break;
@@ -334,7 +334,7 @@
seq_prop_bean, env);
axis2_char_t *name = sandesha2_seq_property_bean_get_name(
seq_prop_bean, env);
- if(axis2_strcmp(name, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER))
+ if(axutil_strcmp(name, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER))
{
highest_in_msg_key_str =
sandesha2_seq_property_bean_get_value(seq_prop_bean, env);
@@ -398,13 +398,13 @@
if(NULL == name)
return AXIS2_FAILURE;
- if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES))
+ if(0 == axutil_strcmp(name, SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES))
add_entry_with_seq_id = AXIS2_TRUE;
- if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_TERMINATED))
+ if(0 == axutil_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_TERMINATED))
add_entry_with_seq_id = AXIS2_TRUE;
- if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_CLOSED))
+ if(0 == axutil_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_CLOSED))
add_entry_with_seq_id = AXIS2_TRUE;
- if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT))
+ if(0 == axutil_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT))
add_entry_with_seq_id = AXIS2_TRUE;
if(AXIS2_TRUE == add_entry_with_seq_id && seq_id)
@@ -431,17 +431,17 @@
{
axis2_bool_t deletable = AXIS2_TRUE;
- if(0 == axis2_strcasecmp(name, SANDESHA2_SEQ_PROP_TERMINATE_ADDED))
+ if(0 == axutil_strcasecmp(name, SANDESHA2_SEQ_PROP_TERMINATE_ADDED))
deletable = AXIS2_FALSE;
- if(0 == axis2_strcasecmp(name, SANDESHA2_SEQ_PROP_NO_OF_OUTGOING_MSGS_ACKED))
+ if(0 == axutil_strcasecmp(name, SANDESHA2_SEQ_PROP_NO_OF_OUTGOING_MSGS_ACKED))
deletable = AXIS2_FALSE;
- if(0 == axis2_strcasecmp(name, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID))
+ if(0 == axutil_strcasecmp(name, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID))
deletable = AXIS2_FALSE;
- if(0 == axis2_strcasecmp(name, SANDESHA2_SEQ_PROP_SEQ_TERMINATED))
+ if(0 == axutil_strcasecmp(name, SANDESHA2_SEQ_PROP_SEQ_TERMINATED))
deletable = AXIS2_FALSE;
- if(0 == axis2_strcasecmp(name, SANDESHA2_SEQ_PROP_SEQ_CLOSED))
+ if(0 == axutil_strcasecmp(name, SANDESHA2_SEQ_PROP_SEQ_CLOSED))
deletable = AXIS2_FALSE;
- if(0 == axis2_strcasecmp(name, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT))
+ if(0 == axutil_strcasecmp(name, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT))
deletable = AXIS2_FALSE;
return deletable;
}
@@ -519,7 +519,7 @@
{
axis2_char_t *acks_to = NULL;
acks_to = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
- if(acks_to && 0 == axis2_strcmp(acks_to, anon_uri))
+ if(acks_to && 0 == axutil_strcmp(acks_to, anon_uri))
stop_listner_for_async = AXIS2_TRUE;
}
@@ -594,7 +594,7 @@
seq_prop_bean, env);
axis2_char_t *name = sandesha2_seq_property_bean_get_name(
seq_prop_bean, env);
- if(axis2_strcmp(name, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER))
+ if(axutil_strcmp(name, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER))
{
highest_in_msg_key_str =
sandesha2_seq_property_bean_get_value(seq_prop_bean, env);
@@ -654,7 +654,7 @@
terminated = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
out_seq_id, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
if(terminated && sandesha2_seq_property_bean_get_value(terminated, env)
- && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
+ && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
sandesha2_seq_property_bean_get_value(terminated, env)))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was"
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=527768&r1=527767&r2=527768
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Wed Apr 11 21:45:25 2007
@@ -129,7 +129,7 @@
{
axis2_char_t *tmp_id = NULL;
tmp_id = axutil_array_list_get(invoker->working_seqs, env, i);
- if(0 == axis2_strcmp(seq_id, tmp_id))
+ if(0 == axutil_strcmp(seq_id, tmp_id))
{
axutil_array_list_remove(invoker->working_seqs, env, i);
break;
@@ -208,7 +208,7 @@
" sandesha2_in_order_invoker_run");
return AXIS2_FAILURE;
}
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+ axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
return AXIS2_SUCCESS;
}
@@ -370,7 +370,7 @@
SANDESHA2_POST_FAILURE_MESSAGE);
if(property)
post_failure_str = axutil_property_get_value(property, env);
- if(post_failure_str && 0 == axis2_strcmp(
+ if(post_failure_str && 0 == axutil_strcmp(
post_failure_str, AXIS2_VALUE_TRUE))
post_failure_invocation = AXIS2_TRUE;
engine = axis2_engine_create(env, invoker->conf_ctx);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org