Author: damitha
Date: Fri Jan 19 22:15:11 2007
New Revision: 498081
URL: http://svn.apache.org/viewvc?view=rev&rev=498081
Log:
removed all the warnings
Modified:
webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.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/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c?view=diff&rev=498081&r1=498080&r2=498081
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c Fri Jan
19 22:15:11 2007
@@ -29,6 +29,8 @@
#include <sandesha2_client.h>
#include <axis2_addr.h>
+#define SANDESHA2_MAX_COUNT 10
+
/* on_complete callback function */
axis2_status_t AXIS2_CALL
rm_echo_callback_on_complete(
@@ -224,13 +226,13 @@
sandesha2_client_send_non_blocking(env, svc_client, options, NULL,
callback3, payload, listener_manager);
wait_on_callback(env, callback3);
- AXIS2_SLEEP(2 * SANDESHA2_CLIENT_SLEEP_TIME);
+ AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
callback4 = axis2_callback_create(env);
AXIS2_CALLBACK_SET_ON_COMPLETE(callback4, rm_echo_callback_on_complete);
AXIS2_CALLBACK_SET_ON_ERROR(callback4, rm_echo_callback_on_error);
sandesha2_client_terminate_seq_with_svc_client(env, svc_client, callback4,
listener_manager);
- AXIS2_SLEEP(SANDESHA2_CLIENT_SLEEP_TIME);
+ AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
if (svc_client)
{
/*AXIS2_SVC_CLIENT_FREE(svc_client, env);*/
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=498081&r1=498080&r2=498081
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Fri
Jan 19 22:15:11 2007
@@ -164,13 +164,13 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
ack_requested = (sandesha2_ack_requested_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
if(!ack_requested)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Ack requested "
- "part is missing");
+ "part is missing");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
sandesha2_ack_requested_set_must_understand(ack_requested, env,
AXIS2_FALSE);
@@ -178,20 +178,19 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
- sandesha2_ack_requested_get_identifier(ack_requested,
- env), env);
+ sandesha2_ack_requested_get_identifier(ack_requested, env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
seq_id,
- SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
+ SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
acks_to_str = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
if(!acks_to_str)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] acks_to_str"
- " seqeunce property is not set correctly");
+ " seqeunce property is not set correctly");
return AXIS2_FAILURE;
}
acks_to = axis2_endpoint_ref_create(env, acks_to_str);
@@ -214,28 +213,27 @@
AXIS2_OP_SET_FAULT_OUT_FLOW(ack_op, env, new_out_fault_flow);
}
ack_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, rm_msg_ctx,
- ack_op);
+ ack_op);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
- SANDESHA2_APPLICATION_PROCESSING_DONE, property,
- AXIS2_FALSE);
+ SANDESHA2_APPLICATION_PROCESSING_DONE, property, AXIS2_FALSE);
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));
+ 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));
envelope = axiom_soap_envelope_create_default_soap_envelope(env,
- sandesha2_utils_get_soap_version(env,
- AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env)));
+ sandesha2_utils_get_soap_version(env,
+ AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env)));
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(ack_msg_ctx, env, envelope);
AXIS2_MSG_CTX_SET_TO(ack_msg_ctx, env, acks_to);
AXIS2_MSG_CTX_SET_REPLY_TO(ack_msg_ctx, env, AXIS2_MSG_CTX_GET_TO(msg_ctx,
- env));
+ env));
sandesha2_msg_creator_add_ack_msg(env, ack_rm_msg, seq_id, storage_mgr);
AXIS2_MSG_CTX_SET_SERVER_SIDE(ack_msg_ctx, env, AXIS2_TRUE);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION,
- AXIS2_FALSE);
+ AXIS2_FALSE);
if(property)
wsa_version = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -243,13 +241,12 @@
if(property)
{
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION,
property,
- AXIS2_FALSE);
+ AXIS2_FALSE);
property = NULL;
}
addr_ns_val = sandesha2_utils_get_seq_property(env, seq_id,
- SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
- storage_mgr);
+ 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))
{
@@ -259,33 +256,33 @@
if(!AXIS2_MSG_CTX_GET_OP(msg_ctx, env))
{
axis2_op_t *operation = NULL;
- axis2_op_ctx_t *operation_ctx = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
operation = axis2_op_create(env);
AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(operation, env,
- AXIS2_MEP_URI_IN_OUT);
- operation_ctx = axis2_op_ctx_create(env, operation, NULL);
+ AXIS2_MEP_URI_IN_OUT);
+ op_ctx = axis2_op_ctx_create(env, operation, NULL);
AXIS2_MSG_CTX_SET_OP(msg_ctx, env, operation);
- AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, operation_ctx);
+ AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
}
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env),
env);
property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
- AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN,
- property, AXIS2_FALSE);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
+ AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_WRITTEN,
- property, AXIS2_FALSE);
+ property, AXIS2_FALSE);
engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND(engine, env, ack_msg_ctx))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] ack sending"
- " failed");
+ " failed");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_ACK,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
@@ -312,28 +309,27 @@
sandesha2_sender_bean_set_resend(ack_bean, env, AXIS2_FALSE);
sandesha2_sender_bean_set_seq_id(ack_bean, env, seq_id);
sandesha2_sender_bean_set_send(ack_bean, env, AXIS2_TRUE);
- sandesha2_sender_bean_set_msg_type(ack_bean, env,
- SANDESHA2_MSG_TYPE_ACK);
+ sandesha2_sender_bean_set_msg_type(ack_bean, env,
SANDESHA2_MSG_TYPE_ACK);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
- SANDESHA2_QUALIFIED_FOR_SENDING, property,
AXIS2_FALSE);
+ SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
prop_bean = sandesha2_utils_get_property_bean_from_op(env,
- AXIS2_MSG_CTX_GET_OP(msg_ctx, env));
+ AXIS2_MSG_CTX_GET_OP(msg_ctx, env));
ack_interval = sandesha2_property_bean_get_ack_interval(prop_bean,
env);
time_to_send = sandesha2_utils_get_current_time_in_millis(env) +
- ack_interval;
+ ack_interval;
find_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_resend(find_bean, env, AXIS2_FALSE);
sandesha2_sender_bean_set_send(find_bean, env, AXIS2_TRUE);
sandesha2_sender_bean_set_msg_type(find_bean, env,
- SANDESHA2_MSG_TYPE_ACK);
+ SANDESHA2_MSG_TYPE_ACK);
found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr,
env,
- find_bean);
+ find_bean);
if(found_list)
{
int i = 0;
@@ -343,7 +339,7 @@
sandesha2_sender_bean_t *old_ack_bean = NULL;
old_ack_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
time_to_send = sandesha2_sender_bean_get_time_to_send(
- old_ack_bean, env);
+ old_ack_bean, env);
sandesha2_sender_mgr_remove(retrans_mgr, env,
sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
old_ack_bean, env));
@@ -363,27 +359,27 @@
property = axis2_property_create_with_args(env, 0, 0,
transport_out->ops->free_void_arg, transport_out);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
- SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
- AXIS2_FALSE);
+ SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
+ AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
- SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
+ SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0, key);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
- SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
+ SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(ack_msg_ctx, env,
- sandesha2_utils_get_transport_out(env));
+ sandesha2_utils_get_transport_out(env));
engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND(engine, env, ack_msg_ctx))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] ack sending"
- " failed");
+ " failed");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_ACK,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
sandesha2_utils_start_sender_for_seq(env, conf_ctx, seq_id);
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=498081&r1=498080&r2=498081
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Fri Jan
19 22:15:11 2007
@@ -222,14 +222,14 @@
if(property)
{
- processed = AXIS2_PROPERTY_GET_VALUE(property, env);
+ processed = axis2_property_get_value(property, env);
}
- if(processed && 0 == AXIS2_STRCMP(processed, "true"))
+ if(processed && 0 == axis2_strcmp(processed, "true"))
{
return AXIS2_SUCCESS;
}
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
{
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -375,7 +375,7 @@
msg_no_present_in_list =
sandesha2_app_msg_processor_msg_num_is_in_list(env,
msgs_str, msg_no);
if(msg_no_present_in_list &&
- 0 == AXIS2_STRCMP(SANDESHA2_QOS_DEFAULT_INVOCATION_TYPE,
+ 0 == axis2_strcmp(SANDESHA2_QOS_DEFAULT_INVOCATION_TYPE,
SANDESHA2_QOS_EXACTLY_ONCE))
{
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
@@ -524,7 +524,7 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_IN);
/* TODO setting up fault callback */
@@ -603,27 +603,27 @@
to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "to:%s", to);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY, AXIS2_FALSE);
if(property)
- seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
+ seq_key = axis2_property_get_value(property, env);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env,
to, seq_key);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "internal_seq_id:%s",
internal_seq_id);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_LAST_MESSAGE, AXIS2_FALSE);
if(property)
- last_app_msg = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(last_app_msg && 0 == AXIS2_STRCMP(last_app_msg,
+ last_app_msg = axis2_property_get_value(property, env);
+ if(last_app_msg && 0 == axis2_strcmp(last_app_msg,
SANDESHA2_VALUE_TRUE))
last_msg = AXIS2_TRUE;
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_MESSAGE_NUMBER, AXIS2_FALSE);
if(property)
{
- msg_num_lng = *(long*)(AXIS2_PROPERTY_GET_VALUE(property, env));
+ msg_num_lng = *(long*)(axis2_property_get_value(property, env));
if(msg_num_lng <= 0)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Invalid message number");
@@ -652,11 +652,11 @@
/* A dummy message is a one which will not be processed as a actual
* application message. The RM handlers will simply let these go.
*/
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_DUMMY_MESSAGE, AXIS2_FALSE);
if(property)
- dummy_msg_str = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(dummy_msg_str && 0 == AXIS2_STRCMP(dummy_msg_str,
+ dummy_msg_str = axis2_property_get_value(property, env);
+ if(dummy_msg_str && 0 == axis2_strcmp(dummy_msg_str,
SANDESHA2_VALUE_TRUE))
dummy_msg = AXIS2_TRUE;
if(!dummy_msg)
@@ -710,7 +710,7 @@
value = sandesha2_seq_property_bean_get_value(incoming_to_bean,
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,
+ axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_SEQ_PROP_TO_EPR,
property, AXIS2_FALSE);
}
@@ -734,10 +734,10 @@
}
else
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, AXIS2_FALSE);
if(property)
- spec_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
+ spec_ver = axis2_property_get_value(property, env);
}
if(!spec_ver)
spec_ver =
sandesha2_spec_specific_consts_get_default_spec_version(env);
@@ -774,10 +774,10 @@
res_create_seq_added);
if(AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
if(property)
- acks_to = AXIS2_PROPERTY_GET_VALUE(property, env);
+ acks_to = axis2_property_get_value(property, env);
}
if(is_svr_side)
{
@@ -842,8 +842,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_ACK_WRITTEN,
AXIS2_FALSE);
if(property)
- written = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(!written || 0 != AXIS2_STRCMP(written, SANDESHA2_VALUE_TRUE))
+ written = axis2_property_get_value(property, env);
+ if(!written || 0 != axis2_strcmp(written, SANDESHA2_VALUE_TRUE))
{
axis2_ctx_t *ctx = NULL;
if (op_ctx)
@@ -860,7 +860,7 @@
}
}
op_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(AXIS2_OP_CTX_GET_OP(
- AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env), env), env);
+ axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env);
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))
@@ -1035,7 +1035,7 @@
/* Set that the create sequence message is part of a transaction. */
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
SANDESHA2_WITHIN_TRANSACTION,
+ axis2_msg_ctx_set_property(create_seq_msg, env,
SANDESHA2_WITHIN_TRANSACTION,
property, AXIS2_FALSE);
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
internal_seq_id, (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
@@ -1070,23 +1070,23 @@
internal_seq_id);
sandesha2_sender_bean_set_send(create_seq_entry, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
+ axis2_msg_ctx_set_property(create_seq_msg, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
sandesha2_sender_bean_set_msg_type(create_seq_entry, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ);
sandesha2_sender_mgr_insert(retrans_mgr, env, create_seq_entry);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, str_key,
create_seq_msg);
property = axis2_property_create_with_args(env, 0, 0, 0, str_key);
- AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
SANDESHA2_MESSAGE_STORE_KEY,
+ axis2_msg_ctx_set_property(create_seq_msg, env,
SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(create_seq_msg, env);
property = axis2_property_create_with_args(env, 0, 0,
orig_trans_out->ops->free_void_arg, orig_trans_out);
- AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
+ axis2_msg_ctx_set_property(create_seq_msg, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
trans_out = sandesha2_utils_get_transport_out(env);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env, SANDESHA2_SET_SEND_TO_TRUE,
+ axis2_msg_ctx_set_property(create_seq_msg, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(create_seq_msg, env, trans_out);
engine = axis2_engine_create(env,
AXIS2_MSG_CTX_GET_CONF_CTX(create_seq_msg,
@@ -1168,7 +1168,7 @@
{
axis2_endpoint_ref_t *reply_to = NULL;
- req_msg =
AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env),
+ req_msg =
AXIS2_OP_CTX_GET_MSG_CTX(axis2_msg_ctx_get_op_ctx(app_msg_ctx, env),
env, AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg)
{
@@ -1225,15 +1225,15 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_property_t *property = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(app_msg_ctx, env);
if(op_ctx)
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(app_msg_ctx, env,
+ property = axis2_msg_ctx_get_property(app_msg_ctx, env,
SANDESHA2_CLIENT_LAST_MESSAGE, AXIS2_FALSE);
if(property)
{
- axis2_char_t *value = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(value && 0 == AXIS2_STRCMP(value, SANDESHA2_VALUE_TRUE))
+ axis2_char_t *value = axis2_property_get_value(property, env);
+ if(value && 0 == axis2_strcmp(value, SANDESHA2_VALUE_TRUE))
{
axis2_char_t *spec_ver = NULL;
spec_ver = sandesha2_utils_get_rm_version(env,
@@ -1282,7 +1282,7 @@
sandesha2_sender_bean_set_send(app_msg_entry, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
+ axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
sandesha2_sender_bean_set_internal_seq_id(app_msg_entry, env,
internal_seq_id);
@@ -1290,7 +1290,7 @@
sandesha2_sender_mgr_insert(retrans_mgr, env, app_msg_entry);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
+ axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
trs_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(
AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env), env);
@@ -1299,13 +1299,13 @@
axis2_transport_out_desc_t *trans_out = NULL;
property = axis2_property_create_with_args(env, 0, 0, 0, storage_key);
- AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
+ axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env);
property = axis2_property_create_with_args(env, 0, 0,
trans_out->ops->free_void_arg, trans_out);
- AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
+ axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(app_msg_ctx, env,
sandesha2_utils_get_transport_out(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=498081&r1=498080&r2=498081
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
Fri Jan 19 22:15:11 2007
@@ -538,15 +538,16 @@
AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(out_in_op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_OP_SET_IN_FLOW(out_in_op, env,
AXIS2_OP_GET_IN_FLOW(old_op, env));
+
op_ctx = axis2_op_ctx_create(env, out_in_op, NULL);
AXIS2_OP_CTX_SET_PARENT(op_ctx, env, AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx,
env));
- AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, sandesha2_msg_ctx_get_msg_id(
- rm_msg_ctx, env), op_ctx);
+ /*axis2_conf_ctx_register_op_ctx(conf_ctx, env,
sandesha2_msg_ctx_get_msg_id(
+ rm_msg_ctx, env), op_ctx);*/
if(terminated && 0 == AXIS2_STRCMP(terminated, SANDESHA2_VALUE_TRUE))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was "
- "added previously");
+ "added previously");
return AXIS2_SUCCESS;
}
term_seq_part = (sandesha2_terminate_seq_t*)sandesha2_msg_ctx_get_msg_part(
@@ -555,9 +556,8 @@
term_seq_part, env), env, out_seq_id);
sandesha2_msg_ctx_set_flow(rm_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
- SANDESHA2_APPLICATION_PROCESSING_DONE, property,
- AXIS2_FALSE);
+ axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE,
+ property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,
to_address));
rm_version = sandesha2_utils_get_rm_version(env, int_seq_id, storage_mgr);
if(!rm_version)
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=498081&r1=498080&r2=498081
==============================================================================
---
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
Fri Jan 19 22:15:11 2007
@@ -121,7 +121,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx)
{
axis2_msg_ctx_t *msg_ctx = NULL;
- sandesha2_seq_ack_t *seq_ack = NULL;
sandesha2_terminate_seq_res_t *term_seq_res = NULL;
axis2_char_t *seq_id = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
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=498081&r1=498080&r2=498081
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
Fri Jan 19 22:15:11 2007
@@ -343,11 +343,11 @@
sandesha2_transaction_t *transaction = NULL;
axis2_hash_index_t *index = NULL;
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
- unsigned long *thread_id;
+ unsigned long int *thread_id;
axis2_char_t *thread_id_key = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
- thread_id = (unsigned long *) axis2_os_thread_current();
+ thread_id = (unsigned long int *) axis2_os_thread_current();
axis2_thread_mutex_lock(storage_mgr_impl->mutex);
@@ -366,7 +366,7 @@
}
thread_id_key = AXIS2_MALLOC(env->allocator, 128);
- sprintf(thread_id_key, "%ld", thread_id);
+ sprintf(thread_id_key, "%lu", *thread_id);
transaction = (sandesha2_transaction_t *) axis2_hash_get(
storage_mgr_impl->transactions, thread_id_key, AXIS2_HASH_KEY_STRING);
if(!transaction)
@@ -387,14 +387,14 @@
sandesha2_transaction_t *transaction)
{
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
- unsigned long *thread_id = NULL;
+ unsigned long int *thread_id = NULL;
axis2_char_t *thread_id_key = AXIS2_MALLOC(env->allocator, 128);
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
axis2_thread_mutex_lock(storage_mgr_impl->mutex);
- thread_id = (unsigned long *)
sandesha2_permanent_transaction_get_thread_id(
+ thread_id = (unsigned long int *)
sandesha2_permanent_transaction_get_thread_id(
transaction, env);
- sprintf(thread_id_key, "%ld", thread_id);
+ sprintf(thread_id_key, "%lu", *thread_id);
axis2_hash_set(storage_mgr_impl->transactions, thread_id_key,
AXIS2_HASH_KEY_STRING, NULL);
axis2_thread_mutex_unlock(storage_mgr_impl->mutex);
@@ -934,12 +934,12 @@
axis2_op_ctx_t *op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
if(op_ctx)
{
- axis2_char_t *msg_id = NULL;
+ /*axis2_char_t *msg_id = NULL;*/
AXIS2_OP_CTX_SET_PARENT(op_ctx, env, svc_ctx);
AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
/*AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx);*/
- msg_id = (axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
- /*AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, msg_id, op_ctx);*/
+ /*msg_id = (axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx,
env);*/
+ /*axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, op_ctx);*/
}
}
AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env,
@@ -1125,12 +1125,12 @@
{
sqlite3* dbconn = NULL;
sandesha2_transaction_t *transaction = NULL;
- unsigned long *thread_id = (unsigned long *) axis2_os_thread_current();
+ unsigned long int *thread_id = (unsigned long int *)
axis2_os_thread_current();
axis2_char_t thread_id_key[128];
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
/*axis2_thread_mutex_lock(storage_mgr_impl->mutex);*/
- sprintf(thread_id_key, "%ld", thread_id);
+ sprintf(thread_id_key, "%lu", *thread_id);
transaction = (sandesha2_transaction_t *) axis2_hash_get(
storage_mgr_impl->transactions, thread_id_key, AXIS2_HASH_KEY_STRING);
/*transaction =
sandesha2_permanent_storage_mgr_get_transaction(storage_mgr,
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=498081&r1=498080&r2=498081
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Fri Jan 19 22:15:11
2007
@@ -507,7 +507,8 @@
axis2_char_t *msg_id = NULL;
retrans_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
- msg_id = sandesha2_sender_bean_get_msg_id(retrans_bean, env);
+ msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
+ retrans_bean, env);
sandesha2_sender_mgr_remove(retrans_mgr, env, msg_id);
msg_store_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
retrans_bean, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
