Author: damitha
Date: Mon Apr 16 21:55:30 2007
New Revision: 529486
URL: http://svn.apache.org/viewvc?view=rev&rev=529486
Log:
Changes in accordance with the current axis2c svn changes and the default
permanent storage is changed to mysql
Modified:
webservices/sandesha/trunk/c/config/module.xml
webservices/sandesha/trunk/c/include/sandesha2_error.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h
webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
webservices/sandesha/trunk/c/samples/rm_report/report.c
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/core/Makefile.am
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.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/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am
webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/util/Makefile.am
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/config/module.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Mon Apr 16 21:55:30 2007
@@ -70,10 +70,10 @@
<!-- Database connection parameters -->
<parameter name="sandesha2_db" locked="false">/axis2c/deploy</parameter>
<!-- General parameters -->
- <parameter name="ExponentialBackoff" locked="false">AXIS2_TRUE</parameter>
- <parameter name="RetransmissionInterval" locked="false">4000</parameter>
- <parameter name="AcknowledgementInterval" locked="false">2</parameter><!--
in seconds-->
- <parameter name="InactivityTimeout" locked="false">60000</parameter>
+ <parameter name="ExponentialBackoff" locked="false">AXIS2_FALSE</parameter>
+ <parameter name="RetransmissionInterval" locked="false">1</parameter>
+ <parameter name="AcknowledgementInterval" locked="false">1</parameter><!--
in seconds-->
+ <parameter name="InactivityTimeout" locked="false">10</parameter>
<parameter name="StorageManager" locked="false">persistent</parameter>
<parameter name="InvokeInOrder" locked="false">AXIS2_FALSE</parameter>
<parameter name="MessageTypesToDrop" locked="false">none</parameter>
Modified: webservices/sandesha/trunk/c/include/sandesha2_error.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_error.h?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_error.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_error.h Mon Apr 16 21:55:30
2007
@@ -215,6 +215,9 @@
SANDESHA2_ERROR_LAST
};
+axis2_status_t AXIS2_CALL
+sandesha2_error_init();
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
(original)
+++ webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h Mon Apr
16 21:55:30 2007
@@ -30,7 +30,7 @@
#include <axutil_array_list.h>
#include <sandesha2_rm_bean.h>
#include <sandesha2_msg_store_bean.h>
-#include <sqlite3.h>
+#include <mysql.h>
#ifdef __cplusplus
extern "C"
@@ -93,7 +93,7 @@
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
sandesha2_rm_bean_t *bean,
- int (*retrieve_func)(void *, int, char **, char **),
+ int (*retrieve_func)(MYSQL_RES *, void *),
axis2_char_t *sql_stmt_retrieve,
axis2_char_t *sql_stmt_update,
axis2_char_t *sql_stmt_insert);
@@ -102,7 +102,7 @@
sandesha2_permanent_bean_mgr_remove(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- int (*retrieve_func)(void *, int, char **, char **),
+ int (*retrieve_func)(MYSQL_RES *, void *),
axis2_char_t *sql_stmt_retrieve,
axis2_char_t *sql_stmt_remove);
@@ -110,7 +110,7 @@
sandesha2_permanent_bean_mgr_retrieve(
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
- int (*retrieve_func)(void *, int, char **, char **),
+ int (*retrieve_func)(MYSQL_RES *, void *),
axis2_char_t *sql_stmt_retrieve);
axis2_bool_t AXIS2_CALL
@@ -118,7 +118,7 @@
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
sandesha2_rm_bean_t *bean,
- int (*update_func)(void *, int, char **, char **),
+ int (*retrieve_func)(MYSQL_RES *, void *),
axis2_char_t *sql_stmt_retrieve_old_bean,
axis2_char_t *sql_stmt_update);
@@ -127,8 +127,8 @@
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
sandesha2_rm_bean_t *bean,
- int (*find_func)(void *, int, char **, char **),
- int (*count_func)(void *, int, char **, char **),
+ int (*find_func)(MYSQL_RES *, void *),
+ int (*count_func)(MYSQL_RES *, void *),
axis2_char_t *sql_stmt_find,
axis2_char_t *sql_stmt_count);
@@ -137,8 +137,8 @@
sandesha2_permanent_bean_mgr_t *bean_mgr,
const axutil_env_t *env,
sandesha2_rm_bean_t *bean,
- int (*find_func)(void *, int, char **, char **),
- int (*count_func)(void *, int, char **, char **),
+ int (*find_func)(MYSQL_RES *, void *),
+ int (*count_func)(MYSQL_RES *, void *),
axis2_char_t *sql_stmt_find,
axis2_char_t *sql_stmt_count);
@@ -193,11 +193,8 @@
int
sandesha2_permanent_bean_mgr_busy_handler(
- sqlite3* dbconn,
+ MYSQL * dbconn,
char *sql_stmt,
- int (*callback_func)(void *, int, char **, char **),
- void *arg,
- char **error_msg,
int rc);
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h
(original)
+++ webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h Mon
Apr 16 21:55:30 2007
@@ -25,7 +25,7 @@
#include <axutil_utils_defines.h>
#include <axutil_env.h>
#include <axis2_conf_ctx.h>
-#include <sqlite3.h>
+#include <mysql.h>
#include <sandesha2_storage_mgr.h>
#ifdef __cplusplus
@@ -54,7 +54,7 @@
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-sqlite3 * AXIS2_CALL
+MYSQL * AXIS2_CALL
sandesha2_permanent_storage_mgr_get_dbconn(
sandesha2_storage_mgr_t *storage_mgr,
const axutil_env_t *env);
Modified: webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h
(original)
+++ webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h Mon
Apr 16 21:55:30 2007
@@ -27,7 +27,7 @@
#include <axutil_error.h>
#include <axutil_string.h>
#include <axutil_utils.h>
-#include <sqlite3.h>
+#include <mysql.h>
#ifdef __cplusplus
extern "C"
@@ -43,7 +43,7 @@
struct sandesha2_storage_mgr *storage_mgr,
unsigned long int thread_id);
-sqlite3 * AXIS2_CALL
+MYSQL * AXIS2_CALL
sandesha2_permanent_transaction_get_dbconn(
struct sandesha2_transaction *transaction,
const axutil_env_t *env);
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c Mon Apr 16
21:55:30 2007
@@ -30,7 +30,7 @@
#include <platforms/axutil_platform_auto_sense.h>
#include <ctype.h>
-#define SANDESHA2_MAX_COUNT 40
+#define SANDESHA2_MAX_COUNT 8
/* on_complete callback function */
axis2_status_t AXIS2_CALL
@@ -71,13 +71,12 @@
axutil_property_t *property = NULL;
axis2_listener_manager_t *listener_manager = NULL;
axutil_string_t *soap_action = NULL;
+ axis2_char_t *seq_key = NULL;
int c;
/* Set up the environment */
- /*env = axutil_env_create_all("echo_non_blocking_dual.log",
- AXIS2_LOG_LEVEL_TRACE);*/
- env = axutil_env_create_all("echo_non_blocking_dual.log",
- AXIS2_LOG_LEVEL_CRITICAL);
+ env = axutil_env_create_all("rm_echo_1_0.log",
+ AXIS2_LOG_LEVEL_TRACE);
/* Set end point reference of echo service */
to = "http://127.0.0.1:8888/axis2/services/RMSampleService";;
@@ -126,8 +125,6 @@
axis2_options_set_use_separate_listener(options, env, AXIS2_TRUE);
/* Separate listner needs addressing, hence addressing stuff in options */
- /*axis2_options_set_action(options, env,
- "http://127.0.0.1:5555/axis2/services/RMSampleService/anonOutInOp";);*/
soap_action = axutil_string_create(env, "urn:wsrm:EchoString");
axis2_options_set_soap_action(options, env, soap_action);
axis2_options_set_action(options, env, "urn:wsrm:EchoString");
@@ -179,29 +176,37 @@
{
return AXIS2_FAILURE;
}
- /*payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
+ seq_key = axutil_uuid_gen(env);
+ property = axutil_property_create_with_args(env, 0, 0, 0, seq_key);
+ if(property)
+ {
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
+ property);
+ }
+ /*payload = build_om_payload_for_echo_svc(env, "echo1", seq_key);
callback1 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback1, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback1, rm_echo_callback_on_error);
axis2_svc_client_send_receive_NON_BLOCKING(svc_client, env, payload,
callback1);
wait_on_callback(env, callback1);
- payload = build_om_payload_for_echo_svc(env, "echo2", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo2", seq_key);
callback2 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback2, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback2, rm_echo_callback_on_error);
axis2_svc_client_send_receive_NON_BLOCKING(svc_client, env, payload,
callback2);
- wait_on_callback(env, callback2);*/
-
+ wait_on_callback(env, callback2);
+ */
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
axis2_options_set_property(options, env, "Sandesha2LastMessage", property);
- payload = build_om_payload_for_echo_svc(env, "echo3", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo3", seq_key);
callback3 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback3, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback3, rm_echo_callback_on_error);
axis2_svc_client_send_receive_non_blocking(svc_client, env, payload,
callback3);
wait_on_callback(env, callback3);
- AXIS2_SLEEP(2 * SANDESHA2_MAX_COUNT);
+ AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
+ AXIS2_FREE(env->allocator, seq_key);
if (svc_client)
{
/*axis2_svc_client_free(svc_client, env);*/
@@ -297,7 +302,7 @@
fprintf(stdout, " [-a ADDRESS]");
fprintf(stdout, " Options :\n");
fprintf(stdout, "\t-a ADDRESS \t endpoint address.. The" \
- " default is http://127.0.0.1:5555/axis2/services/RMSampleService \n");
+ " default is http://127.0.0.1:8888/axis2/services/RMSampleService \n");
fprintf(stdout, " Help :\n\t-h \t display this help screen.\n\n");
}
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c Mon Apr 16
21:55:30 2007
@@ -74,6 +74,7 @@
axis2_listener_manager_t *listener_manager = NULL;
axis2_char_t *offered_seq_id = NULL;
axis2_bool_t offer = AXIS2_FALSE;
+ axis2_char_t *seq_key = NULL;
int c;
/* Set up the environment */
@@ -184,7 +185,8 @@
axis2_options_set_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
- property = axutil_property_create_with_args(env, 3, 0, 0, "sequence1");
+ seq_key = axutil_uuid_gen(env);
+ property = axutil_property_create_with_args(env, 3, 0, 0, seq_key);
if(property)
{
axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
@@ -200,7 +202,7 @@
wait_on_callback(env, callback);
- payload = build_om_payload_for_echo_svc(env, "echo2", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo2", seq_key);
callback2 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback2, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback2, rm_echo_callback_on_error);
@@ -208,7 +210,7 @@
callback2, payload, listener_manager);
wait_on_callback(env, callback2);
- payload = build_om_payload_for_echo_svc(env, "echo3", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo3", seq_key);
callback3 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback3, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback3, rm_echo_callback_on_error);
@@ -222,6 +224,7 @@
sandesha2_client_terminate_seq_with_svc_client(env, svc_client, callback4,
listener_manager);
AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
+ AXIS2_FREE(env->allocator, seq_key);
if (svc_client)
{
/*axis2_svc_client_free(svc_client, env);*/
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am
(original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am Mon Apr
16 21:55:30 2007
@@ -17,6 +17,7 @@
-lsandesha2_client \
-lsandesha2 \
-lsqlite3 \
+ -lmysqlclient -lnsl -lm -lz \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified:
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
(original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
Mon Apr 16 21:55:30 2007
@@ -71,13 +71,14 @@
axis2_char_t *offered_seq_id = NULL;
axiom_soap_envelope_t *result = NULL;
axutil_string_t *soap_action = NULL;
+ axis2_char_t *seq_key = NULL;
int c;
int i = 0, size = 0;
/* Set up the environment */
- /*env = axutil_env_create_all("echo_non_blocking_dual.log",
- AXIS2_LOG_LEVEL_DEBUG);*/
- /*env = axutil_env_create_all("echo_non_blocking_dual.log",
+ /*env = axutil_env_create_all("rm_echo_single_1_0.log",
+ AXIS2_LOG_LEVEL_INFO);*/
+ /*env = axutil_env_create_all("rm_echo_single_1_0.log",
AXIS2_LOG_LEVEL_ERROR);*/
env = axutil_env_create_all("rm_echo_single_1_0.log",
AXIS2_LOG_LEVEL_DEBUG);
@@ -166,8 +167,8 @@
property = axutil_property_create(env);
if(property)
{
- axutil_property_set_value(property, env, axutil_strdup(offered_seq_id,
- env));
+ axutil_property_set_value(property, env, axutil_strdup(env,
+ offered_seq_id));
axis2_options_set_property(options, env,
SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);
}
@@ -179,7 +180,8 @@
axis2_options_set_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
- property = axutil_property_create_with_args(env, 3, 0, 0, "sequence1");
+ seq_key = axutil_uuid_gen(env);
+ property = axutil_property_create_with_args(env, 0, 0, 0, seq_key);
if(property)
{
axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
@@ -192,11 +194,8 @@
axis2_options_set_property(options, env, AXIS2_TIMEOUT_IN_SECONDS,
property);
}
- payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo1", seq_key);
result = axis2_svc_client_send_receive(svc_client, env, payload);
- /*svc_ctx = axis2_svc_client_get_svc_ctx(svc_client, env);
- conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
- result = sandesha2_client_get_response_envelope(env, conf_ctx, svc_client,
1);*/
if(result)
{
axis2_char_t *om_str = NULL;
@@ -220,7 +219,7 @@
axis2_options_set_property(options, env, AXIS2_TIMEOUT_IN_SECONDS,
property);
}
- payload = build_om_payload_for_echo_svc(env, "echo2", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo2", seq_key);
result = axis2_svc_client_send_receive(svc_client, env, payload);
if(result)
@@ -267,7 +266,7 @@
}
payload = NULL;
AXIS2_SLEEP(2 * SANDESHA2_MAX_COUNT);
-
+ AXIS2_FREE(env->allocator, seq_key);
if (svc_client)
{
/*axis2_svc_client_free(svc_client, env);*/
Modified: webservices/sandesha/trunk/c/samples/rm_report/report.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_report/report.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_report/report.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_report/report.c Mon Apr 16 21:55:30
2007
@@ -70,6 +70,7 @@
axutil_property_t *property = NULL;
axis2_listener_manager_t *listener_manager = NULL;
axis2_char_t *offered_seq_id = NULL;
+ axis2_char_t *seq_key = NULL;
axiom_soap_envelope_t *result = NULL;
sandesha2_seq_report_t *report = NULL;
int c;
@@ -178,7 +179,8 @@
axis2_options_set_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
- property = axutil_property_create_with_args(env, 3, 0, 0, "sequence1");
+ seq_key = axutil_uuid_gen(env);
+ property = axutil_property_create_with_args(env, 3, 0, 0, seq_key);
if(property)
{
axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
@@ -194,7 +196,7 @@
axis2_options_set_property(options, env, AXIS2_TIMEOUT_IN_SECONDS,
property);
}
- payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo1", seq_key);
result = axis2_svc_client_send_receive(svc_client, env, payload);
if(result)
@@ -249,7 +251,7 @@
}
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
axis2_options_set_property(options, env, "Sandesha2LastMessage", property);
- payload = build_om_payload_for_echo_svc(env, "echo2", "sequence1");
+ payload = build_om_payload_for_echo_svc(env, "echo2", seq_key);
result = axis2_svc_client_send_receive(svc_client, env, payload);
if(result)
{
@@ -268,7 +270,7 @@
}
payload = NULL;
AXIS2_SLEEP(2 * SANDESHA2_MAX_COUNT);
-
+ AXIS2_FREE(env->allocator, seq_key);
if (svc_client)
{
/*axis2_svc_client_free(svc_client, env);*/
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Mon Apr 16 21:55:30 2007
@@ -1358,10 +1358,13 @@
out_seq_id = sandesha2_seq_property_bean_get_seq_id(internal_seq_bean,
env);
seq_terminated_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env,
out_seq_id, SANDESHA2_SEQ_PROP_SEQ_TERMINATED);
- value = sandesha2_seq_property_bean_get_value(seq_terminated_bean, env);
- if(seq_terminated_bean != NULL && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
value))
+ if(seq_terminated_bean)
{
- return AXIS2_TRUE;
+ value = sandesha2_seq_property_bean_get_value(seq_terminated_bean,
env);
+ if(0 == axutil_strcmp(AXIS2_VALUE_TRUE, value))
+ {
+ return AXIS2_TRUE;
+ }
}
return AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/core/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/Makefile.am?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/core/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/core/Makefile.am Mon Apr 16 21:55:30 2007
@@ -19,6 +19,7 @@
../workers/libsandesha2_workers.la\
../wsrm/libsandesha2_wsrm.la \
../polling/libsandesha2_polling.la \
- -lsqlite3
+ -lsqlite3 \
+ -lmysqlclient -lnsl -lm -lz
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Mon
Apr 16 21:55:30 2007
@@ -119,9 +119,7 @@
axis2_bool_t rolled_back = AXIS2_FALSE;
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
-
- AXIS2_LOG_INFO(env->log,
- "[sandesha2]Starting sandesha2 global in handler ......");
+ AXIS2_LOG_INFO(env->log, "[sandesha2]Start:sandesha2_global_in_handler");
/* This handler needs to identify messages which follow the WSRM 1.0
* convention for sending 'LastMessage' when the sender doesn't have a
* reliable message to piggyback the last message marker onto.
@@ -177,12 +175,15 @@
}
}
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] soap::action and wsa::action are NULL. So return
here");
return AXIS2_SUCCESS;
}
is_rm_global_msg = sandesha2_utils_is_rm_global_msg(env, msg_ctx);
if(!is_rm_global_msg)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Not a global RM Message");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Not a global RM Message");
return AXIS2_SUCCESS;
}
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
@@ -208,7 +209,7 @@
if(!soap_envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]SOAP envelope "
- "is NULL");
+ "is NULL");
return AXIS2_FAILURE;
}
property = axis2_ctx_get_property(ctx, env, SANDESHA2_REINJECTED_MESSAGE);
@@ -217,7 +218,7 @@
if(reinjected_msg && 0 == axutil_strcmp(AXIS2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Detected"
- " reinjected_msg");
+ " reinjected_msg. So return here.");
return AXIS2_SUCCESS; /* Reinjected Messages are not processed by
sandesha2 inflow handlers */
}
@@ -225,7 +226,7 @@
if(!storage_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot get the "
- "storage manager");
+ "storage manager");
return AXIS2_FAILURE;
}
property = axis2_ctx_get_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION);
@@ -280,6 +281,8 @@
req_msg_ctx))
{
/* TODO we need to notify the listeners */
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2] soap fault generated");
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
@@ -305,7 +308,8 @@
}
sandesha2_global_in_handler_process_dropped_msg(handler, env,
rm_msg_ctx,
storage_mgr);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "msg_ctx dropped");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] msg_ctx dropped. So return here");
return AXIS2_SUCCESS;
}
/*Process if global processing possible. - Currently none*/
@@ -317,8 +321,7 @@
AXIS2_FALSE, 0, AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop);
}
- AXIS2_LOG_INFO(env->log,
- "[sandesha2]Exit sandesha2 global in handler ......");
+ AXIS2_LOG_INFO(env->log, "[sandesha2]Exit:sandesha2_global_in_handler");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Mon Apr 16
21:55:30 2007
@@ -93,7 +93,7 @@
sandesha2_ack_requested_t *ack_requested = NULL;
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_INFO(env->log, "[sandesha2] Starting in handler .........");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Start: sandesha2_in_handler_invoke");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(!conf_ctx)
@@ -112,8 +112,7 @@
if(str_done && 0 == axutil_strcmp(AXIS2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit: sandesha2_in_handler::invoke, Application " \
- "processing done");
+ "[sandesha2] Application processing done");
return AXIS2_SUCCESS;
}
temp_prop = axis2_ctx_get_property(ctx, env, SANDESHA2_REINJECTED_MESSAGE);
@@ -123,7 +122,7 @@
if(reinjected_msg && 0 == axutil_strcmp(AXIS2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit: sandesha2_in_handler::invoke, reinjected_msg");
+ "[sandesha2] Reinjected_msg. So return here");
return AXIS2_SUCCESS; /* Reinjected Messages are not processed by
sandesha2 inflow handlers */
}
@@ -227,14 +226,13 @@
if(!within_transaction && !rolled_back)
{
axutil_property_t *prop = NULL;
- printf("came26\n");
sandesha2_transaction_commit(transaction, env);
prop = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop);
}
- AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_in_handler::invoke");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_in_handler_invoke");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Mon Apr
16 21:55:30 2007
@@ -96,24 +96,28 @@
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_INFO(env->log, "[sandesha2] Starting out handler .........");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Start:
sandesha2_out_handler_invoke");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if(!conf_ctx)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Configuration
Context is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Configuration Context is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if(!svc)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Axis2 Service is
NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Axis2 Service is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
module_qname = axutil_qname_create(env, "sandesha2", NULL, NULL);
if(!axis2_svc_is_module_engaged(svc, env, module_qname))
{
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] RM is not engaged. So return here");
return AXIS2_SUCCESS;
}
axutil_qname_free(module_qname, env);
@@ -127,10 +131,11 @@
}
else
{
+ int size = -1, i = 0;
axutil_qname_t *mod_qname = axutil_qname_create(env, "sandesha2",
NULL, NULL);
- axutil_array_list_t *mod_qnames = (axutil_array_list_t
*)axis2_svc_get_all_module_qnames(svc, env);
- int size = axutil_array_list_size(mod_qnames, env);
- int i = 0;
+ axutil_array_list_t *mod_qnames = (axutil_array_list_t *)
+ axis2_svc_get_all_module_qnames(svc, env);
+ size = axutil_array_list_size(mod_qnames, env);
axis2_bool_t found = AXIS2_FALSE;
for (i = 0; i < size; i++)
{
@@ -144,7 +149,11 @@
}
}
if (!found)
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] RM is not engaged. So return here.");
return AXIS2_SUCCESS;
+ }
}
temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE);
@@ -153,8 +162,7 @@
if(str_done && 0 == axutil_strcmp(AXIS2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit: sandesha2_out_handler::invoke, Application \
- Processing Done");
+ "[sandesha2] Application Processing Done. So return here.");
return AXIS2_SUCCESS;
}
temp_prop = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
@@ -243,7 +251,8 @@
prop);
rolled_back = AXIS2_TRUE;
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Error in
processing the message");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Error in processing the message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_PROCESS_MSG,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -263,7 +272,7 @@
if(temp_prop)
axutil_property_set_value(temp_prop, env, axutil_strdup(
env,AXIS2_VALUE_FALSE));
- AXIS2_LOG_INFO(env->log, "[sandesha2] Exit:
sandesha2_out_handler::invoke");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_out_handler_invoke");
return AXIS2_SUCCESS;
}
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?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Apr
16 21:55:30 2007
@@ -98,6 +98,7 @@
const axutil_env_t *env,
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *internal_seq_id,
+ axis2_char_t *out_seq_id,
long msg_num,
axis2_char_t *storage_key,
sandesha2_storage_mgr_t *mgr);
@@ -226,7 +227,7 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Start:sandesha2_app_msg_processor_process_in_msg");
-
+
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
if(!msg_ctx)
{
@@ -606,6 +607,7 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
axis2_bool_t is_svr_side = AXIS2_FALSE;
axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *out_seq_id = NULL;
axis2_char_t *storage_key = NULL;
axis2_bool_t last_msg = AXIS2_FALSE;
axutil_property_t *property = NULL;
@@ -896,7 +898,7 @@
sandesha2_seq_property_bean_t *res_create_seq_added = NULL;
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
-
+
res_create_seq_added = sandesha2_seq_property_mgr_retrieve(
seq_prop_mgr, env, internal_seq_id,
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
@@ -1013,7 +1015,7 @@
if(!dummy_msg)
sandesha2_app_msg_processor_process_response_msg(env, rm_msg_ctx,
- internal_seq_id, msg_number, storage_key, storage_mgr);
+ internal_seq_id, out_seq_id, msg_number, storage_key, storage_mgr);
/*if(1 < msg_number && !axis2_msg_ctx_get_server_side(msg_ctx, env))
{
return AXIS2_SUCCESS;
@@ -1208,7 +1210,7 @@
sandesha2_sender_bean_set_time_to_send(create_seq_entry, env, millisecs);
msg_id = sandesha2_msg_ctx_get_msg_id(create_seq_rm_msg, env);
sandesha2_sender_bean_set_msg_id(create_seq_entry, env, msg_id);
- sandesha2_sender_bean_set_internal_seq_id(create_seq_entry, env,
+ sandesha2_sender_bean_set_seq_id(create_seq_entry, env,
internal_seq_id);
sandesha2_sender_bean_set_send(create_seq_entry, env, AXIS2_TRUE);
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_FALSE);
@@ -1249,6 +1251,7 @@
const axutil_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *internal_seq_id,
+ axis2_char_t *out_seq_id,
long msg_num,
axis2_char_t *storage_key,
sandesha2_storage_mgr_t *storage_mgr)
@@ -1468,7 +1471,7 @@
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property);
}
- sandesha2_sender_bean_set_internal_seq_id(app_msg_entry, env,
internal_seq_id);
+ sandesha2_sender_bean_set_seq_id(app_msg_entry, env, internal_seq_id);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, storage_key,
app_msg_ctx);
sandesha2_sender_mgr_insert(retrans_mgr, env, app_msg_entry);
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?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
Mon Apr 16 21:55:30 2007
@@ -168,12 +168,11 @@
axis2_char_t *anon_uri = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
axis2_op_ctx_t *op_ctx = NULL;
- printf("came10\n");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
- "[sandesha2] sandesha2_create_seq_msg_processor_process_in_msg
.........");
+ "[sandesha2] Start:sandesha2_create_seq_msg_processor_process_in_msg");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
create_seq_part = (sandesha2_create_seq_t*)sandesha2_msg_ctx_get_msg_part(
@@ -181,24 +180,25 @@
if(!create_seq_part)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]create_seq_part"
- " is NULL");
+ " is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- axis2_conf_ctx_get_conf(conf_ctx, env));
+ axis2_conf_ctx_get_conf(conf_ctx, env));
fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_create_seq_refused(
env, msg_ctx, storage_mgr);
if(fault_rm_msg_ctx)
{
axis2_engine_t *engine = NULL;
-
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]A fault occurred in
create_seq_msg_processor_process_in_msg");
engine = axis2_engine_create(env, conf_ctx);
axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(
- fault_rm_msg_ctx, env));
+ fault_rm_msg_ctx, env));
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
@@ -234,16 +234,16 @@
if(!accept)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Accept part "
- "has not genereated for a message with offer");
+ "has not genereated for a message with offer");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
offer_seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_offer_get_identifier(seq_offer, env),
env);
offer_accepted = sandesha2_create_seq_msg_processor_offer_accepted(
- env, offer_seq_id, rm_msg_ctx,
- storage_mgr);
+ env, offer_seq_id, rm_msg_ctx,
+ storage_mgr);
if(offer_accepted)
{
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
@@ -252,7 +252,7 @@
sandesha2_seq_property_bean_t *out_seq_bean = NULL;
sandesha2_seq_property_bean_t *int_seq_bean = NULL;
- AXIS2_LOG_INFO(env->log, "[sandesha2] Offer Accepted .........");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Offer
Accepted");
create_seq_bean = sandesha2_create_seq_bean_create(env);
sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env,
@@ -297,29 +297,29 @@
}
}
acks_to = sandesha2_address_get_epr(sandesha2_acks_to_get_address(
- sandesha2_create_seq_get_acks_to(create_seq_part, env),
- env), env);
+ sandesha2_create_seq_get_acks_to(create_seq_part, env),
+ env), env);
if(!acks_to || !axis2_endpoint_ref_get_address(acks_to,
env))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null"
- " in create_seq message");
+ " in create_seq message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env,
- new_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
- (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to,
env));
+ new_seq_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,
- storage_mgr);
+ storage_mgr);
engine = axis2_engine_create(env, conf_ctx);
axis2_engine_send(engine, env, out_msg_ctx);
to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- new_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
+ new_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
if(!to_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]wsa:To is not
set");
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?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
Mon Apr 16 21:55:30 2007
@@ -178,7 +178,6 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] sandesha2_terminate_msg_processor_process_in_msg
.........");
-
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(
@@ -223,14 +222,14 @@
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
- seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
+ /*seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
term_rcvd_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_seq_id(term_rcvd_bean, env, seq_id);
sandesha2_seq_property_bean_set_name(term_rcvd_bean, env,
SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
sandesha2_seq_property_bean_set_value(term_rcvd_bean, env,
AXIS2_VALUE_TRUE);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_rcvd_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_rcvd_bean);*/
spec_version = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_term_seq_res_reqd(env,
@@ -241,11 +240,11 @@
storage_mgr, seq_id, rm_msg_ctx);
sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
seq_id, storage_mgr);
- transmit_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
+ /*transmit_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_SEQ_TERMINATED, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, transmit_bean);
sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_mgr);
-
+ */
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg");
Modified: webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am Mon Apr 16
21:55:30 2007
@@ -13,5 +13,6 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
+ -I/usr/include/mysql \
@AXIS2INC@
Modified: webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c?view=diff&rev=529486&r1=529485&r2=529486
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c Mon Apr
16 21:55:30 2007
@@ -418,8 +418,8 @@
const axutil_env_t *env,
axis2_char_t * persistent_property_str)
{
- msg_store_bean->persistent_property_str = axutil_strdup(env,
- persistent_property_str);
+ msg_store_bean->persistent_property_str = axutil_strdup(
+ env, persistent_property_str);
}
axis2_char_t *AXIS2_CALL
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
