Author: damitha
Date: Tue Dec 11 02:43:39 2007
New Revision: 603201
URL: http://svn.apache.org/viewvc?rev=603201&view=rev
Log:
cleaned the code
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h
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?rev=603201&r1=603200&r2=603201&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Dec
11 02:43:39 2007
@@ -1176,8 +1176,6 @@
axis2_engine_t *engine = NULL;
axutil_property_t *property = NULL;
axis2_char_t *msg_id = NULL;
- axis2_char_t *create_seq_msg_store_key = NULL;
- axis2_char_t *ref_msg_store_key = NULL;
axis2_op_ctx_t *temp_opctx = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
@@ -1223,18 +1221,9 @@
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
internal_seq_id, (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(
create_seq_msg, env), NULL);
- create_seq_msg_store_key = axutil_uuid_gen(env);
- sandesha2_create_seq_bean_set_create_seq_msg_store_key(create_seq_bean,
env,
- create_seq_msg_store_key);
- /* Storing the create_seq_msg_ctx as a reference */
- ref_msg_store_key = axutil_uuid_gen(env);
- sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, ref_msg_store_key,
- create_seq_msg);
temp_opctx = axis2_msg_ctx_get_op_ctx(create_seq_msg, env);
axis2_op_ctx_increment_ref(temp_opctx, env);
- sandesha2_create_seq_bean_set_ref_msg_store_key(create_seq_bean, env,
- ref_msg_store_key);
sandesha2_create_seq_mgr_insert(create_seq_man, env, create_seq_bean);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr);
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?rev=603201&r1=603200&r2=603201&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
Tue Dec 11 02:43:39 2007
@@ -52,6 +52,7 @@
#include <sandesha2_next_msg_mgr.h>
#include <sandesha2_msg_init.h>
#include <sandesha2_seq_mgr.h>
+#include <sandesha2_msg_creator.h>
/**
@@ -291,9 +292,9 @@
sandesha2_seq_property_bean_t *addr_ver_bean = NULL;
axis2_char_t *rm_spec_ver = NULL;
axis2_char_t *addr_ns_val = NULL;
- axis2_char_t *ref_msg_store_key = NULL;
+ /*axis2_char_t *ref_msg_store_key = NULL;*/
axis2_char_t *new_msg_store_key = NULL;
- axis2_msg_ctx_t *ref_msg_ctx = NULL;
+ /*axis2_msg_ctx_t *ref_msg_ctx = NULL;*/
offerd_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env,
int_seq_id, SANDESHA2_SEQ_PROP_OFFERED_SEQ);
@@ -335,20 +336,21 @@
polling_mode = sandesha2_utils_is_anon_uri(env, reply_to_addr);
}
}
- /* Storing the referenceMessage of the sending side sequence as the
reference message
- * of the receiving side as well.
- * This can be used when creating new outgoing messages.
- */
- ref_msg_store_key = sandesha2_create_seq_bean_get_ref_msg_store_key(
- create_seq_bean, env);
- if(ref_msg_store_key)
{
- ref_msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr,
- env, ref_msg_store_key, conf_ctx, AXIS2_FALSE);
+ sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
+ axis2_msg_ctx_t *create_seq_msg = NULL;
+ axis2_char_t *acks_to = NULL;
+ 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, int_seq_id, acks_to, storage_mgr);
+ 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);
+ axis2_msg_ctx_set_relates_to(create_seq_msg, env, NULL);
+ new_msg_store_key = axutil_uuid_gen(env);
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env,
new_msg_store_key,
+ create_seq_msg);
}
- new_msg_store_key = axutil_uuid_gen(env);
- sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env,
new_msg_store_key,
- ref_msg_ctx);
sandesha2_next_msg_bean_set_ref_msg_key(next_bean, env,
new_msg_store_key);
sandesha2_next_msg_bean_set_polling_mode(next_bean, env, polling_mode);
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c?rev=603201&r1=603200&r2=603201&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c Tue
Dec 11 02:43:39 2007
@@ -572,7 +572,6 @@
sandesha2_permanent_bean_mgr_update_msg_store_bean(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- axis2_char_t *key,
sandesha2_msg_store_bean_t *bean)
{
axis2_char_t *sql_stmt_update = NULL;
@@ -650,7 +649,7 @@
"prop_str='%s', action='%s' where stored_key='%s'", msg_id,
soap_env_str, soap_version, transport_out, op, svc, svc_grp, op_mep,
to_url, transport_to, reply_to, execution_chain_str, flow,
- msg_recv_str, svr_side, in_msg_store_key, prop_str, action, key);
+ msg_recv_str, svr_side, in_msg_store_key, prop_str, action,
stored_key);
rc = sqlite3_exec(bean_mgr_impl->dbconn, sql_stmt_update, 0, 0,
&error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
@@ -676,7 +675,6 @@
sandesha2_permanent_bean_mgr_insert_msg_store_bean(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- axis2_char_t *key,
sandesha2_msg_store_bean_t *bean)
{
axis2_char_t *sql_stmt_insert = NULL;
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c?rev=603201&r1=603200&r2=603201&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c Tue
Dec 11 02:43:39 2007
@@ -647,6 +647,8 @@
bean = (sandesha2_sender_bean_t *) axutil_array_list_get(match_list,
env, i);
msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]msg_type:%d",
+ msg_type);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
{
long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c?rev=603201&r1=603200&r2=603201&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Tue
Dec 11 02:43:39 2007
@@ -458,7 +458,7 @@
storage_mgr, env, msg_ctx);
sandesha2_msg_store_bean_set_stored_key(msg_store_bean, env, key);
sandesha2_permanent_bean_mgr_insert_msg_store_bean(storage_mgr_impl->bean_mgr,
- env, key, msg_store_bean);
+ env, msg_store_bean);
return AXIS2_SUCCESS;
}
@@ -482,7 +482,7 @@
storage_mgr, env, msg_ctx);
sandesha2_msg_store_bean_set_stored_key(msg_store_bean, env, key);
sandesha2_permanent_bean_mgr_update_msg_store_bean(storage_mgr_impl->bean_mgr,
- env, key, msg_store_bean);
+ env, msg_store_bean);
return AXIS2_SUCCESS;
}
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h?rev=603201&r1=603200&r2=603201&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h
(original)
+++
webservices/sandesha/trunk/c/src/storage/sqlite/sandesha2_permanent_bean_mgr.h
Tue Dec 11 02:43:39 2007
@@ -146,14 +146,12 @@
sandesha2_permanent_bean_mgr_update_msg_store_bean(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- axis2_char_t *key,
sandesha2_msg_store_bean_t *bean);
axis2_bool_t AXIS2_CALL
sandesha2_permanent_bean_mgr_insert_msg_store_bean(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- axis2_char_t *key,
sandesha2_msg_store_bean_t *bean);
axis2_bool_t AXIS2_CALL
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
