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 du...@apache.org on 2007/03/19 05:54:54 UTC
svn commit: r519842 [1/2] - 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_report/ src/client/ src/core/ src/h...
Author: dushshantha
Date: Sun Mar 18 21:54:50 2007
New Revision: 519842
URL: http://svn.apache.org/viewvc?view=rev&rev=519842
Log:
removed some of the macro referances.
Modified:
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
webservices/sandesha/trunk/c/samples/rm_mtom_1_0/rm_mtom_1_0.c
webservices/sandesha/trunk/c/samples/rm_report/report.c
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/client/sequence_report.c
webservices/sandesha/trunk/c/src/core/msg_validator.c
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c
webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_data.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/property_bean.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
webservices/sandesha/trunk/c/src/wsrm/accept.c
webservices/sandesha/trunk/c/src/wsrm/ack_final.c
webservices/sandesha/trunk/c/src/wsrm/ack_none.c
webservices/sandesha/trunk/c/src/wsrm/ack_range.c
webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
webservices/sandesha/trunk/c/src/wsrm/acks_to.c
webservices/sandesha/trunk/c/src/wsrm/address.c
webservices/sandesha/trunk/c/src/wsrm/close_seq.c
webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
webservices/sandesha/trunk/c/src/wsrm/create_seq.c
webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
webservices/sandesha/trunk/c/src/wsrm/expires.c
webservices/sandesha/trunk/c/src/wsrm/fault_code.c
webservices/sandesha/trunk/c/src/wsrm/identifier.c
webservices/sandesha/trunk/c/src/wsrm/last_msg.c
webservices/sandesha/trunk/c/src/wsrm/make_connection.c
webservices/sandesha/trunk/c/src/wsrm/msg_number.c
webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
webservices/sandesha/trunk/c/src/wsrm/nack.c
webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
webservices/sandesha/trunk/c/src/wsrm/sequence.c
webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c
Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c Sun Mar 18 21:54:50 2007
@@ -112,14 +112,14 @@
op_name = AXIS2_QNAME_GET_LOCALPART(op_qname, env);
if(op_name)
{
- if (AXIS2_STRCMP(op_name, "echoString") == 0)
+ if (axis2_strcmp(op_name, "echoString") == 0)
return rm_sample_svc_echo(env, node);
- if (AXIS2_STRCMP(op_name, "ping") == 0)
+ if (axis2_strcmp(op_name, "ping") == 0)
{
rm_sample_svc_ping(env, node);
return NULL;
}
- if (AXIS2_STRCMP(op_name, "mtomSample") == 0)
+ if (axis2_strcmp(op_name, "mtomSample") == 0)
return rm_sample_svc_mtom(env, node);
}
}
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c Sun Mar 18 21:54:50 2007
@@ -99,7 +99,7 @@
return -1;
}
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [offer]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c Sun Mar 18 21:54:50 2007
@@ -104,7 +104,7 @@
return -1;
}
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [offer]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c Sun Mar 18 21:54:50 2007
@@ -103,7 +103,7 @@
return -1;
}
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [offer]\n", argv[0]);
printf("use -h for help\n");
@@ -163,7 +163,7 @@
property = axis2_property_create(env);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(offered_seq_id,
+ AXIS2_PROPERTY_SET_VALUE(property, env, axis2_strdup(offered_seq_id,
env));
AXIS2_OPTIONS_SET_PROPERTY(options, env,
SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c Sun Mar 18 21:54:50 2007
@@ -96,7 +96,7 @@
return -1;
}
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [offer]\n", argv[0]);
printf("use -h for help\n");
@@ -159,7 +159,7 @@
property = axis2_property_create(env);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(offered_seq_id,
+ AXIS2_PROPERTY_SET_VALUE(property, env, axis2_strdup(offered_seq_id,
env));
AXIS2_OPTIONS_SET_PROPERTY(options, env,
SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);
Modified: webservices/sandesha/trunk/c/samples/rm_mtom_1_0/rm_mtom_1_0.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_mtom_1_0/rm_mtom_1_0.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_mtom_1_0/rm_mtom_1_0.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_mtom_1_0/rm_mtom_1_0.c Sun Mar 18 21:54:50 2007
@@ -78,7 +78,7 @@
return -1;
}
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/sandesha/trunk/c/samples/rm_report/report.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_report/report.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_report/report.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_report/report.c Sun Mar 18 21:54:50 2007
@@ -105,7 +105,7 @@
return -1;
}
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [offer]\n", argv[0]);
printf("use -h for help\n");
@@ -165,7 +165,7 @@
property = axis2_property_create(env);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(offered_seq_id,
+ AXIS2_PROPERTY_SET_VALUE(property, env, axis2_strdup(offered_seq_id,
env));
AXIS2_OPTIONS_SET_PROPERTY(options, env,
SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Sun Mar 18 21:54:50 2007
@@ -686,7 +686,7 @@
rm_namespc_value, NULL);
terminate_body_element = axiom_element_get_first_child_with_qname(element,
env, qname, node, &terminate_body_node);
- old_action = AXIS2_STRDUP(AXIS2_OPTIONS_GET_ACTION(options, env), env);
+ old_action = axis2_strdup(AXIS2_OPTIONS_GET_ACTION(options, env), env);
action = sandesha2_spec_specific_consts_get_terminate_seq_action(env,
rm_spec_version);
if(action)
@@ -1103,7 +1103,7 @@
rm_spec_version = AXIS2_PROPERTY_GET_VALUE(property, env);
if(!rm_spec_version)
{
- rm_spec_version = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_0, env);
+ rm_spec_version = axis2_strdup(SANDESHA2_SPEC_VERSION_1_0, env);
}
if(0 == axis2_strcmp(rm_spec_version, SANDESHA2_SPEC_VERSION_1_0))
{
Modified: webservices/sandesha/trunk/c/src/client/sequence_report.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/sequence_report.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/client/sequence_report.c (original)
+++ webservices/sandesha/trunk/c/src/client/sequence_report.c Sun Mar 18 21:54:50 2007
@@ -151,7 +151,7 @@
AXIS2_FREE(env->allocator, report->seq_id);
report->seq_id = NULL;
}
- report->seq_id = AXIS2_STRDUP(seq_id, env);
+ report->seq_id = axis2_strdup(seq_id, env);
if(!report->seq_id)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -232,7 +232,7 @@
AXIS2_FREE(env->allocator, report->internal_seq_id);
report->internal_seq_id = NULL;
}
- report->internal_seq_id = AXIS2_STRDUP(internal_seq_id, env);
+ report->internal_seq_id = axis2_strdup(internal_seq_id, env);
if(!report->internal_seq_id)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/sandesha/trunk/c/src/core/msg_validator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/msg_validator.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/core/msg_validator.c (original)
+++ webservices/sandesha/trunk/c/src/core/msg_validator.c Sun Mar 18 21:54:50 2007
@@ -59,14 +59,14 @@
rm_ns_seq = sandesha2_spec_specific_consts_get_rm_ns_val(env,
rm_ver_seq);
- if(NULL != rm_ns_seq && 0 != AXIS2_STRCMP(rm_ns_seq, rm_ns_msg))
+ if(NULL != rm_ns_seq && 0 != axis2_strcmp(rm_ns_seq, rm_ns_msg))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Validation"
" failed. The RM namespace of the message does not"
" match with the sequence");
return AXIS2_FAILURE;
}
- if(NULL != addr_ns_seq && 0 != AXIS2_STRCMP(addr_ns_seq, addr_ns_msg))
+ if(NULL != addr_ns_seq && 0 != axis2_strcmp(addr_ns_seq, addr_ns_msg))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Validation"
" failed. The Addressing namespace of the message does"
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Sun Mar 18 21:54:50 2007
@@ -456,11 +456,11 @@
AXIS2_FREE(env->allocator, rm_msg_ctx->rm_ns_val);
rm_msg_ctx->rm_ns_val = NULL;
}
- rm_msg_ctx->rm_ns_val = AXIS2_STRDUP(ns_val, env);
- if(0 == AXIS2_STRCMP(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
- rm_msg_ctx->spec_ver = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_0, env);
- if(0 == AXIS2_STRCMP(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
- rm_msg_ctx->spec_ver = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_1, env);
+ rm_msg_ctx->rm_ns_val = axis2_strdup(ns_val, env);
+ if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
+ rm_msg_ctx->spec_ver = axis2_strdup(SANDESHA2_SPEC_VERSION_1_0, env);
+ if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
+ rm_msg_ctx->spec_ver = axis2_strdup(SANDESHA2_SPEC_VERSION_1_1, env);
return AXIS2_SUCCESS;
}
@@ -487,7 +487,7 @@
AXIS2_FREE(env->allocator, rm_msg_ctx->addr_ns_val);
rm_msg_ctx->addr_ns_val = NULL;
}
- rm_msg_ctx->addr_ns_val = AXIS2_STRDUP(ns_val, env);
+ rm_msg_ctx->addr_ns_val = axis2_strdup(ns_val, env);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Sun Mar 18 21:54:50 2007
@@ -154,7 +154,7 @@
AXIS2_FALSE);
if(property)
reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(reinjected_msg && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, reinjected_msg))
+ if(reinjected_msg && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Detected"
" reinjected_msg");
@@ -173,7 +173,7 @@
if(property)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
- if(within_transaction_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
+ if(within_transaction_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
within_transaction_str))
{
within_transaction = AXIS2_TRUE;
@@ -379,7 +379,7 @@
bean_value = axis2_strcat(env, rcvd_msgs_str1, ",",
msg_no_str, NULL);
else
- bean_value = AXIS2_STRDUP(msg_no_str, env);
+ bean_value = axis2_strdup(msg_no_str, env);
sandesha2_seq_property_bean_set_value(rcvd_msgs_bean, env,
bean_value);
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Sun Mar 18 21:54:50 2007
@@ -113,7 +113,7 @@
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
- if(str_done && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, str_done))
+ if(str_done && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit: sandesha2_in_handler::invoke, Application " \
@@ -125,7 +125,7 @@
if(temp_prop)
reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop,
env);
- if(reinjected_msg && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, reinjected_msg))
+ if(reinjected_msg && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit: sandesha2_in_handler::invoke, reinjected_msg");
@@ -140,7 +140,7 @@
if(temp_prop)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
temp_prop, env);
- if(within_transaction_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
+ if(within_transaction_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
within_transaction_str))
{
within_transaction = AXIS2_TRUE;
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Sun Mar 18 21:54:50 2007
@@ -151,7 +151,7 @@
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
- if(str_done && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, str_done))
+ if(str_done && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit: sandesha2_out_handler::invoke, Application \
@@ -168,7 +168,7 @@
if(temp_prop)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
temp_prop, env);
- if(within_transaction_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
+ if(within_transaction_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
within_transaction_str))
{
within_transaction = AXIS2_TRUE;
@@ -188,7 +188,7 @@
AXIS2_FALSE);
if(NULL != temp_prop)
dummy_msg_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
- if(dummy_msg_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, dummy_msg_str))
+ if(dummy_msg_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, dummy_msg_str))
{
dummy_msg = AXIS2_TRUE;
}
@@ -264,7 +264,7 @@
temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
- axis2_property_set_value(temp_prop, env, AXIS2_STRDUP(
+ axis2_property_set_value(temp_prop, env, axis2_strdup(
AXIS2_VALUE_FALSE, env));
AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_out_handler::invoke");
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Sun Mar 18 21:54:50 2007
@@ -197,7 +197,7 @@
nack_list = sandesha2_seq_ack_get_nack_list(seq_ack, env);
out_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_ack_get_identifier(seq_ack, env), env);
- if(!out_seq_id || 0 == AXIS2_STRLEN(out_seq_id))
+ if(!out_seq_id || 0 == axis2_strlen(out_seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] OutSequenceId is"
" null");
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Sun Mar 18 21:54:50 2007
@@ -248,7 +248,7 @@
addr_ns_val = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_val);
- if(0 == AXIS2_STRCMP(anon_uri, acks_to_str))
+ if(0 == axis2_strcmp(anon_uri, acks_to_str))
{
axis2_engine_t *engine = NULL;
axis2_op_ctx_t *op_ctx = NULL;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Sun Mar 18 21:54:50 2007
@@ -417,10 +417,10 @@
}
if(!msg_no_present_in_list)
{
- if(msgs_str && 0 < AXIS2_STRLEN(msgs_str))
+ if(msgs_str && 0 < axis2_strlen(msgs_str))
msgs_str = axis2_strcat(env, msgs_str, ",", msg_num_str, NULL);
else
- msgs_str = AXIS2_STRDUP(msg_num_str, env);
+ msgs_str = axis2_strdup(msg_num_str, env);
sandesha2_seq_property_bean_set_value(msgs_bean, env, msgs_str);
sandesha2_seq_property_mgr_update(seq_prop_mgr, env, msgs_bean);
}
@@ -637,7 +637,7 @@
to_epr = axis2_msg_ctx_get_to(msg_ctx, env);
if((!to_epr || !axis2_endpoint_ref_get_address(to_epr, env)
- || 0 == AXIS2_STRLEN(axis2_endpoint_ref_get_address(
+ || 0 == axis2_strlen(axis2_endpoint_ref_get_address(
to_epr, env))) && !is_svr_side)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "to epr is not set - a"
@@ -831,7 +831,7 @@
axis2_char_t *value = NULL;
value = sandesha2_seq_property_bean_get_value(incoming_to_bean, env);
- incoming_to = AXIS2_STRDUP(value, env);
+ incoming_to = axis2_strdup(value, env);
property = axis2_property_create_with_args(env, 0, 0, 0, incoming_to);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_SEQ_PROP_TO_EPR,
property, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Sun Mar 18 21:54:50 2007
@@ -332,7 +332,7 @@
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- if(0 == AXIS2_STRCMP(anon_uri, axis2_endpoint_ref_get_address(to_epr,
+ if(0 == axis2_strcmp(anon_uri, axis2_endpoint_ref_get_address(to_epr,
env)))
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
else
@@ -383,7 +383,7 @@
seq_id);
list = sandesha2_create_seq_mgr_find(create_seq_mgr, env, find_bean);
/* Single char offerings are not accepted */
- if(1 >= AXIS2_STRLEN(seq_id))
+ if(1 >= axis2_strlen(seq_id))
return AXIS2_FALSE;
if(NULL != list && 0 < axis2_array_list_size(list, env))
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Sun Mar 18 21:54:50 2007
@@ -202,7 +202,7 @@
}
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(term_seq, env), env);
- if(!seq_id || 0 == AXIS2_STRLEN(seq_id))
+ if(!seq_id || 0 == axis2_strlen(seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid "
"sequence id");
@@ -437,7 +437,7 @@
to_epr = axis2_msg_ctx_get_to(msg_ctx, env);
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- if(0 == AXIS2_STRCMP(anon_uri, axis2_endpoint_ref_get_address(to_epr, env)))
+ if(0 == axis2_strcmp(anon_uri, axis2_endpoint_ref_get_address(to_epr, env)))
{
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
}
@@ -522,7 +522,7 @@
rm_msg_ctx, env), op_ctx);
axis2_allocator_switch_to_local_pool(env->allocator);
- if(terminated && 0 == AXIS2_STRCMP(terminated, AXIS2_VALUE_TRUE))
+ if(terminated && 0 == axis2_strcmp(terminated, AXIS2_VALUE_TRUE))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was "
"added previously");
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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 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 == axis2_strlen(seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid "
"sequence id");
Modified: webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c Sun Mar 18 21:54:50 2007
@@ -206,7 +206,7 @@
{
sandesha2_create_seq_bean_impl_t *create_seq_bean_impl = NULL;
create_seq_bean_impl = SANDESHA2_INTF_TO_IMPL(create_seq_bean);
- create_seq_bean_impl->create_seq_msg_id = AXIS2_STRDUP(seq_msg_id, env);
+ create_seq_bean_impl->create_seq_msg_id = axis2_strdup(seq_msg_id, env);
}
axis2_char_t * AXIS2_CALL
@@ -226,7 +226,7 @@
{
sandesha2_create_seq_bean_impl_t *create_seq_bean_impl = NULL;
create_seq_bean_impl = SANDESHA2_INTF_TO_IMPL(create_seq_bean);
- create_seq_bean_impl->seq_id = AXIS2_STRDUP(seq_id, env);
+ create_seq_bean_impl->seq_id = axis2_strdup(seq_id, env);
}
axis2_char_t * AXIS2_CALL
@@ -246,7 +246,7 @@
{
sandesha2_create_seq_bean_impl_t *create_seq_bean_impl = NULL;
create_seq_bean_impl = SANDESHA2_INTF_TO_IMPL(create_seq_bean);
- create_seq_bean_impl->internal_seq_id = AXIS2_STRDUP(int_seq_id, env);
+ create_seq_bean_impl->internal_seq_id = axis2_strdup(int_seq_id, env);
}
axis2_char_t * AXIS2_CALL
@@ -266,7 +266,7 @@
{
sandesha2_create_seq_bean_impl_t *create_seq_bean_impl = NULL;
create_seq_bean_impl = SANDESHA2_INTF_TO_IMPL(create_seq_bean);
- create_seq_bean_impl->create_seq_msg_store_key = AXIS2_STRDUP(
+ create_seq_bean_impl->create_seq_msg_store_key = axis2_strdup(
create_seq_msg_store_key, env);
}
@@ -287,7 +287,7 @@
{
sandesha2_create_seq_bean_impl_t *create_seq_bean_impl = NULL;
create_seq_bean_impl = SANDESHA2_INTF_TO_IMPL(create_seq_bean);
- create_seq_bean_impl->ref_msg_store_key = AXIS2_STRDUP(ref_msg_store_key,
+ create_seq_bean_impl->ref_msg_store_key = axis2_strdup(ref_msg_store_key,
env);
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c Sun Mar 18 21:54:50 2007
@@ -102,13 +102,13 @@
if(!ref_key)
invoker_bean_impl->msg_ctx_ref_key = NULL;
else
- invoker_bean_impl->msg_ctx_ref_key = (axis2_char_t*)AXIS2_STRDUP(
+ invoker_bean_impl->msg_ctx_ref_key = (axis2_char_t*)axis2_strdup(
ref_key, env);
if(!seq_id)
invoker_bean_impl->seq_id = NULL;
else
- invoker_bean_impl->seq_id = (axis2_char_t*)AXIS2_STRDUP(seq_id, env);
+ invoker_bean_impl->seq_id = (axis2_char_t*)axis2_strdup(seq_id, env);
invoker_bean_impl->msg_no = msg_no;
invoker_bean_impl->invoked = invoked;
@@ -191,7 +191,7 @@
AXIS2_FREE(env->allocator, invoker_bean_impl->msg_ctx_ref_key);
invoker_bean_impl->msg_ctx_ref_key =
- (axis2_char_t*)AXIS2_STRDUP(context_ref_id, env);
+ (axis2_char_t*)axis2_strdup(context_ref_id, env);
}
@@ -232,7 +232,7 @@
{
sandesha2_invoker_bean_impl_t *invoker_bean_impl = NULL;
invoker_bean_impl = SANDESHA2_INTF_TO_IMPL(invoker_bean);
- invoker_bean_impl->seq_id = (axis2_char_t*)AXIS2_STRDUP(int_seq_id, env);
+ invoker_bean_impl->seq_id = (axis2_char_t*)axis2_strdup(int_seq_id, env);
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c Sun Mar 18 21:54:50 2007
@@ -86,7 +86,7 @@
return NULL;
}
/* init the properties. */
- next_msg_bean_impl->seq_id = (axis2_char_t*)AXIS2_STRDUP(seq_id, env);
+ next_msg_bean_impl->seq_id = (axis2_char_t*)axis2_strdup(seq_id, env);
next_msg_bean_impl->ref_msg_key = NULL;
next_msg_bean_impl->msg_no = msg_no;
next_msg_bean_impl->polling_mode = AXIS2_FALSE;
@@ -171,7 +171,7 @@
next_msg_bean_impl->seq_id = NULL;
}
- next_msg_bean_impl->seq_id = (axis2_char_t*) AXIS2_STRDUP(seq_id, env);
+ next_msg_bean_impl->seq_id = (axis2_char_t*) axis2_strdup(seq_id, env);
}
@@ -235,7 +235,7 @@
{
sandesha2_next_msg_bean_impl_t *next_msg_bean_impl = NULL;
next_msg_bean_impl = SANDESHA2_INTF_TO_IMPL(next_msg_bean);
- next_msg_bean_impl->ref_msg_key = AXIS2_STRDUP(ref_msg_key, env);
+ next_msg_bean_impl->ref_msg_key = axis2_strdup(ref_msg_key, env);
}
void AXIS2_CALL
Modified: webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c Sun Mar 18 21:54:50 2007
@@ -116,9 +116,9 @@
}
/* init properties */
- sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
- sender_bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
- sender_bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
+ sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)axis2_strdup(key, env);
+ sender_bean_impl->msg_id = (axis2_char_t *)axis2_strdup(msg_id, env);
+ sender_bean_impl->internal_seq_id = (axis2_char_t *)axis2_strdup(int_seq_id, env);
sender_bean_impl->sent_count = -1;
sender_bean_impl->msg_no = msg_no;
sender_bean_impl->send = send;
@@ -222,7 +222,7 @@
AXIS2_FREE(env->allocator, sender_bean_impl->msg_ctx_ref_key);
sender_bean_impl->msg_ctx_ref_key = NULL;
}
- sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
+ sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)axis2_strdup(ref_key, env);
}
axis2_char_t* AXIS2_CALL
@@ -248,7 +248,7 @@
AXIS2_FREE(env->allocator, msg_id);
sender_bean_impl->msg_id = NULL;
}
- sender_bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
+ sender_bean_impl->msg_id = (axis2_char_t *)axis2_strdup(msg_id, env);
}
axis2_bool_t AXIS2_CALL
@@ -296,7 +296,7 @@
sender_bean_impl->internal_seq_id = NULL;
}
- sender_bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
+ sender_bean_impl->internal_seq_id = (axis2_char_t *)axis2_strdup(int_seq_id, env);
}
int AXIS2_CALL
@@ -429,7 +429,7 @@
sender_bean_impl->seq_id = NULL;
}
- sender_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ sender_bean_impl->seq_id = (axis2_char_t *)axis2_strdup(seq_id, env);
}
axis2_char_t* AXIS2_CALL
@@ -456,7 +456,7 @@
sender_bean_impl->wsrm_anon_uri = NULL;
}
- sender_bean_impl->wsrm_anon_uri = (axis2_char_t *)AXIS2_STRDUP(anon_uri, env);
+ sender_bean_impl->wsrm_anon_uri = (axis2_char_t *)axis2_strdup(anon_uri, env);
}
void AXIS2_CALL
@@ -473,7 +473,7 @@
sender_bean_impl->to_address = NULL;
}
- sender_bean_impl->to_address = (axis2_char_t *)AXIS2_STRDUP(to_address, env);
+ sender_bean_impl->to_address = (axis2_char_t *)axis2_strdup(to_address, env);
}
axis2_char_t* AXIS2_CALL
Modified: webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Sun Mar 18 21:54:50 2007
@@ -97,9 +97,9 @@
return NULL;
}
/* initialize properties */
- seq_property_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
- seq_property_bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(prop_name, env);
- seq_property_bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ seq_property_bean_impl->seq_id = (axis2_char_t *)axis2_strdup(seq_id, env);
+ seq_property_bean_impl->name = (axis2_char_t *)axis2_strdup(prop_name, env);
+ seq_property_bean_impl->value = (axis2_char_t *)axis2_strdup(value, env);
seq_property_bean_impl->rm_bean_impl = sandesha2_rm_bean_create(env);
seq_property_bean_impl->seq_property_bean.rm_bean.ops = rm_bean_ops;
@@ -187,7 +187,7 @@
seq_property_bean_impl->name = NULL;
}
if(name)
- seq_property_bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
+ seq_property_bean_impl->name = (axis2_char_t *)axis2_strdup(name, env);
}
axis2_char_t *AXIS2_CALL
@@ -215,7 +215,7 @@
seq_property_bean_impl->seq_id = NULL;
}
if(seq_id)
- seq_property_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id,
+ seq_property_bean_impl->seq_id = (axis2_char_t *)axis2_strdup(seq_id,
env);
}
@@ -244,7 +244,7 @@
seq_property_bean_impl->value = NULL;
}
if(value)
- seq_property_bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ seq_property_bean_impl->value = (axis2_char_t *)axis2_strdup(value, env);
}
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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 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 != axis2_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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c Sun Mar 18 21:54:50 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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c Sun Mar 18 21:54:50 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 != axis2_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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 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 != axis2_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 != axis2_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 != axis2_strcmp(value, temp_value))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c Sun Mar 18 21:54:50 2007
@@ -202,7 +202,7 @@
storage_mgr_impl = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_inmemory_storage_mgr_t));
- storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = AXIS2_STRDUP("Sandesha2MessageMap",
+ storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = axis2_strdup("Sandesha2MessageMap",
env);
storage_mgr_impl->conf_ctx = conf_ctx;
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
@@ -435,7 +435,7 @@
if(!storage_map)
{
storage_map = axis2_hash_make(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_map);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
axis2_ctx_set_property(ctx, env, storage_mgr_impl->SANDESHA2_MSG_MAP_KEY,
Modified: webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c Sun Mar 18 21:54:50 2007
@@ -129,7 +129,7 @@
const axis2_env_t *env,
axis2_char_t * msg_id)
{
- msg_store_bean->msg_id = AXIS2_STRDUP(msg_id, env);
+ msg_store_bean->msg_id = axis2_strdup(msg_id, env);
}
axis2_char_t *AXIS2_CALL
@@ -146,7 +146,7 @@
const axis2_env_t *env,
axis2_char_t * key)
{
- msg_store_bean->stored_key = AXIS2_STRDUP(key, env);
+ msg_store_bean->stored_key = axis2_strdup(key, env);
}
axis2_char_t *AXIS2_CALL
@@ -163,7 +163,7 @@
const axis2_env_t *env,
axis2_char_t * soap_env_str)
{
- msg_store_bean->soap_env_str = AXIS2_STRDUP(soap_env_str, env);
+ msg_store_bean->soap_env_str = axis2_strdup(soap_env_str, env);
}
int AXIS2_CALL
@@ -214,7 +214,7 @@
const axis2_env_t *env,
axis2_char_t * op)
{
- msg_store_bean->op = AXIS2_STRDUP(op, env);
+ msg_store_bean->op = axis2_strdup(op, env);
}
axis2_char_t *AXIS2_CALL
@@ -231,7 +231,7 @@
const axis2_env_t *env,
axis2_char_t * svc)
{
- msg_store_bean->svc = AXIS2_STRDUP(svc, env);
+ msg_store_bean->svc = axis2_strdup(svc, env);
}
axis2_char_t *AXIS2_CALL
@@ -248,7 +248,7 @@
const axis2_env_t *env,
axis2_char_t * svc_grp)
{
- msg_store_bean->svc_grp = AXIS2_STRDUP(svc_grp, env);
+ msg_store_bean->svc_grp = axis2_strdup(svc_grp, env);
}
axis2_char_t *AXIS2_CALL
@@ -265,7 +265,7 @@
const axis2_env_t *env,
axis2_char_t * opAdd)
{
- msg_store_bean->op_mep = AXIS2_STRDUP(opAdd, env);
+ msg_store_bean->op_mep = axis2_strdup(opAdd, env);
}
axis2_char_t *AXIS2_CALL
@@ -282,7 +282,7 @@
const axis2_env_t *env,
axis2_char_t * to_url)
{
- msg_store_bean->to_url = AXIS2_STRDUP(to_url, env);
+ msg_store_bean->to_url = axis2_strdup(to_url, env);
}
axis2_char_t *AXIS2_CALL
@@ -299,7 +299,7 @@
const axis2_env_t *env,
axis2_char_t * reply_to)
{
- msg_store_bean->reply_to = AXIS2_STRDUP(reply_to, env);
+ msg_store_bean->reply_to = axis2_strdup(reply_to, env);
}
axis2_char_t *AXIS2_CALL
@@ -316,7 +316,7 @@
const axis2_env_t *env,
axis2_char_t * transport_to)
{
- msg_store_bean->transport_to = AXIS2_STRDUP(transport_to, env);
+ msg_store_bean->transport_to = axis2_strdup(transport_to, env);
}
axis2_char_t *AXIS2_CALL
@@ -333,7 +333,7 @@
const axis2_env_t *env,
axis2_char_t * execution_chain_str)
{
- msg_store_bean->execution_chain_str = AXIS2_STRDUP(execution_chain_str, env);
+ msg_store_bean->execution_chain_str = axis2_strdup(execution_chain_str, env);
}
int AXIS2_CALL
@@ -367,7 +367,7 @@
const axis2_env_t *env,
axis2_char_t * msg_recv_str)
{
- msg_store_bean->msg_recv_str = AXIS2_STRDUP(msg_recv_str, env);
+ msg_store_bean->msg_recv_str = axis2_strdup(msg_recv_str, env);
}
axis2_bool_t AXIS2_CALL
@@ -401,7 +401,7 @@
const axis2_env_t *env,
axis2_char_t * request_msg_key)
{
- msg_store_bean->in_msg_store_key = AXIS2_STRDUP(request_msg_key, env);
+ msg_store_bean->in_msg_store_key = axis2_strdup(request_msg_key, env);
}
axis2_char_t *AXIS2_CALL
@@ -418,7 +418,7 @@
const axis2_env_t *env,
axis2_char_t * persistent_property_str)
{
- msg_store_bean->persistent_property_str = AXIS2_STRDUP(
+ msg_store_bean->persistent_property_str = axis2_strdup(
persistent_property_str, env);
}
@@ -436,6 +436,6 @@
const axis2_env_t *env,
axis2_char_t * action)
{
- msg_store_bean->action = AXIS2_STRDUP(action, env);
+ msg_store_bean->action = axis2_strdup(action, env);
}
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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Sun Mar 18 21:54:50 2007
@@ -83,10 +83,10 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == AXIS2_STRCMP(col_name[i], "response_str"))
+ if(0 == axis2_strcmp(col_name[i], "response_str"))
if(argv[i])
response->response_str = axis2_strdup(argv[i], env);
- if(0 == AXIS2_STRCMP(col_name[i], "soap_version"))
+ if(0 == axis2_strcmp(col_name[i], "soap_version"))
if(argv[i])
response->soap_version = axis2_atoi(argv[i]);
}
@@ -118,64 +118,64 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == AXIS2_STRCMP(col_name[i], "stored_key"))
+ if(0 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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(0 == axis2_strcmp(col_name[i], "transport_to"))
if(argv[i] && 0 != axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_strcmp(col_name[i], "action"))
if(argv[i])
sandesha2_msg_store_bean_set_action(bean, env, argv[i]);
}
@@ -822,13 +822,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 = 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;
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
dbconn = (sqlite3 *) sandesha2_permanent_storage_mgr_get_dbconn(
@@ -993,7 +993,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 = axis2_strlen(seq_id) + axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 != axis2_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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c Sun Mar 18 21:54:50 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 == axis2_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 == axis2_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 == axis2_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 == axis2_strcmp(col_name[i], "is_invoked"))
sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
}
axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 2007
@@ -69,21 +69,21 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
+ if(0 == axis2_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 == axis2_strcmp(col_name[i], "ref_msg_key"))
{
if(argv[i] && 0 != axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_strcmp(col_name[i], "ref_msg_key"))
if(argv[i] && 0 != axis2_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 == axis2_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 == axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c Sun Mar 18 21:54:50 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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 != axis2_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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- 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 Sun Mar 18 21:54:50 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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 == axis2_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 != axis2_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 != axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Sun Mar 18 21:54:50 2007
@@ -266,7 +266,7 @@
storage_mgr_impl = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_permanent_storage_mgr_t));
- storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = AXIS2_STRDUP("Sandesha2MessageMap",
+ storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = axis2_strdup("Sandesha2MessageMap",
env);
storage_mgr_impl->conf_ctx = conf_ctx;
axis2_allocator_switch_to_global_pool(env->allocator);
@@ -839,7 +839,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, axis2_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);
@@ -928,7 +928,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 == axis2_strcmp(mep, op_mep_str))
{
op = temp;
break;
@@ -1020,7 +1020,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 != axis2_strcmp("", persistent_prop_str))
{
axis2_hash_t *map =
sandesha2_permanent_storage_mgr_get_property_map_from_string(env,
@@ -1131,7 +1131,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR);
if(values)
size = axis2_array_list_size(values, env);
- if((size % 2 != 0) || (size == 1 && 0 == AXIS2_STRCMP("",
+ if((size % 2 != 0) || (size == 1 && 0 == axis2_strcmp("",
axis2_array_list_get(values, env, 0))))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -1246,7 +1246,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);
+ axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Sun Mar 18 21:54:50 2007
@@ -141,7 +141,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 == axis2_strcmp(acks_to_str, anon_uri))
{
axis2_op_ctx_t *op_ctx = NULL;
@@ -440,7 +440,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 == axis2_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_data.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_data.c?view=diff&rev=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_data.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_data.c Sun Mar 18 21:54:50 2007
@@ -141,7 +141,7 @@
AXIS2_FREE(env->allocator, data->reason);
data->reason = NULL;
}
- data->reason = AXIS2_STRDUP(reason, env);
+ data->reason = axis2_strdup(reason, env);
return AXIS2_SUCCESS;
}
@@ -168,7 +168,7 @@
AXIS2_FREE(env->allocator, data->sub_code);
data->sub_code = NULL;
}
- data->sub_code = AXIS2_STRDUP(sub_code, env);
+ data->sub_code = axis2_strdup(sub_code, env);
return AXIS2_SUCCESS;
}
@@ -195,7 +195,7 @@
AXIS2_FREE(env->allocator, data->code);
data->code = NULL;
}
- data->code = AXIS2_STRDUP(code, env);
+ data->code = axis2_strdup(code, env);
return AXIS2_SUCCESS;
}
@@ -242,7 +242,7 @@
AXIS2_FREE(env->allocator, data->seq_id);
data->seq_id = NULL;
}
- data->seq_id = AXIS2_STRDUP(seq_id, env);
+ data->seq_id = axis2_strdup(seq_id, env);
return AXIS2_SUCCESS;
}
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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Sun Mar 18 21:54:50 2007
@@ -218,7 +218,7 @@
next_bean = axis2_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 == axis2_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 == axis2_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 != axis2_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=519842&r1=519841&r2=519842
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Sun Mar 18 21:54:50 2007
@@ -220,7 +220,7 @@
SANDESHA2_CLIENT_OFFERED_SEQ_ID, AXIS2_FALSE);
if(property)
offered_seq = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(offered_seq && 0 != AXIS2_STRCMP("", offered_seq))
+ if(offered_seq && 0 != axis2_strcmp("", offered_seq))
{
sandesha2_seq_offer_t *offer_part = NULL;
sandesha2_identifier_t *identifier = NULL;
@@ -254,9 +254,9 @@
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 == axis2_strcmp("", acks_to))
{
- acks_to = AXIS2_STRDUP(anonymous_uri, env);
+ acks_to = axis2_strdup(anonymous_uri, env);
}
acks_to_epr = axis2_endpoint_ref_create(env, acks_to);
if(reply_to_bean)
@@ -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 != axis2_strcmp("", out_seq_id))
{
sandesha2_accept_t *accept = NULL;
axis2_endpoint_ref_t *acks_to_epr = NULL;
@@ -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 == axis2_strcmp(AXIS2_VALUE_TRUE, str_value))
{
axis2_bool_t is_allowed = AXIS2_FALSE;
@@ -1037,7 +1037,7 @@
{
const axis2_phase_t *phase = axis2_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 == axis2_strcmp(phase_name, AXIS2_PHASE_MESSAGE_OUT))
{
axis2_array_list_add(new_flow, env, phase);
}
@@ -1053,7 +1053,7 @@
{
const axis2_phase_t *phase = axis2_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 == axis2_strcmp(phase_name, "RMPhase"))
{
axis2_array_list_add(new_flow, env, phase);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org