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 2008/05/31 11:45:26 UTC
svn commit: r661993 [1/2] - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008:
include/ src/client/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/sqlite/ src/util/ src/workers/
Author: damitha
Date: Sat May 31 02:45:25 2008
New Revision: 661993
URL: http://svn.apache.org/viewvc?rev=661993&view=rev
Log:
Merged with new changes in the 30may2008 branch
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_create_seq_bean.h
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_seq_mgr.h
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_utils.h
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/client/client.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/beans/create_seq_bean.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_create_seq_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/fault_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_init.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/seq_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender_worker.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h Sat May 31 02:45:25 2008
@@ -233,9 +233,9 @@
#define SANDESHA2_SEQ_PROP_ACKS_TO_EPR "acksToEPR"
- #define SANDESHA2_SEQ_PROP_OUT_SEQ_ID "OutSequenceId"
+ #define SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID "OutSequenceId"
- #define SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID "TempSequenceId"
+ #define SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID "TempSequenceId"
#define SANDESHA2_SEQ_PROP_SPECIAL_INTERNAL_SEQ_ID "SpecialIntSequenceId"
@@ -283,8 +283,6 @@
#define SANDESHA2_SEQ_PROP_HIGHEST_OUT_RELATES_TO "HighestOutRelatesTo"
- #define SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_KEY "HighestOutMsgKey"
-
#define SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO "LastOutMessage"
#define SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_NO "LastInMessage"
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_create_seq_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_create_seq_bean.h?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_create_seq_bean.h (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_create_seq_bean.h Sat May 31 02:45:25 2008
@@ -59,23 +59,23 @@
axis2_char_t* seq_msg_id) ;
axis2_char_t* AXIS2_CALL
-sandesha2_create_seq_bean_get_seq_id (
+sandesha2_create_seq_bean_get_rms_sequence_id (
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env);
void AXIS2_CALL
-sandesha2_create_seq_bean_set_seq_id (
+sandesha2_create_seq_bean_set_rms_sequence_id (
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env,
axis2_char_t* seq_id) ;
axis2_char_t* AXIS2_CALL
-sandesha2_create_seq_bean_get_internal_seq_id (
+sandesha2_create_seq_bean_get_rms_internal_sequence_id (
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env);
void AXIS2_CALL
-sandesha2_create_seq_bean_set_internal_seq_id (
+sandesha2_create_seq_bean_set_rms_internal_sequence_id (
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env,
axis2_char_t* int_seq_id);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_seq_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_seq_mgr.h?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_seq_mgr.h (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_seq_mgr.h Sat May 31 02:45:25 2008
@@ -45,7 +45,7 @@
*/
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-sandesha2_seq_mgr_setup_new_seq(
+sandesha2_seq_mgr_setup_new_rmd_sequence(
const axutil_env_t *env,
sandesha2_msg_ctx_t *create_seq_msg,
struct sandesha2_seq_property_mgr *seq_prop_mgr,
@@ -71,13 +71,12 @@
axis2_conf_ctx_t *conf_ctx);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_seq_mgr_setup_new_client_seq(
+sandesha2_seq_mgr_setup_new_rms_sequence(
const axutil_env_t *env,
axis2_msg_ctx_t *first_app_msg,
axis2_char_t *int_seq_id,
axis2_char_t *spec_version,
- struct sandesha2_seq_property_mgr *seq_prop_mgr,
- const axis2_bool_t persistent);
+ struct sandesha2_seq_property_mgr *seq_prop_mgr);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_utils.h?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_utils.h (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_utils.h Sat May 31 02:45:25 2008
@@ -124,9 +124,9 @@
const axis2_char_t *internal_seq_id);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_outgoing_internal_seq_id(
+sandesha2_utils_get_rms_internal_sequence_id(
const axutil_env_t *env,
- axis2_char_t *seq_id);
+ axis2_char_t *rmd_seq_id);
AXIS2_EXTERN axis2_transport_out_desc_t* AXIS2_CALL
sandesha2_utils_get_transport_out(
@@ -142,20 +142,20 @@
const axutil_env_t *env,
axis2_char_t *dbname);
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+/*AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_get_svr_side_incoming_seq_id(
const axutil_env_t *env,
- axis2_char_t *incoming_seq_id);
+ axis2_char_t *incoming_seq_id);*/
/**
* Caller must free the returned string.
* @param to
* @param seq_key
*
- * @return internal_seq_id
+ * @return rms_internal_seq_id
*/
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_internal_seq_id(
+sandesha2_utils_get_client_rms_internal_sequence_id(
const axutil_env_t *env,
axis2_char_t *to,
axis2_char_t *seq_key);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/client/client.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/client/client.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/client/client.c Sat May 31 02:45:25 2008
@@ -213,7 +213,7 @@
AXIS2_PARAM_CHECK(env->error, seq_key, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
+ internal_seq_id = sandesha2_utils_get_client_rms_internal_sequence_id(env, to, seq_key);
return (sandesha2_seq_report_t *)
sandesha2_client_get_outgoing_seq_report_with_internal_seq_id(env,
internal_seq_id, conf_ctx);
@@ -251,8 +251,7 @@
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
sandesha2_seq_report_set_internal_seq_id(seq_report, env, internal_seq_id);
create_seq_find_bean = sandesha2_create_seq_bean_create(env);
- sandesha2_create_seq_bean_set_internal_seq_id(create_seq_find_bean,
- env, internal_seq_id);
+ sandesha2_create_seq_bean_set_rms_internal_sequence_id(create_seq_find_bean, env, internal_seq_id);
create_seq_bean = sandesha2_create_seq_mgr_find_unique(create_seq_mgr, env,
create_seq_find_bean);
/* if data is not available seq has to be terminated or timedOut.*/
@@ -306,7 +305,7 @@
sandesha2_storage_mgr_free(storage_mgr, env);
return seq_report;
}
- out_seq_id = sandesha2_create_seq_bean_get_seq_id(create_seq_bean, env);
+ out_seq_id = sandesha2_create_seq_bean_get_rms_sequence_id(create_seq_bean, env);
if(!out_seq_id)
{
sandesha2_seq_report_set_internal_seq_id(seq_report, env,
@@ -419,7 +418,7 @@
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
if(internal_seq_find_bean)
sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
if (seq_prop_mgr)
{
collection = sandesha2_seq_property_mgr_find(seq_prop_mgr, env,
@@ -1011,7 +1010,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ internal_seq_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
if(!seq_id_bean)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_ID_BEAN_NOT_SET,
@@ -1196,7 +1195,7 @@
axis2_char_t *to,
axis2_char_t *seq_key)
{
- return (axis2_char_t *) sandesha2_utils_get_internal_seq_id(env, to, seq_key);
+ return (axis2_char_t *) sandesha2_utils_get_client_rms_internal_sequence_id(env, to, seq_key);
}
static axiom_soap_envelope_t *
@@ -1242,7 +1241,7 @@
property = (axutil_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
seq_key = axutil_property_get_value(property, env);
- internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
+ internal_seq_id = sandesha2_utils_get_client_rms_internal_sequence_id(env, to, seq_key);
seq_report = sandesha2_client_get_outgoing_seq_report_with_internal_seq_id(
env, internal_seq_id, conf_ctx);
@@ -1264,7 +1263,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ internal_seq_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
if(!seq_id_bean)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_ID_BEAN_NOT_SET,
@@ -1354,7 +1353,7 @@
sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env,
internal_seq_id);
sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
internal_seq_bean = sandesha2_seq_property_mgr_find_unique(seq_prop_mgr,
env, internal_seq_find_bean);
if(!internal_seq_bean)
@@ -1399,7 +1398,7 @@
sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env,
internal_seq_id);
sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
internal_seq_bean = sandesha2_seq_property_mgr_find_unique(seq_prop_mgr,
env, internal_seq_find_bean);
if(!internal_seq_bean)
@@ -1441,7 +1440,7 @@
sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env,
internal_seq_id);
sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
internal_seq_bean = sandesha2_seq_property_mgr_find_unique(seq_prop_mgr,
env, internal_seq_find_bean);
if(!internal_seq_bean)
@@ -1479,7 +1478,7 @@
sandesha2_seq_property_bean_set_value(internal_seq_find_bean, env,
internal_seq_id);
sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
internal_seq_bean = sandesha2_seq_property_mgr_find_UNIQUE(seq_prop_mgr,
env, internal_seq_find_bean);
if(!internal_seq_bean)
@@ -1561,7 +1560,7 @@
axis2_char_t *to_epr,
axis2_char_t *seq_key)
{
- return sandesha2_utils_get_internal_seq_id(env, to_epr, seq_key);
+ return sandesha2_utils_get_client_rms_internal_sequence_id(env, to_epr, seq_key);
}
static sandesha2_seq_report_t *
@@ -1657,7 +1656,7 @@
SANDESHA2_CLIENT_SEQ_KEY);
if(property)
seq_key = axutil_property_get_value(property, env);
- internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
+ internal_seq_id = sandesha2_utils_get_client_rms_internal_sequence_id(env, to, seq_key);
seq_report = sandesha2_client_get_outgoing_seq_report_with_internal_seq_id(
env, internal_seq_id, conf_ctx);
@@ -1696,7 +1695,7 @@
}
if(seq_prop_mgr)
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ internal_seq_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
if(!seq_id_bean)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_ID_BEAN_NOT_SET,
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c Sat May 31 02:45:25 2008
@@ -111,8 +111,7 @@
axutil_property_t *property = NULL;
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Start:sandesha2_in_handler_invoke");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2] Start:sandesha2_in_handler_invoke");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(!conf_ctx)
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/ack_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/ack_msg_processor.c Sat May 31 02:45:25 2008
@@ -230,7 +230,7 @@
}
int_seq_id = sandesha2_utils_get_seq_property(env, out_seq_id,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, seq_prop_mgr);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, seq_prop_mgr);
fault_msg_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env, rm_msg_ctx, out_seq_id,
seq_prop_mgr, create_seq_mgr, next_msg_mgr);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c Sat May 31 02:45:25 2008
@@ -221,7 +221,7 @@
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
sandesha2_seq_t *seq = NULL;
- axis2_char_t *str_seq_id = NULL;
+ axis2_char_t *rmd_sequence_id = NULL;
sandesha2_seq_property_bean_t *msgs_bean = NULL;
long msg_no = 0;
long highest_in_msg_no = 0;
@@ -342,8 +342,8 @@
seq = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
sandesha2_seq_set_must_understand(seq, env, AXIS2_FALSE);
- str_seq_id = sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(seq, env), env);
- fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,rm_msg_ctx, str_seq_id, seq_prop_mgr,
+ rmd_sequence_id = sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(seq, env), env);
+ fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,rm_msg_ctx, rmd_sequence_id, seq_prop_mgr,
create_seq_mgr, next_msg_mgr);
if(fault_ctx)
{
@@ -407,7 +407,7 @@
}
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
- fault_ctx = sandesha2_fault_mgr_check_for_seq_closed(env, rm_msg_ctx, str_seq_id, seq_prop_mgr);
+ fault_ctx = sandesha2_fault_mgr_check_for_seq_closed(env, rm_msg_ctx, rmd_sequence_id, seq_prop_mgr);
if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -458,8 +458,8 @@
return AXIS2_SUCCESS;
}
- sandesha2_seq_mgr_update_last_activated_time(env, str_seq_id, seq_prop_mgr);
- msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
+ sandesha2_seq_mgr_update_last_activated_time(env, rmd_sequence_id, seq_prop_mgr);
+ msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
msg_no = sandesha2_msg_number_get_msg_num(sandesha2_seq_get_msg_num(seq, env), env);
@@ -494,9 +494,9 @@
return AXIS2_FAILURE;
}
- highest_in_msg_no_str = sandesha2_utils_get_seq_property(env, str_seq_id,
+ highest_in_msg_no_str = sandesha2_utils_get_seq_property(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER, seq_prop_mgr);
- highest_in_msg_key_str = sandesha2_utils_get_seq_property(env, str_seq_id,
+ highest_in_msg_key_str = sandesha2_utils_get_seq_property(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, seq_prop_mgr);
if(!highest_in_msg_key_str)
{
@@ -522,13 +522,13 @@
highest_in_msg_no = msg_no;
msg_id = axis2_msg_ctx_get_msg_id(msg_ctx, env);
highest_msg_no_bean = sandesha2_seq_property_bean_create_with_data(env,
- str_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER,
+ rmd_sequence_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER,
msg_num_str);
highest_msg_key_bean = sandesha2_seq_property_bean_create_with_data(env,
- str_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY,
+ rmd_sequence_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY,
highest_in_msg_key_str);
highest_msg_id_bean = sandesha2_seq_property_bean_create_with_data(env,
- str_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_ID,
+ rmd_sequence_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_ID,
(axis2_char_t *)msg_id);
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
highest_in_msg_key_str, conf_ctx, -1);
@@ -597,7 +597,7 @@
else
{
msgs_bean = sandesha2_seq_property_bean_create(env);
- sandesha2_seq_property_bean_set_seq_id(msgs_bean, env, str_seq_id);
+ sandesha2_seq_property_bean_set_seq_id(msgs_bean, env, rmd_sequence_id);
sandesha2_seq_property_bean_set_name(msgs_bean, env,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
sandesha2_seq_property_bean_set_value(msgs_bean, env, msgs_str);
@@ -627,11 +627,11 @@
}
}
- next_msg_bean = sandesha2_next_msg_mgr_retrieve(next_msg_mgr, env, str_seq_id);
+ next_msg_bean = sandesha2_next_msg_mgr_retrieve(next_msg_mgr, env, rmd_sequence_id);
if(!next_msg_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Sequence with seq_id:%s does not exist", str_seq_id);
+ "[sandesha2]Sequence with seq_id:%s does not exist", rmd_sequence_id);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST, AXIS2_FAILURE);
if(seq_prop_mgr)
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
@@ -660,7 +660,7 @@
sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
seq_prop_bean = sandesha2_seq_property_bean_create_with_data(
- env, str_seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID, msg_id);
+ env, rmd_sequence_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID, msg_id);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, seq_prop_bean);
}
}
@@ -753,10 +753,10 @@
}
/* Adding current seq to the incoming seq List */
if(!sandesha2_utils_array_list_contains(env,
- incoming_seq_list, str_seq_id))
+ incoming_seq_list, rmd_sequence_id))
{
axis2_char_t *str_seq_list = NULL;
- axutil_array_list_add(incoming_seq_list, env, str_seq_id);
+ axutil_array_list_add(incoming_seq_list, env, rmd_sequence_id);
str_seq_list = sandesha2_utils_array_list_to_string(env,
incoming_seq_list, SANDESHA2_ARRAY_LIST_STRING);
/* saving the property. */
@@ -772,7 +772,7 @@
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, str_key,
msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
- msg_no, str_seq_id, AXIS2_FALSE);
+ msg_no, rmd_sequence_id, AXIS2_FALSE);
if(str_key)
AXIS2_FREE(env->allocator, str_key);
sandesha2_invoker_mgr_insert(invoker_mgr, env, invoker_bean);
@@ -783,14 +783,14 @@
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
/* Start the invoker if stopped */
- sandesha2_utils_start_invoker_for_seq(env, conf_ctx, str_seq_id);
+ sandesha2_utils_start_invoker_for_seq(env, conf_ctx, rmd_sequence_id);
}
- rm_version = sandesha2_utils_get_rm_version(env, str_seq_id, seq_prop_mgr);
+ rm_version = sandesha2_utils_get_rm_version(env, rmd_sequence_id, seq_prop_mgr);
if(!rm_version)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Unable to find RM spec version for seq_id %s", str_seq_id);
+ "[sandesha2]Unable to find RM spec version for seq_id %s", rmd_sequence_id);
if(seq_prop_mgr)
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
if(create_seq_mgr)
@@ -818,7 +818,7 @@
}
op = axis2_op_ctx_get_op(op_ctx, env);
- acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
+ acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
if(acks_to_bean)
acks_to_str = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
@@ -850,7 +850,7 @@
reply_to_addr)) || AXIS2_MEP_CONSTANT_IN_ONLY == mep;
if(!reply_to_epr)
{
- to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
+ to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(to_bean)
reply_to_addr = sandesha2_seq_property_bean_get_value(to_bean, env);
@@ -916,7 +916,7 @@
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_sender_mgr_t *sender_mgr = NULL;
axis2_bool_t is_svr_side = AXIS2_FALSE;
- axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *rms_internal_sequence_id = NULL;
axis2_char_t *out_seq_id = NULL;
axis2_char_t *storage_key = NULL;
axis2_bool_t last_msg = AXIS2_FALSE;
@@ -926,6 +926,7 @@
long msg_number = -1;
axis2_char_t *dummy_msg_str = NULL;
axis2_bool_t dummy_msg = AXIS2_FALSE;
+ axis2_char_t *rmd_sequence_id = NULL;
/*axis2_bool_t seq_timed_out = AXIS2_FALSE;*/
@@ -935,7 +936,7 @@
axis2_char_t *spec_ver = NULL;
axiom_soap_envelope_t *soap_env = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
- sandesha2_seq_property_bean_t *out_seq_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
axis2_char_t *op_name = NULL;
axis2_char_t *to_addr = NULL;
axis2_op_ctx_t *op_ctx = NULL;
@@ -944,6 +945,7 @@
axis2_char_t *dbname = NULL;
sandesha2_seq_property_bean_t *seq_timeout_bean = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_app_msg_processor_process_out_msg");
@@ -981,13 +983,21 @@
"[sandesha2]To epr is not set - a requirement in sandesha client side");
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
return AXIS2_FAILURE;
}
@@ -1001,8 +1011,6 @@
{
sandesha2_seq_t *req_seq = NULL;
long request_msg_no = -1;
- axis2_char_t *incoming_seq_id = NULL;
- sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
const axis2_relates_to_t *relates_to = NULL;
axis2_char_t *relates_to_value = NULL;
axis2_char_t *last_req_id = NULL;
@@ -1011,53 +1019,73 @@
req_seq = sandesha2_msg_ctx_get_sequence(req_rm_msg_ctx, env);
if(!req_seq)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Sequence is NULL");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST,
- AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Sequence is NULL");
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST, AXIS2_FAILURE);
if(req_rm_msg_ctx)
+ {
sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
+
return AXIS2_FAILURE;
}
- incoming_seq_id = sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(req_seq,
+ rmd_sequence_id = sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(req_seq,
env), env);
- if(!incoming_seq_id)
+ if(!rmd_sequence_id)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Sequence ID is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Sequence ID is NULL");
if(req_rm_msg_ctx)
+ {
sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
+
return AXIS2_FAILURE;
}
request_msg_no = sandesha2_msg_number_get_msg_num(sandesha2_seq_get_msg_num(req_seq, env), env);
- internal_seq_id = sandesha2_utils_get_outgoing_internal_seq_id(env, incoming_seq_id);
+ rms_internal_sequence_id = sandesha2_utils_get_rms_internal_sequence_id(env, rmd_sequence_id);
/* Deciding whether this is the last message. We assume it is if it
* relates to a message which arrived with the LastMessage flag on it.
*/
- last_req_id = sandesha2_utils_get_seq_property(env, incoming_seq_id,
+ last_req_id = sandesha2_utils_get_seq_property(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID, seq_prop_mgr);
+
relates_to = axis2_msg_ctx_get_relates_to(msg_ctx, env);
relates_to_value = (axis2_char_t *)axis2_relates_to_get_value(relates_to, env);
- if(relates_to && last_req_id && 0 == axutil_strcmp(last_req_id, relates_to_value))
+ if(relates_to && last_req_id && !axutil_strcmp(last_req_id, relates_to_value))
{
last_msg = AXIS2_TRUE;
}
@@ -1066,10 +1094,6 @@
{
AXIS2_FREE(env->allocator, last_req_id);
}
- if(req_rm_msg_ctx)
- {
- sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
- }
}
else /* Client side */
{
@@ -1078,51 +1102,55 @@
axis2_char_t *last_app_msg = NULL;
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- property = axis2_msg_ctx_get_property(msg_ctx, env,
- SANDESHA2_CLIENT_SEQ_KEY);
+ property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY);
if(property)
+ {
seq_key = axutil_property_get_value(property, env);
+ }
+
if(!seq_key)
{
seq_key = axutil_uuid_gen(env);
property = axutil_property_create_with_args(env, 0, 0, 0, seq_key);
- axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
- property);
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY, property);
}
- internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
+
+ rms_internal_sequence_id = sandesha2_utils_get_client_rms_internal_sequence_id(env, to,
+ seq_key);
property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_LAST_MESSAGE);
if(property)
{
last_app_msg = axutil_property_get_value(property, env);
}
- if(last_app_msg && 0 == axutil_strcmp(last_app_msg, AXIS2_VALUE_TRUE))
+ if(last_app_msg && !axutil_strcmp(last_app_msg, AXIS2_VALUE_TRUE))
{
axis2_char_t *spec_ver = NULL;
- spec_ver = sandesha2_utils_get_rm_version(env, internal_seq_id,
- seq_prop_mgr);
+ spec_ver = sandesha2_utils_get_rm_version(env, rms_internal_sequence_id, seq_prop_mgr);
if(!spec_ver)
{
axutil_property_t *spec_ver_prop = NULL;
spec_ver_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
- spec_ver = axutil_strdup(env, axutil_property_get_value(
- spec_ver_prop, env));
+
+ spec_ver = axutil_strdup(env, axutil_property_get_value(spec_ver_prop, env));
}
- if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
- (env, spec_ver))
+ if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd(env, spec_ver))
{
last_msg = AXIS2_TRUE;
}
if(spec_ver)
+ {
AXIS2_FREE(env->allocator, spec_ver);
+ }
}
}
- seq_timeout_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ seq_timeout_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_sequence_id,
SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT);
+
if(seq_timeout_bean && sandesha2_seq_property_bean_get_value(seq_timeout_bean, env)
- && 0 == axutil_strcmp(AXIS2_VALUE_TRUE, sandesha2_seq_property_bean_get_value(seq_timeout_bean,
+ && !axutil_strcmp(AXIS2_VALUE_TRUE, sandesha2_seq_property_bean_get_value(seq_timeout_bean,
env)))
{
axis2_char_t *temp_int_seq_id = sandesha2_seq_property_bean_get_seq_id(seq_timeout_bean, env);
@@ -1132,16 +1160,30 @@
temp_int_seq_id);
sandesha2_seq_property_mgr_remove(seq_prop_mgr, env, temp_int_seq_id, temp_name);
- if(internal_seq_id)
- AXIS2_FREE(env->allocator, internal_seq_id);
+ if(req_rm_msg_ctx)
+ {
+ sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
+ }
+ if(rms_internal_sequence_id)
+ {
+ AXIS2_FREE(env->allocator, rms_internal_sequence_id);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
/* We should halt the system here. Otherwise application client keep on sending messages. */
exit(AXIS2_FAILURE);
@@ -1153,51 +1195,86 @@
msg_num_lng = *(long*)(axutil_property_get_value(property, env));
if(msg_num_lng <= 0)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Invalid message number");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
- AXIS2_FAILURE);
- if(internal_seq_id)
- AXIS2_FREE(env->allocator, internal_seq_id);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid message number");
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM, AXIS2_FAILURE);
+
+ if(req_rm_msg_ctx)
+ {
+ sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
+ }
+ if(rms_internal_sequence_id)
+ {
+ AXIS2_FREE(env->allocator, rms_internal_sequence_id);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
+
return AXIS2_FAILURE;
}
}
- system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(env, internal_seq_id, seq_prop_mgr);
+ system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(env, rms_internal_sequence_id, seq_prop_mgr);
if(msg_num_lng > 0 && msg_num_lng <= system_msg_num)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2] Invalid Message Number");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
- AXIS2_FAILURE);
- if(internal_seq_id)
- AXIS2_FREE(env->allocator, internal_seq_id);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid Message Number");
+
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM, AXIS2_FAILURE);
+
+ if(req_rm_msg_ctx)
+ {
+ sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
+ }
+ if(rms_internal_sequence_id)
+ {
+ AXIS2_FREE(env->allocator, rms_internal_sequence_id);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
+
return AXIS2_FAILURE;
}
if(msg_num_lng > 0)
+ {
msg_number = msg_num_lng;
+ }
else if(system_msg_num > 0)
+ {
msg_number = system_msg_num + 1;
+ }
else
+ {
msg_number = 1;
+ }
/* A dummy message is a one which will not be processed as a actual
* application message. The RM handlers will simply let these go.
@@ -1215,11 +1292,11 @@
if(!dummy_msg)
{
- sandesha2_app_msg_processor_set_next_msg_no(env, internal_seq_id, msg_number, seq_prop_mgr);
+ sandesha2_app_msg_processor_set_next_msg_no(env, rms_internal_sequence_id, msg_number, seq_prop_mgr);
}
sprintf(msg_number_str, "%ld", msg_number);
- res_highest_msg_bean = sandesha2_seq_property_bean_create_with_data(env, internal_seq_id,
+ res_highest_msg_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_NUMBER, msg_number_str);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, res_highest_msg_bean);
@@ -1234,8 +1311,9 @@
sandesha2_seq_property_bean_t *response_relates_to_bean = NULL;
const axis2_char_t *relates_to_value = axis2_relates_to_get_value(relates_to, env);
- response_relates_to_bean = sandesha2_seq_property_bean_create_with_data(env, internal_seq_id,
- SANDESHA2_SEQ_PROP_HIGHEST_OUT_RELATES_TO, (axis2_char_t *) relates_to_value);
+ response_relates_to_bean = sandesha2_seq_property_bean_create_with_data(env,
+ rms_internal_sequence_id, SANDESHA2_SEQ_PROP_HIGHEST_OUT_RELATES_TO,
+ (axis2_char_t *) relates_to_value);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, response_relates_to_bean);
}
@@ -1244,83 +1322,81 @@
if(last_msg)
{
- sandesha2_seq_property_bean_t *res_highest_msg_key_bean = NULL;
sandesha2_seq_property_bean_t *res_last_msg_key_bean = NULL;
- res_highest_msg_key_bean = sandesha2_seq_property_bean_create_with_data(env, internal_seq_id,
- SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_KEY, storage_key);
-
- res_last_msg_key_bean = sandesha2_seq_property_bean_create_with_data(env, internal_seq_id,
- SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, msg_number_str);
+ res_last_msg_key_bean = sandesha2_seq_property_bean_create_with_data(env,
+ rms_internal_sequence_id, SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, msg_number_str);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, res_highest_msg_key_bean);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, res_last_msg_key_bean);
}
- out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
+ rms_internal_sequence_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
if(is_svr_side)
{
- axis2_char_t *incoming_seq_id = NULL;
- sandesha2_seq_property_bean_t *incoming_to_bean = NULL;
- sandesha2_seq_t *seq = NULL;
- axis2_char_t *req_seq_id = NULL;
+ sandesha2_seq_property_bean_t *rmd_to_bean = NULL;
sandesha2_seq_property_bean_t *spec_ver_bean = NULL;
- sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
- incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(env,
- internal_seq_id);
- incoming_to_bean = sandesha2_seq_property_mgr_retrieve(
- seq_prop_mgr, env, incoming_seq_id,
- SANDESHA2_SEQ_PROP_TO_EPR);
- if(incoming_to_bean)
+ rmd_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rmd_sequence_id,
+ SANDESHA2_SEQ_PROP_TO_EPR);
+ if(rmd_to_bean)
{
- axis2_char_t *incoming_to = NULL;
+ axis2_char_t *rmd_to = NULL;
axis2_char_t *value = NULL;
- value = sandesha2_seq_property_bean_get_value(incoming_to_bean, env);
- 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);
+ value = sandesha2_seq_property_bean_get_value(rmd_to_bean, env);
+ rmd_to = axutil_strdup(env, value);
+ property = axutil_property_create_with_args(env, 0, 0, 0, rmd_to);
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_SEQ_PROP_TO_EPR, property);
}
- req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
- seq = sandesha2_msg_ctx_get_sequence(req_rm_msg_ctx, env);
-
- req_seq_id = sandesha2_identifier_get_identifier(
- sandesha2_seq_get_identifier(seq, env), env);
- spec_ver_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
+ spec_ver_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rmd_sequence_id,
+ SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
+
if(req_rm_msg_ctx)
+ {
sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
+ }
if(!spec_ver_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[sandesha2] Invalid spec version");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VERSION,
AXIS2_FAILURE);
- if(internal_seq_id)
- AXIS2_FREE(env->allocator, internal_seq_id);
+ if(rms_internal_sequence_id)
+ {
+ AXIS2_FREE(env->allocator, rms_internal_sequence_id);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
+
return AXIS2_FAILURE;
}
+
spec_ver = sandesha2_seq_property_bean_get_value(spec_ver_bean, env);
}
else
{
- property = axis2_msg_ctx_get_property(msg_ctx, env,
- SANDESHA2_CLIENT_RM_SPEC_VERSION);
+ property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(property)
+ {
spec_ver = axutil_property_get_value(property, env);
+ }
}
if(!spec_ver)
@@ -1332,19 +1408,12 @@
if(1 == msg_number)
{
- if(!out_seq_bean)
+ if(!rms_sequence_bean)
{
send_create_seq = AXIS2_TRUE;
}
- if(is_svr_side)
- {
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Starting the server sequence with internal sequence id %s", internal_seq_id);
- sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx, internal_seq_id, spec_ver,
- seq_prop_mgr, AXIS2_TRUE);
- }
- else
+ if(!is_svr_side)
{
axutil_property_t *property = NULL;
axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env);
@@ -1353,19 +1422,23 @@
property = axis2_ctx_get_property(ctx, env, SANDESHA2_MSG_CTX_MAP);
if(!property)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2]msg_ctx_map not found in the conf_ctx");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]msg_ctx_map not found in the conf_ctx");
+
msg_ctx_map = axutil_hash_make(env);
- property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- AXIS2_TRUE, axutil_hash_free_void_arg, msg_ctx_map);
- axis2_ctx_set_property(ctx, env, SANDESHA2_MSG_CTX_MAP,
- property);
- }
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Starting the client "\
- "sequence with internal sequence id %s", internal_seq_id);
- sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx, internal_seq_id,
- spec_ver, seq_prop_mgr, AXIS2_FALSE);
+ property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, AXIS2_TRUE,
+ axutil_hash_free_void_arg, msg_ctx_map);
+
+ axis2_ctx_set_property(ctx, env, SANDESHA2_MSG_CTX_MAP, property);
+ }
}
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Starting the rms sequence with rms rms internal sequence id %s",
+ rms_internal_sequence_id);
+
+ sandesha2_seq_mgr_setup_new_rms_sequence(env, msg_ctx, rms_internal_sequence_id, spec_ver,
+ seq_prop_mgr);
}
if(send_create_seq)
@@ -1374,10 +1447,10 @@
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
- create_seq_added = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ create_seq_added = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_sequence_id,
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
- addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
+ addr_ns_uri = sandesha2_utils_get_seq_property(env, rms_internal_sequence_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, seq_prop_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
@@ -1391,9 +1464,10 @@
axis2_char_t *acks_to = NULL;
create_seq_added = sandesha2_seq_property_bean_create_with_data(env,
- internal_seq_id, SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT, AXIS2_VALUE_TRUE);
+ rms_internal_sequence_id, SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, create_seq_added);
+
if(axis2_msg_ctx_get_svc_ctx(msg_ctx, env))
{
property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_ACKS_TO);
@@ -1417,13 +1491,10 @@
if(!acks_to && is_svr_side)
{
- axis2_char_t *incoming_seq_id = NULL;
-
sandesha2_seq_property_bean_t *reply_to_epr_bean = NULL;
- incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(env, internal_seq_id);
reply_to_epr_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- incoming_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
+ rmd_sequence_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
if(reply_to_epr_bean)
{
axis2_endpoint_ref_t *acks_epr = NULL;
@@ -1440,10 +1511,11 @@
* else if()
* TODO handle acks_to == anon_uri case
*/
- sandesha2_app_msg_processor_send_create_seq_msg(env, rm_msg_ctx, internal_seq_id,
+ sandesha2_app_msg_processor_send_create_seq_msg(env, rm_msg_ctx, rms_internal_sequence_id,
acks_to, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
}
}
+
soap_env = sandesha2_msg_ctx_get_soap_envelope(rm_msg_ctx, env);
if(!soap_env)
{
@@ -1451,6 +1523,7 @@
AXIOM_SOAP12);
sandesha2_msg_ctx_set_soap_envelope(rm_msg_ctx, env, soap_env);
}
+
if(!sandesha2_msg_ctx_get_msg_id(rm_msg_ctx, env))
{
axis2_char_t *msg_id = NULL;
@@ -1460,7 +1533,7 @@
if(is_svr_side)
{
- /* let the request end with 202 if a ack has not been
+ /* Let the request end with 202 if a ack has not been
* written in the incoming thread
*/
axis2_ctx_t *ctx = NULL;
@@ -1469,8 +1542,11 @@
ctx = axis2_op_ctx_get_base(op_ctx, env);
property = axis2_ctx_get_property(ctx, env, SANDESHA2_ACK_WRITTEN);
if(property)
+ {
written = axutil_property_get_value(property, env);
- if(!written || 0 != axutil_strcmp(written, AXIS2_VALUE_TRUE))
+ }
+
+ if(!written || axutil_strcmp(written, AXIS2_VALUE_TRUE))
{
if (op_ctx)
{
@@ -1478,12 +1554,20 @@
}
}
}
+
op_name = axutil_qname_get_localpart(axis2_op_get_qname( axis2_op_ctx_get_op(
axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env);
+
if (to_epr)
+ {
to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
+ }
+
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))
{
axutil_string_t *soap_action = axutil_string_create(env, to_addr);
@@ -1492,23 +1576,33 @@
if(!dummy_msg)
{
- status = sandesha2_app_msg_processor_send_app_msg(env, rm_msg_ctx, internal_seq_id,
+ status = sandesha2_app_msg_processor_send_app_msg(env, rm_msg_ctx, rms_internal_sequence_id,
out_seq_id, msg_number, storage_key, storage_mgr, create_seq_mgr, seq_prop_mgr,
sender_mgr);
}
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
- if(internal_seq_id)
- AXIS2_FREE(env->allocator, internal_seq_id);
+ if(rms_internal_sequence_id)
+ {
+ AXIS2_FREE(env->allocator, rms_internal_sequence_id);
+ }
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(sender_mgr)
+ {
sandesha2_sender_mgr_free(sender_mgr, env);
+ }
if(storage_mgr)
+ {
sandesha2_storage_mgr_free(storage_mgr, env);
+ }
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit:sandesha2_app_msg_processor_process_out_msg");
@@ -1678,7 +1772,7 @@
{
axis2_msg_ctx_t *msg_ctx = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
- sandesha2_seq_property_bean_t *out_seq_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
sandesha2_seq_offer_t *seq_offer = NULL;
axis2_msg_ctx_t *create_seq_msg = NULL;
@@ -1797,12 +1891,12 @@
axis2_engine_free(engine, env);
}
- out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
create_seq_op = axis2_msg_ctx_get_op(create_seq_msg, env);
transport_out = axis2_msg_ctx_get_transport_out_desc(create_seq_msg, env);
transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
- while(!out_seq_bean)
+ while(!rms_sequence_bean)
{
if(transport_sender)
{
@@ -1822,8 +1916,8 @@
break;
}
- out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
}
create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg, env);
@@ -2084,7 +2178,7 @@
axis2_msg_ctx_t *app_msg_ctx = NULL;
sandesha2_seq_property_bean_t *to_bean = NULL;
sandesha2_seq_property_bean_t *reply_to_bean = NULL;
- sandesha2_seq_property_bean_t *out_seq_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
const axis2_char_t *to_addr = NULL;
@@ -2130,13 +2224,13 @@
reply_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
- out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
- while(!out_seq_bean)
+ while(!rms_sequence_bean)
{
- out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
AXIS2_SLEEP(1);
}
@@ -2258,13 +2352,13 @@
}
}
- if(!out_seq_bean || !sandesha2_seq_property_bean_get_value(out_seq_bean, env))
+ if(!rms_sequence_bean || !sandesha2_seq_property_bean_get_value(rms_sequence_bean, env))
{
str_identifier = SANDESHA2_TEMP_SEQ_ID;
}
else
{
- str_identifier = sandesha2_seq_property_bean_get_value(out_seq_bean, env);
+ str_identifier = sandesha2_seq_property_bean_get_value(rms_sequence_bean, env);
}
identifier = sandesha2_identifier_create(env, rm_ns_val);
@@ -2365,7 +2459,7 @@
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, internal_seq_bean);
}
- if(!out_seq_bean || !sandesha2_seq_property_bean_get_value(out_seq_bean, env))
+ if(!rms_sequence_bean || !sandesha2_seq_property_bean_get_value(rms_sequence_bean, env))
{
sandesha2_sender_bean_set_send(app_msg_entry, env, AXIS2_FALSE);
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c Sat May 31 02:45:25 2008
@@ -62,7 +62,6 @@
#define SANDESHA2_INTF_TO_IMPL(msg_proc) \
((sandesha2_create_seq_msg_processor_impl_t *)(msg_proc))
-/***************************** Function headers *******************************/
static axis2_status_t AXIS2_CALL
sandesha2_create_seq_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
@@ -95,8 +94,6 @@
sandesha2_msg_processor_t *msg_processor,
const axutil_env_t *env);
-/***************************** End of function headers ************************/
-
AXIS2_EXTERN sandesha2_msg_processor_t* AXIS2_CALL
sandesha2_create_seq_msg_processor_create(
const axutil_env_t *env)
@@ -165,7 +162,7 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_next_msg_mgr_t *next_msg_mgr = NULL;
axutil_property_t *property = NULL;
- axis2_char_t *new_seq_id = NULL;
+ axis2_char_t *rmd_sequence_id = NULL;
sandesha2_msg_ctx_t *create_seq_res_msg = NULL;
sandesha2_create_seq_res_t *create_seq_res_part = NULL;
sandesha2_seq_offer_t *seq_offer = NULL;
@@ -228,10 +225,11 @@
}
out_msg_ctx = sandesha2_utils_create_out_msg_ctx(env, msg_ctx);
- new_seq_id = sandesha2_seq_mgr_setup_new_seq(env, rm_msg_ctx, seq_prop_mgr, next_msg_mgr);
+ rmd_sequence_id = sandesha2_seq_mgr_setup_new_rmd_sequence(env, rm_msg_ctx, seq_prop_mgr,
+ next_msg_mgr);
create_seq_res_msg = sandesha2_msg_creator_create_create_seq_res_msg(env,
- rm_msg_ctx, out_msg_ctx, new_seq_id, seq_prop_mgr);
+ rm_msg_ctx, out_msg_ctx, rmd_sequence_id, seq_prop_mgr);
axis2_msg_ctx_set_flow(out_msg_ctx, env, AXIS2_OUT_FLOW);
if(!create_seq_res_msg)
{
@@ -256,7 +254,7 @@
if(seq_offer)
{
sandesha2_accept_t *accept = NULL;
- axis2_char_t *offer_seq_id = NULL;
+ axis2_char_t *rms_sequence_id = NULL;
axis2_bool_t offer_accepted = AXIS2_FALSE;
if(create_seq_res_part)
@@ -284,54 +282,56 @@
return AXIS2_FAILURE;
}
- offer_seq_id = sandesha2_identifier_get_identifier(sandesha2_seq_offer_get_identifier(
+ rms_sequence_id = sandesha2_identifier_get_identifier(sandesha2_seq_offer_get_identifier(
seq_offer, env), env);
/* Check whether offered sequence id is valid or create sequence bean already created */
- offer_accepted = sandesha2_create_seq_msg_processor_offer_accepted(env, offer_seq_id,
+ offer_accepted = sandesha2_create_seq_msg_processor_offer_accepted(env, rms_sequence_id,
rm_msg_ctx, create_seq_mgr);
if(offer_accepted)
{
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
- axis2_char_t *internal_seq_id = NULL;
- sandesha2_seq_property_bean_t *out_seq_bean = NULL;
- sandesha2_seq_property_bean_t *internal_seq_bean = NULL;
+ axis2_char_t *rms_internal_seq_id = NULL;
+ sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_internal_sequence_bean = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Offer Accepted");
/*
* If previously a create sequence message has arrived with an offer then there is
* a create sequence bean already created in the database. Free it. Also free
- * internal_seq_bean, and out_seq_bean.
+ * rms_internal_sequence_bean, and rms_sequence_bean.
*/
- sandesha2_create_seq_msg_processor_create_seq_msg_already_received(env, offer_seq_id,
+ sandesha2_create_seq_msg_processor_create_seq_msg_already_received(env, rms_sequence_id,
rm_msg_ctx, create_seq_mgr, seq_prop_mgr);
create_seq_bean = sandesha2_create_seq_bean_create(env);
- sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env, offer_seq_id);
- internal_seq_id = sandesha2_utils_get_outgoing_internal_seq_id(env, new_seq_id);
- sandesha2_create_seq_bean_set_internal_seq_id(create_seq_bean, env, internal_seq_id);
+ sandesha2_create_seq_bean_set_rms_sequence_id(create_seq_bean, env, rms_sequence_id);
+ rms_internal_seq_id = sandesha2_utils_get_rms_internal_sequence_id(env, rmd_sequence_id);
+ sandesha2_create_seq_bean_set_rms_internal_sequence_id(create_seq_bean, env,
+ rms_internal_seq_id);
+
sandesha2_create_seq_bean_set_create_seq_msg_id(create_seq_bean, env,
axutil_uuid_gen(env));
sandesha2_create_seq_mgr_insert(create_seq_mgr, env, create_seq_bean);
- out_seq_bean = sandesha2_seq_property_bean_create(env);
- sandesha2_seq_property_bean_set_name(out_seq_bean, env, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_bean_create(env);
+ sandesha2_seq_property_bean_set_name(rms_sequence_bean, env, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
- sandesha2_seq_property_bean_set_seq_id(out_seq_bean, env, internal_seq_id);
- sandesha2_seq_property_bean_set_value(out_seq_bean, env, offer_seq_id);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] new_seq_id:%s", new_seq_id);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, out_seq_bean);
-
- internal_seq_bean = sandesha2_seq_property_bean_create(env);
- sandesha2_seq_property_bean_set_name(internal_seq_bean, env,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
-
- sandesha2_seq_property_bean_set_seq_id(internal_seq_bean, env, offer_seq_id);
- sandesha2_seq_property_bean_set_value(internal_seq_bean, env, internal_seq_id);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, internal_seq_bean);
+ sandesha2_seq_property_bean_set_seq_id(rms_sequence_bean, env, rms_internal_seq_id);
+ sandesha2_seq_property_bean_set_value(rms_sequence_bean, env, rms_sequence_id);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] rmd_sequence_id:%s", rmd_sequence_id);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rms_sequence_bean);
+
+ rms_internal_sequence_bean = sandesha2_seq_property_bean_create(env);
+ sandesha2_seq_property_bean_set_name(rms_internal_sequence_bean, env,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
+
+ sandesha2_seq_property_bean_set_seq_id(rms_internal_sequence_bean, env, rms_sequence_id);
+ sandesha2_seq_property_bean_set_value(rms_internal_sequence_bean, env, rms_internal_seq_id);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rms_internal_sequence_bean);
}
else
{
@@ -360,14 +360,14 @@
return AXIS2_FAILURE;
}
- acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, new_seq_id,
+ acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR, (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to, env));
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
- sandesha2_seq_mgr_update_last_activated_time(env, new_seq_id, seq_prop_mgr);
+ sandesha2_seq_mgr_update_last_activated_time(env, rmd_sequence_id, seq_prop_mgr);
engine = axis2_engine_create(env, conf_ctx);
@@ -379,7 +379,7 @@
axis2_engine_free(engine, env);
}
- to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, new_seq_id,
+ to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(!to_bean)
{
@@ -401,7 +401,7 @@
}
to_addr = sandesha2_seq_property_bean_get_value(to_bean, env);
- addr_ns_uri = sandesha2_utils_get_seq_property(env, new_seq_id,
+ addr_ns_uri = sandesha2_utils_get_seq_property(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, seq_prop_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
@@ -520,7 +520,7 @@
axis2_char_t *name = NULL;
name = sandesha2_seq_property_bean_get_name(seq_prop_bean, env);
- if(!axutil_strcmp(name, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID))
+ if(!axutil_strcmp(name, SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID))
{
axutil_array_list_t *temp_list = NULL;
int temp_size = 0;
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c Sat May 31 02:45:25 2008
@@ -72,27 +72,17 @@
#define SANDESHA2_INTF_TO_IMPL(msg_proc) \
((sandesha2_create_seq_res_msg_processor_impl_t *)(msg_proc))
-/***************************** Function headers *******************************/
static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axutil_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx);
-/*
-static axis2_bool_t AXIS2_CALL
-sandesha2_create_seq_res_msg_processor_offer_accepted(
- const axutil_env_t *env,
- axis2_char_t *seq_id,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
-*/
static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_free (
sandesha2_msg_processor_t *msg_processor,
const axutil_env_t *env);
-/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_msg_processor_t* AXIS2_CALL
sandesha2_create_seq_res_msg_processor_create(
@@ -158,18 +148,17 @@
axis2_msg_ctx_t *msg_ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
- /*sandesha2_seq_ack_t *seq_ack = NULL;*/
sandesha2_create_seq_res_t *csr_part = NULL;
- axis2_char_t *new_out_seq_id = NULL;
+ axis2_char_t *rms_sequence_id = NULL;
axis2_relates_to_t *relates_to = NULL;
axis2_char_t *create_seq_msg_id = NULL;
sandesha2_sender_mgr_t *sender_mgr = NULL;
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
- axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *rms_internal_seq_id = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
- sandesha2_seq_property_bean_t *out_seq_bean = NULL;
- sandesha2_seq_property_bean_t *int_seq_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_internal_sequence_bean = NULL;
sandesha2_accept_t *accept = NULL;
axis2_op_ctx_t *op_ctx = NULL;
axis2_bool_t polling_mode = AXIS2_FALSE;
@@ -198,9 +187,9 @@
return AXIS2_FAILURE;
}
- new_out_seq_id = sandesha2_identifier_get_identifier(sandesha2_create_seq_res_get_identifier(
+ rms_sequence_id = sandesha2_identifier_get_identifier(sandesha2_create_seq_res_get_identifier(
csr_part, env), env);
- if(!new_out_seq_id)
+ if(!rms_sequence_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] New sequence id is null");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID, AXIS2_FAILURE);
@@ -253,8 +242,8 @@
return AXIS2_FAILURE;
}
- internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(create_seq_bean, env);
- if(!internal_seq_id)
+ rms_internal_seq_id = sandesha2_create_seq_bean_get_rms_internal_sequence_id(create_seq_bean, env);
+ if(!rms_internal_seq_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Internal sequence id is not set");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID, AXIS2_FAILURE);
@@ -279,48 +268,24 @@
return AXIS2_FAILURE;
}
- sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env, new_out_seq_id);
+ sandesha2_create_seq_bean_set_rms_sequence_id(create_seq_bean, env, rms_sequence_id);
sandesha2_create_seq_mgr_update(create_seq_mgr, env, create_seq_bean);
- /*create_seq_sender_bean = sandesha2_sender_mgr_retrieve(sender_mgr, env, create_seq_msg_id);
- if(!create_seq_sender_bean)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Create sequence entry not found");
- if(seq_prop_mgr)
- sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
- if(create_seq_mgr)
- sandesha2_create_seq_mgr_free(create_seq_mgr, env);
- if(sender_mgr)
- sandesha2_sender_mgr_free(sender_mgr, env);
- if(storage_mgr)
- sandesha2_storage_mgr_free(storage_mgr, env);
- return AXIS2_FAILURE;
- }
- create_seq_storage_key = sandesha2_sender_bean_get_msg_ctx_ref_key(create_seq_sender_bean, env);
- sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, create_seq_storage_key, conf_ctx,
- SANDESHA2_MSG_TYPE_CREATE_SEQ);
- if(create_seq_sender_bean)
- {
- sandesha2_sender_bean_free(create_seq_sender_bean, env);
- }
-
- sandesha2_sender_mgr_remove(sender_mgr, env, create_seq_msg_id);*/
+ rms_sequence_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_seq_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID, rms_sequence_id);
- out_seq_bean = sandesha2_seq_property_bean_create_with_data(env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID, new_out_seq_id);
-
- int_seq_bean = sandesha2_seq_property_bean_create_with_data(env, new_out_seq_id,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, internal_seq_id);
+ rms_internal_sequence_bean = sandesha2_seq_property_bean_create_with_data(env, rms_sequence_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, rms_internal_seq_id);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, out_seq_bean);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, int_seq_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rms_sequence_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rms_internal_sequence_bean);
accept = sandesha2_create_seq_res_get_accept(csr_part, env);
if(accept)
{
sandesha2_seq_property_bean_t *special_int_seq_bean = NULL;
sandesha2_seq_property_bean_t *offerd_seq_bean = NULL;
- axis2_char_t *offered_seq_id = NULL;
+ axis2_char_t *rmd_sequence_id = NULL;
axis2_endpoint_ref_t *acks_to_epr = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
sandesha2_seq_property_bean_t *acks_to_bean = NULL;
@@ -339,8 +304,9 @@
axis2_char_t *acks_to = NULL;
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
- offerd_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- internal_seq_id, SANDESHA2_SEQ_PROP_OFFERED_SEQ);
+ offerd_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_seq_id,
+ SANDESHA2_SEQ_PROP_OFFERED_SEQ);
+
if(!offerd_seq_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -370,9 +336,9 @@
return AXIS2_FAILURE;
}
- offered_seq_id = sandesha2_seq_property_bean_get_value(offerd_seq_bean, env);
- special_int_seq_bean = sandesha2_seq_property_bean_create_with_data(env, offered_seq_id,
- SANDESHA2_SEQ_PROP_SPECIAL_INTERNAL_SEQ_ID, internal_seq_id);
+ rmd_sequence_id = sandesha2_seq_property_bean_get_value(offerd_seq_bean, env);
+ special_int_seq_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
+ SANDESHA2_SEQ_PROP_SPECIAL_INTERNAL_SEQ_ID, rms_internal_seq_id);
if(special_int_seq_bean)
{
@@ -385,7 +351,7 @@
acks_to_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_name(acks_to_bean, env, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
- sandesha2_seq_property_bean_set_seq_id(acks_to_bean, env, offered_seq_id);
+ sandesha2_seq_property_bean_set_seq_id(acks_to_bean, env, rmd_sequence_id);
if (acks_to_epr)
{
@@ -396,15 +362,15 @@
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
next_bean = sandesha2_next_msg_bean_create(env);
- sandesha2_next_msg_bean_set_seq_id(next_bean, env, offered_seq_id);
- sandesha2_next_msg_bean_set_internal_seq_id(next_bean, env, internal_seq_id);
+ sandesha2_next_msg_bean_set_seq_id(next_bean, env, rmd_sequence_id);
+ sandesha2_next_msg_bean_set_internal_seq_id(next_bean, env, rms_internal_seq_id);
sandesha2_next_msg_bean_set_next_msg_no_to_process(next_bean, env, 1);
rm_spec_ver = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
if(!axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, rm_spec_ver))
{
- axis2_char_t *reply_to_addr = sandesha2_utils_get_seq_property(env, internal_seq_id,
+ axis2_char_t *reply_to_addr = sandesha2_utils_get_seq_property(env, rms_internal_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, seq_prop_mgr);
if(reply_to_addr)
{
@@ -418,7 +384,7 @@
acks_to = (axis2_char_t *) axis2_endpoint_ref_get_address(acks_to_epr, env);
create_seq_rm_msg = sandesha2_msg_creator_create_create_seq_msg(env, rm_msg_ctx,
- internal_seq_id, acks_to, seq_prop_mgr);
+ rms_internal_seq_id, acks_to, seq_prop_mgr);
if(!create_seq_rm_msg)
{
@@ -454,7 +420,7 @@
sandesha2_msg_ctx_set_flow(create_seq_rm_msg, env, SANDESHA2_MSG_CTX_OUT_FLOW);
create_seq_msg = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg, env);
- to_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_seq_id,
+ to_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(to_seq_bean)
@@ -516,28 +482,28 @@
/* If polling_mode is true, starting the polling manager */
if(polling_mode)
{
- sandesha2_utils_start_polling_mgr(env, conf_ctx, internal_seq_id);
+ sandesha2_utils_start_polling_mgr(env, conf_ctx, rms_internal_seq_id);
}
sandesha2_next_msg_mgr_insert(next_msg_mgr, env, next_bean);
- spec_ver_bean = sandesha2_seq_property_bean_create_with_data(env, offered_seq_id,
+ spec_ver_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_RM_SPEC_VERSION, rm_spec_ver);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_ver_bean);
- rcvd_msg_bean = sandesha2_seq_property_bean_create_with_data(env, offered_seq_id,
+ rcvd_msg_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES, "");
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rcvd_msg_bean);
- msgs_bean = sandesha2_seq_property_bean_create_with_data(env, offered_seq_id,
+ msgs_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES, "");
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, msgs_bean);
addr_ns_val = sandesha2_msg_ctx_get_addr_ns_val(rm_msg_ctx, env);
- addr_ver_bean = sandesha2_seq_property_bean_create_with_data(env, offered_seq_id,
+ addr_ver_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, addr_ns_val);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, addr_ver_bean);
@@ -547,7 +513,7 @@
}
}
- sandesha2_seq_mgr_update_last_activated_time(env, internal_seq_id, seq_prop_mgr);
+ sandesha2_seq_mgr_update_last_activated_time(env, rms_internal_seq_id, seq_prop_mgr);
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c Sat May 31 02:45:25 2008
@@ -282,7 +282,7 @@
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
}
int_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- seq_id, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
+ seq_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
if(int_seq_bean)
internal_seq_id = sandesha2_seq_property_bean_get_value(int_seq_bean, env);
@@ -500,7 +500,7 @@
env), env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
int_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, seq_prop_mgr);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, seq_prop_mgr);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
int_seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c Sat May 31 02:45:25 2008
@@ -281,7 +281,7 @@
env), env);
int_seq_id = sandesha2_utils_get_seq_property(env, out_seq_id,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, seq_prop_mgr);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, seq_prop_mgr);
last_out_msg_no_str = sandesha2_utils_get_seq_property(env, int_seq_id,
SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, seq_prop_mgr);
@@ -402,8 +402,7 @@
if(highest_in_msg_num_str)
AXIS2_FREE(env->allocator, highest_in_msg_num_str);
}
- rec_side_int_seq_id = sandesha2_utils_get_outgoing_internal_seq_id(env,
- seq_id);
+ rec_side_int_seq_id = sandesha2_utils_get_rms_internal_sequence_id(env, seq_id);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]rec_side_int_seq_id:%s",
rec_side_int_seq_id);
if(0 == highest_in_msg_num)
@@ -446,7 +445,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]add_rec_side_term:%d",
add_rec_side_term);
out_seq_id = sandesha2_utils_get_seq_property(env, rec_side_int_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID, seq_prop_mgr);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID, seq_prop_mgr);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]out_seq_id:%s",
out_seq_id);
if(add_rec_side_term && highest_out_msg_num > 0 &&
@@ -639,9 +638,9 @@
property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY);
if(property)
seq_key = axutil_property_get_value(property, env);
- int_seq_id = sandesha2_utils_get_internal_seq_id(env, to_address, seq_key);
+ int_seq_id = sandesha2_utils_get_client_rms_internal_sequence_id(env, to_address, seq_key);
out_seq_id = sandesha2_utils_get_seq_property(env, int_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID, seq_prop_mgr);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID, seq_prop_mgr);
if(!out_seq_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]seq_id was not"
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_res_msg_processor.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_res_msg_processor.c Sat May 31 02:45:25 2008
@@ -165,7 +165,7 @@
sender_mgr =sandesha2_permanent_sender_mgr_create(env, dbname);
/* We need to pass here internal seq id isn't it?:damitha
int internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
- SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);*/
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, storage_mgr);*/
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, seq_id,
AXIS2_FALSE, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
if(seq_prop_mgr)
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/beans/create_seq_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/beans/create_seq_bean.c?rev=661993&r1=661992&r2=661993&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/beans/create_seq_bean.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/beans/create_seq_bean.c Sat May 31 02:45:25 2008
@@ -159,7 +159,7 @@
}
axis2_char_t * AXIS2_CALL
-sandesha2_create_seq_bean_get_seq_id(
+sandesha2_create_seq_bean_get_rms_sequence_id(
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env)
{
@@ -167,7 +167,7 @@
}
void AXIS2_CALL
-sandesha2_create_seq_bean_set_seq_id(
+sandesha2_create_seq_bean_set_rms_sequence_id(
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env, axis2_char_t *seq_id)
{
@@ -175,7 +175,7 @@
}
axis2_char_t * AXIS2_CALL
-sandesha2_create_seq_bean_get_internal_seq_id(
+sandesha2_create_seq_bean_get_rms_internal_sequence_id(
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env)
{
@@ -183,7 +183,7 @@
}
void AXIS2_CALL
-sandesha2_create_seq_bean_set_internal_seq_id(
+sandesha2_create_seq_bean_set_rms_internal_sequence_id(
sandesha2_create_seq_bean_t *create_seq_bean,
const axutil_env_t *env, axis2_char_t *int_seq_id)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org