You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/04/11 14:51:23 UTC
svn commit: r527478 [1/2] - in /webservices/sandesha/trunk/c:
samples/RMSampleService/ samples/rm_echo_1_1/ samples/rm_echo_single_1_0/
samples/rm_echo_single_1_1/ samples/rm_mtom_1_0/ samples/rm_report/
src/client/ src/core/ src/handlers/ src/msgproce...
Author: damitha
Date: Wed Apr 11 05:51:19 2007
New Revision: 527478
URL: http://svn.apache.org/viewvc?view=rev&rev=527478
Log:
Fixed the code according to the current changes in axis2c svn
Modified:
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.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/mod_sandesha2.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_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/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.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_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_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/error.c
webservices/sandesha/trunk/c/src/util/fault_data.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/property_mgr.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.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c Wed Apr 11 05:51:19 2007
@@ -70,7 +70,7 @@
buffer = AXIOM_XML_WRITER_GET_XML(writer, env);
}
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, "Text", ns, NULL);
text_parent_element = axiom_element_get_first_child_with_qname(element, env,
qname, node, &text_parent_node);
@@ -90,7 +90,7 @@
if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(text_node, env);
if( text && axiom_text_get_value(text , env))
{
axis2_char_t *text_str = axiom_text_get_value(text, env);
@@ -172,7 +172,7 @@
buffer = AXIOM_XML_WRITER_GET_XML(writer, env);
}
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, "Text", ns, NULL);
text_parent_element = axiom_element_get_first_child_with_qname(element, env,
qname, node, &text_parent_node);
@@ -192,7 +192,7 @@
if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
{
- /*axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
+ /*axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(text_node, env);
if( text && axiom_text_get_value(text , env))
{
axis2_char_t *text_str = axiom_text_get_value(text, env);
@@ -248,7 +248,7 @@
if (AXIOM_NODE_GET_NODE_TYPE(file_text_node, env) == AXIOM_TEXT)
{
- axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(file_text_node, env);
+ axiom_text_t *text = (axiom_text_t *)axiom_node_get_data_element(file_text_node, env);
if (text && axiom_text_get_value(text , env))
{
axiom_node_t *image_node = NULL;
@@ -267,7 +267,7 @@
{
axiom_data_handler_t *data_handler = NULL;
axiom_text_t *bin_text = (axiom_text_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(binary_node, env);
+ axiom_node_get_data_element(binary_node, env);
data_handler = axiom_text_get_data_handler(bin_text, env);
if (data_handler)
{
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=527478&r1=527477&r2=527478
==============================================================================
--- 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 Wed Apr 11 05:51:19 2007
@@ -166,11 +166,11 @@
/* Offer sequence */
if(offer)
{
- offered_seq_id = axis2_uuid_gen(env);
+ offered_seq_id = axutil_uuid_gen(env);
property = axutil_property_create(env);
if(property)
{
- axutil_property_set_value(property, env, axis2_strdup(offered_seq_id,
+ axutil_property_set_value(property, env, axutil_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_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=527478&r1=527477&r2=527478
==============================================================================
--- 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 Wed Apr 11 05:51:19 2007
@@ -162,11 +162,11 @@
return AXIS2_FAILURE;
}
/* Offer sequence */
- offered_seq_id = axis2_uuid_gen(env);
+ offered_seq_id = axutil_uuid_gen(env);
property = axutil_property_create(env);
if(property)
{
- axutil_property_set_value(property, env, axis2_strdup(offered_seq_id,
+ axutil_property_set_value(property, env, axutil_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=527478&r1=527477&r2=527478
==============================================================================
--- 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 Wed Apr 11 05:51:19 2007
@@ -155,11 +155,11 @@
return AXIS2_FAILURE;
}
/* Offer sequence */
- offered_seq_id = axis2_uuid_gen(env);
+ offered_seq_id = axutil_uuid_gen(env);
property = axutil_property_create(env);
if(property)
{
- axutil_property_set_value(property, env, axis2_strdup(offered_seq_id,
+ axutil_property_set_value(property, env, axutil_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=527478&r1=527477&r2=527478
==============================================================================
--- 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 Wed Apr 11 05:51:19 2007
@@ -127,7 +127,7 @@
AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "sandesha2");
/* Offer sequence */
- offered_seq_id = axis2_uuid_gen(env);
+ offered_seq_id = axutil_uuid_gen(env);
property = axutil_property_create_with_args(env, 0, 0, 0, offered_seq_id);
if(property)
AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_OFFERED_SEQ_ID,
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_report/report.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_report/report.c Wed Apr 11 05:51:19 2007
@@ -161,11 +161,11 @@
return AXIS2_FAILURE;
}
/* Offer sequence */
- offered_seq_id = axis2_uuid_gen(env);
+ offered_seq_id = axutil_uuid_gen(env);
property = axutil_property_create(env);
if(property)
{
- axutil_property_set_value(property, env, axis2_strdup(offered_seq_id,
+ axutil_property_set_value(property, env, axutil_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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Wed Apr 11 05:51:19 2007
@@ -563,7 +563,7 @@
{
axis2_char_t *offered_seq_id = NULL;
- offered_seq_id = axis2_uuid_gen(env);
+ offered_seq_id = axutil_uuid_gen(env);
axis2_options_set_property(options, env, SANDESHA2_CLIENT_OFFERED_SEQ_ID,
offered_seq_id);
}
@@ -575,7 +575,7 @@
seq_key = axutil_property_get_value(property, env);
if (seq_key == NULL)
{
- seq_key = axis2_uuid_gen(env);
+ seq_key = axutil_uuid_gen(env);
property = axutil_property_create_with_args(env, 0, 0, 0, seq_key);
axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
property);
@@ -680,12 +680,12 @@
return AXIS2_FAILURE;
body = axiom_soap_envelope_get_body(terminate_envelope, env);
node = axiom_soap_body_get_base_node(body, env);
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ,
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(env, axis2_options_get_action(options, env));
+ old_action = axutil_strdup(env, axis2_options_get_action(options, env));
action = sandesha2_spec_specific_consts_get_terminate_seq_action(env,
rm_spec_version);
if(action)
@@ -788,7 +788,7 @@
conf_ctx);
body = axiom_soap_envelope_get_body(close_envelope, env);
node = axiom_soap_body_get_base_node(body, env);
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ,
rm_namespc_value, NULL);
close_body_element = axiom_element_get_first_child_with_qname(element, env,
@@ -1102,7 +1102,7 @@
rm_spec_version = axutil_property_get_value(property, env);
if(!rm_spec_version)
{
- rm_spec_version = axis2_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
+ rm_spec_version = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
}
if(0 == axis2_strcmp(rm_spec_version, SANDESHA2_SPEC_VERSION_1_0))
{
@@ -1149,7 +1149,7 @@
ack_requested, env, dummy_envelope);
header = axiom_soap_envelope_get_header(dummy_envelope, env);
node = axiom_soap_header_get_base_node(header, env);
- element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+ element = axiom_node_get_data_element(node, env);
qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_REQUESTED,
rm_ns_value, NULL);
ack_requested_header_block = axiom_element_get_first_child_with_qname(
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/client/sequence_report.c (original)
+++ webservices/sandesha/trunk/c/src/client/sequence_report.c Wed Apr 11 05:51:19 2007
@@ -145,7 +145,7 @@
AXIS2_FREE(env->allocator, report->seq_id);
report->seq_id = NULL;
}
- report->seq_id = axis2_strdup(env ,seq_id);
+ report->seq_id = axutil_strdup(env ,seq_id);
if(!report->seq_id)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -223,7 +223,7 @@
AXIS2_FREE(env->allocator, report->internal_seq_id);
report->internal_seq_id = NULL;
}
- report->internal_seq_id = axis2_strdup(env, internal_seq_id);
+ report->internal_seq_id = axutil_strdup(env, internal_seq_id);
if(!report->internal_seq_id)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Wed Apr 11 05:51:19 2007
@@ -37,6 +37,14 @@
mod_sandesha2_fill_handler_create_func_map(
axis2_module_t *module,
const axutil_env_t *env);
+
+static const axis2_module_ops_t mod_sandesha2_ops_var =
+{
+ mod_sandesha2_init,
+ mod_sandesha2_shutdown,
+ mod_sandesha2_fill_handler_create_func_map
+};
+
/******************************************************************************/
AXIS2_EXTERN axis2_module_t * AXIS2_CALL
@@ -50,12 +58,7 @@
module->ops = AXIS2_MALLOC(
env->allocator, sizeof(axis2_module_ops_t));
-
- module->ops->shutdown = mod_sandesha2_shutdown;
- module->ops->init = mod_sandesha2_init;
- module->ops->fill_handler_create_func_map =
- mod_sandesha2_fill_handler_create_func_map;
-
+ module->ops = &mod_sandesha2_ops_var;
return module;
}
@@ -77,6 +80,7 @@
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] module initializing ..");
+ sandesha2_error_init();
property_bean = sandesha2_property_mgr_load_properties_from_module_desc(env,
module_desc);
if(!property_bean)
@@ -115,12 +119,6 @@
* sandesha2_utils_stop_sender(env, conf_ctx);
* sandesha2_utils_stop_invoker(env, conf_ctx);
*/
- if(module->ops)
- {
- AXIS2_FREE(env->allocator, module->ops);
- module->ops = NULL;
- }
-
if(module->handler_create_func_map)
{
/* TODO
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Wed Apr 11 05:51:19 2007
@@ -454,11 +454,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(env, ns_val);
+ rm_msg_ctx->rm_ns_val = axutil_strdup(env, ns_val);
if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
- rm_msg_ctx->spec_ver = axis2_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
+ rm_msg_ctx->spec_ver = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
- rm_msg_ctx->spec_ver = axis2_strdup(env, SANDESHA2_SPEC_VERSION_1_1);
+ rm_msg_ctx->spec_ver = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_1);
return AXIS2_SUCCESS;
}
@@ -485,7 +485,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(env, ns_val);
+ rm_msg_ctx->addr_ns_val = axutil_strdup(env, ns_val);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Wed Apr 11 05:51:19 2007
@@ -85,8 +85,7 @@
/* handler init is handled by conf loading, so no need to do it here */
/* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = sandesha2_global_in_handler_invoke;
+ axis2_handler_set_invoke(handler, env, sandesha2_global_in_handler_invoke);
return handler;
}
@@ -404,7 +403,7 @@
sandesha2_msg_ctx_get_soap_envelope(rm_msg_ctx, env),
env);
body_node = axiom_soap_body_get_base_node(soap_body, env);
- body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
+ body_element = axiom_node_get_data_element(body_node, env);
children_iterator = axiom_element_get_children(body_element, env,
body_node);
if(!axiom_children_iterator_has_next(children_iterator, env))
@@ -431,10 +430,10 @@
rcvd_msgs_bean, env);
sprintf(msg_no_str, "%ld", msg_no);
if(rcvd_msgs_str1 && 0 < axis2_strlen(rcvd_msgs_str1))
- bean_value = axis2_strcat(env, rcvd_msgs_str1, ",",
+ bean_value = axutil_strcat(env, rcvd_msgs_str1, ",",
msg_no_str, NULL);
else
- bean_value = axis2_strdup(env, msg_no_str);
+ bean_value = axutil_strdup(env, msg_no_str);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Apr 11 05:51:19 2007
@@ -33,10 +33,10 @@
#include <sandesha2_seq_ack.h>
#include <sandesha2_ack_requested.h>
-static const axutil_string_t *AXIS2_CALL
+/*static const axutil_string_t *AXIS2_CALL
sandesha2_in_handler_get_name(
const struct axis2_handler *handler,
- const axutil_env_t *env);
+ const axutil_env_t *env);*/
static axis2_status_t AXIS2_CALL
sandesha2_in_handler_invoke(
@@ -64,11 +64,7 @@
/* handler init is handled by conf loading, so no need to do it here */
/* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = sandesha2_in_handler_invoke;
- if (handler->ops)
- handler->ops->get_name = sandesha2_in_handler_get_name;
-
+ axis2_handler_set_invoke(handler, env, sandesha2_in_handler_invoke);
return handler;
}
@@ -243,11 +239,11 @@
return AXIS2_SUCCESS;
}
-static const axutil_string_t *AXIS2_CALL
+/*static const axutil_string_t *AXIS2_CALL
sandesha2_in_handler_get_name(
const struct axis2_handler *handler,
const axutil_env_t *env)
{
return axutil_string_create(env, SANDESHA2_IN_HANDLER_NAME);
-}
+}*/
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Wed Apr 11 05:51:19 2007
@@ -64,8 +64,7 @@
/* handler init is handled by conf loading, so no need to do it here */
/* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = sandesha2_out_handler_invoke;
+ hxis2_handler_set_invoke(handler, env, sandesha2_out_handler_invoke);
return handler;
}
@@ -262,7 +261,7 @@
temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE);
if(temp_prop)
- axutil_property_set_value(temp_prop, env, axis2_strdup(
+ axutil_property_set_value(temp_prop, env, axutil_strdup(
env,AXIS2_VALUE_FALSE));
AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_out_handler::invoke");
return AXIS2_SUCCESS;
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Wed Apr 11 05:51:19 2007
@@ -220,7 +220,7 @@
ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
sandesha2_msg_ctx_set_rm_ns_val(ack_rm_msg, env,
sandesha2_msg_ctx_get_rm_ns_val(rm_msg_ctx, env));
- axis2_msg_ctx_set_message_id(ack_msg_ctx, env, axis2_uuid_gen(env));
+ axis2_msg_ctx_set_message_id(ack_msg_ctx, env, axutil_uuid_gen(env));
envelope = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
@@ -296,7 +296,7 @@
axis2_transport_out_desc_t *transport_out = NULL;
retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
- key = axis2_uuid_gen(env);
+ key = axutil_uuid_gen(env);
ack_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(ack_bean, env, key);
sandesha2_sender_bean_set_msg_id(ack_bean, env,
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Apr 11 05:51:19 2007
@@ -323,14 +323,14 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- str_key = axis2_uuid_gen(env);
+ str_key = axutil_uuid_gen(env);
highest_in_msg_no_str = sandesha2_utils_get_seq_property(env, str_seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER, storage_mgr);
highest_in_msg_key_str = sandesha2_utils_get_seq_property(env, str_seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, storage_mgr);
if(!highest_in_msg_key_str)
{
- highest_in_msg_key_str = axis2_uuid_gen(env);
+ highest_in_msg_key_str = axutil_uuid_gen(env);
}
if(highest_in_msg_no_str)
{
@@ -421,9 +421,9 @@
if(!msg_no_present_in_list)
{
if(msgs_str && 0 < axis2_strlen(msgs_str))
- msgs_str = axis2_strcat(env, msgs_str, ",", msg_num_str, NULL);
+ msgs_str = axutil_strcat(env, msgs_str, ",", msg_num_str, NULL);
else
- msgs_str = axis2_strdup(env, msg_num_str);
+ msgs_str = axutil_strdup(env, msg_num_str);
sandesha2_seq_property_bean_set_value(msgs_bean, env, msgs_str);
sandesha2_seq_property_mgr_update(seq_prop_mgr, env, msgs_bean);
}
@@ -666,8 +666,8 @@
}
if(!axis2_msg_ctx_get_msg_id(msg_ctx, env))
- axis2_msg_ctx_set_message_id(msg_ctx, env, axis2_uuid_gen(env));
- storage_key = axis2_uuid_gen(env);
+ axis2_msg_ctx_set_message_id(msg_ctx, env, axutil_uuid_gen(env));
+ storage_key = axutil_uuid_gen(env);
if(is_svr_side)
{
@@ -850,7 +850,7 @@
axis2_char_t *value = NULL;
value = sandesha2_seq_property_bean_get_value(incoming_to_bean, env);
- incoming_to = axis2_strdup(env, value);
+ incoming_to = axutil_strdup(env, value);
property = axutil_property_create_with_args(env, 0, 0, 0, incoming_to);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_SEQ_PROP_TO_EPR,
property);
@@ -967,7 +967,7 @@
AXIOM_SOAP12);
sandesha2_msg_ctx_set_soap_envelope(rm_msg_ctx, env, soap_env);
}
- msg_id = axis2_uuid_gen(env);
+ msg_id = axutil_uuid_gen(env);
if(!sandesha2_msg_ctx_get_msg_id(rm_msg_ctx, env))
sandesha2_msg_ctx_set_msg_id(rm_msg_ctx, env, msg_id);
@@ -997,12 +997,12 @@
to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
/* test code */
/*if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env))
- axis2_msg_ctx_set_wsa_action(msg_ctx, env, axis2_strcat(env, to_addr,
+ axis2_msg_ctx_set_wsa_action(msg_ctx, env, axutil_strcat(env, to_addr,
"/", op_name, NULL));*/
if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env))
axis2_msg_ctx_set_wsa_action(msg_ctx, env, to_addr);
/*if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
- axis2_msg_ctx_set_soap_action(msg_ctx, env, axis2_strcat(env, "\"",
+ axis2_msg_ctx_set_soap_action(msg_ctx, env, axutil_strcat(env, "\"",
to_addr, "/", op_name, "\"", NULL));*/
if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
{
@@ -1182,11 +1182,11 @@
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
internal_seq_id, (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(
create_seq_msg, env), NULL);
- create_seq_msg_store_key = axis2_uuid_gen(env);
+ create_seq_msg_store_key = axutil_uuid_gen(env);
sandesha2_create_seq_bean_set_create_seq_msg_store_key(create_seq_bean, env,
create_seq_msg_store_key);
/* Storing the create_seq_msg_ctx as a reference */
- ref_msg_store_key = axis2_uuid_gen(env);
+ ref_msg_store_key = axutil_uuid_gen(env);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, ref_msg_store_key,
create_seq_msg);
sandesha2_create_seq_bean_set_ref_msg_store_key(create_seq_bean, env,
@@ -1201,7 +1201,7 @@
cs_epr = axis2_endpoint_ref_create(env, anon_uri);
axis2_msg_ctx_set_reply_to(create_seq_msg, env, cs_epr);
}
- str_key = axis2_uuid_gen(env);
+ str_key = axutil_uuid_gen(env);
create_seq_entry = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(create_seq_entry, env, str_key);
millisecs = sandesha2_utils_get_current_time_in_millis(env);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed Apr 11 05:51:19 2007
@@ -262,7 +262,7 @@
sandesha2_create_seq_bean_set_internal_seq_id(create_seq_bean, env,
int_seq_id);
sandesha2_create_seq_bean_set_create_seq_msg_id(create_seq_bean, env,
- axis2_uuid_gen(env));
+ axutil_uuid_gen(env));
create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(
storage_mgr, env);
sandesha2_create_seq_mgr_insert(create_seq_mgr, env, create_seq_bean);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Wed Apr 11 05:51:19 2007
@@ -346,7 +346,7 @@
ref_msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr,
env, ref_msg_store_key, conf_ctx);
}
- new_msg_store_key = axis2_uuid_gen(env);
+ new_msg_store_key = axutil_uuid_gen(env);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, new_msg_store_key,
ref_msg_ctx);
sandesha2_next_msg_bean_set_ref_msg_key(next_bean, 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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Apr 11 05:51:19 2007
@@ -402,7 +402,7 @@
trans_out = sandesha2_utils_get_transport_out(env);
axis2_msg_ctx_set_transport_out_desc(out_msg_ctx, env, trans_out);
- key = axis2_uuid_gen(env);
+ key = axutil_uuid_gen(env);
term_res_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(term_res_bean, env, key);
property = axutil_property_create_with_args(env, 0, 0, 0, key);
@@ -560,7 +560,7 @@
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
- /*key = axis2_uuid_gen(env);
+ /*key = axutil_uuid_gen(env);
term_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(term_bean, env, key);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, msg_ctx);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Wed Apr 11 05:51:19 2007
@@ -189,7 +189,7 @@
args->impl = polling_mgr;
args->env = (axutil_env_t*)env;
args->storage_mgr = storage_mgr;
- worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+ worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
sandesha2_polling_mgr_worker_func, (void*)args);
if(!worker_thread)
{
@@ -327,7 +327,7 @@
sandesha2_msg_ctx_set_property(make_conn_rm_msg_ctx, env,
AXIS2_TRANSPORT_IN, NULL);
/* Storing the MakeConnection message */
- make_conn_msg_store_key = axis2_uuid_gen(env);
+ make_conn_msg_store_key = axutil_uuid_gen(env);
property = axutil_property_create_with_args(env, 0, 0, 0, seq_prop_key);
sandesha2_msg_ctx_set_property(make_conn_rm_msg_ctx, env,
SANDESHA2_MSG_CTX_PROP_SEQUENCE_PROPERTY_KEY, property);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/create_seq_bean.c Wed Apr 11 05:51:19 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(env, seq_msg_id);
+ create_seq_bean_impl->create_seq_msg_id = axutil_strdup(env, seq_msg_id);
}
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(env, seq_id);
+ create_seq_bean_impl->seq_id = axutil_strdup(env, seq_id);
}
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(env, int_seq_id);
+ create_seq_bean_impl->internal_seq_id = axutil_strdup(env, int_seq_id);
}
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 = axutil_strdup(
env, create_seq_msg_store_key);
}
@@ -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(env, ref_msg_store_key);
+ create_seq_bean_impl->ref_msg_store_key = axutil_strdup(env, ref_msg_store_key);
}
void AXIS2_CALL
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c Wed Apr 11 05:51:19 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*)axutil_strdup(
env, ref_key);
if(!seq_id)
invoker_bean_impl->seq_id = NULL;
else
- invoker_bean_impl->seq_id = (axis2_char_t*)axis2_strdup(env, seq_id);
+ invoker_bean_impl->seq_id = (axis2_char_t*)axutil_strdup(env, seq_id);
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(env, context_ref_id);
+ (axis2_char_t*)axutil_strdup(env, context_ref_id);
}
@@ -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(env ,int_seq_id);
+ invoker_bean_impl->seq_id = (axis2_char_t*)axutil_strdup(env ,int_seq_id);
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c Wed Apr 11 05:51:19 2007
@@ -86,7 +86,7 @@
return NULL;
}
/* init the properties. */
- next_msg_bean_impl->seq_id = (axis2_char_t*)axis2_strdup(env, seq_id);
+ next_msg_bean_impl->seq_id = (axis2_char_t*)axutil_strdup(env, seq_id);
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(env, seq_id);
+ next_msg_bean_impl->seq_id = (axis2_char_t*) axutil_strdup(env, seq_id);
}
@@ -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(env, ref_msg_key);
+ next_msg_bean_impl->ref_msg_key = axutil_strdup(env, ref_msg_key);
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c Wed Apr 11 05:51:19 2007
@@ -116,9 +116,9 @@
}
/* init properties */
- sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)axis2_strdup(env, key);
- sender_bean_impl->msg_id = (axis2_char_t *)axis2_strdup(env, msg_id);
- sender_bean_impl->internal_seq_id = (axis2_char_t *)axis2_strdup(env, int_seq_id);
+ sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)axutil_strdup(env, key);
+ sender_bean_impl->msg_id = (axis2_char_t *)axutil_strdup(env, msg_id);
+ sender_bean_impl->internal_seq_id = (axis2_char_t *)axutil_strdup(env, int_seq_id);
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(env, ref_key);
+ sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)axutil_strdup(env, ref_key);
}
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(env, msg_id);
+ sender_bean_impl->msg_id = (axis2_char_t *)axutil_strdup(env, msg_id);
}
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(env, int_seq_id);
+ sender_bean_impl->internal_seq_id = (axis2_char_t *)axutil_strdup(env, int_seq_id);
}
int AXIS2_CALL
@@ -429,7 +429,7 @@
sender_bean_impl->seq_id = NULL;
}
- sender_bean_impl->seq_id = (axis2_char_t *)axis2_strdup(env, seq_id);
+ sender_bean_impl->seq_id = (axis2_char_t *)axutil_strdup(env, seq_id);
}
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(env, anon_uri);
+ sender_bean_impl->wsrm_anon_uri = (axis2_char_t *)axutil_strdup(env, anon_uri);
}
void AXIS2_CALL
@@ -473,7 +473,7 @@
sender_bean_impl->to_address = NULL;
}
- sender_bean_impl->to_address = (axis2_char_t *)axis2_strdup(env, to_address);
+ sender_bean_impl->to_address = (axis2_char_t *)axutil_strdup(env, to_address);
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Wed Apr 11 05:51:19 2007
@@ -97,9 +97,9 @@
return NULL;
}
/* initialize properties */
- seq_property_bean_impl->seq_id = (axis2_char_t *)axis2_strdup(env, seq_id);
- seq_property_bean_impl->name = (axis2_char_t *)axis2_strdup(env, prop_name);
- seq_property_bean_impl->value = (axis2_char_t *)axis2_strdup(env, value);
+ seq_property_bean_impl->seq_id = (axis2_char_t *)axutil_strdup(env, seq_id);
+ seq_property_bean_impl->name = (axis2_char_t *)axutil_strdup(env, prop_name);
+ seq_property_bean_impl->value = (axis2_char_t *)axutil_strdup(env, value);
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(env, name);
+ seq_property_bean_impl->name = (axis2_char_t *)axutil_strdup(env, name);
}
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(env, seq_id);
+ seq_property_bean_impl->seq_id = (axis2_char_t *)axutil_strdup(env, seq_id);
}
axis2_char_t* AXIS2_CALL
@@ -243,7 +243,7 @@
seq_property_bean_impl->value = NULL;
}
if(value)
- seq_property_bean_impl->value = (axis2_char_t *)axis2_strdup(env, value);
+ seq_property_bean_impl->value = (axis2_char_t *)axutil_strdup(env, value);
}
@@ -304,7 +304,7 @@
(sandesha2_seq_property_bean_t *) seq_property_bean, env);
name = sandesha2_seq_property_bean_get_name(
(sandesha2_seq_property_bean_t *) seq_property_bean, env);
- id = axis2_strcat(env, seq_id, ":", name, NULL);
+ id = axutil_strcat(env, seq_id, ":", name, NULL);
return id;
}
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=527478&r1=527477&r2=527478
==============================================================================
--- 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 05:51:19 2007
@@ -372,7 +372,7 @@
{
axis2_char_t *id = NULL;
- id = axis2_strcat(env, seq_id, ":", name, NULL);
+ id = axutil_strcat(env, seq_id, ":", name, NULL);
return id;
}
@@ -387,7 +387,7 @@
seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
name = sandesha2_seq_property_bean_get_name(bean, env);
- id = axis2_strcat(env, seq_id, ":", name, NULL);
+ id = axutil_strcat(env, seq_id, ":", name, NULL);
return id;
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c Wed Apr 11 05:51:19 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(env, "Sandesha2MessageMap");
+ storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = axutil_strdup(env, "Sandesha2MessageMap");
storage_mgr_impl->conf_ctx = conf_ctx;
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
storage_mgr_impl->create_seq_mgr = sandesha2_inmemory_create_seq_mgr_create(
@@ -442,7 +442,7 @@
}
if(!key)
{
- key = axis2_uuid_gen(env);
+ key = axutil_uuid_gen(env);
}
axis2_msg_ctx_set_keep_alive(msg_ctx, env, AXIS2_TRUE);
axutil_hash_set(storage_map, key, AXIS2_HASH_KEY_STRING, msg_ctx);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c Wed Apr 11 05:51:19 2007
@@ -129,7 +129,7 @@
const axutil_env_t *env,
axis2_char_t * msg_id)
{
- msg_store_bean->msg_id = axis2_strdup(env, msg_id);
+ msg_store_bean->msg_id = axutil_strdup(env, msg_id);
}
axis2_char_t *AXIS2_CALL
@@ -146,7 +146,7 @@
const axutil_env_t *env,
axis2_char_t * key)
{
- msg_store_bean->stored_key = axis2_strdup(env, key);
+ msg_store_bean->stored_key = axutil_strdup(env, key);
}
axis2_char_t *AXIS2_CALL
@@ -163,7 +163,7 @@
const axutil_env_t *env,
axis2_char_t * soap_env_str)
{
- msg_store_bean->soap_env_str = axis2_strdup(env, soap_env_str);
+ msg_store_bean->soap_env_str = axutil_strdup(env, soap_env_str);
}
int AXIS2_CALL
@@ -214,7 +214,7 @@
const axutil_env_t *env,
axis2_char_t * op)
{
- msg_store_bean->op = axis2_strdup(env, op);
+ msg_store_bean->op = axutil_strdup(env, op);
}
axis2_char_t *AXIS2_CALL
@@ -231,7 +231,7 @@
const axutil_env_t *env,
axis2_char_t * svc)
{
- msg_store_bean->svc = axis2_strdup(env, svc);
+ msg_store_bean->svc = axutil_strdup(env, svc);
}
axis2_char_t *AXIS2_CALL
@@ -248,7 +248,7 @@
const axutil_env_t *env,
axis2_char_t * svc_grp)
{
- msg_store_bean->svc_grp = axis2_strdup(env, svc_grp);
+ msg_store_bean->svc_grp = axutil_strdup(env, svc_grp);
}
axis2_char_t *AXIS2_CALL
@@ -265,7 +265,7 @@
const axutil_env_t *env,
axis2_char_t * opAdd)
{
- msg_store_bean->op_mep = axis2_strdup(env, opAdd);
+ msg_store_bean->op_mep = axutil_strdup(env, opAdd);
}
axis2_char_t *AXIS2_CALL
@@ -282,7 +282,7 @@
const axutil_env_t *env,
axis2_char_t * to_url)
{
- msg_store_bean->to_url = axis2_strdup(env, to_url);
+ msg_store_bean->to_url = axutil_strdup(env, to_url);
}
axis2_char_t *AXIS2_CALL
@@ -299,7 +299,7 @@
const axutil_env_t *env,
axis2_char_t * reply_to)
{
- msg_store_bean->reply_to = axis2_strdup(env, reply_to);
+ msg_store_bean->reply_to = axutil_strdup(env, reply_to);
}
axis2_char_t *AXIS2_CALL
@@ -316,7 +316,7 @@
const axutil_env_t *env,
axis2_char_t * transport_to)
{
- msg_store_bean->transport_to = axis2_strdup(env, transport_to);
+ msg_store_bean->transport_to = axutil_strdup(env, transport_to);
}
axis2_char_t *AXIS2_CALL
@@ -333,7 +333,7 @@
const axutil_env_t *env,
axis2_char_t * execution_chain_str)
{
- msg_store_bean->execution_chain_str = axis2_strdup(env, execution_chain_str);
+ msg_store_bean->execution_chain_str = axutil_strdup(env, execution_chain_str);
}
int AXIS2_CALL
@@ -367,7 +367,7 @@
const axutil_env_t *env,
axis2_char_t * msg_recv_str)
{
- msg_store_bean->msg_recv_str = axis2_strdup(env, msg_recv_str);
+ msg_store_bean->msg_recv_str = axutil_strdup(env, msg_recv_str);
}
axis2_bool_t AXIS2_CALL
@@ -401,7 +401,7 @@
const axutil_env_t *env,
axis2_char_t * request_msg_key)
{
- msg_store_bean->in_msg_store_key = axis2_strdup(env, request_msg_key);
+ msg_store_bean->in_msg_store_key = axutil_strdup(env, request_msg_key);
}
axis2_char_t *AXIS2_CALL
@@ -418,7 +418,7 @@
const axutil_env_t *env,
axis2_char_t * persistent_property_str)
{
- msg_store_bean->persistent_property_str = axis2_strdup(env,
+ msg_store_bean->persistent_property_str = axutil_strdup(env,
persistent_property_str);
}
@@ -436,6 +436,6 @@
const axutil_env_t *env,
axis2_char_t * action)
{
- msg_store_bean->action = axis2_strdup(env, action);
+ msg_store_bean->action = axutil_strdup(env, action);
}
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=527478&r1=527477&r2=527478
==============================================================================
--- 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 05:51:19 2007
@@ -85,7 +85,7 @@
{
if(0 == axis2_strcmp(col_name[i], "response_str"))
if(argv[i])
- response->response_str = axis2_strdup(env, argv[i]);
+ response->response_str = axutil_strdup(env, argv[i]);
if(0 == axis2_strcmp(col_name[i], "soap_version"))
if(argv[i])
response->soap_version = axis2_atoi(argv[i]);
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=527478&r1=527477&r2=527478
==============================================================================
--- 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 05:51:19 2007
@@ -497,7 +497,7 @@
{
axis2_char_t *id = NULL;
- id = axis2_strcat(env, seq_id, ":", name, NULL);
+ id = axutil_strcat(env, seq_id, ":", name, NULL);
return id;
}
@@ -512,7 +512,7 @@
seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
name = sandesha2_seq_property_bean_get_name(bean, env);
- id = axis2_strcat(env, seq_id, ":", name, NULL);
+ id = axutil_strcat(env, seq_id, ":", name, NULL);
return id;
}
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=527478&r1=527477&r2=527478
==============================================================================
--- 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 05:51:19 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(env, "Sandesha2MessageMap");
+ 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);
storage_mgr_impl->transactions = axutil_hash_make(env);
@@ -773,7 +773,7 @@
property, env);
if(!in_msg_store_key)
{
- in_msg_store_key = (axis2_char_t *) axis2_uuid_gen(env);
+ in_msg_store_key = (axis2_char_t *) axutil_uuid_gen(env);
insert = AXIS2_TRUE;
}
/*if(insert)
@@ -861,7 +861,7 @@
msg_store_bean, env));
/* You cannot set the same message id to a new message context again. So generate
* a new message id and set it
- * axis2_msg_ctx_set_msg_id(msg_ctx, env, axis2_uuid_gen(env));*/
+ * axis2_msg_ctx_set_msg_id(msg_ctx, env, axutil_uuid_gen(env));*/
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
transport_out = sandesha2_msg_store_bean_get_transport_out(msg_store_bean,
@@ -1058,7 +1058,7 @@
if(property)
{
axis2_char_t *value = axutil_property_get_value(property, env);
- prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
+ prop_str = axutil_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
}
property = axis2_msg_ctx_get_property(msg_ctx, env,
@@ -1070,7 +1070,7 @@
if(value)
{
temp_str = prop_str;
- prop_str = axis2_strcat(env, temp_str,
+ 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))
@@ -1106,7 +1106,7 @@
if(value)
{
temp_str = prop_str;
- prop_str = axis2_strcat(env, temp_str,
+ prop_str = axutil_strcat(env, temp_str,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, key,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR,
value, NULL);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c Wed Apr 11 05:51:19 2007
@@ -148,12 +148,12 @@
SANDESHA2_IS_SVR_SIDE);
if(!property)
{
- db_name = axis2_strcat(env, path, AXIS2_PATH_SEP_STR,
+ db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
"sandesha2_svr_db", NULL);
}
else
{
- db_name = axis2_strcat(env, path, AXIS2_PATH_SEP_STR,
+ db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
"sandesha2_client_db", NULL);
}
rc = sqlite3_open(db_name, &(trans_impl->dbconn));
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Wed Apr 11 05:51:19 2007
@@ -44,7 +44,7 @@
axis2_transport_out_desc_t *transport_out);
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_cleanup(
+sandesha2_transport_sender_clean_up(
axis2_transport_sender_t *transport_sender,
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx);
@@ -55,13 +55,20 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx);
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_transport_sender_free(
axis2_transport_sender_t *transport_sender,
const axutil_env_t *env);
/***************************** End of function headers ************************/
+static const axis2_transport_sender_ops_t sandesha2_transport_sender_ops_var = {
+ sandesha2_transport_sender_init,
+ sandesha2_transport_sender_invoke,
+ sandesha2_transport_sender_clean_up,
+ sandesha2_transport_sender_free
+};
+
AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL
sandesha2_transport_sender_create(
const axutil_env_t *env)
@@ -88,34 +95,19 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
- transport_sender_impl->transport_sender.ops->init =
- sandesha2_transport_sender_init;
- transport_sender_impl->transport_sender.ops->cleanup =
- sandesha2_transport_sender_cleanup;
- transport_sender_impl->transport_sender.ops->invoke =
- sandesha2_transport_sender_invoke;
- transport_sender_impl->transport_sender.ops->free =
- sandesha2_transport_sender_free;
-
+ transport_sender_impl->transport_sender.ops = &sandesha2_transport_sender_ops_var;
return &(transport_sender_impl->transport_sender);
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_transport_sender_free(
axis2_transport_sender_t *transport_sender,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if(NULL != transport_sender->ops)
- {
- AXIS2_FREE(env->allocator, transport_sender->ops);
- transport_sender->ops = NULL;
- }
AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(transport_sender));
- return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
@@ -134,7 +126,7 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_cleanup(
+sandesha2_transport_sender_clean_up(
axis2_transport_sender_t *transport_sender,
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Apr 11 05:51:19 2007
@@ -111,7 +111,7 @@
ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
sandesha2_msg_ctx_set_rm_ns_val(ack_rm_msg, env,
sandesha2_msg_ctx_get_rm_ns_val(ref_rm_msg, env));
- axis2_msg_ctx_set_wsa_message_id(ack_msg_ctx, env, axis2_uuid_gen(env));
+ axis2_msg_ctx_set_wsa_message_id(ack_msg_ctx, env, axutil_uuid_gen(env));
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
axis2_msg_ctx_get_soap_envelope(ref_msg, env)));
@@ -174,7 +174,7 @@
sandesha2_msg_ctx_t *ret_rm_msg = NULL;
retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
- key = axis2_uuid_gen(env);
+ key = axutil_uuid_gen(env);
ack_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(ack_bean, env, key);
sandesha2_sender_bean_set_msg_id(ack_bean, env,
Modified: webservices/sandesha/trunk/c/src/util/error.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/error.c?view=diff&rev=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/error.c (original)
+++ webservices/sandesha/trunk/c/src/util/error.c Wed Apr 11 05:51:19 2007
@@ -18,260 +18,163 @@
#include <sandesha2_error.h>
#include <axutil_error_default.h>
-const axis2_char_t * AXIS2_CALL
-sandesha2_error_impl_get_message (const axutil_error_t *error);
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_set_error_number (axutil_error_t *error, axutil_error_codes_t error_number);
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_set_status_code (axutil_error_t *error, axis2_status_codes_t status_code);
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_get_status_code (axutil_error_t *error);
-
-/* array to hold error messages */
-const axis2_char_t* sandesha2_error_messages[AXIS2_ERROR_LAST];
-
axis2_status_t AXIS2_CALL
sandesha2_error_init()
{
- int i = 0;
- for (i = 0; i < AXIS2_ERROR_LAST; i++)
- {
- sandesha2_error_messages[i] = "Unknown Error :(";
- }
- sandesha2_error_messages[AXIS2_ERROR_NONE] = "No Error";
- /* A namespace that is not supported by Sandesha2 */
- sandesha2_error_messages[SANDESHA2_ERROR_UNSUPPORTED_NS] =
+ /* A namespace that is not supported by Sandesha2 */
+ axutil_error_messages[SANDESHA2_ERROR_UNSUPPORTED_NS] =
"A namespace that is not supported by Sandesha2";
/* Object cannot generated since the om_element corresponding to
* that is NULL
*/
- sandesha2_error_messages[SANDESHA2_ERROR_NULL_OM_ELEMENT] =
+ axutil_error_messages[SANDESHA2_ERROR_NULL_OM_ELEMENT] =
"Object cannot generated since the om_element corresponding to \
that is NULL";
/* The om element has no child elements or attributes */
- sandesha2_error_messages[SANDESHA2_ERROR_EMPTY_OM_ELEMENT] =
+ axutil_error_messages[SANDESHA2_ERROR_EMPTY_OM_ELEMENT] =
"The om element has no child elements or attributes";
/* om_element cannot be generated since the element corresponding
* to that is NULL
*/
- sandesha2_error_messages[SANDESHA2_ERROR_TO_OM_NULL_ELEMENT] =
+ axutil_error_messages[SANDESHA2_ERROR_TO_OM_NULL_ELEMENT] =
"om_element cannot be generated since the element corresponding \
to that is NULL";
/* Required OM attribute is NULL */
- sandesha2_error_messages[SANDESHA2_ERROR_NULL_OM_ATTRIBUTE] =
+ axutil_error_messages[SANDESHA2_ERROR_NULL_OM_ATTRIBUTE] =
"Required OM attribute is NULL";
/* An invalid number found during object to om conversion */
- sandesha2_error_messages[SANDESHA2_ERROR_TO_OM_INVALID_NUMBER] =
+ axutil_error_messages[SANDESHA2_ERROR_TO_OM_INVALID_NUMBER] =
"An invalid number found during object to om conversion";
/* Ack Final now allowed in the spec */
- sandesha2_error_messages[SANDESHA2_ERROR_ACK_FINAL_NOT_ALLOWED] =
+ axutil_error_messages[SANDESHA2_ERROR_ACK_FINAL_NOT_ALLOWED] =
"Ack Final now allowed in the spec";
/* Ack None now allowed in the spec */
- sandesha2_error_messages[SANDESHA2_ERROR_ACK_NONE_NOT_ALLOWED] =
+ axutil_error_messages[SANDESHA2_ERROR_ACK_NONE_NOT_ALLOWED] =
"Ack None now allowed in the spec";
/* 'To' Address is not set */
- sandesha2_error_messages[SANDESHA2_ERROR_TO_ADDRESS_NOT_SET] =
+ axutil_error_messages[SANDESHA2_ERROR_TO_ADDRESS_NOT_SET] =
"'To' address is not set";
/* Service Context is NULL */
- sandesha2_error_messages[SANDESHA2_ERROR_SVC_CTX_NULL] =
+ axutil_error_messages[SANDESHA2_ERROR_SVC_CTX_NULL] =
"Service context is NULL";
- sandesha2_error_messages[SANDESHA2_ERROR_SVC_NULL]=
+ axutil_error_messages[SANDESHA2_ERROR_SVC_NULL]=
"Service is NULL";
/* Non Unique Result */
- sandesha2_error_messages[SANDESHA2_ERROR_NON_UNIQUE_RESULT] =
+ axutil_error_messages[SANDESHA2_ERROR_NON_UNIQUE_RESULT] =
"Result is Not Unique";
/* Key is NULL. Cannot insert */
- sandesha2_error_messages[SANDESHA2_ERROR_KEY_IS_NULL] =
+ axutil_error_messages[SANDESHA2_ERROR_KEY_IS_NULL] =
"Key is NULL, Cannot insert";
/* Storage Map not present */
- sandesha2_error_messages[SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT] =
+ axutil_error_messages[SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT] =
"Storage Map not present";
- sandesha2_error_messages[SANDESHA2_ERROR_ENTRY_IS_NOT_PRESENT_FOR_UPDATING] =
+ axutil_error_messages[SANDESHA2_ERROR_ENTRY_IS_NOT_PRESENT_FOR_UPDATING] =
"Entry is not present for updating";
- sandesha2_error_messages[SANDESHA2_ERROR_INVALID_NS_URI] =
+ axutil_error_messages[SANDESHA2_ERROR_INVALID_NS_URI] =
"Invalid namespace uri";
- sandesha2_error_messages[SANDESHA2_ERROR_INVALID_SPEC_VERSION] =
+ axutil_error_messages[SANDESHA2_ERROR_INVALID_SPEC_VERSION] =
"Invalid Spec Version";
- sandesha2_error_messages[
+ axutil_error_messages[
SANDESHA2_ERROR_INCOMING_SEQ_REPORT_NOT_PRESENT_FOR_GIVEN_SEQ_ID] =
"An incoming seq report is not present for the given seqID";
- sandesha2_error_messages[SANDESHA2_ERROR_TO_EPR_NOT_SET] =
+ axutil_error_messages[SANDESHA2_ERROR_TO_EPR_NOT_SET] =
"To EPR is not set";
- sandesha2_error_messages[SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET] =
+ axutil_error_messages[SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET] =
"Options object is not set";
- sandesha2_error_messages[SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE] =
+ axutil_error_messages[SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE] =
"Unknown specification error message";
- sandesha2_error_messages[SANDESHA2_ERROR_COULD_NOT_SEND_TERMINATE_MESSAGE] =
+ axutil_error_messages[SANDESHA2_ERROR_COULD_NOT_SEND_TERMINATE_MESSAGE] =
"Could not send the terminate message";
- sandesha2_error_messages[SANDESHA2_ERROR_RM_SPEC_VERSION_DOES_NOT_DEFINE_A_SEQ_CLOSE_ACTION] =
+ axutil_error_messages[SANDESHA2_ERROR_RM_SPEC_VERSION_DOES_NOT_DEFINE_A_SEQ_CLOSE_ACTION] =
"This rm spec version does not define a sequence close action";
- sandesha2_error_messages[SANDESHA2_ERROR_COULD_NOT_SEND_THE_CLOSE_SEQ_MESSAGE] =
+ axutil_error_messages[SANDESHA2_ERROR_COULD_NOT_SEND_THE_CLOSE_SEQ_MESSAGE] =
"Could not send the close sequence message";
- sandesha2_error_messages[SANDESHA2_ERROR_CLOSE_SEQ_FEATURE_ONLY_AVAILABLE_FOR_WSRM1_1] =
+ axutil_error_messages[SANDESHA2_ERROR_CLOSE_SEQ_FEATURE_ONLY_AVAILABLE_FOR_WSRM1_1] =
"Close Sequence feature is only available for WSRM 1.1";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_FIND_SEQ_REPORT_FOR_GIVEN_DATA] =
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_FIND_SEQ_REPORT_FOR_GIVEN_DATA] =
"Cannnot find a seq report for the given data";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_FIND_SEQ_REPORT_FOR_GIVEN_SEQ_ID] =
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_FIND_SEQ_REPORT_FOR_GIVEN_SEQ_ID] =
"Cannnot find a seq report for the given sequence id";
- sandesha2_error_messages[SANDESHA2_ERROR_SEQ_NOT_IN_ACTIVE_STATE] =
+ axutil_error_messages[SANDESHA2_ERROR_SEQ_NOT_IN_ACTIVE_STATE] =
"Sequence is not in a active state. Either create seq response has not \
being received or seq has been terminated, cannot get seqID";
- sandesha2_error_messages[SANDESHA2_ERROR_SEQ_ID_BEAN_NOT_SET] =
+ axutil_error_messages[SANDESHA2_ERROR_SEQ_ID_BEAN_NOT_SET] =
"Sequence id bean is not set";
- sandesha2_error_messages[SANDESHA2_ERROR_EMPTY_ACK_REQUEST_MESSAGE] =
+ axutil_error_messages[SANDESHA2_ERROR_EMPTY_ACK_REQUEST_MESSAGE] =
"Empty AckRequest messages can only be sent with the v1_1 spec";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_GENERATE_SEQ_REPORT_FOR_GIVEN_INTERNAL_SEQ_ID] =
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_GENERATE_SEQ_REPORT_FOR_GIVEN_INTERNAL_SEQ_ID] =
"Cannot generate the sequence report for the given internalSequenceID";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_SEND_ACK_REQUEST_MESSAGE_SINCE_IS_NOT_ACTIVE] =
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_SEND_ACK_REQUEST_MESSAGE_SINCE_IS_NOT_ACTIVE] =
"Canot send the ackRequest message since it is not active";
- sandesha2_error_messages[SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_ACTION] =
+ axutil_error_messages[SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_ACTION] =
"This spec version does not define a ackRequest action";
- sandesha2_error_messages[SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_SOAP_ACTION] =
+ axutil_error_messages[SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_SOAP_ACTION] =
"This spec version does not define a ackRequest soap action";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID] =
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID] =
"Cannot find the sequence id";
- sandesha2_error_messages[SANDESHA2_ERROR_RM_VERSION_DOES_NOT_ALLOW_SEQ_CLOSING] =
+ axutil_error_messages[SANDESHA2_ERROR_RM_VERSION_DOES_NOT_ALLOW_SEQ_CLOSING] =
"This RM version does not allow sequence closing";
- sandesha2_error_messages[NOT_A_VALID_TERMINATED_SEQ] =
+ axutil_error_messages[NOT_A_VALID_TERMINATED_SEQ] =
"Not a valid terminated sequence. Internal sequence Bean is not \
available for the given sequence";
- sandesha2_error_messages[NOT_A_VALID_TIMEDOUT_SEQ] =
+ axutil_error_messages[NOT_A_VALID_TIMEDOUT_SEQ] =
"Not a valid timedout sequence. Internal sequence Bean is not \
available for the given sequence";
- sandesha2_error_messages[SANDESHA2_ERROR_COMPLETED_MSGS_BEAN_IS_NULL] =
+ axutil_error_messages[SANDESHA2_ERROR_COMPLETED_MSGS_BEAN_IS_NULL] =
"Completed messages bean is null, for the sequence";
- sandesha2_error_messages[SANDESHA2_ERROR_UNRECORDED_SEQ_ID] =
+ axutil_error_messages[SANDESHA2_ERROR_UNRECORDED_SEQ_ID] =
"Sequence id is not recoreded";
- sandesha2_error_messages[SANDESHA2_ERROR_TO_IS_NULL] =
+ axutil_error_messages[SANDESHA2_ERROR_TO_IS_NULL] =
"To is NULL";
- sandesha2_error_messages[SANDESHA2_ERROR_CREATE_SEQ_PART_IS_NULL] =
+ axutil_error_messages[SANDESHA2_ERROR_CREATE_SEQ_PART_IS_NULL] =
"Create Sequence Part is NULL";
- sandesha2_error_messages[SANDESHA2_ERROR_ACKS_TO_IS_NULL] =
+ axutil_error_messages[SANDESHA2_ERROR_ACKS_TO_IS_NULL] =
"AcksTo is NULL";
- sandesha2_error_messages[SANDESHA2_ERROR_CREATE_SEQ_MSG_DOES_NOT_HAVE_WSA_ACTION_VALUE] =
+ axutil_error_messages[SANDESHA2_ERROR_CREATE_SEQ_MSG_DOES_NOT_HAVE_WSA_ACTION_VALUE] =
"Create sequence message does not have the WSA:Action value";
- sandesha2_error_messages[SANDESHA2_ERROR_CREATE_SEQ_MSG_DOES_NOT_HAVE_VALID_RM_NS_VALUE]=
+ axutil_error_messages[SANDESHA2_ERROR_CREATE_SEQ_MSG_DOES_NOT_HAVE_VALID_RM_NS_VALUE]=
"Create sequence message does not has a valid RM namespace value. \
Can't decide the RM version";
- sandesha2_error_messages[SANDESHA2_ERROR_APPLICATION_MSG_NULL]=
+ axutil_error_messages[SANDESHA2_ERROR_APPLICATION_MSG_NULL]=
"Application message is NULL";
- sandesha2_error_messages[SANDESHA2_ERROR_CONF_CTX_NULL]=
+ axutil_error_messages[SANDESHA2_ERROR_CONF_CTX_NULL]=
"Configuration Context is NULL";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_FIND_RM_VERSION_OF_GIVEN_MSG]=
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_FIND_RM_VERSION_OF_GIVEN_MSG]=
"Cannot find the rmVersion of the given message";
- sandesha2_error_messages[SANDESHA2_ERROR_RM_NS_VALUE_IS_DIFFERENT_FROM_REGISTERED_NS_FOR_SEQ]=
+ axutil_error_messages[SANDESHA2_ERROR_RM_NS_VALUE_IS_DIFFERENT_FROM_REGISTERED_NS_FOR_SEQ]=
"Given message has rmNamespace value, which is different from the \
reqistered namespace for the sequence";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_INIT_MSG]=
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_INIT_MSG]=
"Cannot initialize the message";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_PROCESS_MSG]=
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_PROCESS_MSG]=
"Error in processing the message";
- sandesha2_error_messages[SANDESHA2_ERROR_INVALID_STRING_ARRAY]=
+ axutil_error_messages[SANDESHA2_ERROR_INVALID_STRING_ARRAY]=
"String array is invalid";
- sandesha2_error_messages[SANDESHA2_ERROR_PENDING_HEADER_MUST_HAVE_ATTRIBUTE_PENDING]=
+ axutil_error_messages[SANDESHA2_ERROR_PENDING_HEADER_MUST_HAVE_ATTRIBUTE_PENDING]=
"MessagePending header must have an attribute named 'pending'";
- sandesha2_error_messages[SANDESHA2_ERROR_ATTRIBUTE_PENDING_MUST_HAVE_VALUE_TRUE_OR_FALSE]=
+ axutil_error_messages[SANDESHA2_ERROR_ATTRIBUTE_PENDING_MUST_HAVE_VALUE_TRUE_OR_FALSE]=
"Attribute 'pending' must have value 'true' or 'false'";
- sandesha2_error_messages[SANDESHA2_ERROR_MAKE_CONNECTION_ELEMENT_SHOULD_HAVE_AT_LEAST_ADDRESS_OR_IDENTIFIER]=
+ axutil_error_messages[SANDESHA2_ERROR_MAKE_CONNECTION_ELEMENT_SHOULD_HAVE_AT_LEAST_ADDRESS_OR_IDENTIFIER]=
"MakeConnection element should have at lease one of Address and Identifier subelements";
/* Invalid MakeConnection object. Both Identifier and Address are null */
- sandesha2_error_messages[SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_BOTH_IDENTIFER_AND_ADDRESS_NULL]=
+ axutil_error_messages[SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_BOTH_IDENTIFER_AND_ADDRESS_NULL]=
"Invalid MakeConnection object. Both Identifier and Address are null";
- sandesha2_error_messages[SANDESHA2_ERROR_MAKE_CONNECTION_IS_NOT_SUPPORTED_IN_THIS_RM_VERSION]=
+ axutil_error_messages[SANDESHA2_ERROR_MAKE_CONNECTION_IS_NOT_SUPPORTED_IN_THIS_RM_VERSION]=
"MakeConnection is not supported in this RM version";
- sandesha2_error_messages[SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_MSG]=
+ axutil_error_messages[SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_MSG]=
"Invalid MakeConnection message. Either Address or Identifier must be present";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_OPEN_DATABASE]=
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_OPEN_DATABASE]=
"Database cannot be opened";
- sandesha2_error_messages[SANDESHA2_ERROR_SQL_ERROR]=
+ axutil_error_messages[SANDESHA2_ERROR_SQL_ERROR]=
"There is an sql error. Please refer logs";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_BUILD_MSG_CTX_WHEN_SVC_NOT_PRESENT]=
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_BUILD_MSG_CTX_WHEN_SVC_NOT_PRESENT]=
"Cannot build message context since service is not present";
- sandesha2_error_messages[SANDESHA2_ERROR_CANNOT_FIND_OP_FOR_GENERATED_MSG]=
+ axutil_error_messages[SANDESHA2_ERROR_CANNOT_FIND_OP_FOR_GENERATED_MSG]=
"Cannot find a operation for generated message";
- sandesha2_error_messages[SANDESHA2_ERROR_INVALID_PERSISTENCE_PROPERTY_STRING]=
+ axutil_error_messages[SANDESHA2_ERROR_INVALID_PERSISTENCE_PROPERTY_STRING]=
"Invalid persistence property string";
return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_free (axutil_error_t *error)
-{
- if (NULL != error && NULL != error->ops)
- {
- free (error->ops);
- }
- if (NULL != error)
- {
- free (error);
- }
- return AXIS2_SUCCESS;
-}
-
-AXIS2_EXTERN axutil_error_t* AXIS2_CALL
-sandesha2_error_create (axis2_allocator_t * allocator)
-{
- axutil_error_t *error = NULL;
- if (!allocator)
- return NULL;
-
- error = axutil_error_create(allocator);
-
- if (!error)
- return NULL;
-
- /*error->ops->get_extended_message = sandesha2_error_impl_get_message;*/
- error->ops->set_error_number = sandesha2_error_impl_set_error_number;
- error->ops->set_status_code = sandesha2_error_impl_set_status_code;
- error->ops->get_status_code = sandesha2_error_impl_get_status_code;
- error->ops->free = sandesha2_error_impl_free;
-
- return error;
-}
-
-const axis2_char_t * AXIS2_CALL
-sandesha2_error_impl_get_message (
- const axutil_error_t *error)
-{
- if (error && error->error_number >= AXIS2_ERROR_NONE && error->error_number
- < AXIS2_ERROR_LAST)
- {
- return AXIS2_ERROR_GET_MESSAGE(error);
- }
- else if(error && error->error_number >= SANDESHA2_ERROR_NONE && error->
- error_number < SANDESHA2_ERROR_LAST)
- {
- return sandesha2_error_messages[error->error_number];
- }
-
- return "Invalid Error Number";
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_set_error_number (
- axutil_error_t *error,
- axutil_error_codes_t error_number)
-{
- error->error_number = error_number;
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_set_status_code (axutil_error_t *error, axis2_status_codes_t status_code)
-{
- error->status_code = status_code;
- return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_error_impl_get_status_code (
- axutil_error_t *error)
-{
- return error->status_code;
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_data.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_data.c Wed Apr 11 05:51:19 2007
@@ -141,7 +141,7 @@
AXIS2_FREE(env->allocator, data->reason);
data->reason = NULL;
}
- data->reason = axis2_strdup(env, reason);
+ data->reason = axutil_strdup(env, reason);
return AXIS2_SUCCESS;
}
@@ -168,7 +168,7 @@
AXIS2_FREE(env->allocator, data->sub_code);
data->sub_code = NULL;
}
- data->sub_code = axis2_strdup(env, sub_code);
+ data->sub_code = axutil_strdup(env, sub_code);
return AXIS2_SUCCESS;
}
@@ -195,7 +195,7 @@
AXIS2_FREE(env->allocator, data->code);
data->code = NULL;
}
- data->code = axis2_strdup(env, code);
+ data->code = axutil_strdup(env, code);
return AXIS2_SUCCESS;
}
@@ -242,7 +242,7 @@
AXIS2_FREE(env->allocator, data->seq_id);
data->seq_id = NULL;
}
- data->seq_id = axis2_strdup(env, seq_id);
+ data->seq_id = axutil_strdup(env, seq_id);
return AXIS2_SUCCESS;
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Apr 11 05:51:19 2007
@@ -136,7 +136,7 @@
sandesha2_msg_creator_init_creation(env, application_msg_ctx,
create_seq_msg_ctx);
create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg_ctx, env);
- create_seq_msg_id = axis2_uuid_gen(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);
axis2_conf_ctx_register_op_ctx(ctx, env, create_seq_msg_id, create_seq_op_ctx);
@@ -256,7 +256,7 @@
addressing_ns_value);
if(!acks_to || 0 == axis2_strcmp("", acks_to))
{
- acks_to = axis2_strdup(env, anonymous_uri);
+ acks_to = axutil_strdup(env, anonymous_uri);
}
acks_to_epr = axis2_endpoint_ref_create(env, acks_to);
if(reply_to_bean)
@@ -401,7 +401,7 @@
prop = axutil_property_create_with_args(env, 0, 0, 0, addressing_ns_value);
axis2_ctx_set_property(ctx, env, AXIS2_WSA_VERSION, prop);
}
- new_msg_id = axis2_uuid_gen(env);
+ new_msg_id = axutil_uuid_gen(env);
axis2_msg_ctx_set_message_id(out_msg, env, new_msg_id);
axis2_msg_ctx_set_soap_envelope(out_msg, env, envelope);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
@@ -596,7 +596,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX, AXIS2_FAILURE);
return NULL;
}
- temp_msg_id = axis2_uuid_gen(env);
+ temp_msg_id = axutil_uuid_gen(env);
axis2_msg_ctx_set_message_id(terminate_seq_msg_ctx, env, temp_msg_id);
/*ref_msg_op = axis2_msg_ctx_get_op(ref_msg_ctx, env);
if(ref_msg_op)
@@ -980,7 +980,7 @@
rm_version);
ack_req_soap_action = axutil_string_create(env, temp_action);
sandesha2_msg_ctx_set_soap_action(app_msg, env, ack_req_soap_action);
- uuid = axis2_uuid_gen(env);
+ uuid = axutil_uuid_gen(env);
sandesha2_msg_ctx_set_msg_id(app_msg, env, uuid);
return AXIS2_SUCCESS;
@@ -1099,7 +1099,7 @@
wsa_action = sandesha2_spec_specific_consts_get_make_connection_action(
env, rm_version);
axis2_msg_ctx_set_wsa_action(make_conn_msg_ctx, env, wsa_action);
- axis2_msg_ctx_set_message_id(make_conn_msg_ctx, env, axis2_uuid_gen(env));
+ axis2_msg_ctx_set_message_id(make_conn_msg_ctx, env, axutil_uuid_gen(env));
sandesha2_msg_ctx_set_msg_part(make_conn_rm_msg_ctx, env,
SANDESHA2_MSG_PART_MAKE_CONNECTION,
(sandesha2_iom_rm_part_t *) make_conn);
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Wed Apr 11 05:51:19 2007
@@ -139,7 +139,7 @@
if(!addressing_ns && !axis2_msg_ctx_get_server_side(msg_ctx, env))
{
- addressing_ns = axis2_strdup(env, AXIS2_WSA_NAMESPACE);
+ addressing_ns = axutil_strdup(env, AXIS2_WSA_NAMESPACE);
}
if(addressing_ns)
rm_elements = sandesha2_rm_elements_create(env, addressing_ns);
@@ -424,7 +424,7 @@
temp_flow = axis2_msg_ctx_get_flow(temp_msg_ctx, env);
if(temp_flow == AXIS2_IN_FLOW)
{
- prop_key = axis2_strdup(env, seq_id);
+ prop_key = axutil_strdup(env, seq_id);
}
else
{
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Wed Apr 11 05:51:19 2007
@@ -214,7 +214,7 @@
const axutil_env_t *env, axis2_char_t *manager)
{
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- bean->in_mem_storage_mgr = axis2_strdup(env, manager);
+ bean->in_mem_storage_mgr = axutil_strdup(env, manager);
return AXIS2_SUCCESS;
}
@@ -232,7 +232,7 @@
const axutil_env_t *env, axis2_char_t *manager)
{
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- bean->permanent_storage_mgr = axis2_strdup(env, manager);
+ bean->permanent_storage_mgr = axutil_strdup(env, manager);
return AXIS2_SUCCESS;
}
@@ -251,7 +251,7 @@
axis2_char_t *manager)
{
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- bean->storage_mgr = axis2_strdup(env, manager);
+ bean->storage_mgr = axutil_strdup(env, manager);
return AXIS2_SUCCESS;
}
@@ -335,7 +335,7 @@
const axutil_env_t *env,
axis2_char_t *db_path)
{
- bean->db_path = axis2_strdup(env, db_path);
+ bean->db_path = axutil_strdup(env, db_path);
return AXIS2_SUCCESS;
}
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=527478&r1=527477&r2=527478
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Wed Apr 11 05:51:19 2007
@@ -408,7 +408,7 @@
axis2_char_t *str2 = NULL;
axutil_array_list_t *list = NULL;
- str2 = axis2_strcat(env, "[", str, "]", NULL);
+ str2 = axutil_strcat(env, "[", str, "]", NULL);
list = sandesha2_utils_get_array_list_from_string(env, str2);
if(list)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org