Author: damitha
Date: Fri Nov 30 18:00:41 2007
New Revision: 600035
URL: http://svn.apache.org/viewvc?rev=600035&view=rev
Log:
Now rm_ping rm_echo works both for RM1.0 and RM1.1. rm_echo_single works only
for RM1.0.
Modified:
webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c
webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c?rev=600035&r1=600034&r2=600035&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c Fri Nov 30
18:00:41 2007
@@ -23,7 +23,7 @@
#include <sandesha2_constants.h>
#include <ctype.h>
-#define MAX_COUNT 15
+#define MAX_COUNT 10
axiom_node_t *
build_om_programatically(
@@ -52,8 +52,7 @@
axis2_char_t *seq_key = NULL;
/* Set up the environment */
- /*env = axutil_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_TRACE);*/
- env = axutil_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_DEBUG);
+ env = axutil_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_TRACE);
/* Set end point reference of echo service */
address = "http://127.0.0.1:9090/axis2/services/RMSampleService";;
Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c?rev=600035&r1=600034&r2=600035&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c Fri Nov 30
18:00:41 2007
@@ -24,7 +24,7 @@
#include <sandesha2_client.h>
#include <ctype.h>
-#define MAX_COUNT 5
+#define MAX_COUNT 10
axiom_node_t *
build_om_programatically(
@@ -51,8 +51,7 @@
int c;
/* Set up the environment */
- /*env = axutil_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_TRACE);*/
- env = axutil_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_CRITICAL);
+ env = axutil_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_TRACE);
/* Set end point reference of echo service */
address = "http://127.0.0.1:9090/axis2/services/RMSampleService";;
@@ -143,14 +142,14 @@
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
payload = NULL;
- AXIS2_SLEEP(MAX_COUNT);
+ /*AXIS2_SLEEP(MAX_COUNT);*/
payload = build_om_programatically(env, "ping2", seq_key);
status = axis2_svc_client_send_robust(svc_client, env, payload);
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
payload = NULL;
- AXIS2_SLEEP(MAX_COUNT);
+ /*AXIS2_SLEEP(MAX_COUNT);*/
payload = build_om_programatically(env, "ping3", seq_key);
status = axis2_svc_client_send_robust(svc_client, env, payload);
@@ -162,7 +161,7 @@
/** Wait till callback is complete. Simply keep the parent thread running
until our on_complete or on_error is invoked */
- AXIS2_SLEEP(MAX_COUNT);
+ /*AXIS2_SLEEP(MAX_COUNT);*/
if (svc_client)
{
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=600035&r1=600034&r2=600035&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Fri Nov
30 18:00:41 2007
@@ -763,6 +763,13 @@
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);
+ }
internal_seq_id = sandesha2_utils_get_internal_seq_id(env,
to, seq_key);
property = axis2_msg_ctx_get_property(msg_ctx, env,
@@ -923,7 +930,9 @@
if(1 == msg_number)
{
if(!out_seq_bean)
+ {
send_create_seq = AXIS2_TRUE;
+ }
if(is_svr_side)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Starting the server "\
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=600035&r1=600034&r2=600035&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 Fri
Nov 30 18:00:41 2007
@@ -667,6 +667,7 @@
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, "dam_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/util/sandesha2_utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?rev=600035&r1=600034&r2=600035&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Fri Nov 30 18:00:41
2007
@@ -607,11 +607,7 @@
}
else if(!seq_key)
{
- seq_key = axutil_uuid_gen(env);
- ret = axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", seq_key,
- NULL);
- return ret;
- /*return axutil_strdup(env, to);*/
+ return axutil_strdup(env, to);
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
