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 2006/07/12 05:38:59 UTC
svn commit: r421104 - in /webservices/sandesha/trunk/c: ./ include/
include/sandesha2/ src/msgprocessors/ src/storage/inmemory/ src/transport/
src/workers/
Author: damitha
Date: Tue Jul 11 20:38:58 2006
New Revision: 421104
URL: http://svn.apache.org/viewvc?rev=421104&view=rev
Log:
More work on storage manager
Added:
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_seq.h
- copied unchanged from r420822, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h
webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h
- copied, changed from r420822, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h
webservices/sandesha/trunk/c/include/sandesha2_seq_report.h
- copied unchanged from r420822, webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h
webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
- copied, changed from r420822, webservices/sandesha/trunk/c/src/storage/inmemory/storage_manager.c
Removed:
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_sequence.h
webservices/sandesha/trunk/c/include/sandesha2_sequence_report.h
webservices/sandesha/trunk/c/src/storage/inmemory/storage_manager.c
Modified:
webservices/sandesha/trunk/c/build.sh
webservices/sandesha/trunk/c/configure.ac
webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_transaction.h
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
Modified: webservices/sandesha/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build.sh?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/build.sh (original)
+++ webservices/sandesha/trunk/c/build.sh Tue Jul 11 20:38:58 2006
@@ -1,6 +1,6 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include --with-axis2_util=${AXIS2C_HOME}/include
+./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include --with-axis2_util=${AXIS2C_HOME}/include --with-axis2_axiom=${AXIS2C_HOME}/include
make
make
make install
Modified: webservices/sandesha/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/configure.ac?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/configure.ac (original)
+++ webservices/sandesha/trunk/c/configure.ac Tue Jul 11 20:38:58 2006
@@ -84,10 +84,35 @@
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
+AC_ARG_WITH(axiom,
+[ --with-axiom[=PATH] use axiom.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ dnl Find axiom include dir in the path
+ if test -d $withval; then
+ axiominc="-I$withval"
+ dnl else find the axiom include dir in $(AXIS2C_HOME)/include
+ elif test -d '$(AXIS2C_HOME)/include'; then
+ axiominc="-I$(AXIS2C_HOME)/include"
+ else
+ AC_MSG_ERROR(could not find axiom. stop)
+ fi
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AXIS2INC=$axis2inc
+AXIOMINC=$axiominc
UTILINC=$axis2_utilinc
AC_SUBST(AXIS2INC)
+AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
AC_CONFIG_FILES([Makefile \
Copied: webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h (from r420822, webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h?p2=webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h&p1=webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h&r1=420822&r2=421104&rev=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_manager.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_fault_mgr.h Tue Jul 11 20:38:58 2006
@@ -26,7 +26,7 @@
#include <axis2_env.h>
#include <axis2_conf_ctx.h>
#include <sandesha2/sandesha2_msg_ctx.h>
-#include <sandesha2/sandesha2_storage_mgr.h>
+#include <sandesha2_storage_mgr.h>
#include <sandesha2/sandesha2_fault_data.h>
#include <axis2_msg_ctx.h>
Modified: webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_next_msg_mgr.h Tue Jul 11 20:38:58 2006
@@ -110,31 +110,31 @@
#define SANDESHA2_NEXT_MSG_MGR_FREE(next_msg, env) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->free (next_msg, env))
-#define SANDESHA2_NEXT_MSG_INSERT(next_msg, env, bean) \
+#define SANDESHA2_NEXT_MSG_MGR_INSERT(next_msg, env, bean) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
insert (next_msg, env, bean))
-#define SANDESHA2_NEXT_MSG_REMOVE(next_msg, env, msg_id) \
+#define SANDESHA2_NEXT_MSG_MGR_REMOVE(next_msg, env, msg_id) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
remove (next_msg, env, msg_id))
-#define SANDESHA2_NEXT_MSG_RETRIEVE(next_msg, env, msg_id) \
+#define SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_msg, env, msg_id) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
retrieve (next_msg, env, msg_id))
-#define SANDESHA2_NEXT_MSG_UPDATE(next_msg, env, bean) \
+#define SANDESHA2_NEXT_MSG_MGR_UPDATE(next_msg, env, bean) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
update (next_msg, env, bean))
-#define SANDESHA2_NEXT_MSG_FIND(next_msg, env, bean) \
+#define SANDESHA2_NEXT_MSG_MGR_FIND(next_msg, env, bean) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
find_by_next_msg_bean (next_msg, env, bean))
-#define SANDESHA2_NEXT_MSG_FIND_UNIQUE(next_msg, env, bean) \
+#define SANDESHA2_NEXT_MSG_MGR_FIND_UNIQUE(next_msg, env, bean) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
find_unique (next_msg, env, bean))
-#define SANDESHA2_NEXT_MSG_RETRIEVE_ALL(next_msg, env) \
+#define SANDESHA2_NEXT_MSG_MGR_RETRIEVE_ALL(next_msg, env) \
(((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
retrieve_all (next_msg, env))
Modified: webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq_property_mgr.h Tue Jul 11 20:38:58 2006
@@ -118,35 +118,35 @@
#define SANDESHA2_SEQ_PROPERTY_MGR_FREE(seq_property, env) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->free (seq_property, env))
-#define SANDESHA2_SEQ_PROPERTY_INSERT(seq_property, env, bean) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_property, env, bean) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
insert (seq_property, env, bean))
-#define SANDESHA2_SEQ_PROPERTY_REMOVE(seq_property, env, seq_id, name) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_REMOVE(seq_property, env, seq_id, name) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
remove (seq_property, env, seq_id, name))
-#define SANDESHA2_SEQ_PROPERTY_RETRIEVE(seq_property, env, seq_id, name) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_property, env, seq_id, name) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
retrieve (seq_property, env, seq_id, name))
-#define SANDESHA2_SEQ_PROPERTY_UPDATE(seq_property, env, bean) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_property, env, bean) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
update (seq_property, env, bean))
-#define SANDESHA2_SEQ_PROPERTY_FIND(seq_property, env, bean) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_FIND(seq_property, env, bean) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
find (seq_property, env, bean))
-#define SANDESHA2_SEQ_PROPERTY_FIND_UNIQUE(seq_property, env, bean) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_FIND_UNIQUE(seq_property, env, bean) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
find_unique (seq_property, env, bean))
-#define SANDESHA2_SEQ_PROPERTY_UPDATE_OR_INSERT(seq_property, env, bean) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_UPDATE_OR_INSERT(seq_property, env, bean) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
update_or_insert (seq_property, env, bean))
-#define SANDESHA2_SEQ_PROPERTY_RETRIEVE_ALL(seq_property, env) \
+#define SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE_ALL(seq_property, env) \
(((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
retrieve_all (seq_property, env))
Modified: webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Tue Jul 11 20:38:58 2006
@@ -55,12 +55,12 @@
{
axis2_conf_ctx_t* (AXIS2_CALL *
- get_context)
+ get_ctx)
(sandesha2_storage_mgr_t *storage_man,
const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_context)
+ set_ctx)
(sandesha2_storage_mgr_t *storage_man,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
@@ -87,7 +87,7 @@
const axis2_env_t *env);
sandesha2_sender_mgr_t* (AXIS2_CALL *
- get_retrans_mgr)
+ get_retransmitter_mgr)
(sandesha2_storage_mgr_t *storage_man,
const axis2_env_t *env);
@@ -127,10 +127,30 @@
(sandesha2_storage_mgr_t *storage_man,
const axis2_env_t *env,
axis2_char_t *storage_key);
-
+
+ axis2_status_t (AXIS2_CALL *
+ init) (
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
+
+ axiom_soap_envelope_t *(AXIS2_CALL *
+ retrieve_soap_envelope) (
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
+
+ axis2_status_t (AXIS2_CALL *
+ store_soap_envelope) (
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_env,
+ axis2_char_t *key);
+
+
axis2_status_t (AXIS2_CALL *
free)
- (sandesha2_storage_mgr_t *storage_man,
+ (void *storage_man,
const axis2_env_t *env);
};
@@ -147,16 +167,25 @@
sandesha2_storage_mgr_create(
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
+
+sandesha2_storage_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_instance(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
/************************** Start of function macros **************************/
#define SANDESHA2_STORAGE_MGR_FREE(storage_man, env) \
- ((storage_man)->ops->free (storage_man, env))
+ (((sandesha2_storage_mgr_t *) storage_man)->ops->free (storage_man, env))
+
+#define SANDESHA2_STORAGE_MGR_INIT(storage_man, env, conf_ctx) \
+ ((storage_man)->ops->init (storage_man, env, conf_ctx))
-#define SANDESHA2_STORAGE_MGR_SET_CONEXT(storage_man, env, conf_ctx) \
- ((storage_man)->ops->set_context(storage_man, env, conf_ctx))
+#define SANDESHA2_STORAGE_MGR_SET_CONTEXT(storage_man, env, conf_ctx) \
+ ((storage_man)->ops->set_ctx(storage_man, env, conf_ctx))
#define SANDESHA2_STORAGE_MGR_GET_CONEXT(storage_man, env) \
- ((storage_man)->ops->get_context(storage_man, env))
+ ((storage_man)->ops->get_ctx(storage_man, env))
#define SANDESHA2_STORAGE_MGR_INIT_STORAGE(storage_man, env, module_desc) \
((storage_man)->ops->init_storage(storage_man, env, module_desc))
@@ -164,19 +193,19 @@
#define SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_man, env) \
((storage_man)->ops->get_transaction(storage_man, env))
-#define SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_BEAN_MGR(storage_man, env)\
+#define SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(storage_man, env)\
((storage_man)->ops->get_create_seq_mgr(storage_man, env))
-#define SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_BEAN_MGR(storage_man, env)\
+#define SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_man, env)\
((storage_man)->ops->get_next_msg_mgr(storage_man, env))
-#define SANDESHA2_STORAGE_MGR_GET_RETRANS_BEAN_MGR(storage_man, env)\
- ((storage_man)->ops->get_retrans_mgr(storage_man, env))
+#define SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_man, env)\
+ ((storage_man)->ops->get_retransmitter_mgr(storage_man, env))
-#define SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(storage_man, env)\
+#define SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env)\
((storage_man)->ops->get_seq_property_mgr(storage_man, env))
-#define SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_BEAN_MGR(storage_man, env)\
+#define SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR(storage_man, env)\
((storage_man)->ops->get_storage_map_mgr(storage_man, env))
#define SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, storage_key, \
@@ -194,6 +223,12 @@
#define SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env, storage_key)\
((storage_man)->ops->remove_msg_ctx(storage_man, env, storage_key))
+
+#define SANDESHA2_STORAGE_MGR_RETRIEVE_SOAP_ENVELOPE(storage_man, env, key) \
+ ((storage_man)->ops->retrieve_soap_envelope (storage_man, env, key))
+
+#define SANDESHA2_STORAGE_MGR_STORE_SOAP_ENVELOPE(storage_man, env, envelope) \
+ ((storage_man)->ops->store_soap_envelope (storage_man, env, envelope))
/************************** End of function macros ****************************/
/** @} */
Modified: webservices/sandesha/trunk/c/include/sandesha2_transaction.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_transaction.h?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_transaction.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_transaction.h Tue Jul 11 20:38:58 2006
@@ -49,17 +49,17 @@
*/
axis2_status_t (AXIS2_CALL *
free) (
- void *seq_mgr,
+ void *transaction,
const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
commit) (
- sandesha2_transaction_t *seq_mgr,
+ sandesha2_transaction_t *transaction,
const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
rollback) (
- sandesha2_transaction_t *seq_mgr,
+ sandesha2_transaction_t *transaction,
const axis2_env_t *env);
};
@@ -72,16 +72,16 @@
sandesha2_transaction_create(
const axis2_env_t *env);
-#define SANDESHA2_TRANSACTION_FREE(seq_mgr, env) \
- (((sandesha2_transaction_t *) seq_mgr)->ops->free (seq_mgr, env))
+#define SANDESHA2_TRANSACTION_FREE(transaction, env) \
+ (((sandesha2_transaction_t *) transaction)->ops->free (transaction, env))
-#define SANDESHA2_TRANSACTION_COMMIT(seq_mgr, env) \
- (((sandesha2_transaction_t *) seq_mgr)->ops->\
- commit (seq_mgr, env))
-
-#define SANDESHA2_TRANSACTION_ROLLBACK(seq_mgr, env) \
- (((sandesha2_transaction_t *) seq_mgr)->ops->\
- rollback (seq_mgr, env))
+#define SANDESHA2_TRANSACTION_COMMIT(transaction, env) \
+ (((sandesha2_transaction_t *) transaction)->ops->\
+ commit (transaction, env))
+
+#define SANDESHA2_TRANSACTION_ROLLBACK(transaction, env) \
+ (((sandesha2_transaction_t *) transaction)->ops->\
+ rollback (transaction, env))
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Jul 11 20:38:58 2006
@@ -20,16 +20,19 @@
#include <sandesha2/sandesha2_ack_requested.h>
#include <sandesha2/sandesha2_last_msg.h>
#include <sandesha2/sandesha2_identifier.h>
-#include <sandesha2/sandesha2_invoker_bean_mgr.h>
-#include <sandesha2/sandesha2_next_msg_bean_mgr.h>
-#include <sandesha2/sandesha2_seq_property_bean_mgr.h>
-#include <sandesha2/sandesha2_seq_property_bean.h>
-#include <sandesha2/sandesha2_storage_mgr.h>
-#include <sandesha2/sandesha2_fault_mgr.h>
+#include <sandesha2_invoker_mgr.h>
+#include <sandesha2_next_msg_mgr.h>
+#include <sandesha2_seq_property_mgr.h>
+#include <sandesha2_seq_property_bean.h>
+#include <sandesha2_storage_mgr.h>
+#include <sandesha2_fault_mgr.h>
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_utils.h>
+#include <sandesha2/sandesha2_msg_ctx.h>
+#include <axis2_msg_ctx.h>
#include <axis2_string.h>
#include <axis2_engine.h>
+#include <axis2_uuid_gen.h>
/**
* @brief Application Message Processor struct impl
* Sandesha2 App Msg Processor
@@ -191,12 +194,12 @@
axis2_char_t *str_key = NULL;
axis2_char_t *msgs_str = "";
axis2_char_t msg_num_str[32];
- sandesha2_invoker_bean_mgr_t *storage_map_mgr = NULL;
- sandesha2_next_msg_bean_mgr_t *next_bean_mgr = NULL;
+ sandesha2_invoker_mgr_t *storage_map_mgr = NULL;
+ sandesha2_next_msg_mgr_t *next_mgr = NULL;
sandesha2_next_msg_bean_t *next_msg_bean = NULL;
axis2_bool_t in_order_invoke = AXIS2_FALSE;
sandesha2_invoker_bean_t *invoker_bean = NULL;
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
axis2_char_t *highest_in_msg_no_str = NULL;
axis2_char_t *highest_in_msg_key_str = NULL;
@@ -275,7 +278,7 @@
AXIS2_MSG_CTX_PAUSE(msg_ctx1, env);
return AXIS2_SUCCESS;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_man, env);
seq = SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
@@ -316,7 +319,7 @@
}
sandesha2_seq_mgr_update_last_activated_time(env, str_seq_id,
storage_man);
- msgs_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
+ msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
str_seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(SANDESHA2_SEQ_GET_MSG_NUM(
@@ -360,16 +363,16 @@
highest_in_msg_key_str, msg_ctx1);
if(NULL != highest_in_msg_no_str)
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
highest_msg_no_bean);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
highest_msg_key_bean);
}
else
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
highest_msg_no_bean);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
highest_msg_key_bean);
}
}
@@ -399,9 +402,9 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
SANDESHA2_SEQ_PROPERY_MGR_UPDATE(seq_prop_mgr, env, msgs_bean);
- next_bean_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_BEAN_MGR(storage_man,
+ next_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_man,
env);
- next_msg_bean = SANDESHA2_NEXT_MSG_BEAN_MGR_RETRIEVE(next_bean_mgr, env,
+ next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_mgr, env,
str_seq_id);
if(NULL != next_msg_bean)
{
@@ -409,7 +412,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_BEAN_MGR(
+ storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR(
storage_man, env);
in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(
sandesha2_utils_get_property_bean(env,
@@ -419,7 +422,7 @@
sandesha2_seq_property_bean_t *incoming_seq_list_bean = NULL;
axis2_array_list_t *incoming_seq_list = NULL;
- incoming_seq_list_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
+ incoming_seq_list_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
if(NULL == incoming_seq_list_bean)
@@ -435,7 +438,7 @@
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(incoming_seq_list_bean,
env, "[]");
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
incoming_seq_list_bean);
}
incoming_seq_list = sandesha2_utils_get_array_list_from_string(env,
@@ -453,7 +456,7 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(incoming_seq_list_bean,
env, str_seq_list);
AXIS2_FREE(env->allocator, str_seq_list);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
incoming_seq_list_bean);
}
/* save the message */
@@ -485,7 +488,7 @@
axis2_msg_ctx_t *msg_ctx1 = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_man = NULL;
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ 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 *storage_key = NULL;
@@ -512,7 +515,7 @@
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_man, env);
is_svr_side = AXIS2_MSG_CTX_IS_SERVER_SIDE(msg_ctx1, env);
@@ -537,6 +540,7 @@
sandesha2_seq_t *req_seq = NULL;
long request_msg_no = NULL;
axis2_char_t *req_last_msg_num_str = NULL;
+ axis2_char_t *incoming_seq_id = NULL;
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx1, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
@@ -551,22 +555,22 @@
return AXIS2_FAILURE;
}
incoming_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
- SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+ SANDESHA2_SEQ_GET_IDENTIFIER(req_seq, env), env);
if(NULL == incoming_seq_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL");
return AXIS2_FAILURE;
}
request_msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(
- SANDESHA2_SEQ_GET_MSG_NUM(seq, env), env);
+ SANDESHA2_SEQ_GET_MSG_NUM(req_seq, env), env);
internal_seq_id = sandesha2_utils_get_outgoing_internal_seq_id(env,
incoming_seq_id);
req_last_msg_num_str = sandesha2_utils_get_seq_property(env,
incoming_seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_NO,
storage_man);
- if(NULL != req_last_msg_num)
+ if(NULL != req_last_msg_num_str)
{
- long req_last_msg_num = atol(req_last_msg_num_str);
+ /*long req_last_msg_num = atol(req_last_msg_num_str);*/
if(req_last_msg_num_str == request_msg_no)
last_msg = AXIS2_TRUE;
}
@@ -636,7 +640,7 @@
internal_seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_NUMBER,
msg_number_str);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
res_highest_msg_bean);
if(AXIS2_TRUE == last_msg)
{
@@ -651,9 +655,9 @@
env, internal_seq_id,
SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO,
msg_number_str);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
res_highest_msg_key_bean);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
res_last_msg_key_bean);
}
if(AXIS2_TRUE == is_svr_side)
@@ -662,7 +666,7 @@
sandesha2_seq_property_bean_t *incoming_to_bean = NULL;
incoming_seq_id = sandesha2_utils_get_incoming_seq_id(env,
internal_seq_id);
- incoming_to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
+ incoming_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(NULL != incoming_to_bean)
@@ -698,7 +702,7 @@
SANDESHA2_MSG_PART_SEQ);
req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
SANDESHA2_SEQUNCE_GET_IDENTIFIER(seq, env), env);
- spec_ver_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
+ spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(NULL == spec_ver_bean)
{
@@ -730,7 +734,7 @@
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
- res_create_seq_added = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
+ res_create_seq_added = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, internal_seq_id,
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
@@ -744,7 +748,7 @@
env, internal_seq_id,
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT,
SANDESHA2_VALUE_TRUE);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
res_create_seq_added);
if(NULL != AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx1, env))
{
@@ -779,7 +783,7 @@
incoming_seq_id = sandesha2_utils_get_incoming_seq_id(env,
internal_seq_id);
- reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(
+ reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
if(NULL != reply_to_epr_bean)
@@ -953,9 +957,9 @@
axis2_msg_ctx_t *msg_ctx1 = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
- sandesha2_create_seq_bean_mgr_t *create_seq_man = NULL;
- sandesha2_sender_bean_mgr_t *retransmitter_man = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_create_seq_mgr_t *create_seq_man = NULL;
+ sandesha2_sender_mgr_t *retransmitter_man = NULL;
sandesha2_seq_offer_t *seq_offer = NULL;
axis2_msg_ctx_t *create_seq_msg = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
@@ -984,11 +988,11 @@
create_seq_part = SANDESHA2_MSG_CTX_GET_MSG_PART(create_seq_rm_msg, env,
SANDESHA2_MSG_PART_CREATE_SEQ);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
mgr, env);
- create_seq_man = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_BEAN_MGR(
+ create_seq_man = SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_MGR(
mgr, env);
- retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANSMITTER_BEAN_MGR
+ retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANSMITTER_MGR
(mgr, env);
seq_offer = SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq_part, env);
if(NULL != seq_offer)
@@ -1004,7 +1008,7 @@
internal_seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(offer_seq_bean, env,
seq_offer_id);
- SANDESHA2_SEQUNCE_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQUNCE_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
offer_seq_bean);
}
create_seq_msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(create_seq_rm_msg, env);
@@ -1013,7 +1017,7 @@
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
internal_seq_id, AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
create_seq_msg, env), NULL);
- SANDESHA2_CREATE_SEQ_BEAN_MGR_INSERT(create_seq_man, env,
+ SANDESHA2_CREATE_SEQ_MGR_INSERT(create_seq_man, env,
create_seq_bean);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
@@ -1046,7 +1050,7 @@
AXIS2_FALSE);
SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(create_seq_entry, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ);
- SANDESHA2_SENDER_BEAN_MGR_INSERT(retransmitter_man, env,
+ SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env,
create_seq_entry);
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, create_seq_msg);
property = axis2_property_create(env);
@@ -1088,8 +1092,8 @@
sandesha2_storage_mgr_t *mgr)
{
axis2_msg_ctx_t *msg = NULL;
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
- sandesha2_sender_bean_mgr_t *retransmitter_man = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_sender_mgr_t *retransmitter_man = NULL;
sandesha2_seq_property_bean_t *to_bean = NULL;
sandesha2_seq_property_bean_t *reply_to_bean = NULL;
sandesha2_seq_property_bean_t *out_seq_bean = NULL;
@@ -1119,15 +1123,15 @@
msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
mgr, env);
- retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANS_BEAN_MGR
+ retransmitter_man = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR
(mgr, env);
- to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
+ to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
- reply_to_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
+ reply_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
- out_seq_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr, env,
+ out_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
if(NULL != to_bean)
{
@@ -1261,7 +1265,7 @@
}
SANDESHA2_MSG_CTX_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, msg);
- SANDESHA2_SENDER_BEAN_MGR_INSERT(retransmitter_man, env, app_msg_entry);
+ SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env, app_msg_entry);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -1302,7 +1306,7 @@
axis2_char_t *internal_seq_id,
sandesha2_storage_mgr_t *mgr)
{
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
long next_msg_no = -1;
@@ -1310,9 +1314,9 @@
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
mgr, env);
- next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
+ next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, internal_seq_id,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
@@ -1337,7 +1341,7 @@
long msg_num,
sandesha2_storage_mgr_t *mgr)
{
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
axis2_bool_t update = AXIS2_TRUE;
axis2_char_t str_long[32];
@@ -1352,9 +1356,9 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
mgr, env);
- next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
+ next_msg_no_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, internal_seq_id,
SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
if(NULL == next_msg_no_bean)
@@ -1370,12 +1374,12 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(next_msg_no_bean, env, str_long);
if(AXIS2_TRUE == update)
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
next_msg_no_bean);
}
else
{
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
next_msg_no_bean);
}
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am Tue Jul 11 20:38:58 2006
@@ -6,8 +6,10 @@
sender_mgr.c \
next_msg_mgr.c \
seq_property_mgr.c \
- transaction.c
+ transaction.c \
+ storage_mgr.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
+ @AXIOMINC@ \
@UTILINC@
Copied: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (from r420822, webservices/sandesha/trunk/c/src/storage/inmemory/storage_manager.c)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?p2=webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c&p1=webservices/sandesha/trunk/c/src/storage/inmemory/storage_manager.c&r1=420822&r2=421104&rev=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_manager.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Tue Jul 11 20:38:58 2006
@@ -15,6 +15,12 @@
*/
#include <sandesha2_storage_mgr.h>
+#include <sandesha2_create_seq_mgr.h>
+#include <sandesha2_invoker_mgr.h>
+#include <sandesha2_next_msg_mgr.h>
+#include <sandesha2_sender_mgr.h>
+#include <sandesha2_seq_property_mgr.h>
+#include <sandesha2_transaction.h>
#include <sandesha2_constants.h>
#include <sandesha2_error.h>
#include <sandesha2_utils.h>
@@ -22,6 +28,9 @@
#include <axis2_hash.h>
#include <axis2_thread.h>
#include <axis2_property.h>
+#include <axis2_msg_ctx.h>
+#include <axis2_uuid_gen.h>
+#include <axis2_conf_ctx.h>
typedef struct sandesha2_storage_mgr_impl sandesha2_storage_mgr_impl_t;
@@ -41,7 +50,7 @@
sandesha2_sender_mgr_t *sender_mgr;
sandesha2_invoker_mgr_t *invoker_mgr;
- axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_conf_ctx_t *conf_ctx;
};
#define SANDESHA2_INTF_TO_IMPL(storage) ((sandesha2_storage_mgr_impl_t *) storage)
@@ -51,6 +60,99 @@
void *storage,
const axis2_env_t *envv);
+sandesha2_transaction_t *AXIS2_CALL
+sandesha2_storage_mgr_get_transaction(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_create_seq_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_create_seq_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_next_msg_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_next_msg_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_sender_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_retransmitter_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_seq_property_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_seq_property_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+sandesha2_invoker_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_storage_map_mgr(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_set_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_conf_ctx_t *AXIS2_CALL
+sandesha2_storage_mgr_get_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_init(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_msg_ctx_t *AXIS2_CALL
+sandesha2_storage_mgr_retrieve_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_conf_ctx_t *conf_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_store_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_update_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_remove_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_init_storage(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_module_desc_t *module_desc);
+
+axiom_soap_envelope_t *AXIS2_CALL
+sandesha2_storage_mgr_retrieve_soap_envelope(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_store_soap_envelope(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_env,
+ axis2_char_t *key);
+
AXIS2_EXTERN sandesha2_storage_mgr_t * AXIS2_CALL
sandesha2_storage_mgr_create(
const axis2_env_t *env,
@@ -83,28 +185,60 @@
storage_impl->invoker_mgr = sandesha2_invoker_mgr_create(env, ctx);
storage_impl->storage.ops->free = sandesha2_storage_mgr_free;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
- storage_impl->storage.ops-> =
- sandesha2_storage_mgr_;
+ storage_impl->storage.ops->init = sandesha2_storage_mgr_init;
+ storage_impl->storage.ops->set_ctx =
+ sandesha2_storage_mgr_set_ctx;
+ storage_impl->storage.ops->get_ctx =
+ sandesha2_storage_mgr_get_ctx;
+ storage_impl->storage.ops->init_storage =
+ sandesha2_storage_mgr_init_storage;
+ storage_impl->storage.ops->get_transaction =
+ sandesha2_storage_mgr_get_transaction;
+ storage_impl->storage.ops->get_create_seq_mgr =
+ sandesha2_storage_mgr_get_create_seq_mgr;
+ storage_impl->storage.ops->get_next_msg_mgr =
+ sandesha2_storage_mgr_get_next_msg_mgr;
+ storage_impl->storage.ops->get_retransmitter_mgr =
+ sandesha2_storage_mgr_get_retransmitter_mgr;
+ storage_impl->storage.ops->get_seq_property_mgr =
+ sandesha2_storage_mgr_get_seq_property_mgr;
+ storage_impl->storage.ops->get_storage_map_mgr =
+ sandesha2_storage_mgr_get_storage_map_mgr;
+ storage_impl->storage.ops->store_msg_ctx =
+ sandesha2_storage_mgr_store_msg_ctx;
+ storage_impl->storage.ops->update_msg_ctx =
+ sandesha2_storage_mgr_update_msg_ctx;
+ storage_impl->storage.ops->retrieve_msg_ctx =
+ sandesha2_storage_mgr_retrieve_msg_ctx;
+ storage_impl->storage.ops->remove_msg_ctx =
+ sandesha2_storage_mgr_remove_msg_ctx;
+ storage_impl->storage.ops->retrieve_soap_envelope =
+ sandesha2_storage_mgr_retrieve_soap_envelope;
+ storage_impl->storage.ops->store_soap_envelope =
+ sandesha2_storage_mgr_store_soap_envelope;
return &(storage_impl->storage);
}
+sandesha2_storage_mgr_t *AXIS2_CALL
+sandesha2_storage_mgr_get_instance(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx)
+{
+ sandesha2_storage_mgr_impl_t *storage_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FALSE);
+ storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
+
+ if(!storage_impl->instance)
+ {
+ storage_impl->instance = sandesha2_storage_mgr_create(env, conf_ctx);
+ }
+
+ return storage_impl->instance;
+}
+
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_free(
void *storage,
@@ -122,7 +256,7 @@
}
if(storage_impl->create_seq_mgr)
{
- SANDESHA2_CREATE_SEQ_MGR_FREE(storage_impl->creat_seq_mgr, env);
+ SANDESHA2_CREATE_SEQ_MGR_FREE(storage_impl->create_seq_mgr, env);
storage_impl->create_seq_mgr = NULL;
}
if(storage_impl->next_msg_mgr)
@@ -165,7 +299,7 @@
return AXIS2_SUCCESS;
}
-sandesha2_transaction_mgr_t *AXIS2_CALL
+sandesha2_transaction_t *AXIS2_CALL
sandesha2_storage_mgr_get_transaction(
sandesha2_storage_mgr_t *storage,
const axis2_env_t *env)
@@ -175,7 +309,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
- return sandesha2_transaction_mgr_create(env);
+ return sandesha2_transaction_create(env);
}
sandesha2_create_seq_mgr_t *AXIS2_CALL
@@ -263,13 +397,11 @@
axis2_conf_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_get_ctx(
sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
@@ -292,25 +424,6 @@
return AXIS2_SUCCESS;
}
-sandesha2_storage_mgr_t *AXIS2_CALL
-sandesha2_storage_mgr_get_instance(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
-{
- sandesha2_storage_mgr_impl_t *storage_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
-
- if(!storage_impl->instance)
- {
- storage_impl->instance = sandesha2_storage_mgr_create(env, conf_ctx);
- }
-
- return storage_impl->instance;
-}
-
axis2_msg_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_msg_ctx(
sandesha2_storage_mgr_t *storage,
@@ -321,7 +434,6 @@
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_hash_t *storage_map = NULL;
axis2_property_t *property = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
axis2_ctx_t *ctx = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -329,7 +441,8 @@
conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY);
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!storage_map)
return NULL;
@@ -355,7 +468,8 @@
conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY);
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
property = axis2_property_create(env);
@@ -365,7 +479,8 @@
{
storage_map = axis2_hash_make(env);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_map);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY, property);
+ AXIS2_CTX_SET_PROPERTY(ctx, env, storage_impl->SANDESHA2_MSG_MAP_KEY,
+ property, AXIS2_FALSE);
}
if(!key)
{
@@ -387,13 +502,15 @@
axis2_property_t *property = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_ctx_t *ctx = NULL;
+ void *old_entry = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_MSG_MAP_KEY);
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
if(!property)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
@@ -414,49 +531,77 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return sandesha2_storage_mgr
+ return sandesha2_storage_mgr_store_msg_ctx(storage, env, key, msg_ctx);
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_remove_msg_ctx(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key)
+{
+ sandesha2_storage_mgr_impl_t *storage_impl = NULL;
+ axis2_hash_t *storage_map = NULL;
+ axis2_property_t *property = NULL;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_ctx_t *ctx = NULL;
+ void *entry = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FALSE);
+ storage_impl = SANDESHA2_INTF_TO_IMPL(storage);
+
+ conf_ctx = sandesha2_storage_mgr_get_ctx(storage, env);
+ ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ storage_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
+ if(!property)
+ {
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+ storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(!storage_map)
+ {
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+ entry = axis2_hash_get(storage_map, key, AXIS2_HASH_KEY_STRING);
+ if(entry)
+ {
+ axis2_hash_set(storage_map, key, AXIS2_HASH_KEY_STRING, NULL);
+ }
return AXIS2_SUCCESS;
}
-
- public void updateMessageContext(String key,MessageContext msgContext) throws SandeshaStorageException {
- HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
-
- if (storageMap==null) {
- throw new SandeshaStorageException ("Storage Map not present");
- }
-
- Object oldEntry = storageMap.get(key);
- if (oldEntry==null)
- throw new SandeshaStorageException ("Entry is not present for updating");
-
- storeMessageContext(key,msgContext);
- }
-
- public void removeMessageContext(String key) throws SandeshaStorageException {
- HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
-
- if (storageMap==null) {
- return;
- }
-
- Object entry = storageMap.get(key);
- if (entry!=null)
- storageMap.remove(key);
- }
-
- public void initStorage (AxisModule moduleDesc) {
-
- }
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_init_storage(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_module_desc_t *module_desc)
+{
+ return AXIS2_SUCCESS;
+}
- public SOAPEnvelope retrieveSOAPEnvelope(String key) throws SandeshaStorageException {
- // TODO no real value
- return null;
- }
-
- public void storeSOAPEnvelope(SOAPEnvelope envelope, String key) throws SandeshaStorageException {
- // TODO no real value
- }
-
-
+axiom_soap_envelope_t *AXIS2_CALL
+sandesha2_storage_mgr_retrieve_soap_envelope(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key)
+{
+ /* TODO No real value */
+ return NULL;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_store_soap_envelope(
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_env,
+ axis2_char_t *key)
+{
+ /* TODO No real value */
+ return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Tue Jul 11 20:38:58 2006
@@ -15,7 +15,7 @@
*/
#include <sandesha2/sandesha2_transport_sender.h>
#include <sandesha2/sandesha2_constants.h>
-#include <sandesha2/sandesha2_storage_mgr.h>
+#include <sandesha2_storage_mgr.h>
#include <sandesha2/sandesha2_utils.h>
#include <axis2_conf.h>
#include <axis2_string.h>
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?rev=421104&r1=421103&r2=421104&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Tue Jul 11 20:38:58 2006
@@ -16,9 +16,10 @@
#include <sandesha2/sandesha2_in_order_invoker.h>
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_utils.h>
-#include <sandesha2/sandesha2_transaction.h>
-#include <sandesha2/sandesha2_storage_mgr.h>
-#include <sandesha2/sandesha2_seq_property_bean.h>
+#include <sandesha2_transaction.h>
+#include <sandesha2_storage_mgr.h>
+#include <sandesha2_seq_property_bean.h>
+#include <sandesha2_seq_property_mgr.h>
#include <sandesha2/sandesha2_msg_ctx.h>
#include <sandesha2/sandesha2_seq.h>
#include <axis2_addr.h>
@@ -318,9 +319,9 @@
/* Use when transaction handling is done
axis2_bool_t rollbacked = AXIS2_FALSE;*/
sandesha2_storage_mgr_t *storage_mgr = NULL;
- sandesha2_next_msg_bean_mgr_t *next_msg_mgr = NULL;
- sandesha2_invoker_bean_mgr_t *storage_map_mgr = NULL;
- sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
+ sandesha2_next_msg_mgr_t *next_msg_mgr = NULL;
+ sandesha2_invoker_mgr_t *storage_map_mgr = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *all_seq_bean = NULL;
axis2_array_list_t *all_seq_list = NULL;
int i = 0;
@@ -337,7 +338,7 @@
storage_mgr, env);
transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr,
env);
- all_seq_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
+ all_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
if(NULL == all_seq_bean)
@@ -362,7 +363,7 @@
SANDESHA2_TRANSACTION_COMMIT(transaction, env);
transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(
storage_mgr, env);
- next_msg_bean = SANDESHA2_NEXT_MSG_BEAN_MGR_RETRIEVE(
+ next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(
next_msg_mgr, env, seq_id);
if(NULL == next_msg_bean)
{
@@ -377,7 +378,7 @@
str_list = sandesha2_utils_array_list_to_string(env, all_seq_list);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(all_seq_bean, env,
str_list);
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
all_seq_bean);
continue;
}
@@ -391,7 +392,7 @@
}
find_bean = sandesha2_invoker_bean_create_with_data(env, NULL,
next_msg_no, seq_id, AXIS2_FALSE);
- st_map_list = SANDESHA2_INVOKER_BEAN_MGR_FIND(storage_map_mgr,
+ st_map_list = SANDESHA2_INVOKER_MGR_FIND(storage_map_mgr,
env, find_bean);
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(st_map_list, env); j++)
{
@@ -406,7 +407,7 @@
axis2_engine_t *engine = NULL;
st_map_bean = AXIS2_ARRAY_LIST_GET(st_map_list, env, j);
- key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_ID(st_map_bean,
+ key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(st_map_bean,
env);
msg_to_invoke = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(
storage_mgr, env, key, invoker_impl->conf_ctx);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org