You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2007/02/20 09:55:09 UTC
svn commit: r509468 - in /webservices/sandesha/trunk/c/src: handlers/
msgprocessors/ polling/ storage/permanent/ util/ workers/
Author: damitha
Date: Tue Feb 20 00:55:08 2007
New Revision: 509468
URL: http://svn.apache.org/viewvc?view=rev&rev=509468
Log:
updated with latest axis2c svn
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_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/make_connection_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/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Tue Feb 20 00:55:08 2007
@@ -71,7 +71,6 @@
axis2_qname_t *qname)
{
axis2_handler_t *handler = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
handler = axis2_handler_create(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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Tue Feb 20 00:55:08 2007
@@ -340,6 +340,7 @@
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);
+ char *msg_id = sandesha2_sender_bean_get_msg_id(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));
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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Feb 20 00:55:08 2007
@@ -663,9 +663,13 @@
if(!spec_ver)
{
axis2_property_t *spec_ver_prop = NULL;
+ /*sandesha2_seq_property_bean_t *spec_ver_bean = NULL;*/
spec_ver_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, AXIS2_FALSE);
spec_ver = axis2_property_get_value(spec_ver_prop, env);
+ /*spec_ver_bean = sandesha2_seq_property_bean_create_with_data(env,
+ internal_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION, spec_ver);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_ver_bean);*/
}
if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, spec_ver))
Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Tue Feb 20 00:55:08 2007
@@ -392,7 +392,7 @@
axis2_char_t *msg_stored_key = NULL;
msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
- bean1, env);
+ bean1, env);
sandesha2_sender_mgr_remove(sender_mgr, env, msg_id);
/* Removing the message from the storage */
msg_stored_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
@@ -422,23 +422,6 @@
int_seq_id, AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env),
storage_mgr);
}
- /*else if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ_RESPONSE == msg_type)
- {
- sandesha2_terminate_seq_res_t *terminate_seq_res = NULL;
- axis2_char_t *seq_id = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
-
- terminate_seq_res = (sandesha2_terminate_seq_res_t*)
- sandesha2_msg_ctx_get_msg_part(return_rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE);
- seq_id = sandesha2_identifier_get_identifier(
- sandesha2_terminate_seq_res_get_identifier(terminate_seq_res,
- env), env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
- seq_id, AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env),
- storage_mgr);
- }*/
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log, "[sandesha2] EXIT sandesha2_make_connection_msg_" \
"processor_process_in_msg .........");
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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Tue Feb 20 00:55:08 2007
@@ -375,7 +375,6 @@
out_msg_ctx = axis2_core_utils_create_out_msg_ctx(env, msg_ctx);
out_rm_msg = sandesha2_msg_creator_create_terminate_seq_res_msg(env,
rm_msg_ctx, out_msg_ctx, storage_mgr);
-
ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id,
storage_mgr);
if(ack_rm_msg)
@@ -410,6 +409,7 @@
property = axis2_property_create_with_args(env, 0, 0, 0, key);
axis2_msg_ctx_set_property(out_msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
+ char *action = axis2_msg_ctx_get_wsa_action(out_msg_ctx, env);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, out_msg_ctx);
/* TODO: refine the terminate delay */
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=509468&r1=509467&r2=509468
==============================================================================
--- 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 Tue Feb 20 00:55:08 2007
@@ -129,7 +129,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
- "[sandesha2] sandesha2_terminate_msg_processor_process_in_msg .........");
+ "[sandesha2] sandesha2_terminate_msg_processor_process_in_msg .........");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
@@ -138,9 +138,9 @@
if(!term_seq_res)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate "
- "Sequence part is not available");
+ "Sequence part is not available");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
seq_id = sandesha2_identifier_get_identifier(
@@ -154,8 +154,6 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = (sandesha2_storage_mgr_t *) sandesha2_utils_get_storage_mgr(
env, conf_ctx, AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- /*sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
- seq_id, storage_mgr);*/
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, seq_id,
AXIS2_FALSE, storage_mgr);
AXIS2_LOG_INFO(env->log,
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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Tue Feb 20 00:55:08 2007
@@ -241,7 +241,6 @@
axis2_endpoint_ref_t *to = NULL;
axis2_property_t *property = NULL;
sandesha2_transaction_t *transaction = NULL;
-
AXIS2_SLEEP(SANDESHA2_POLLING_MANAGER_WAIT_TIME);
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(
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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Tue Feb 20 00:55:08 2007
@@ -650,7 +650,6 @@
msg_ctx, env));
AXIOM_SOAP_ENVELOPE_SERIALIZE(envelope, env, om_output, AXIS2_FALSE);
soap_str = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
-
if (AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
soap_version = SANDESHA2_SOAP_VERSION_1_1;
else
@@ -709,11 +708,18 @@
address = (axis2_char_t *) AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to, env);
sandesha2_msg_store_bean_set_reply_to(bean, env, address);
}
+ /*property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL,
+ AXIS2_FALSE);
+ if(property)
- transport_to = axis2_msg_ctx_get_transport_url(msg_ctx, env);
- if(transport_to)
{
sandesha2_msg_store_bean_set_transport_to(bean, env, transport_to);
+ }*/
+ {
+ axis2_char_t *transport_to = NULL;
+ transport_to = axis2_msg_ctx_get_transport_url(msg_ctx, env);
+ if(transport_to)
+ sandesha2_msg_store_bean_set_transport_to(bean, env, transport_to);
}
options = (axis2_options_t *) axis2_msg_ctx_get_options(msg_ctx, env);
@@ -958,6 +964,9 @@
env);
if(transport_to_str)
{
+ /*property = axis2_property_create_with_args(env, 0, 0, 0, transport_to_str);
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL, property,
+ AXIS2_FALSE);*/
axis2_msg_ctx_set_transport_url(msg_ctx, env, transport_to_str);
}
to_url_str = sandesha2_msg_store_bean_get_to_url(msg_store_bean, env);
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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Tue Feb 20 00:55:08 2007
@@ -219,6 +219,7 @@
old_ack_bean = AXIS2_ARRAY_LIST_GET(bean_list, env, i);
time_to_send = sandesha2_sender_bean_get_time_to_send(old_ack_bean,
env);
+ axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id(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));
@@ -442,6 +443,7 @@
AXIS2_MSG_CTX_GET_TO(msg_ctx1, env), env);
if(0 == AXIS2_STRCMP(to, to_str))
continue;
+ axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id(sender_bean, env);
sandesha2_sender_mgr_remove(retrans_mgr, env,
sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
sender_bean, env));
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Tue Feb 20 00:55:08 2007
@@ -653,13 +653,14 @@
sandesha2_msg_ctx_set_msg_part(res_rm_msg, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE,
(sandesha2_iom_rm_part_t*)terminate_seq_res);
-
rm_version = sandesha2_utils_get_rm_version(env, seq_id, storage_mgr);
- axis2_msg_ctx_set_wsa_action(out_msg, env,
- sandesha2_spec_specific_consts_get_teminate_seq_res_action(
- env, rm_version));
+ if(!rm_version)
+ {
+ rm_version = sandesha2_msg_ctx_get_rm_spec_ver(ref_rm_msg, env);
+ }
temp_action = sandesha2_spec_specific_consts_get_teminate_seq_res_action(
env, rm_version);
+ axis2_msg_ctx_set_wsa_action(out_msg, env, temp_action);
soap_action = axis2_string_create(env, temp_action);
axis2_msg_ctx_set_soap_action(out_msg, env, soap_action);
sandesha2_msg_creator_init_creation(env, sandesha2_msg_ctx_get_msg_ctx(
Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?view=diff&rev=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Tue Feb 20 00:55:08 2007
@@ -109,6 +109,7 @@
if(timeout_seq)
{
+ printf("came40\n");
sandesha2_sender_bean_set_send(retrans_bean, env, AXIS2_FALSE);
sandesha2_msg_retrans_adjuster_finalize_timedout_seq(env, int_seq_id,
seq_id, msg_ctx, 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=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue Feb 20 00:55:08 2007
@@ -112,7 +112,7 @@
sandesha2_terminate_mgr_rcv_side_clean_map, seq_id,
AXIS2_HASH_KEY_STRING);
axis2_allocator_switch_to_local_pool(env->allocator);
- if(clean_status && 0 == AXIS2_STRCMP(clean_status,
+ if(clean_status && 0 == axis2_strcmp(clean_status,
SANDESHA2_CLEANED_AFTER_INVOCATION))
{
sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id,
@@ -184,7 +184,7 @@
seq_id, AXIS2_HASH_KEY_STRING);
axis2_allocator_switch_to_local_pool(env->allocator);
- if(clean_status && 0 == AXIS2_STRCMP(clean_status,
+ if(clean_status && 0 == axis2_strcmp(clean_status,
SANDESHA2_CLEANED_ON_TERMINATE_MSG))
{
sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id,
@@ -230,7 +230,7 @@
sandesha2_next_msg_bean_set_seq_id(find_bean, env, seq_id);
found_list = sandesha2_next_msg_mgr_find(next_mgr, env, find_bean);
- if(found_list)
+ /*if(found_list)
size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
for(i = 0; i < size; i++)
{
@@ -250,7 +250,7 @@
if(seq_id)
sandesha2_next_msg_mgr_remove(next_mgr, env, seq_id);
}
- }
+ }*/
highest_in_msg_key = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, storage_mgr);
if(highest_in_msg_key)
@@ -298,7 +298,7 @@
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(all_seq_list, env); i++)
{
axis2_char_t *value = AXIS2_ARRAY_LIST_GET(all_seq_list, env, i);
- if(0 == AXIS2_STRCMP(value, seq_id))
+ if(0 == axis2_strcmp(value, seq_id))
{
AXIS2_ARRAY_LIST_REMOVE(all_seq_list, env, i);
break;
@@ -334,11 +334,11 @@
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_term_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
- SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
+ SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, seq_term_bean);
sandesha2_terminate_mgr_clean_sending_side_data(env, conf_ctx, seq_id,
- svr_side, storage_mgr);
+ svr_side, storage_mgr);
AXIS2_LOG_INFO(env->log,
"[sandesha2]Exit:sandesha2_terminate_mgr_terminate_sending_side");
return AXIS2_SUCCESS;
@@ -363,16 +363,16 @@
if(NULL == name)
return AXIS2_FAILURE;
- if(0 == AXIS2_STRCMP(name, SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES))
+ if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES))
add_entry_with_seq_id = AXIS2_TRUE;
- if(0 == AXIS2_STRCMP(name, SANDESHA2_SEQ_PROP_SEQ_TERMINATED))
+ if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_TERMINATED))
add_entry_with_seq_id = AXIS2_TRUE;
- if(0 == AXIS2_STRCMP(name, SANDESHA2_SEQ_PROP_SEQ_CLOSED))
+ if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_CLOSED))
add_entry_with_seq_id = AXIS2_TRUE;
- if(0 == AXIS2_STRCMP(name, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT))
+ if(0 == axis2_strcmp(name, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT))
add_entry_with_seq_id = AXIS2_TRUE;
- if(AXIS2_TRUE == add_entry_with_seq_id && NULL != seq_id)
+ if(AXIS2_TRUE == add_entry_with_seq_id && seq_id)
{
sandesha2_seq_property_bean_t *new_bean = NULL;
new_bean = sandesha2_seq_property_bean_create(env);
@@ -481,16 +481,16 @@
axis2_bool_t stop_listner_for_async = AXIS2_FALSE;
acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
+ seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
addr_ns_uri = 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_uri);
- if(NULL != acks_to_bean)
+ if(acks_to_bean)
{
axis2_char_t *acks_to = NULL;
acks_to = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
- if(NULL != acks_to && 0 == AXIS2_STRCMP(acks_to, anon_uri))
+ if(acks_to && 0 == axis2_strcmp(acks_to, anon_uri))
stop_listner_for_async = AXIS2_TRUE;
}
@@ -522,7 +522,7 @@
sandesha2_create_seq_bean_set_internal_seq_id(find_create_seq_bean, env,
internal_seq_id);
found_list = sandesha2_create_seq_mgr_find(create_seq_mgr, env,
- find_create_seq_bean);
+ find_create_seq_bean);
if(found_list)
{
int i = 0;
@@ -545,7 +545,7 @@
find_seq_prop_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_seq_id(find_seq_prop_bean, env, internal_seq_id);
found_list = sandesha2_seq_property_mgr_find(seq_prop_mgr, env,
- find_seq_prop_bean);
+ find_seq_prop_bean);
if(found_list)
{
int i = 0, size = 0;
@@ -556,7 +556,7 @@
seq_prop_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
sandesha2_terminate_mgr_do_updates_if_needed(env, out_seq_id,
- seq_prop_bean, seq_prop_mgr);
+ seq_prop_bean, seq_prop_mgr);
/* test comment */
/*if(sandesha2_terminate_mgr_is_property_deletable(env,
sandesha2_seq_property_bean_get_name(seq_prop_bean, env)))*/
@@ -619,33 +619,33 @@
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
terminated = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- out_seq_id, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
+ out_seq_id, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
if(terminated && sandesha2_seq_property_bean_get_value(terminated, env)
- && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
- sandesha2_seq_property_bean_get_value(terminated, env)))
+ && 0 == axis2_strcmp(SANDESHA2_VALUE_TRUE,
+ sandesha2_seq_property_bean_get_value(terminated, env)))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was"
- " added previously");
+ " added previously");
}
terminate_rm_msg = sandesha2_msg_creator_create_terminate_seq_msg(env,
- rm_msg_ctx, out_seq_id, int_seq_id, storage_mgr);
+ rm_msg_ctx, out_seq_id, int_seq_id, storage_mgr);
sandesha2_msg_ctx_set_flow(terminate_rm_msg, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
sandesha2_msg_ctx_set_property(terminate_rm_msg, env,
- SANDESHA2_APPLICATION_PROCESSING_DONE, property);
+ SANDESHA2_APPLICATION_PROCESSING_DONE, property);
to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, int_seq_id,
- SANDESHA2_SEQ_PROP_TO_EPR);
+ SANDESHA2_SEQ_PROP_TO_EPR);
to_epr = axis2_endpoint_ref_create(env,
- sandesha2_seq_property_bean_get_value(to_bean, env));
+ sandesha2_seq_property_bean_get_value(to_bean, env));
if(!to_epr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] To EPR has an "
- "invalid value");
+ "invalid value");
return AXIS2_FAILURE;
}
to_addr = axis2_endpoint_ref_get_address(to_epr, env);
@@ -654,18 +654,17 @@
if(!rm_ver)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot find the "
- "rm version for msg");
+ "rm version for msg");
return AXIS2_FAILURE;
}
sandesha2_msg_ctx_set_wsa_action(terminate_rm_msg, env,
- sandesha2_spec_specific_consts_get_terminate_seq_action(
- env, rm_ver));
+ sandesha2_spec_specific_consts_get_terminate_seq_action(env, rm_ver));
temp_action = sandesha2_spec_specific_consts_get_terminate_seq_soap_action
(env, rm_ver);
soap_action = axis2_string_create(env, temp_action);
sandesha2_msg_ctx_set_soap_action(terminate_rm_msg, env, soap_action);
transport_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- int_seq_id, SANDESHA2_SEQ_PROP_TRANSPORT_TO);
+ int_seq_id, SANDESHA2_SEQ_PROP_TRANSPORT_TO);
if(transport_to_bean)
{
axis2_char_t *value = sandesha2_seq_property_bean_get_value(
@@ -715,7 +714,7 @@
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
sandesha2_sender_bean_set_msg_id(terminate_bean, env,
- sandesha2_msg_ctx_get_msg_id(terminate_rm_msg, env));
+ sandesha2_msg_ctx_get_msg_id(terminate_rm_msg, env));
sandesha2_sender_bean_set_send(terminate_bean, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE);
@@ -729,10 +728,10 @@
terminate_added = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_name(terminate_added, env,
- SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
+ SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
sandesha2_seq_property_bean_set_seq_id(terminate_added, env, out_seq_id);
sandesha2_seq_property_bean_set_value(terminate_added, env,
- SANDESHA2_VALUE_TRUE);
+ SANDESHA2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, terminate_added);
@@ -741,22 +740,31 @@
property = axis2_property_create_with_args(env, 0, 0,
transport_out->ops->free_void_arg, transport_out);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env,
- SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
- AXIS2_FALSE);
+ axis2_msg_ctx_set_property(msg_ctx1, env,
+ SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0, key);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env, SANDESHA2_MESSAGE_STORE_KEY,
- property, AXIS2_FALSE);
+ axis2_msg_ctx_set_property(msg_ctx1, env, SANDESHA2_MESSAGE_STORE_KEY,
+ property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env, SANDESHA2_SET_SEND_TO_TRUE,
- property, AXIS2_FALSE);
-
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx1, env,
- sandesha2_utils_get_transport_out(env));
+ axis2_msg_ctx_set_property(msg_ctx1, env, SANDESHA2_SET_SEND_TO_TRUE,
+ property, AXIS2_FALSE);
+ axis2_msg_ctx_set_transport_out_desc(msg_ctx1, env,
+ sandesha2_utils_get_transport_out(env));
+ {
+ axis2_endpoint_ref_t *reply_to_epr = NULL;
+ reply_to_epr = axis2_msg_ctx_get_to(msg_ctx, env);
+ if(!reply_to_epr)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Reply To EPR "
+ "has an invalid value");
+ return AXIS2_FAILURE;
+ }
+ axis2_msg_ctx_set_reply_to(msg_ctx1, env, reply_to_epr);
+ }
engine = axis2_engine_create(env, conf_ctx);
return AXIS2_ENGINE_SEND(engine, env, msg_ctx1);
}
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=509468&r1=509467&r2=509468
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Tue Feb 20 00:55:08 2007
@@ -483,23 +483,6 @@
internal_seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
storage_mgr);
}
- /*else if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ_RESPONSE == msg_type)
- {
- sandesha2_terminate_seq_res_t *terminate_seq_res = NULL;
- axis2_char_t *seq_id = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
-
- terminate_seq_res = (sandesha2_terminate_seq_res_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE);
- seq_id = sandesha2_identifier_get_identifier(
- sandesha2_terminate_seq_res_get_identifier(terminate_seq_res,
- env), env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
- seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
- storage_mgr);
- }*/
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
@@ -614,8 +597,12 @@
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI:
AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
- res_envelope = axis2_http_transport_utils_create_soap_msg(env, msg_ctx,
- soap_ns_uri);
+ /*res_envelope = axis2_http_transport_utils_create_soap_msg(env, msg_ctx,
+ soap_ns_uri);*/
+ res_envelope = axis2_msg_ctx_get_response_soap_envelope(msg_ctx, env);
+ if(!res_envelope)
+ res_envelope = axis2_http_transport_utils_create_soap_msg(env, msg_ctx,
+ soap_ns_uri);
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org