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 2007/01/02 08:57:35 UTC
svn commit: r491758 [1/4] - in /webservices/sandesha/trunk/c: include/
samples/rm_1_1_echo/ samples/rm_echo/ samples/rm_mtom/ samples/rm_ping/
src/client/ src/core/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/storage/p...
Author: damitha
Date: Mon Jan 1 23:57:33 2007
New Revision: 491758
URL: http://svn.apache.org/viewvc?view=rev&rev=491758
Log:
Added message context storing mechanism
Added:
webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h
webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
Modified:
webservices/sandesha/trunk/c/include/sandesha2_constants.h
webservices/sandesha/trunk/c/include/sandesha2_error.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h
webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_utils.h
webservices/sandesha/trunk/c/samples/rm_1_1_echo/Makefile.am
webservices/sandesha/trunk/c/samples/rm_echo/Makefile.am
webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c
webservices/sandesha/trunk/c/samples/rm_mtom/Makefile.am
webservices/sandesha/trunk/c/samples/rm_ping/Makefile.am
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/ack_req_msg_processor.c
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/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am
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/storage/permanent/sandesha2_permanent_bean_mgr.h
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/error.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_constants.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_constants.h?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_constants.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_constants.h Mon Jan 1 23:57:33 2007
@@ -389,7 +389,7 @@
#define SANDESHA2_DEF_VAL_PERM_STORAGE_MGR "InMemoryStorageManager"
- #define SANDESHA2_DEF_VAL_INORDER_INVOCATION AXIS2_TRUE
+ #define SANDESHA2_DEF_VAL_INORDER_INVOCATION AXIS2_FALSE
#define SANDESHA2_DEF_VAL_MSG_TYPES_TO_DROP "none"
@@ -407,15 +407,15 @@
#define SANDESHA2_ACK_WRITTEN "AckWritten"
- #define SANDESHA2_INVOKER_SLEEP_TIME 6 /* 2 */
+ #define SANDESHA2_INVOKER_SLEEP_TIME 6 /*6 2 */
- #define SANDESHA2_SENDER_SLEEP_TIME 6 /* 4 */
+ #define SANDESHA2_SENDER_SLEEP_TIME 6 /*6 4 */
- #define SANDESHA2_POLLING_MANAGER_WAIT_TIME 12 /* 4 */
+ #define SANDESHA2_POLLING_MANAGER_WAIT_TIME 12 /* 12 4 */
- #define SANDESHA2_CLIENT_SLEEP_TIME 64 /* 32 */
+ #define SANDESHA2_CLIENT_SLEEP_TIME 32 /* 32 16 */
- #define SANDESHA2_TERMINATE_DELAY 100 /* 100 */
+ #define SANDESHA2_TERMINATE_DELAY 32 /* 100 32 */
#define SANDESHA2_TEMP_SEQ_ID "uuid:tempID"
@@ -462,7 +462,7 @@
#define SANDESHA2_PERMANENT_STORAGE_MGR "persistent"
- #define SANDESHA2_DEFAULT_STORAGE_MGR "inmemory"
+ #define SANDESHA2_DEFAULT_STORAGE_MGR "persistent"
#define SANDESHA2_SENDER "Sender"
@@ -489,7 +489,11 @@
#define SANDESHA2_MSG_CTX_IN_FAULT_FLOW 2
#define SANDESHA2_MSG_CTX_OUT_FLOW 3
#define SANDESHA2_MSG_CTX_OUT_FAULT_FLOW 4
-
+
+
+ #define SANDESHA2_IN_MESSAGE_STORAGE_KEY "InMsgStoreKey"
+ #define SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR ",,,"
+ #define SANDESHA2_BUSY_WAIT_TIME 8
/** @} */
#ifdef __cplusplus
}
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_error.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_error.h Mon Jan 1 23:57:33 2007
@@ -206,6 +206,12 @@
SANDESHA2_ERROR_CANNOT_OPEN_DATABASE,
/* There is an sql error. Please refer logs */
SANDESHA2_ERROR_SQL_ERROR,
+ /* Cannot build message context since service is not present */
+ SANDESHA2_ERROR_CANNOT_BUILD_MSG_CTX_WHEN_SVC_NOT_PRESENT,
+ /* Cannot find a operation for generated message */
+ SANDESHA2_ERROR_CANNOT_FIND_OP_FOR_GENERATED_MSG,
+ /* Invalid persistence property string */
+ SANDESHA2_ERROR_INVALID_PERSISTENCE_PROPERTY_STRING,
SANDESHA2_ERROR_LAST
};
Added: webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h?view=auto&rev=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h (added)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h Mon Jan 1 23:57:33 2007
@@ -0,0 +1,256 @@
+/*
+ * copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+#ifndef SANDESHA2_MSG_STORE_BEAN_H
+#define SANDESHA2_MSG_STORE_BEAN_H
+
+#include <axis2_utils_defines.h>
+#include <axis2_env.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef struct sandesha2_msg_store_bean_t sandesha2_msg_store_bean_t;
+
+
+/* constructors
+ */
+AXIS2_EXTERN sandesha2_msg_store_bean_t* AXIS2_CALL
+sandesha2_msg_store_bean_create(
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_free (
+ sandesha2_msg_store_bean_t *msg_store,
+ const axis2_env_t *env);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_msg_id(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_msg_id(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * msg_id);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_stored_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_stored_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * key);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_soap_envelope_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_soap_envelope_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * soap_env_str);
+
+int AXIS2_CALL
+sandesha2_msg_store_bean_get_soap_version(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_soap_version(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ int soap_version);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_transport_out(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_transport_out(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * transport_sender);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_op(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_op(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * op);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_svc(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_svc(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * svc);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_svc_grp(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_svc_grp(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * svc_grp);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_op_mep(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_op_mep(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * opAdd);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_to_url(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_to_url(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * to_url);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_reply_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_reply_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * reply_to);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_transport_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_transport_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * transport_to);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_execution_chain_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_execution_chain_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * execution_chain_str);
+
+int AXIS2_CALL
+sandesha2_msg_store_bean_get_flow(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_flow(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ int flow);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_msg_recv_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_msg_recv_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * msg_recv_str);
+
+axis2_bool_t AXIS2_CALL
+sandesha2_msg_store_bean_is_svr_side(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_svr_side(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_bool_t svr_side);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_in_msg_store_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_in_msg_store_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * request_msg_key);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_persistent_property_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_persistent_property_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * persistent_property_str);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_action(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env);
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_action(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * action);
+
+#ifdef __cplusplus
+}
+
+#endif
+
+#endif /* End of SANDESHA2_MSG_STORE_BEAN_H */
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h Mon Jan 1 23:57:33 2007
@@ -25,13 +25,15 @@
#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_conf_ctx.h>
-
+#include <sqlite3.h>
#ifdef __cplusplus
extern "C"
{
#endif
+struct sandesha2_storage_mgr;
+
/**
* @ingroup sandesha2_storage
* @{
@@ -41,7 +43,17 @@
sandesha2_permanent_storage_mgr_create(
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-
+
+/*sqlite3 * AXIS2_CALL
+sandesha2_permanent_storage_mgr_get_db(
+ struct sandesha2_storage_mgr *storage_mgr,
+ const axis2_env_t *env);*/
+
+unsigned long *AXIS2_CALL
+sandesha2_permanent_transaction_get_thread_id(
+ sandesha2_transaction_t *trans,
+ const axis2_env_t *env);
+
/** @} */
#ifdef __cplusplus
}
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h Mon Jan 1 23:57:33 2007
@@ -27,6 +27,7 @@
#include <axis2_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
+#include <sqlite3.h>
#ifdef __cplusplus
extern "C"
@@ -39,7 +40,18 @@
AXIS2_EXTERN struct sandesha2_transaction* AXIS2_CALL
sandesha2_permanent_transaction_create(
const axis2_env_t *env,
- struct sandesha2_storage_mgr *storage_mgr);
+ struct sandesha2_storage_mgr *storage_mgr,
+ unsigned long *thread_id);
+
+sqlite3 * AXIS2_CALL
+sandesha2_permanent_transaction_get_dbconn(
+ struct sandesha2_transaction *transaction,
+ const axis2_env_t *env);
+
+unsigned long *AXIS2_CALL
+sandesha2_permanent_transaction_get_thread_id(
+ struct sandesha2_transaction *transaction,
+ const axis2_env_t *env);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_terminate_mgr.h Mon Jan 1 23:57:33 2007
@@ -66,20 +66,6 @@
sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_terminate_mgr_complete_term_on_recv_side(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_terminate_mgr_remove_recv_side_propertis(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_man);
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_terminate_sending_side(
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
@@ -94,21 +80,8 @@
sandesha2_seq_property_bean_t *prop_bean,
struct sandesha2_seq_property_mgr *prop_mgr);
-AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_terminate_mgr_is_property_deletable(
- const axis2_env_t *env,
- axis2_char_t *name);
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_time_out_sending_side_seq(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- axis2_bool_t svr_side,
- sandesha2_storage_mgr_t *storage_man);
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_terminate_mgr_clean_sending_side_data(
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_char_t *seq_id,
Modified: webservices/sandesha/trunk/c/include/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_utils.h?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_utils.h Mon Jan 1 23:57:33 2007
@@ -246,6 +246,12 @@
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
+axis2_array_list_t *AXIS2_CALL
+sandesha2_utils_split(
+ const axis2_env_t *env,
+ axis2_char_t *str,
+ axis2_char_t *pattern);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/samples/rm_1_1_echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_1_1_echo/Makefile.am?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_1_1_echo/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_1_1_echo/Makefile.am Mon Jan 1 23:57:33 2007
@@ -19,7 +19,7 @@
-L$(AXIS2C_HOME)/modules/sandesha2 \
-lsandesha2_client \
-lsandesha2 \
- -lsqlite \
+ -lsqlite3 \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/sandesha/trunk/c/samples/rm_echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo/Makefile.am?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo/Makefile.am Mon Jan 1 23:57:33 2007
@@ -19,7 +19,7 @@
-L$(AXIS2C_HOME)/modules/sandesha2 \
-lsandesha2_client \
-lsandesha2 \
- -lsqlite \
+ -lsqlite3 \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c Mon Jan 1 23:57:33 2007
@@ -28,7 +28,7 @@
#include <sandesha2_constants.h>
#include <sandesha2_client.h>
-#define SANDESHA2_MAX_COUNT 30
+#define SANDESHA2_MAX_COUNT 10
/* on_complete callback function */
axis2_status_t AXIS2_CALL
@@ -136,7 +136,7 @@
/* Seperate listner needs addressing, hence addressing stuff in options */
/*AXIS2_OPTIONS_SET_ACTION(options, env,
- "http://127.0.0.1:8080/axis2/services/RMSampleService/anonOutInOp");*/
+ "http://127.0.0.1:5555/axis2/services/RMSampleService/anonOutInOp");*/
reply_to = axis2_endpoint_ref_create(env,
"http://localhost:7777/axis2/services/__ANONYMOUS_SERVICE__/"\
"__OPERATION_OUT_IN__");
@@ -152,6 +152,7 @@
* the client uses
*/
client_home = AXIS2_GETENV("AXIS2C_HOME");
+ /*client_home = "/home/damitha/workspace/sandeshaya/c/deploy";*/
if (!client_home)
client_home = "../../deploy";
@@ -207,7 +208,7 @@
property);
}
}
- payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
+ /*payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
callback = axis2_callback_create(env);
AXIS2_CALLBACK_SET_ON_COMPLETE(callback, rm_echo_callback_on_complete);
AXIS2_CALLBACK_SET_ON_ERROR(callback, rm_echo_callback_on_error);
@@ -222,7 +223,7 @@
AXIS2_CALLBACK_SET_ON_ERROR(callback2, rm_echo_callback_on_error);
sandesha2_client_send_non_blocking(env, svc_client, options, NULL, callback2, payload,
listener_manager);
- wait_on_callback(env, callback2);
+ wait_on_callback(env, callback2);*/
callback3 = axis2_callback_create(env);
AXIS2_CALLBACK_SET_ON_COMPLETE(callback3, rm_echo_callback_on_complete);
Modified: webservices/sandesha/trunk/c/samples/rm_mtom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_mtom/Makefile.am?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_mtom/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_mtom/Makefile.am Mon Jan 1 23:57:33 2007
@@ -15,7 +15,7 @@
-laxis2_http_sender \
-laxis2_http_receiver \
-lwoden \
- -lsqlite \
+ -lsqlite3 \
-laxis2_xml_schema \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/sandesha/trunk/c/samples/rm_ping/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping/Makefile.am?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping/Makefile.am Mon Jan 1 23:57:33 2007
@@ -16,7 +16,7 @@
-laxis2_http_receiver \
-lwoden \
-laxis2_xml_schema \
- -lsqlite \
+ -lsqlite3 \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Mon Jan 1 23:57:33 2007
@@ -259,8 +259,10 @@
within_transaction = AXIS2_TRUE;
}
if(!within_transaction)
+ {
report_transaction = sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
+ }
SANDESHA2_SEQ_REPORT_SET_INTERNAL_SEQ_ID(seq_report, env, internal_seq_id);
create_seq_find_bean = sandesha2_create_seq_bean_create(env);
sandesha2_create_seq_bean_set_internal_seq_id(create_seq_find_bean,
@@ -315,7 +317,8 @@
SANDESHA2_SEQ_STATUS_ESTABLISHED);
sandesha2_client_fill_outgoing_seq_info(env, seq_report, out_seq_id,
seq_prop_mgr);
-
+ if(report_transaction)
+ sandesha2_transaction_commit(report_transaction, env);
return seq_report;
}
@@ -424,6 +427,7 @@
{
if(AXIS2_TRUE != within_transaction && report_transaction != NULL)
{
+ printf("rollback11\n");
sandesha2_transaction_rollback(report_transaction, env);
rolled_back = AXIS2_TRUE;
}
@@ -474,6 +478,7 @@
{
if(AXIS2_TRUE != within_transaction && report_transaction != NULL)
{
+ printf("rollback12\n");
sandesha2_transaction_rollback(report_transaction, env);
rolled_back = AXIS2_TRUE;
}
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/core/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/core/Makefile.am Mon Jan 1 23:57:33 2007
@@ -18,5 +18,7 @@
../util/libsandesha_util.la\
../workers/libsandesha2_workers.la\
../wsrm/libsandesha2_wsrm.la \
- ../polling/libsandesha2_polling.la
+ ../polling/libsandesha2_polling.la \
+ ./libsqlite3.a
+
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Mon Jan 1 23:57:33 2007
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include <sqlite3.h>
#include <axis2_handler_desc.h>
#include <axis2_array_list.h>
#include <axis2_svc.h>
@@ -110,6 +111,7 @@
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_transaction_t *transaction = NULL;
axis2_property_t *property = NULL;
+ axis2_bool_t rolled_back = AXIS2_FALSE;
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -117,11 +119,32 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2]Starting sandesha2 global in handler ......");
+ /*axis2_char_t *error_msg = NULL;
+ axis2_char_t *insert_sql = "insert into seq_property(id, seq_id, name, value) values('5643d0cc-974f-1db1-210b-001125b4c0fc:ReplyToEPR','5643d0cc-974f-1db1-210b-001125b4c0fc','ReplyToEPR','http://127.0.0.1:5555/axis2/services/RMSampleService');";
+ sqlite3 *db = NULL;
+ int rc = sqlite3_open("/usr/local/apache2/htdocs/sandesha2", &db);
+ if(rc != SQLITE_OK)
+ {
+ AXIS2_LOG_INFO(env->log, "cannot open database");
+ }
+ rc = sqlite3_exec(db, "select * from seq_property;", 0, 0, &error_msg);
+ if(rc != SQLITE_OK)
+ {
+ AXIS2_LOG_INFO(env->log, "my error_msg1:%s", error_msg);
+ }
+ rc = sqlite3_exec(db, insert_sql, 0, 0, &error_msg);
+ if(rc != SQLITE_OK)
+ {
+ AXIS2_LOG_INFO(env->log, "my error_msg2:%s", error_msg);
+ }
+ else
+ AXIS2_LOG_INFO(env->log, "sql_stmt OK");
+ sqlite3_close(db);*/
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(!conf_ctx)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Configuration"
- " Context is NULL");
+ " Context is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -153,13 +176,13 @@
"storage manager");
return AXIS2_FAILURE;
}
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ AXIS2_FALSE);
if(property)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
- property, env);
+ property, env);
if(within_transaction_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
- within_transaction_str))
+ within_transaction_str))
{
within_transaction = AXIS2_TRUE;
}
@@ -168,9 +191,8 @@
axis2_property_t *prop = NULL;
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_TRUE);
+ prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
@@ -179,7 +201,18 @@
if(fault_part)
{
axis2_relates_to_t *relates_to = NULL;
-
+ if(!within_transaction)
+ {
+ axis2_property_t *prop = NULL;
+ printf("rollback1\n");
+ sandesha2_transaction_rollback(transaction, env);
+ prop = axis2_property_create_with_args(env,
+ AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ prop, AXIS2_FALSE);
+ rolled_back = AXIS2_TRUE;
+
+ }
relates_to = AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env);
if(relates_to)
{
@@ -209,6 +242,18 @@
is_rm_global_msg = sandesha2_utils_is_rm_global_msg(env, msg_ctx);
if(!is_rm_global_msg)
{
+ if(!within_transaction)
+ {
+ axis2_property_t *prop = NULL;
+ printf("rollback2\n");
+ sandesha2_transaction_rollback(transaction, env);
+ prop = axis2_property_create_with_args(env,
+ AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ prop, AXIS2_FALSE);
+ rolled_back = AXIS2_TRUE;
+
+ }
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Not a global RM Message");
return AXIS2_SUCCESS;
}
@@ -217,20 +262,32 @@
rm_msg_ctx, storage_mgr);
if(dropped)
{
+ if(!within_transaction)
+ {
+ axis2_property_t *prop = NULL;
+ printf("rollback3\n");
+ sandesha2_transaction_rollback(transaction, env);
+ prop = axis2_property_create_with_args(env,
+ AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ prop, AXIS2_FALSE);
+ rolled_back = AXIS2_TRUE;
+
+ }
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");
return AXIS2_SUCCESS;
}
/*Process if global processing possible. - Currently none*/
- if(!within_transaction)
+ if(!within_transaction && !rolled_back)
{
+ axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- property, AXIS2_FALSE);
+ prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
+ 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
+ AXIS2_FALSE);
}
AXIS2_LOG_INFO(env->log,
"[sandesha2]Exit sandesha2 global in handler ......");
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Mon Jan 1 23:57:33 2007
@@ -96,7 +96,6 @@
sandesha2_seq_ack_t *seq_ack = NULL;
sandesha2_ack_requested_t *ack_requested = NULL;
- AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log, "[sandesha2] Starting in handler .........");
@@ -150,17 +149,26 @@
if(!within_transaction)
{
axis2_property_t *prop = NULL;
-
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_TRUE);
+ prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
- AXIS2_FALSE);
+ AXIS2_FALSE);
}
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if(!svc)
{
+ if(!within_transaction)
+ {
+ axis2_property_t *prop = NULL;
+ printf("rollback4\n");
+ sandesha2_transaction_rollback(transaction, env);
+ prop = axis2_property_create_with_args(env,
+ AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ prop, AXIS2_FALSE);
+ rolled_back = AXIS2_TRUE;
+ }
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Axis2 Service is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_NULL, AXIS2_FAILURE);
@@ -176,10 +184,10 @@
{
axis2_property_t *prop = NULL;
+ printf("rollback5\n");
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env,
+ AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -188,13 +196,11 @@
if(!within_transaction && !rolled_back)
{
axis2_property_t *prop = NULL;
-
sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env,
+ AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
+ prop, AXIS2_FALSE);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Cannot initialize the message");
@@ -228,49 +234,15 @@
{
sandesha2_msg_processor_process_in_msg(msg_processor, env, rm_msg_ctx);
}
- /*if(!AXIS2_ERROR_GET_STATUS_CODE(env->error))
- {
- // Message should not be sent in an exception situation
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
- if(!within_transaction)
- {
- axis2_property_t *prop = NULL;
-
- sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
- rolled_back = AXIS2_TRUE;
- }
- if(!within_transaction && !rolled_back)
- {
- axis2_property_t *prop = NULL;
-
- sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
- }
- AXIS2_LOG_DEBUG(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;
- }*/
if(!within_transaction && !rolled_back)
{
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
+ 0, SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
+ prop, AXIS2_FALSE);
}
AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_in_handler::invoke");
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Mon Jan 1 23:57:33 2007
@@ -144,7 +144,7 @@
if(!within_transaction)
{
axis2_property_t *prop = NULL;
-
+
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
@@ -209,7 +209,7 @@
if(!within_transaction)
{
axis2_property_t *prop = NULL;
-
+ printf("rollback13\n");
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
@@ -225,14 +225,14 @@
}
if(!within_transaction && !rolled_back)
{
- /*axis2_property_t *prop = NULL;*/
+ axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- /*prop = axis2_property_create(env);
+ prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);*/
+ prop, AXIS2_FALSE);
}
temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
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?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Mon Jan 1 23:57:33 2007
@@ -350,6 +350,7 @@
int i = 0;
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(found_list, env); i++)
{
+ axis2_char_t *msg_stored_key = NULL;
sandesha2_sender_bean_t *old_ack_bean = NULL;
old_ack_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
time_to_send = sandesha2_sender_bean_get_time_to_send(
@@ -357,6 +358,11 @@
sandesha2_sender_mgr_remove(retrans_mgr, env,
sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
old_ack_bean, env));
+ /* Removing the message from the storage */
+ msg_stored_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
+ old_ack_bean, env);
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
+ msg_stored_key);
}
}
sandesha2_sender_bean_set_time_to_send(ack_bean, env, time_to_send);
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Jan 1 23:57:33 2007
@@ -369,6 +369,7 @@
else
{
msgs_bean = sandesha2_seq_property_bean_create(env);
+ printf("str_seq_id:%s\n", str_seq_id);
sandesha2_seq_property_bean_set_seq_id(msgs_bean, env, str_seq_id);
sandesha2_seq_property_bean_set_name(msgs_bean, env,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
@@ -481,6 +482,7 @@
{
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_FALSE);
}*/
+ /*AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);*/
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_app_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
@@ -632,7 +634,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- }
+ }
system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(env,
internal_seq_id, storage_mgr);
if(msg_num_lng > 0 && msg_num_lng <= system_msg_num)
@@ -649,7 +651,6 @@
msg_number = system_msg_num + 1;
else
msg_number = 1;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "msg_number:%d", msg_number);
/* A dummy message is a one which will not be processed as a actual
* application message. The RM handlers will simply let these go.
@@ -666,12 +667,10 @@
msg_number, storage_mgr);
sprintf(msg_number_str, "%ld", msg_number);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "msg_number_str:%s", msg_number_str);
res_highest_msg_bean = sandesha2_seq_property_bean_create_with_data(env,
internal_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_NUMBER,
msg_number_str);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
- res_highest_msg_bean);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, res_highest_msg_bean);
if(last_msg)
{
sandesha2_seq_property_bean_t *res_highest_msg_key_bean = NULL;
@@ -925,7 +924,6 @@
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
axis2_engine_t *engine = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
- axis2_msg_ctx_t *temp_msg_ctx = NULL;
AXIS2_LOG_INFO(env->log,
"[Sandesha2] sandesha2_app_msg_processor_send_ack_if_reqd");
@@ -933,7 +931,6 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_str, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
seq = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
seq_id = sandesha2_identifier_get_identifier(
@@ -1042,6 +1039,11 @@
}
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);
+ /* Set that the create sequence message is part of a transaction. */
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
+ SANDESHA2_VALUE_TRUE);
+ AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env, SANDESHA2_WITHIN_TRANSACTION,
+ property, AXIS2_FALSE);
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);
@@ -1075,9 +1077,8 @@
internal_seq_id);
sandesha2_sender_bean_set_send(create_seq_entry, env, AXIS2_TRUE);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_FALSE,
- env));
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
sandesha2_sender_bean_set_msg_type(create_seq_entry, env,
@@ -1085,8 +1086,8 @@
sandesha2_sender_mgr_insert(retrans_mgr, env, create_seq_entry);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, str_key, create_seq_msg);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(str_key, env));
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ AXIS2_PROPERTY_SET_VALUE(property, env, str_key);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(create_seq_msg, env);
@@ -1319,8 +1320,8 @@
axis2_transport_out_desc_t *trans_out = NULL;
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(storage_key, env));
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ AXIS2_PROPERTY_SET_VALUE(property, env, storage_key);
AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
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?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- 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 Mon Jan 1 23:57:33 2007
@@ -186,7 +186,7 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Entry:sandesha2_create_seq_res_msg_processor_process_in_msg");
-
+
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
@@ -386,7 +386,6 @@
sandesha2_sender_bean_set_internal_seq_id(target_bean, env, int_seq_id);
sandesha2_sender_bean_set_send(target_bean, env, AXIS2_FALSE);
sandesha2_sender_bean_set_resend(target_bean, env, AXIS2_TRUE);
-
found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
target_bean);
if(found_list)
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Mon Jan 1 23:57:33 2007
@@ -173,7 +173,7 @@
sandesha2_seq_property_bean_t *term_rcvd_bean = NULL;
sandesha2_seq_property_bean_t *transmit_bean = NULL;
axis2_char_t *spec_version = NULL;
-
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
@@ -421,6 +421,10 @@
term_res_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(term_res_bean, env, key);
/*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
+ key);
+ AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY,
+ property, AXIS2_FALSE);
sandesha2_storage_mgr_store_msg_ctx(storage_man, env, key, out_msg_ctx);
/* TODO: refine the terminate delay */
@@ -432,7 +436,7 @@
sandesha2_sender_bean_set_send(term_res_bean, env, AXIS2_TRUE);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
@@ -441,15 +445,6 @@
sandesha2_sender_mgr_insert(retrans_mgr, env, term_res_bean);
/* end test code */
-
-
-
-
-
-
-
-
-
engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env));
AXIS2_ENGINE_SEND(engine, env, out_msg_ctx);
@@ -462,12 +457,12 @@
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
if(0 == AXIS2_STRCMP(anon_uri, AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env)))
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
+ AXIS2_PROPERTY_SET_VALUE(property, env, "TRUE");
else
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("FALSE", env));
+ AXIS2_PROPERTY_SET_VALUE(property, env, "FALSE");
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Mon Jan 1 23:57:33 2007
@@ -14,6 +14,12 @@
* limitations under the License.
*/
#include <sandesha2_terminate_seq_res_msg_processor.h>
+#include <sandesha2_seq_ack.h>
+#include <sandesha2_terminate_seq_res.h>
+#include <sandesha2_storage_mgr.h>
+#include <sandesha2_seq_property_mgr.h>
+#include <sandesha2_constants.h>
+#include <axis2_conf_ctx.h>
/**
@@ -113,8 +119,55 @@
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx)
{
+ axis2_msg_ctx_t *msg_ctx = NULL;
+ sandesha2_seq_ack_t *seq_ack = NULL;
+ sandesha2_terminate_seq_res_t *term_seq_res = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
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(
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+
+ if(seq_ack)
+ {
+ sandesha2_msg_processor_t *ack_processor = NULL;
+ ack_processor = (sandesha2_msg_processor_t *)
+ sandesha2_ack_msg_processor_create(env);
+ sandesha2_msg_processor_process_in_msg(ack_processor, env, rm_msg_ctx);
+ }
+ term_seq_res = (sandesha2_terminate_seq_res_t*)sandesha2_msg_ctx_get_msg_part(
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE);
+ 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);
+ return AXIS2_FAILURE;
+ }
+ seq_id = sandesha2_identifier_get_identifier(
+ sandesha2_terminate_seq_res_get_identifier(term_seq_res, env), env);
+ if(!seq_id || 0 == AXIS2_STRLEN(seq_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);
+ storage_mgr = (sandesha2_storage_mgr_t *) sandesha2_utils_get_storage_mgr(
+ env, conf_ctx, AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
+ seq_id, storage_mgr);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_terminate_seq_res_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/invoker_bean.c Mon Jan 1 23:57:33 2007
@@ -25,7 +25,7 @@
sandesha2_invoker_bean_t invoker_bean;
sandesha2_rm_bean_t *rm_bean_impl;
/* This is the messageContextRefKey that is obtained after saving a message context in a storage. */
- axis2_char_t *msg_context_ref_key;
+ axis2_char_t *msg_ctx_ref_key;
/* The message number of the message. */
long msg_no;
@@ -69,7 +69,7 @@
}
/* init the properties. */
- invoker_bean_impl->msg_context_ref_key = NULL;
+ invoker_bean_impl->msg_ctx_ref_key = NULL;
invoker_bean_impl->msg_no = -1;
invoker_bean_impl->seq_id = NULL;
invoker_bean_impl->invoked = AXIS2_FALSE;
@@ -100,9 +100,9 @@
}
/* init the properties. */
if(!ref_key)
- invoker_bean_impl->msg_context_ref_key = NULL;
+ invoker_bean_impl->msg_ctx_ref_key = NULL;
else
- invoker_bean_impl->msg_context_ref_key = (axis2_char_t*)AXIS2_STRDUP(
+ invoker_bean_impl->msg_ctx_ref_key = (axis2_char_t*)AXIS2_STRDUP(
ref_key, env);
if(!seq_id)
@@ -130,10 +130,10 @@
sandesha2_rm_bean_free(invoker_bean_impl->rm_bean_impl, env);
invoker_bean_impl->rm_bean_impl= NULL;
}
- if(invoker_bean_impl->msg_context_ref_key)
+ if(invoker_bean_impl->msg_ctx_ref_key)
{
- AXIS2_FREE(env->allocator, invoker_bean_impl->msg_context_ref_key);
- invoker_bean_impl->msg_context_ref_key= NULL;
+ AXIS2_FREE(env->allocator, invoker_bean_impl->msg_ctx_ref_key);
+ invoker_bean_impl->msg_ctx_ref_key= NULL;
}
if(!invoker_bean_impl->seq_id)
@@ -177,7 +177,7 @@
{
sandesha2_invoker_bean_impl_t *invoker_bean_impl = NULL;
invoker_bean_impl = SANDESHA2_INTF_TO_IMPL(invoker_bean);
- return invoker_bean_impl->msg_context_ref_key;
+ return invoker_bean_impl->msg_ctx_ref_key;
}
void AXIS2_CALL
@@ -187,10 +187,10 @@
{
sandesha2_invoker_bean_impl_t *invoker_bean_impl = NULL;
invoker_bean_impl = SANDESHA2_INTF_TO_IMPL(invoker_bean);
- if(invoker_bean_impl->msg_context_ref_key)
- AXIS2_FREE(env->allocator, invoker_bean_impl->msg_context_ref_key);
+ if(invoker_bean_impl->msg_ctx_ref_key)
+ AXIS2_FREE(env->allocator, invoker_bean_impl->msg_ctx_ref_key);
- invoker_bean_impl->msg_context_ref_key =
+ invoker_bean_impl->msg_ctx_ref_key =
(axis2_char_t*)AXIS2_STRDUP(context_ref_id, env);
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c Mon Jan 1 23:57:33 2007
@@ -27,7 +27,7 @@
{
sandesha2_sender_bean_t sender_bean;
sandesha2_rm_bean_t *rm_bean_impl;
- axis2_char_t *msg_context_ref_key;
+ axis2_char_t *msg_ctx_ref_key;
axis2_char_t *msg_id;
axis2_char_t *internal_seq_id;
int sent_count;
@@ -71,7 +71,7 @@
}
/* init properties */
- sender_bean_impl->msg_context_ref_key = NULL;
+ sender_bean_impl->msg_ctx_ref_key = NULL;
sender_bean_impl->msg_id = NULL;
sender_bean_impl->internal_seq_id = NULL;
sender_bean_impl->sent_count = -1;
@@ -116,7 +116,7 @@
}
/* init properties */
- sender_bean_impl->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
+ sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
sender_bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
sender_bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
sender_bean_impl->sent_count = -1;
@@ -146,10 +146,10 @@
sandesha2_rm_bean_free(sender_bean_impl->rm_bean_impl, env);
sender_bean_impl->rm_bean_impl = NULL;
}
- if(sender_bean_impl->msg_context_ref_key)
+ if(sender_bean_impl->msg_ctx_ref_key)
{
- AXIS2_FREE(env->allocator, sender_bean_impl->msg_context_ref_key);
- sender_bean_impl->msg_context_ref_key = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->msg_ctx_ref_key);
+ sender_bean_impl->msg_ctx_ref_key = NULL;
}
if(sender_bean_impl->msg_id)
{
@@ -206,7 +206,7 @@
{
sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
- return sender_bean_impl->msg_context_ref_key;
+ return sender_bean_impl->msg_ctx_ref_key;
}
void AXIS2_CALL
@@ -217,12 +217,12 @@
{
sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
- if(sender_bean_impl->msg_context_ref_key)
+ if(sender_bean_impl->msg_ctx_ref_key)
{
- AXIS2_FREE(env->allocator, sender_bean_impl->msg_context_ref_key);
- sender_bean_impl->msg_context_ref_key = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->msg_ctx_ref_key);
+ sender_bean_impl->msg_ctx_ref_key = NULL;
}
- sender_bean_impl->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
+ sender_bean_impl->msg_ctx_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
}
axis2_char_t* AXIS2_CALL
Modified: webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Mon Jan 1 23:57:33 2007
@@ -114,7 +114,7 @@
{
sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
- if(seq_property_bean_impl->rm_bean_impl)
+/* if(seq_property_bean_impl->rm_bean_impl)
{
sandesha2_rm_bean_free(seq_property_bean_impl->rm_bean_impl, env);
seq_property_bean_impl->rm_bean_impl= NULL;
@@ -139,6 +139,7 @@
AXIS2_FREE(env->allocator, seq_property_bean_impl);
seq_property_bean_impl = NULL;
}
+ */
}
sandesha2_rm_bean_t * AXIS2_CALL
@@ -185,7 +186,8 @@
AXIS2_FREE(env->allocator, seq_property_bean_impl->name);
seq_property_bean_impl->name = NULL;
}
- seq_property_bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
+ if(name)
+ seq_property_bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
}
axis2_char_t *AXIS2_CALL
@@ -212,7 +214,9 @@
AXIS2_FREE(env->allocator, seq_property_bean_impl->seq_id);
seq_property_bean_impl->seq_id = NULL;
}
- seq_property_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ if(seq_id)
+ seq_property_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id,
+ env);
}
axis2_char_t* AXIS2_CALL
@@ -239,7 +243,8 @@
AXIS2_FREE(env->allocator, seq_property_bean_impl->value);
seq_property_bean_impl->value = NULL;
}
- seq_property_bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ if(value)
+ seq_property_bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c Mon Jan 1 23:57:33 2007
@@ -196,8 +196,10 @@
}
property = AXIS2_CTX_GET_PROPERTY(ctx, env, key, AXIS2_FALSE);
if(property)
+ {
bean_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
+ }
if(!bean_mgr_impl->table)
{
axis2_property_t *property = NULL;
@@ -257,7 +259,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
- sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);
+ /*sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);*/
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
axis2_hash_set(bean_mgr_impl->table, key, AXIS2_HASH_KEY_STRING, bean);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -279,8 +281,8 @@
bean = (sandesha2_rm_bean_t *) axis2_hash_get(bean_mgr_impl->table, key,
AXIS2_HASH_KEY_STRING);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
- if(bean)
- sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);
+ /*if(bean)
+ sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);*/
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
axis2_hash_set(bean_mgr_impl->table, key, AXIS2_HASH_KEY_STRING, NULL);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -299,15 +301,16 @@
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log, "%s\n", key);
bean = (sandesha2_rm_bean_t *) axis2_hash_get(bean_mgr_impl->table,
key, AXIS2_HASH_KEY_STRING);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
- if(bean)
+ /*if(bean)
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
bean = (sandesha2_rm_bean_t *) axis2_hash_get(bean_mgr_impl->table,
key, AXIS2_HASH_KEY_STRING);
- axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
+ axis2_thread_mutex_unlock(bean_mgr_impl->mutex);*/
return bean;
}
@@ -323,8 +326,8 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
- if(bean)
- sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);
+ /*if(bean)
+ sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);*/
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
old_bean = (sandesha2_rm_bean_t *) axis2_hash_get(bean_mgr_impl->table, key,
AXIS2_HASH_KEY_STRING);
@@ -332,7 +335,7 @@
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(!old_bean)
return AXIS2_FALSE;
- sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, old_bean);
+ /*sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, old_bean);*/
return AXIS2_TRUE;
}
@@ -379,10 +382,10 @@
size = AXIS2_ARRAY_LIST_SIZE(beans, env);
for(i = 0; i < size; i++)
{
- sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
+ /*sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
if(temp)
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env,
- temp);
+ temp);*/
}
/* Finally remove any beans that are no longer in the table */
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c Mon Jan 1 23:57:33 2007
@@ -331,8 +331,8 @@
(sandesha2_sender_bean_t *) bean, env);
temp_time_to_send = sandesha2_sender_bean_get_time_to_send(
(sandesha2_sender_bean_t *) candidate, env);
- /*if(time_to_send > 0 && (time_to_send < temp_time_to_send))*/
- if(time_to_send > 0 && (time_to_send != temp_time_to_send))
+ /*if(time_to_send > 0 && (time_to_send != temp_time_to_send))*/
+ if(time_to_send > 0 && (time_to_send < temp_time_to_send))
{
add = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c?view=diff&rev=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c Mon Jan 1 23:57:33 2007
@@ -212,7 +212,7 @@
seq_id, name);
status = sandesha2_inmemory_bean_mgr_remove(seq_prop_mgr_impl->bean_mgr, env,
key);
- AXIS2_FREE(env->allocator, key);
+ /*AXIS2_FREE(env->allocator, key);*/
return status;
}
@@ -236,10 +236,9 @@
key = sandesha2_inmemory_seq_property_mgr_get_id_with_seq_id_and_name(env,
seq_id, name);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]key:%s", key);
ret = (sandesha2_seq_property_bean_t *) sandesha2_inmemory_bean_mgr_retrieve(
seq_prop_mgr_impl->bean_mgr, env, key);
- AXIS2_FREE(env->allocator, key);
+ /*AXIS2_FREE(env->allocator, key);*/
AXIS2_LOG_INFO(env->log,
"[sandesha2]Exit:sandesha2_inmemory_seq_property_mgr_retrieve");
return ret;
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=491758&r1=491757&r2=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am Mon Jan 1 23:57:33 2007
@@ -8,7 +8,8 @@
permanent_seq_property_mgr.c \
permanent_transaction.c \
permanent_storage_mgr.c \
- permanent_bean_mgr.c
+ permanent_bean_mgr.c \
+ msg_store_bean.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
Added: 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=auto&rev=491758
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c (added)
+++ webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c Mon Jan 1 23:57:33 2007
@@ -0,0 +1,440 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <sandesha2_msg_store_bean.h>
+#include <axis2_string.h>
+#include <axis2_utils.h>
+
+/**
+ * Defines a set of properties which extracted from a Message Context
+ * when serializing it.
+ */
+struct sandesha2_msg_store_bean_t
+{
+
+
+ axis2_char_t * stored_key;
+
+ axis2_char_t * msg_id;
+
+ axis2_char_t * soap_env_str;
+
+ int soap_version;
+
+ axis2_char_t * transport_out;
+
+ axis2_char_t * op;
+
+ axis2_char_t * svc;
+
+ axis2_char_t * svc_grp;
+
+ axis2_char_t * op_mep;
+
+ axis2_char_t * to_url;
+
+ axis2_char_t * reply_to;
+
+ axis2_char_t * transport_to;
+
+ axis2_char_t * execution_chain_str;
+
+ int flow;
+
+ axis2_char_t * msg_recv_str;
+
+ axis2_bool_t svr_side;
+
+ axis2_char_t * in_msg_store_key;
+
+ axis2_char_t * persistent_property_str;
+
+ axis2_char_t * action;
+};
+
+AXIS2_EXTERN sandesha2_msg_store_bean_t* AXIS2_CALL
+sandesha2_msg_store_bean_create(const axis2_env_t *env)
+{
+ sandesha2_msg_store_bean_t *msg_store_bean = NULL;
+ AXIS2_ENV_CHECK(env, NULL);
+
+ msg_store_bean = (sandesha2_msg_store_bean_t*) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_msg_store_bean_t));
+
+ if(!msg_store_bean)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+ msg_store_bean->stored_key = NULL;
+ msg_store_bean->msg_id = NULL;
+ msg_store_bean->soap_env_str = NULL;
+ msg_store_bean->soap_version = -1;
+ msg_store_bean->transport_out = NULL;
+ msg_store_bean->op = NULL;
+ msg_store_bean->svc = NULL;
+ msg_store_bean->svc_grp = NULL;
+ msg_store_bean->op_mep = NULL;
+ msg_store_bean->to_url = NULL;
+ msg_store_bean->reply_to = NULL;
+ msg_store_bean->transport_to = NULL;
+ msg_store_bean->execution_chain_str = NULL;
+ msg_store_bean->flow = -1;
+ msg_store_bean->msg_recv_str = NULL;
+ msg_store_bean->svr_side = -1;
+ msg_store_bean->in_msg_store_key = NULL;
+ msg_store_bean->persistent_property_str = NULL;
+ msg_store_bean->action = NULL;
+
+ return msg_store_bean;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_free (
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ if(msg_store_bean)
+ {
+ AXIS2_FREE(env->allocator, msg_store_bean);
+ msg_store_bean = NULL;
+ }
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_msg_id(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->msg_id;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_msg_id(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * msg_id)
+{
+ msg_store_bean->msg_id = AXIS2_STRDUP(msg_id, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_stored_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->stored_key;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_stored_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * key)
+{
+ msg_store_bean->stored_key = AXIS2_STRDUP(key, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_soap_envelope_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->soap_env_str;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_soap_envelope_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * soap_env_str)
+{
+ msg_store_bean->soap_env_str = AXIS2_STRDUP(soap_env_str, env);
+}
+
+int AXIS2_CALL
+sandesha2_msg_store_bean_get_soap_version(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->soap_version;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_soap_version(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ int soap_version)
+{
+ msg_store_bean->soap_version = soap_version;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_transport_out(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->transport_out;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_transport_out(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * transport_sender)
+{
+ msg_store_bean->transport_out = AXIS2_STRDUP(transport_sender, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_op(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->op;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_op(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * op)
+{
+ msg_store_bean->op = AXIS2_STRDUP(op, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_svc(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->svc;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_svc(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * svc)
+{
+ msg_store_bean->svc = AXIS2_STRDUP(svc, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_svc_grp(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->svc_grp;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_svc_grp(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * svc_grp)
+{
+ msg_store_bean->svc_grp = AXIS2_STRDUP(svc_grp, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_op_mep(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->op_mep;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_op_mep(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * opAdd)
+{
+ msg_store_bean->op_mep = AXIS2_STRDUP(opAdd, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_to_url(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->to_url;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_to_url(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * to_url)
+{
+ msg_store_bean->to_url = AXIS2_STRDUP(to_url, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_reply_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->reply_to;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_reply_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * reply_to)
+{
+ msg_store_bean->reply_to = AXIS2_STRDUP(reply_to, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_transport_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->transport_to;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_transport_to(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * transport_to)
+{
+ msg_store_bean->transport_to = AXIS2_STRDUP(transport_to, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_execution_chain_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->execution_chain_str;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_execution_chain_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * execution_chain_str)
+{
+ msg_store_bean->execution_chain_str = AXIS2_STRDUP(execution_chain_str, env);
+}
+
+int AXIS2_CALL
+sandesha2_msg_store_bean_get_flow(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->flow;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_flow(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ int flow)
+{
+ msg_store_bean->flow = flow;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_msg_recv_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->msg_recv_str;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_msg_recv_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * msg_recv_str)
+{
+ msg_store_bean->msg_recv_str = AXIS2_STRDUP(msg_recv_str, env);
+}
+
+axis2_bool_t AXIS2_CALL
+sandesha2_msg_store_bean_is_svr_side(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->svr_side;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_svr_side(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_bool_t svr_side)
+{
+ msg_store_bean->svr_side = svr_side;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_in_msg_store_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->in_msg_store_key;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_in_msg_store_key(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * request_msg_key)
+{
+ msg_store_bean->in_msg_store_key = AXIS2_STRDUP(request_msg_key, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_persistent_property_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->persistent_property_str;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_persistent_property_str(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * persistent_property_str)
+{
+ msg_store_bean->persistent_property_str = AXIS2_STRDUP(
+ persistent_property_str, env);
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_msg_store_bean_get_action(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env)
+{
+ return msg_store_bean->action;
+}
+
+void AXIS2_CALL
+sandesha2_msg_store_bean_set_action(
+ sandesha2_msg_store_bean_t *msg_store_bean,
+ const axis2_env_t *env,
+ axis2_char_t * action)
+{
+ msg_store_bean->action = AXIS2_STRDUP(action, env);
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org