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/08/22 11:48:19 UTC
svn commit: r688044 - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008:
config/ samples/ src/msgprocessors/
Author: damitha
Date: Fri Aug 22 02:48:16 2008
New Revision: 688044
URL: http://svn.apache.org/viewvc?rev=688044&view=rev
Log:
Working on interop with .net
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/axis2.xml
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac
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/terminate_seq_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_res_msg_processor.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/axis2.xml?rev=688044&r1=688043&r2=688044&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/axis2.xml (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/axis2.xml Fri Aug 22 02:48:16 2008
@@ -39,7 +39,7 @@
<transportSender name="http" class="axis2_http_sender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
<!--parameter name="Transfer-Encoding">chunked</parameter-->
- <parameter name="PROXY" proxy_host="127.0.0.1" proxy_port="8080" locked="true"/>
+ <!--parameter name="PROXY" proxy_host="127.0.0.1" proxy_port="8080" locked="true"/-->
</transportSender>
<!--
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac?rev=688044&r1=688043&r2=688044&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac Fri Aug 22 02:48:16 2008
@@ -81,6 +81,13 @@
rm_ping_1_1/Makefile \
rm_mtom_1_0/Makefile \
rm_report/Makefile \
+ interop/Makefile \
+ interop/10/rm_interop_service/Makefile \
+ interop/10/oneway/Makefile \
+ interop/10/oneway_addressable/Makefile \
+ interop/10/twoway/Makefile \
+ interop/10/twoway_addressable/Makefile \
+ interop/11/twoway_addressable/Makefile \
resources/Makefile
])
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=688044&r1=688043&r2=688044&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 Fri Aug 22 02:48:16 2008
@@ -34,6 +34,7 @@
#include <axutil_string.h>
#include <axis2_engine.h>
#include <axiom_soap_const.h>
+#include <axiom_soap_body.h>
#include <stdio.h>
#include <axis2_msg_ctx.h>
#include <axis2_conf_ctx.h>
@@ -168,6 +169,11 @@
axis2_bool_t added = AXIS2_FALSE;
sandesha2_msg_ctx_t *fault_msg_ctx = NULL;
axis2_char_t *dbname = NULL;
+ axiom_soap_envelope_t *soap_envelope = NULL;
+ axiom_soap_body_t *soap_body = NULL;
+ axiom_node_t *body_node = NULL;
+ axiom_element_t *body_element = NULL;
+ axiom_children_iterator_t *children_iterator = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Entry:sandesha2_ack_msg_processor_process_in_msg");
@@ -521,6 +527,15 @@
AXIS2_FREE(env->allocator, internal_sequence_id);
}
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
+ body_node = axiom_soap_body_get_base_node(soap_body, env);
+ body_element = axiom_node_get_data_element(body_node, env);
+ children_iterator = axiom_element_get_children(body_element, env, body_node);
+ if(!axiom_children_iterator_has_next(children_iterator, env))
+ {
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
+ }
/* Do we need to pause the message context here */
/*sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);*/
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=688044&r1=688043&r2=688044&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 Fri Aug 22 02:48:16 2008
@@ -1970,7 +1970,8 @@
* In all other cases we do not send the acknowledgment directly, but piggyback it on application
* messages or terminate sequence message.
*/
- if(ack_rm_msg_ctx && one_way)
+ /*if(ack_rm_msg_ctx && one_way)*/
+ if(ack_rm_msg_ctx)
{
axis2_engine_t *engine = NULL;
engine = axis2_engine_create(env, conf_ctx);
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=688044&r1=688043&r2=688044&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 Fri Aug 22 02:48:16 2008
@@ -349,8 +349,8 @@
rmd_sequence_id, rm_msg_ctx, seq_prop_mgr, create_seq_mgr, sender_mgr);
}
- sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx, rmd_sequence_id, storage_mgr,
- seq_prop_mgr, next_msg_mgr);
+ /*sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx, rmd_sequence_id, storage_mgr,
+ seq_prop_mgr, next_msg_mgr);*/
/*transmit_bean = sandesha2_seq_property_bean_create_with_data(env, rmd_sequence_id,
SANDESHA2_SEQ_PROP_SEQ_TERMINATED, AXIS2_VALUE_TRUE);
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=688044&r1=688043&r2=688044&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 Fri Aug 22 02:48:16 2008
@@ -137,47 +137,66 @@
axis2_char_t *dbname = NULL;
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:sandesha2_"\
- "terminate_seq_res_msg_processor_process_in_msg");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Entry:sandesha2_terminate_seq_res_msg_processor_process_in_msg");
+
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
term_seq_res = sandesha2_msg_ctx_get_terminate_seq_res(rm_msg_ctx, env);
if(!term_seq_res)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate "
- "Sequence part is not available");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
- AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Terminate Sequence part is not available");
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
+
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_res_get_identifier(term_seq_res, env), env);
if(!seq_id || 0 == axutil_strlen(seq_id))
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid "\
- "sequence id");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid sequence id");
return AXIS2_FAILURE;
}
+
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
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_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);
+
+ sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
+
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_"\
- "terminate_seq_res_msg_processor_process_in_msg");
+ }
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Exit:sandesha2_terminate_seq_res_msg_processor_process_in_msg");
+
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org