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 2006/08/29 14:07:13 UTC
svn commit: r438055 - in /webservices/sandesha/trunk/c/src: msgprocessors/
storage/inmemory/ util/
Author: damitha
Date: Tue Aug 29 05:07:11 2006
New Revision: 438055
URL: http://svn.apache.org/viewvc?rev=438055&view=rev
Log:
more changes to get echo work with rm
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Tue Aug 29 05:07:11 2006
@@ -224,7 +224,7 @@
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND_FAULT(engine, env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
fault_msg_ctx, env));
- AXIS2_MSG_CTX_SET_PAUSE(msg_ctx, env, AXIS2_TRUE);
+ AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
}
int_seq_id = sandesha2_utils_get_seq_property(env, out_seq_id,
SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
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?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Tue Aug 29 05:07:11 2006
@@ -195,7 +195,7 @@
if(NULL != rm_msg_op)
{
axis2_array_list_t *out_flow = NULL;
- out_flow = AXIS2_OP_GET_OUTFLOW(rm_msg_op, env);
+ out_flow = AXIS2_OP_GET_OUT_FLOW(rm_msg_op, env);
if(NULL != out_flow)
{
AXIS2_OP_SET_OUT_FLOW(ack_op, env, out_flow);
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=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Aug 29 05:07:11 2006
@@ -17,6 +17,7 @@
#include <sandesha2_app_msg_processor.h>
#include <sandesha2_ack_msg_processor.h>
#include <sandesha2_seq_ack.h>
+#include <sandesha2_seq_mgr.h>
#include <sandesha2_seq.h>
#include <sandesha2_ack_requested.h>
#include <sandesha2_last_msg.h>
@@ -489,7 +490,7 @@
msg_no, str_seq_id, AXIS2_FALSE);
SANDESHA2_INVOKER_MGR_INSERT(storage_map_mgr, env, invoker_bean);
property = axis2_property_create(env);
- AXIX2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
SANDESHA2_VALUE_TRUE, env));
/* To avoid performing application processing more than once. */
@@ -1078,7 +1079,7 @@
internal_seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(offer_seq_bean, env,
seq_offer_id);
- SANDESHA2_SEQUNCE_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
offer_seq_bean);
}
create_seq_msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(create_seq_rm_msg, env);
@@ -1299,13 +1300,14 @@
axis2_char_t *spec_ver = NULL;
spec_ver = sandesha2_utils_get_rm_version(env,
internal_seq_id, mgr);
- if(AXIS2_TRUE ==
+ /* uncomment if we need following ?*/
+ /*if(AXIS2_TRUE ==
sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, spec_ver))
{
SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
- }
+ }*/
}
}
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Tue Aug 29 05:07:11 2006
@@ -270,7 +270,7 @@
offer_seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(out_seq_bean, env,
int_seq_id);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
out_seq_bean);
}
else
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=438055&r1=438054&r2=438055&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 Aug 29 05:07:11 2006
@@ -309,7 +309,7 @@
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_SET_NEXT_MSG_TO_PROCESS(next_bean, env, 1);
+ SANDESHA2_NEXT_MSG_BEAN_SET_NEXT_MSG_NO_TO_PROCESS(next_bean, env, 1);
next_bean_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr,
env);
SANDESHA2_NEXT_MSG_BEAN_MGR_INSERT(next_bean_mgr, env, next_bean);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/msg_processor_creator.c Tue Aug 29 05:07:11 2006
@@ -29,6 +29,7 @@
#include <sandesha2_ack_requested.h>
#include <sandesha2_close_seq.h>
#include <sandesha2_close_seq_res.h>
+#include <sandesha2_create_seq_msg_processor.h>
#include <axis2_string.h>
#include <stdio.h>
/**
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?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Tue Aug 29 05:07:11 2006
@@ -224,7 +224,7 @@
SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(term_rcvd_bean, env,
SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PRPERTY_MGR_INSERT(seq_prop_mgr, env, term_rcvd_bean);
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, term_rcvd_bean);
if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_term_seq_res_reqd(env,
SANDESHA2_MSG_CTX_GET_RM_SPEC_VER(rm_msg_ctx, env)))
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Tue Aug 29 05:07:11 2006
@@ -251,7 +251,7 @@
if(storage_impl->instance)
{
- axis2_thread_mutex_destry(storage_impl->instance);
+ axis2_thread_mutex_destroy(storage_impl->instance);
storage_impl->instance = NULL;
}
if(storage_impl->create_seq_mgr)
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?rev=438055&r1=438054&r2=438055&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Tue Aug 29 05:07:11 2006
@@ -502,11 +502,11 @@
axis2_array_list_t *in_fault_flow = NULL;
axis2_array_list_t *inflow = NULL;
- outflow = AXIS2_OP_GET_PHASES_OUTFLOW(ref_msg_op, env);
+ outflow = AXIS2_OP_GET_OUT_FLOW(ref_msg_op, env);
AXIS2_OP_SET_PHASES_OUTFLOW(terminate_seq_op, env, outflow);
- out_fault_flow = AXIS2_OP_GET_PHASES_OUT_FAULT_FLOW(ref_msg_op, env);
+ out_fault_flow = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_msg_op, env);
AXIS2_OP_SET_PHASES_OUT_FAULT_FLOW(terminate_seq_op, env, out_fault_flow);
- in_fault_flow = AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(ref_msg_op, env);
+ in_fault_flow = AXIS2_OP_GET_FAULT_IN_FLOW(ref_msg_op, env);
AXIS2_OP_SET_PHASES_IN_FAULT_FLOW(terminate_seq_op, env, in_fault_flow);
inflow = AXIS2_OP_GET_IN_FLOW(ref_msg_op, env);
AXIS2_OP_SET_IN_FLOW(terminate_seq_op, env, inflow);
@@ -539,7 +539,7 @@
{
axis2_array_list_t *outphases = NULL;
- outphases = AXIS2_OP_GET_PHASES_OUTFLOW(ref_msg_op, env);
+ outphases = AXIS2_OP_GET_OUT_FLOW(ref_msg_op, env);
if(outphases)
{
AXIS2_OP_SET_PHASES_OUTFLOW(terminate_seq_op, env, outphases);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org