name storage_mgr is changed to subs_mgr
diff --git a/include/savan_publisher_mod.h b/include/savan_publisher_mod.h
index bb54b05..03092c3 100644
--- a/include/savan_publisher_mod.h
+++ b/include/savan_publisher_mod.h
@@ -58,7 +58,7 @@
savan_publisher_mod_t *publisher,
const axutil_env_t *env,
void *msg_ctx,
- savan_storage_mgr_t *storage_mgr);
+ savan_subs_mgr_t *subs_mgr);
};
@@ -109,7 +109,7 @@
savan_publisher_mod_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
- savan_storage_mgr_t *storage_mgr);
+ savan_subs_mgr_t *subs_mgr);
/** @} */
#ifdef __cplusplus
diff --git a/include/savan_storage_mgr.h b/include/savan_storage_mgr.h
index 10d3e90..b6566bc 100644
--- a/include/savan_storage_mgr.h
+++ b/include/savan_storage_mgr.h
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef SAVAN_STORAGE_MGR_H
-#define SAVAN_STORAGE_MGR_H
+#ifndef SAVAN_SUBS_MGR_H
+#define SAVAN_SUBS_MGR_H
/**
- * @file savan_storage_mgr.h
+ * @file savan_subs_mgr.h
* @brief
*/
#include <platforms/axutil_platform_auto_sense.h>
@@ -33,173 +33,173 @@
#endif
/**
- * @ingroup savan_storage
+ * @ingroup savan subscription manager
* @{
*/
-typedef struct savan_storage_mgr savan_storage_mgr_t;
-typedef struct savan_storage_mgr_ops savan_storage_mgr_ops_t;
+typedef struct savan_subs_mgr savan_subs_mgr_t;
+typedef struct savan_subs_mgr_ops savan_subs_mgr_ops_t;
/**
- * @brief Storage Manager ops struct
- * Encapsulator struct for ops of savan_storage_mgr
+ * @brief Subscription Manager ops struct
+ * Encapsulator struct for ops of savan_subs_mgr
*/
-AXIS2_DECLARE_DATA struct savan_storage_mgr_ops
+AXIS2_DECLARE_DATA struct savan_subs_mgr_ops
{
void (AXIS2_CALL *
free)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env);
axis2_status_t (AXIS2_CALL *
insert_subscriber)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
axis2_status_t (AXIS2_CALL *
update_subscriber)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
axis2_status_t (AXIS2_CALL *
remove_subscriber)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscription_id);
savan_subscriber_t *(AXIS2_CALL *
retrieve_subscriber)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscription_id);
axutil_array_list_t *(AXIS2_CALL *
retrieve_all_subscribers)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name);
axis2_status_t (AXIS2_CALL *
insert_topic)(
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url);
};
-AXIS2_DECLARE_DATA struct savan_storage_mgr
+AXIS2_DECLARE_DATA struct savan_subs_mgr
{
- const savan_storage_mgr_ops_t *ops;
+ const savan_subs_mgr_ops_t *ops;
};
/**
- * Create the savan storage manager.
+ * Create the savan subscription manager.
* @param env environment object
* @param conf axis2 configuration
* @return status of the operation
*/
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create(
const axutil_env_t *env,
axis2_conf_t *conf);
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create_with_connection_info(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create_with_connection_info(
const axutil_env_t *env,
axis2_char_t *connection_string,
axis2_char_t *username,
axis2_char_t *password);
/**
- * Deallocate the storage.
- * @param storage_mgr
+ * Deallocate the subscription manager.
+ * @param subs_mgr
* @param env environment object
*/
AXIS2_EXTERN void AXIS2_CALL
-savan_storage_mgr_free(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_free(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *envv);
/**
* Insert a subscriber.
- * @param storage_mgr
+ * @param subs_mgr
* @param env environment object
* @param subscriber subscriber instant
* @return status of the operation
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
/**
* Update a subscriber.
- * @param storage_mgr
+ * @param subs_mgr
* @param env environment object
* @param subscriber subscriber instant
* @return status of the operation
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
/**
* Remove a subscriber.
- * @param storage_mgr
+ * @param subs_mgr
* @param env environment object
* @param subscription_id subscriber's id
* @return status of the operation
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscription_id);
/**
* Retrieve a subscriber.
- * @param storage_mgr
+ * @param subs_mgr
* @param env environment object
* @param subscription_id subscriber's id
* @return subscriber corresponding to the passed subscription id
*/
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscription_id);
/**
* Retrive all subscribers for a topic(event source).
- * @param storage_mgr
+ * @param subs_mgr
* @param env environment object
* @param topic_name topoic_name
* @return all subscribers for the event source
*/
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
-savan_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *filter);
/**
* Insert topic. Event source is mapped to a topic
- * @param storage_mgr
+ * @param subs_mgr
* @param env environment object
* @param topic_name topoic name
* @param topic_url topoic url
* @return status of the operation
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_insert_topic(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_insert_topic(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url);
@@ -209,4 +209,4 @@
}
#endif
-#endif /*SAVAN_STORAGE_MGR_H*/
+#endif /*SAVAN_SUBS_MGR_H*/
diff --git a/include/savan_sub_processor.h b/include/savan_sub_processor.h
index 23a158d..382d638 100644
--- a/include/savan_sub_processor.h
+++ b/include/savan_sub_processor.h
@@ -110,7 +110,7 @@
AXIS2_EXTERN savan_sub_processor_t * AXIS2_CALL
savan_sub_processor_create(
const axutil_env_t *env,
- savan_storage_mgr_t *storage_mgr);
+ savan_subs_mgr_t *subs_mgr);
/**
* Freesf a subscription manager instance.
diff --git a/include/savan_util.h b/include/savan_util.h
index 2931646..f9d8035 100644
--- a/include/savan_util.h
+++ b/include/savan_util.h
@@ -135,7 +135,7 @@
savan_util_get_subscriber_from_msg(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axis2_char_t *sub_id);
/**
@@ -152,7 +152,7 @@
savan_util_get_subscriber_from_renew_msg(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axis2_char_t *sub_id);
/**
@@ -177,7 +177,7 @@
* must be set in the publishers services.xml
* @param env pointer to environment struct
* @param msg_ctx pointer to message context
- * @param storage_mgr pointer to storage_mgr
+ * @param subs_mgr pointer to subs_mgr
* @param subscriber
* @return the store on success, else NULL
*/
@@ -186,14 +186,14 @@
savan_util_add_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_util_update_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
savan_subscriber_t *subscriber);
/**
@@ -203,7 +203,7 @@
* must be set in the publishers services.xml
* @param env pointer to environment struct
* @param msg_ctx pointer to message context
- * @param storage_mgr pointer to storage_mgr
+ * @param subs_mgr pointer to subs_mgr
* @param subscriber
* @return the store on success, else NULL
*/
@@ -212,7 +212,7 @@
savan_util_remove_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
savan_subscriber_t *subscriber);
/**
@@ -238,7 +238,7 @@
axis2_char_t *expiry);
/**
- * Create storage hash and set as a service parameter.
+ * Create subs hash and set as a service parameter.
* @param env pointer to environment struct
* @param svc subscription service
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
@@ -341,16 +341,16 @@
axiom_node_t *parent_node);
/**
- * Retrieve storage mgr. If it is already created for this request scope then it should be
+ * Retrieve subs mgr. If it is already created for this request scope then it should be
* available as a message context property. Otherwise create it and set as message context
* property.
* @param env environment object
* @param conf_ctx configuration context instance
* @param conf Axis2 main configuration instance
- * @return storage manager
+ * @return subs manager
*/
- AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
- savan_util_get_storage_mgr(
+ AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+ savan_util_get_subs_mgr(
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_conf_t *conf);
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index b574bc4..b2acf9e 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -3,7 +3,7 @@
libsavan_client_la_SOURCES = savan_client.c
libsavan_client_la_LIBADD = $(top_builddir)/src/util/libsavan_util.la \
- ../subs_mgrs/@SAVAN_SUBS_MGR@/libsavan_storage.la \
+ ../subs_mgrs/@SAVAN_SUBS_MGR@/libsavan_subs_mgr.la \
../filters/@SAVAN_FILTER_LIB@
INCLUDES = -I$(top_builddir)/include \
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 3657ecc..96c3091 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -13,4 +13,4 @@
libmod_savan_la_LIBADD = \
../handlers/libsavan_handlers.la\
../util/libsavan_util.la \
- ../subs_mgrs/@SAVAN_SUBS_MGR@/libsavan_storage.la
+ ../subs_mgrs/@SAVAN_SUBS_MGR@/libsavan_subs_mgr.la
diff --git a/src/core/savan_sub_processor.c b/src/core/savan_sub_processor.c
index e69684f..9bf018e 100644
--- a/src/core/savan_sub_processor.c
+++ b/src/core/savan_sub_processor.c
@@ -32,7 +32,7 @@
struct savan_sub_processor
{
int dummy;
- savan_storage_mgr_t *storage_mgr;
+ savan_subs_mgr_t *subs_mgr;
};
savan_subscriber_t * AXIS2_CALL
@@ -64,7 +64,7 @@
AXIS2_EXTERN savan_sub_processor_t *AXIS2_CALL
savan_sub_processor_create(
const axutil_env_t *env,
- savan_storage_mgr_t *storage_mgr)
+ savan_subs_mgr_t *subs_mgr)
{
savan_sub_processor_t *sub_processor = NULL;
@@ -81,7 +81,7 @@
}
memset ((void *) sub_processor, 0, sizeof(savan_sub_processor_t));
- sub_processor->storage_mgr = storage_mgr;
+ sub_processor->subs_mgr = subs_mgr;
return sub_processor;
}
@@ -138,7 +138,7 @@
}
if(AXIS2_SUCCESS != (status = savan_util_add_subscriber(env, msg_ctx,
- sub_processor->storage_mgr, subscriber)))
+ sub_processor->subs_mgr, subscriber)))
{
savan_subscriber_free(subscriber, env);
return status;
@@ -160,7 +160,7 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sub_processor_unsubscribe");
- subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, sub_processor->storage_mgr, NULL);
+ subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, sub_processor->subs_mgr, NULL);
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to find the subscriber");
@@ -172,7 +172,7 @@
savan_sub_processor_set_sub_id_to_msg_ctx(env, msg_ctx, id);
/* Remove from store */
- status = savan_util_remove_subscriber(env, msg_ctx, sub_processor->storage_mgr, subscriber);
+ status = savan_util_remove_subscriber(env, msg_ctx, sub_processor->subs_mgr, subscriber);
if (status != AXIS2_SUCCESS)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to remove the subscriber");
@@ -214,7 +214,7 @@
return AXIS2_FAILURE;
}
- subscriber = savan_util_get_subscriber_from_renew_msg(env, msg_ctx, sub_processor->storage_mgr, NULL);
+ subscriber = savan_util_get_subscriber_from_renew_msg(env, msg_ctx, sub_processor->subs_mgr, NULL);
if (!subscriber)
{
axis2_char_t *reason = NULL;
@@ -233,7 +233,7 @@
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- status = savan_storage_mgr_update_subscriber(sub_processor->storage_mgr, env, subscriber);
+ status = savan_subs_mgr_update_subscriber(sub_processor->subs_mgr, env, subscriber);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sub_processor_renew_subscription");
@@ -523,7 +523,7 @@
savan_sub_processor_t * sub_processor,
const axutil_env_t * env)
{
- sub_processor->storage_mgr = NULL;
+ sub_processor->subs_mgr = NULL;
if (sub_processor)
{
diff --git a/src/handlers/savan_in_handler.c b/src/handlers/savan_in_handler.c
index 13883bd..4e9a6d6 100644
--- a/src/handlers/savan_in_handler.c
+++ b/src/handlers/savan_in_handler.c
@@ -73,7 +73,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
int type;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Start:savan_in_handler_invoke");
@@ -82,8 +82,8 @@
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not create the database. Check \
whether database path is correct and accessible. Exit loading the Savan module");
@@ -93,7 +93,7 @@
}
/* create a subscription processor */
- processor = savan_sub_processor_create(env, storage_mgr);
+ processor = savan_sub_processor_create(env, subs_mgr);
if (!processor)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to create subscription processor");
diff --git a/src/handlers/savan_out_handler.c b/src/handlers/savan_out_handler.c
index a94b9bd..53cc52f 100644
--- a/src/handlers/savan_out_handler.c
+++ b/src/handlers/savan_out_handler.c
@@ -77,14 +77,14 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
axis2_status_t status = AXIS2_SUCCESS;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not create the database. Check \
whether database path is correct and accessible. Exit loading the Savan module");
diff --git a/src/msgreceivers/Makefile.am b/src/msgreceivers/Makefile.am
index 85d1d9c..6db2e32 100644
--- a/src/msgreceivers/Makefile.am
+++ b/src/msgreceivers/Makefile.am
@@ -3,7 +3,7 @@
libsavan_msgreceivers_la_SOURCES = savan_msg_recv.c
libsavan_msgreceivers_la_LIBADD = ../publisher/@SAVAN_PUBLISHER_LIB@ \
- ../subs_mgrs/@SAVAN_SUBS_MGR@/libsavan_storage.la \
+ ../subs_mgrs/@SAVAN_SUBS_MGR@/libsavan_subs_mgr.la \
../util/libsavan_util.la
diff --git a/src/msgreceivers/savan_msg_recv.c b/src/msgreceivers/savan_msg_recv.c
index 0772c34..a1218ac 100644
--- a/src/msgreceivers/savan_msg_recv.c
+++ b/src/msgreceivers/savan_msg_recv.c
@@ -114,7 +114,7 @@
axis2_conf_t *conf = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
savan_publisher_mod_t *pub_mod = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_msg_recv_handle_event");
@@ -123,8 +123,8 @@
pub_mod = savan_publisher_mod_create_with_conf(env, conf);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- savan_publisher_mod_publish(pub_mod, env, msg_ctx, storage_mgr);
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ savan_publisher_mod_publish(pub_mod, env, msg_ctx, subs_mgr);
savan_publisher_mod_free(pub_mod, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_msg_recv_handle_event");
@@ -281,7 +281,7 @@
axiom_element_set_text(id_elem, env, id, id_node);
/* Expires element. Get expiry time from subscriber and set */
- /*subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, storage_mgr, id);*/
+ /*subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, subs_mgr, id);*/
subs_prop = axis2_msg_ctx_get_property(msg_ctx, env, SAVAN_SUBSCRIBER);
if(subs_prop)
{
@@ -325,7 +325,7 @@
axiom_node_t *response_node = NULL;
axiom_element_t *response_elem = NULL;
savan_subscriber_t *subscriber = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
@@ -336,8 +336,8 @@
* the store */
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not create the data resource. Check \
whether resource path is correct and accessible. Exit loading the Savan module");
@@ -346,7 +346,7 @@
return AXIS2_FAILURE;
}
- subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, storage_mgr, NULL);
+ subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, subs_mgr, NULL);
if (subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -398,15 +398,15 @@
axiom_element_t *expires_elem = NULL;
axis2_char_t *expires = NULL;
savan_subscriber_t *subscriber = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_msg_recv_handle_renew_request");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not create the data resource. Check \
whether resource path is correct and accessible. Exit loading the Savan module");
@@ -415,7 +415,7 @@
return AXIS2_FAILURE;
}
- subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, storage_mgr, NULL);
+ subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, subs_mgr, NULL);
if (!subscriber)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_NOT_FOUND, AXIS2_FAILURE);
@@ -483,7 +483,7 @@
axiom_element_t *expires_elem = NULL;
axis2_char_t *expires = NULL;
savan_subscriber_t *subscriber = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
@@ -495,8 +495,8 @@
axis2_msg_info_headers_set_action(info_header, env, SAVAN_ACTIONS_GET_STATUS_RESPONSE);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not create the data resource. Check \
whether resource path is correct and accessible. Exit loading the Savan module");
@@ -524,11 +524,11 @@
/* Expires element */
- subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, storage_mgr, NULL);
+ subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, subs_mgr, NULL);
if(!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[savan] Failed get subscriber using msg from storage manager");
+ "[savan] Failed get subscriber using msg from subs manager");
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_NOT_FOUND, AXIS2_FAILURE);
return AXIS2_FAILURE;
diff --git a/src/publisher/common/publisher_mod.c b/src/publisher/common/publisher_mod.c
index 4813fd6..72d78c0 100644
--- a/src/publisher/common/publisher_mod.c
+++ b/src/publisher/common/publisher_mod.c
@@ -38,8 +38,8 @@
savan_publisher_mod_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
- savan_storage_mgr_t *storage_mgr)
+ savan_subs_mgr_t *subs_mgr)
{
- publishermod->ops->publish(publishermod, env, msg_ctx, storage_mgr);
+ publishermod->ops->publish(publishermod, env, msg_ctx, subs_mgr);
}
diff --git a/src/publisher/default/publisher_mod.c b/src/publisher/default/publisher_mod.c
index 09c3d37..1d6f1a0 100644
--- a/src/publisher/default/publisher_mod.c
+++ b/src/publisher/default/publisher_mod.c
@@ -61,7 +61,7 @@
savan_publisher_mod_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
- savan_storage_mgr_t *storage_mgr);
+ savan_subs_mgr_t *subs_mgr);
static axis2_status_t
savan_default_publisher_mod_publish_to_subscriber(
@@ -133,7 +133,7 @@
savan_publisher_mod_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
- savan_storage_mgr_t *storage_mgr)
+ savan_subs_mgr_t *subs_mgr)
{
savan_default_publisher_mod_t *publishermodimpl = NULL;
axutil_array_list_t *subs_store = NULL;
@@ -154,9 +154,9 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_default_publisher_mod_publish");
axutil_allocator_switch_to_global_pool(env->allocator);
- if(storage_mgr)
+ if(subs_mgr)
{
- subs_store = savan_storage_mgr_retrieve_all_subscribers(storage_mgr, env, filter);
+ subs_store = savan_subs_mgr_retrieve_all_subscribers(subs_mgr, env, filter);
}
if (!subs_store)
diff --git a/src/publisher/esb/publisher_mod.c b/src/publisher/esb/publisher_mod.c
index 673ad16..1992145 100644
--- a/src/publisher/esb/publisher_mod.c
+++ b/src/publisher/esb/publisher_mod.c
@@ -65,7 +65,7 @@
savan_publisher_mod_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
- savan_storage_mgr_t *storage_mgr);
+ savan_subs_mgr_t *subs_mgr);
static const savan_publisher_mod_ops_t savan_publisher_mod_ops =
{
@@ -142,7 +142,7 @@
savan_publisher_mod_t *publishermod,
const axutil_env_t *env,
void *esb_ctx,
- savan_storage_mgr_t *storage_mgr)
+ savan_subs_mgr_t *subs_mgr)
{
savan_esb_publisher_mod_t *publishermodimpl = NULL;
@@ -155,9 +155,9 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_esb_publisher_mod_publish");
axutil_allocator_switch_to_global_pool(env->allocator);
- if(storage_mgr)
+ if(subs_mgr)
{
- subs_store = savan_storage_mgr_retrieve_all_subscribers(storage_mgr, env, filter);
+ subs_store = savan_subs_mgr_retrieve_all_subscribers(subs_mgr, env, filter);
}
if (!subs_store)
diff --git a/src/subs_mgrs/common/Makefile.am b/src/subs_mgrs/common/Makefile.am
index 3e718a2..fe2bcaa 100644
--- a/src/subs_mgrs/common/Makefile.am
+++ b/src/subs_mgrs/common/Makefile.am
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libsavan_common_storage.la
+noinst_LTLIBRARIES = libsavan_common_subs_mgr.la
-libsavan_common_storage_la_SOURCES = \
+libsavan_common_subs_mgr_la_SOURCES = \
storage_mgr.c
INCLUDES = -I$(top_builddir)/include \
diff --git a/src/subs_mgrs/common/storage_mgr.c b/src/subs_mgrs/common/storage_mgr.c
index 619913a..72aa9f1 100644
--- a/src/subs_mgrs/common/storage_mgr.c
+++ b/src/subs_mgrs/common/storage_mgr.c
@@ -25,65 +25,65 @@
#include <axis2_conf_ctx.h>
AXIS2_EXTERN void AXIS2_CALL
-savan_storage_mgr_free(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_free(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env)
{
- return storage_mgr->ops->free(storage_mgr, env);
+ return subs_mgr->ops->free(subs_mgr, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
- return storage_mgr->ops->insert_subscriber(storage_mgr, env, subscriber);
+ return subs_mgr->ops->insert_subscriber(subs_mgr, env, subscriber);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
- return storage_mgr->ops->update_subscriber(storage_mgr, env, subscriber);
+ return subs_mgr->ops->update_subscriber(subs_mgr, env, subscriber);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id)
{
- return storage_mgr->ops->remove_subscriber(storage_mgr, env, subscriber_id);
+ return subs_mgr->ops->remove_subscriber(subs_mgr, env, subscriber_id);
}
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id)
{
- return storage_mgr->ops->retrieve_subscriber(storage_mgr, env, subscriber_id);
+ return subs_mgr->ops->retrieve_subscriber(subs_mgr, env, subscriber_id);
}
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *filter)
{
- return storage_mgr->ops->retrieve_all_subscribers(storage_mgr, env, filter);
+ return subs_mgr->ops->retrieve_all_subscribers(subs_mgr, env, filter);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_storage_mgr_insert_topic(
- savan_storage_mgr_t *storage_mgr,
+savan_subs_mgr_insert_topic(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url)
{
- return storage_mgr->ops->insert_topic(storage_mgr, env, topic_name, topic_url);
+ return subs_mgr->ops->insert_topic(subs_mgr, env, topic_name, topic_url);
}
diff --git a/src/subs_mgrs/inmemory/Makefile.am b/src/subs_mgrs/inmemory/Makefile.am
index 2f11727..8cb9e70 100644
--- a/src/subs_mgrs/inmemory/Makefile.am
+++ b/src/subs_mgrs/inmemory/Makefile.am
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libsavan_storage.la
+noinst_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_storage_la_SOURCES =
+libsavan_subs_mgr_la_SOURCES =
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/savan \
diff --git a/src/subs_mgrs/inmemory/storage_mgr_inmemory.c b/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
index fea0c2b..6767a9d 100644
--- a/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
+++ b/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
@@ -16,16 +16,16 @@
#include <savan_storage_mgr.h>
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create(
const axutil_env_t *env,
axis2_conf_t *conf)
{
return NULL;
}
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create_with_connection_info(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create_with_connection_info(
const axutil_env_t *env,
axis2_char_t *connection_string,
axis2_char_t *username,
diff --git a/src/subs_mgrs/registry/Makefile.am b/src/subs_mgrs/registry/Makefile.am
index 8d9483c..a1cacc0 100644
--- a/src/subs_mgrs/registry/Makefile.am
+++ b/src/subs_mgrs/registry/Makefile.am
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libsavan_storage.la
+lib_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_storage_la_SOURCES = storage_mgr.c
-libsavan_storage_la_LIBADD = ../common/libsavan_common_storage.la \
+libsavan_subs_mgr_la_SOURCES = storage_mgr.c
+libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la \
-lregistry_client
INCLUDES = -I$(top_builddir)/include \
diff --git a/src/subs_mgrs/registry/storage_mgr.c b/src/subs_mgrs/registry/storage_mgr.c
index 3a63baf..1d3a294 100644
--- a/src/subs_mgrs/registry/storage_mgr.c
+++ b/src/subs_mgrs/registry/storage_mgr.c
@@ -39,7 +39,7 @@
#define TOPIC_INDEX "/eventing/index/TopicIndex"
/**
- * Savan registry based storage manager dependes on the WSO2 registry for subscription storation.
+ * Savan registry based subscription manager dependes on the WSO2 registry for subscription storation.
* This use WSF/C registry cache client to communicate with the WSO2 registry. Registry cache
* client reduce the overhead of each time fetching records from the registry which is very
* expensive by caching the records locally.
@@ -48,193 +48,193 @@
* @brief Savan Registry Storage Manager Struct Impl
* Savan Registry Storage Manager
*/
-typedef struct savan_registry_storage_mgr
+typedef struct savan_registry_subs_mgr
{
- savan_storage_mgr_t storagemgr;
+ savan_subs_mgr_t subsmgr;
axis2_char_t *reg_url;
axis2_char_t *username;
axis2_char_t *password;
axis2_conf_t *conf;
remote_registry_t *remote_registry;
-} savan_registry_storage_mgr_t;
+} savan_registry_subs_mgr_t;
-typedef AXIS2_DECLARE_DATA struct savan_registry_storage_mgr_args
+typedef AXIS2_DECLARE_DATA struct savan_registry_subs_mgr_args
{
const axutil_env_t *env;
void *data;
-} savan_registry_storage_mgr_args_t;
+} savan_registry_subs_mgr_args_t;
-#define SAVAN_INTF_TO_IMPL(storagemgr) ((savan_registry_storage_mgr_t *) storagemgr)
+#define SAVAN_INTF_TO_IMPL(subsmgr) ((savan_registry_subs_mgr_t *) subsmgr)
-static savan_subscriber_t *savan_registry_storage_mgr_extract_subscriber(
+static savan_subscriber_t *savan_registry_subs_mgr_extract_subscriber(
const axutil_env_t *env,
remote_registry_resource_t *resource);
-static axis2_char_t *savan_registry_storage_mgr_serialize_endpoint(
+static axis2_char_t *savan_registry_subs_mgr_serialize_endpoint(
const axutil_env_t *env,
const savan_subscriber_t *subscriber);
static axis2_status_t
-savan_registry_storage_mgr_init_resource(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_init_resource(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
-savan_registry_storage_mgr_free(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_free(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_registry_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_registry_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_registry_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id);
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_registry_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id);
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_registry_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
const axis2_char_t *filter);
-static const savan_storage_mgr_ops_t storage_mgr_ops =
+static const savan_subs_mgr_ops_t subs_mgr_ops =
{
- savan_registry_storage_mgr_free,
- savan_registry_storage_mgr_insert_subscriber,
- savan_registry_storage_mgr_update_subscriber,
- savan_registry_storage_mgr_remove_subscriber,
- savan_registry_storage_mgr_retrieve_subscriber,
- savan_registry_storage_mgr_retrieve_all_subscribers,
+ savan_registry_subs_mgr_free,
+ savan_registry_subs_mgr_insert_subscriber,
+ savan_registry_subs_mgr_update_subscriber,
+ savan_registry_subs_mgr_remove_subscriber,
+ savan_registry_subs_mgr_retrieve_subscriber,
+ savan_registry_subs_mgr_retrieve_all_subscribers,
NULL
};
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create(
const axutil_env_t *env,
axis2_conf_t *conf)
{
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- storagemgrimpl = AXIS2_MALLOC(env->allocator, sizeof(savan_registry_storage_mgr_t));
- if (!storagemgrimpl)
+ subsmgrimpl = AXIS2_MALLOC(env->allocator, sizeof(savan_registry_subs_mgr_t));
+ if (!subsmgrimpl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_STORAGE_MANAGER_CREATION_FAILED, AXIS2_FAILURE);
return NULL;
}
- memset ((void *) storagemgrimpl, 0, sizeof(savan_registry_storage_mgr_t));
+ memset ((void *) subsmgrimpl, 0, sizeof(savan_registry_subs_mgr_t));
- storagemgrimpl->remote_registry = NULL;
- storagemgrimpl->reg_url = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
- storagemgrimpl->username = axutil_strdup(env, savan_util_get_resource_username(env, conf));
- storagemgrimpl->password = axutil_strdup(env, savan_util_get_resource_password(env, conf));
- storagemgrimpl->conf = conf;
- storagemgrimpl->storagemgr.ops = &storage_mgr_ops;
+ subsmgrimpl->remote_registry = NULL;
+ subsmgrimpl->reg_url = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
+ subsmgrimpl->username = axutil_strdup(env, savan_util_get_resource_username(env, conf));
+ subsmgrimpl->password = axutil_strdup(env, savan_util_get_resource_password(env, conf));
+ subsmgrimpl->conf = conf;
+ subsmgrimpl->subsmgr.ops = &subs_mgr_ops;
- status = savan_registry_storage_mgr_init_resource((savan_storage_mgr_t *) storagemgrimpl, env);
+ status = savan_registry_subs_mgr_init_resource((savan_subs_mgr_t *) subsmgrimpl, env);
if(status != AXIS2_SUCCESS)
{
- savan_registry_storage_mgr_free((savan_storage_mgr_t *) storagemgrimpl, env);
+ savan_registry_subs_mgr_free((savan_subs_mgr_t *) subsmgrimpl, env);
return NULL;
}
- return (savan_storage_mgr_t *) storagemgrimpl;
+ return (savan_subs_mgr_t *) subsmgrimpl;
}
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create_with_connection_info(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create_with_connection_info(
const axutil_env_t *env,
axis2_char_t *connection_string,
axis2_char_t *username,
axis2_char_t *password)
{
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- storagemgrimpl = AXIS2_MALLOC(env->allocator, sizeof(savan_registry_storage_mgr_t));
- if (!storagemgrimpl)
+ subsmgrimpl = AXIS2_MALLOC(env->allocator, sizeof(savan_registry_subs_mgr_t));
+ if (!subsmgrimpl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_STORAGE_MANAGER_CREATION_FAILED, AXIS2_FAILURE);
return NULL;
}
- memset ((void *) storagemgrimpl, 0, sizeof(savan_registry_storage_mgr_t));
+ memset ((void *) subsmgrimpl, 0, sizeof(savan_registry_subs_mgr_t));
- storagemgrimpl->remote_registry = NULL;
- storagemgrimpl->reg_url = axutil_strdup(env, connection_string);
- storagemgrimpl->username = axutil_strdup(env, username);
- storagemgrimpl->password = axutil_strdup(env, password);
- storagemgrimpl->conf = NULL;
- storagemgrimpl->storagemgr.ops = &storage_mgr_ops;
+ subsmgrimpl->remote_registry = NULL;
+ subsmgrimpl->reg_url = axutil_strdup(env, connection_string);
+ subsmgrimpl->username = axutil_strdup(env, username);
+ subsmgrimpl->password = axutil_strdup(env, password);
+ subsmgrimpl->conf = NULL;
+ subsmgrimpl->subsmgr.ops = &subs_mgr_ops;
- status = savan_registry_storage_mgr_init_resource((savan_storage_mgr_t *) storagemgrimpl, env);
+ status = savan_registry_subs_mgr_init_resource((savan_subs_mgr_t *) subsmgrimpl, env);
if(status != AXIS2_SUCCESS)
{
- savan_registry_storage_mgr_free((savan_storage_mgr_t *) storagemgrimpl, env);
+ savan_registry_subs_mgr_free((savan_subs_mgr_t *) subsmgrimpl, env);
return NULL;
}
- return (savan_storage_mgr_t *) storagemgrimpl;
+ return (savan_subs_mgr_t *) subsmgrimpl;
}
AXIS2_EXTERN void AXIS2_CALL
-savan_registry_storage_mgr_free(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_free(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env)
{
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_registry_storage_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_registry_subs_mgr_free");
- if(storagemgrimpl->reg_url)
+ if(subsmgrimpl->reg_url)
{
- AXIS2_FREE(env->allocator, storagemgrimpl->reg_url);
- storagemgrimpl->reg_url = NULL;
+ AXIS2_FREE(env->allocator, subsmgrimpl->reg_url);
+ subsmgrimpl->reg_url = NULL;
}
- if(storagemgrimpl->username)
+ if(subsmgrimpl->username)
{
- AXIS2_FREE(env->allocator, storagemgrimpl->username);
- storagemgrimpl->username = NULL;
+ AXIS2_FREE(env->allocator, subsmgrimpl->username);
+ subsmgrimpl->username = NULL;
}
- if(storagemgrimpl->password)
+ if(subsmgrimpl->password)
{
- AXIS2_FREE(env->allocator, storagemgrimpl->password);
- storagemgrimpl->password = NULL;
+ AXIS2_FREE(env->allocator, subsmgrimpl->password);
+ subsmgrimpl->password = NULL;
}
- storagemgrimpl->conf = NULL;
+ subsmgrimpl->conf = NULL;
- if(storagemgrimpl)
+ if(subsmgrimpl)
{
- AXIS2_FREE(env->allocator, storagemgrimpl);
- storagemgrimpl = NULL;
+ AXIS2_FREE(env->allocator, subsmgrimpl);
+ subsmgrimpl = NULL;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_registry_storage_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_registry_subs_mgr_free");
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_registry_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
@@ -247,22 +247,22 @@
axutil_hash_t *properties = NULL;
char *content = NULL;
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_registry_storage_mgr_insert_subscriber");
+ "[savan] Entry:savan_registry_subs_mgr_insert_subscriber");
subscription_id = savan_subscriber_get_id(subscriber, env);
filter = savan_subscriber_get_filter(subscriber, env);
path = axutil_strcat(env, AXIS2_PATH_SEP_STR, filter, AXIS2_PATH_SEP_STR,
SUBSCRIPTION_COLLECTION_NAME, AXIS2_PATH_SEP_STR, subscription_id, NULL);
- id = axutil_strcat(env, storagemgrimpl->reg_url, AXIS2_PATH_SEP_STR, filter,
+ id = axutil_strcat(env, subsmgrimpl->reg_url, AXIS2_PATH_SEP_STR, filter,
AXIS2_PATH_SEP_STR, SUBSCRIPTION_COLLECTION_NAME, AXIS2_PATH_SEP_STR, subscription_id,
NULL);
res = remote_registry_resource_create(env);
- content = savan_registry_storage_mgr_serialize_endpoint(env, subscriber);
+ content = savan_registry_subs_mgr_serialize_endpoint(env, subscriber);
remote_registry_resource_set_content(res, env, content);
remote_registry_resource_set_content_len(res, env, axutil_strlen(content));
remote_registry_resource_set_media_type(res, env, EPR_TYPE);
@@ -314,7 +314,7 @@
remote_registry_resource_set_properties(res, env, properties);
}
- remote_registry_put(storagemgrimpl->remote_registry, env, path, res);
+ remote_registry_put(subsmgrimpl->remote_registry, env, path, res);
if(id)
{
AXIS2_FREE(env->allocator, id);
@@ -330,14 +330,14 @@
res = NULL;
}
- res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_INSERT_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not retrive resource TopicIndex");
return AXIS2_FAILURE;
}
- id = axutil_strcat(env, storagemgrimpl->reg_url, TOPIC_INDEX, NULL);
+ id = axutil_strcat(env, subsmgrimpl->reg_url, TOPIC_INDEX, NULL);
properties = remote_registry_resource_get_properties(res, env);
if(properties)
{
@@ -349,7 +349,7 @@
remote_registry_resource_set_content(res, env, NULL);
remote_registry_resource_set_content_len(res, env, 0);
- remote_registry_put(storagemgrimpl->remote_registry, env, TOPIC_INDEX, res);
+ remote_registry_put(subsmgrimpl->remote_registry, env, TOPIC_INDEX, res);
if(id)
{
@@ -362,13 +362,13 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_registry_storage_mgr_insert_subscriber");
+ "[savan] Exit:savan_registry_subs_mgr_insert_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_registry_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
@@ -381,13 +381,13 @@
axutil_hash_t *properties = NULL;
axis2_char_t *val = NULL;
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_registry_storage_mgr_update_subscriber");
+ "[savan] Entry:savan_registry_subs_mgr_update_subscriber");
- index_res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ index_res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!index_res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_INSERT_ERROR, AXIS2_FAILURE);
@@ -403,7 +403,7 @@
path = axutil_strcat(env, val, AXIS2_PATH_SEP_STR, subscriber_id, NULL);
}
- res = remote_registry_get(storagemgrimpl->remote_registry, env, path, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, path, NULL);
if(!res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_UPDATE_ERROR, AXIS2_FAILURE);
@@ -453,7 +453,7 @@
remote_registry_resource_set_properties(res, env, properties);
}
- remote_registry_put(storagemgrimpl->remote_registry, env, path, res);
+ remote_registry_put(subsmgrimpl->remote_registry, env, path, res);
if(path)
{
@@ -468,13 +468,13 @@
savan_subscriber_set_renew_status(subscriber, env, AXIS2_TRUE);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_registry_storage_mgr_update_subscriber");
+ "[savan] Exit:savan_registry_subs_mgr_update_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_registry_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id)
{
@@ -483,13 +483,13 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_char_t *path = NULL;
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_registry_storage_mgr_remove_subscriber");
+ "[savan] Entry:savan_registry_subs_mgr_remove_subscriber");
- res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_UPDATE_ERROR, AXIS2_FAILURE);
@@ -502,7 +502,7 @@
if(val)
{
path = axutil_strcat(env, val, AXIS2_PATH_SEP_STR, subscriber_id, NULL);
- status = remote_registry_delete(storagemgrimpl->remote_registry, env, path);
+ status = remote_registry_delete(subsmgrimpl->remote_registry, env, path);
}
remote_registry_resource_free(res, env);
@@ -514,7 +514,7 @@
return AXIS2_FAILURE;
}
- res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_UPDATE_ERROR, AXIS2_FAILURE);
@@ -524,17 +524,17 @@
}
remote_registry_resource_remove_property(res, env, subscriber_id);
- remote_registry_put(storagemgrimpl->remote_registry, env, TOPIC_INDEX, res);
+ remote_registry_put(subsmgrimpl->remote_registry, env, TOPIC_INDEX, res);
remote_registry_resource_free(res, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_registry_storage_mgr_remove_subscriber");
+ "[savan] Exit:savan_registry_subs_mgr_remove_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_registry_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id)
{
@@ -544,14 +544,14 @@
axis2_char_t *path = NULL;
savan_subscriber_t *subscriber = NULL;
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_registry_storage_mgr_retrieve_subscriber");
+ "[savan] Entry:savan_registry_subs_mgr_retrieve_subscriber");
- root_res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ root_res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!root_res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_UPDATE_ERROR, AXIS2_FAILURE);
@@ -564,12 +564,12 @@
if(val)
{
path = axutil_strcat(env, val, AXIS2_PATH_SEP_STR, subscriber_id, NULL);
- res = remote_registry_get(storagemgrimpl->remote_registry, env, path, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, path, NULL);
}
if(res)
{
- subscriber = savan_registry_storage_mgr_extract_subscriber(env, res);
+ subscriber = savan_registry_subs_mgr_extract_subscriber(env, res);
if(subscriber)
{
savan_subscriber_set_id(subscriber, env, subscriber_id);
@@ -577,13 +577,13 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_registry_storage_mgr_retrieve_subscriber");
+ "[savan] Exit:savan_registry_subs_mgr_retrieve_subscriber");
return subscriber;
}
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_registry_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env,
const axis2_char_t *filter)
{
@@ -591,16 +591,16 @@
axis2_char_t *path = NULL;
axutil_array_list_t *data_list = NULL;
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_registry_storage_mgr_retrieve_all_subscribers");
+ "[savan] Entry:savan_registry_subs_mgr_retrieve_all_subscribers");
/* Get subscribers for the filter from registry. Eg. /weather/4/system.subscriptions */
if(filter)
{
- root_res = remote_registry_get(storagemgrimpl->remote_registry, env,
+ root_res = remote_registry_get(subsmgrimpl->remote_registry, env,
(axis2_char_t *) filter, NULL);
if(root_res)
{
@@ -622,7 +622,7 @@
{
savan_subscriber_t *subscriber = NULL;
- subscriber = savan_registry_storage_mgr_extract_subscriber(env, res);
+ subscriber = savan_registry_subs_mgr_extract_subscriber(env, res);
axutil_array_list_add(data_list, env, subscriber);
}
}
@@ -633,7 +633,7 @@
{
axutil_hash_t *properties = NULL;
- root_res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ root_res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!root_res)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_SUBSCRIBER_UPDATE_ERROR, AXIS2_FAILURE);
@@ -659,12 +659,12 @@
axutil_hash_this(hi, (const void**)&key, NULL, &val);
subscriber_id = (axis2_char_t *) key;
path = axutil_strcat(env, val, AXIS2_PATH_SEP_STR, key, NULL);
- res = remote_registry_get(storagemgrimpl->remote_registry, env, path, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, path, NULL);
if(res)
{
if(res)
{
- subscriber = savan_registry_storage_mgr_extract_subscriber(env, res);
+ subscriber = savan_registry_subs_mgr_extract_subscriber(env, res);
savan_subscriber_set_id(subscriber, env, subscriber_id);
axutil_array_list_add(data_list, env, subscriber);
}
@@ -674,26 +674,26 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_registry_storage_mgr_retrieve_all_subscribers");
+ "[savan] Exit:savan_registry_subs_mgr_retrieve_all_subscribers");
return data_list;
}
static axis2_status_t
-savan_registry_storage_mgr_init_resource(
- savan_storage_mgr_t *storagemgr,
+savan_registry_subs_mgr_init_resource(
+ savan_subs_mgr_t *subsmgr,
const axutil_env_t *env)
{
remote_registry_resource_t *res = NULL;
axis2_char_t *id = NULL;
- savan_registry_storage_mgr_t *storagemgrimpl = NULL;
- storagemgrimpl = SAVAN_INTF_TO_IMPL(storagemgr);
+ savan_registry_subs_mgr_t *subsmgrimpl = NULL;
+ subsmgrimpl = SAVAN_INTF_TO_IMPL(subsmgr);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_registry_storage_mgr_init_resource");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_registry_subs_mgr_init_resource");
- storagemgrimpl->remote_registry = remote_registry_create(env, storagemgrimpl->reg_url,
- storagemgrimpl->username, storagemgrimpl->password);
- if(!storagemgrimpl->remote_registry)
+ subsmgrimpl->remote_registry = remote_registry_create(env, subsmgrimpl->reg_url,
+ subsmgrimpl->username, subsmgrimpl->password);
+ if(!subsmgrimpl->remote_registry)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_DATABASE_CREATION_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -701,14 +701,14 @@
return AXIS2_FAILURE;
}
- res = remote_registry_get(storagemgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
+ res = remote_registry_get(subsmgrimpl->remote_registry, env, TOPIC_INDEX, NULL);
if(!res)
{
res = remote_registry_resource_create(env);
- id = axutil_strcat(env, storagemgrimpl->reg_url, TOPIC_INDEX, NULL);
+ id = axutil_strcat(env, subsmgrimpl->reg_url, TOPIC_INDEX, NULL);
remote_registry_resource_set_properties(res, env, axutil_hash_make(env));
remote_registry_resource_set_description(res, env, "");
- remote_registry_put(storagemgrimpl->remote_registry, env, TOPIC_INDEX, res);
+ remote_registry_put(subsmgrimpl->remote_registry, env, TOPIC_INDEX, res);
}
if(id)
@@ -720,12 +720,12 @@
remote_registry_resource_free(res, env);
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_registry_storage_mgr_init_resource");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_registry_subs_mgr_init_resource");
return AXIS2_SUCCESS;
}
-static axis2_char_t *savan_registry_storage_mgr_serialize_endpoint(
+static axis2_char_t *savan_registry_subs_mgr_serialize_endpoint(
const axutil_env_t *env,
const savan_subscriber_t *subscriber)
{
@@ -741,7 +741,7 @@
char *content = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_registry_storage_mgr_serialize_endpoint");
+ "[savan] Entry:savan_registry_subs_mgr_serialize_endpoint");
/* Format of the message is as
* <subscription><syn:endpoint xmlns:syn="http://ws.apache.org/ns/synapse"><syn:address uri=
@@ -767,12 +767,12 @@
content = (char *) axiom_node_to_string(subs_node, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_registry_storage_mgr_serialize_endpoint");
+ "[savan] Exit:savan_registry_subs_mgr_serialize_endpoint");
return content;
}
-static savan_subscriber_t *savan_registry_storage_mgr_extract_subscriber(
+static savan_subscriber_t *savan_registry_subs_mgr_extract_subscriber(
const axutil_env_t *env,
remote_registry_resource_t *resource)
{
diff --git a/src/subs_mgrs/service/Makefile.am b/src/subs_mgrs/service/Makefile.am
index e223559..ca375e6 100644
--- a/src/subs_mgrs/service/Makefile.am
+++ b/src/subs_mgrs/service/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = subs_mgr_svc
-noinst_LTLIBRARIES = libsavan_storage.la
+noinst_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_storage_la_SOURCES = service_storage_mgr.c
+libsavan_subs_mgr_la_SOURCES = service_storage_mgr.c
-libsavan_storage_la_LIBADD = ../common/libsavan_common_storage.la
+libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/savan \
diff --git a/src/subs_mgrs/service/service_storage_mgr.c b/src/subs_mgrs/service/service_storage_mgr.c
index 53e226c..d2559ea 100644
--- a/src/subs_mgrs/service/service_storage_mgr.c
+++ b/src/subs_mgrs/service/service_storage_mgr.c
@@ -27,7 +27,7 @@
#include <axis2_svc_client.h>
/**
- * Savan service based storage manager communicate with the savan subscription manager service for
+ * Savan service based subscription manager communicate with the savan subscription manager service for
* resources subscriber and topic.
*
*/
@@ -35,139 +35,139 @@
* @brief Savan Permanent Storage Manager Struct Impl
* Savan Permanent Storage Manager
*/
-typedef struct savan_service_storage_mgr
+typedef struct savan_service_subs_mgr
{
- savan_storage_mgr_t storage_mgr;
+ savan_subs_mgr_t subs_mgr;
axis2_char_t *subs_mgr_url;
axis2_conf_t *conf;
-} savan_service_storage_mgr_t;
+} savan_service_subs_mgr_t;
-typedef AXIS2_DECLARE_DATA struct savan_service_storage_mgr_args
+typedef AXIS2_DECLARE_DATA struct savan_service_subs_mgr_args
{
const axutil_env_t *env;
void *data;
-} savan_service_storage_mgr_args_t;
+} savan_service_subs_mgr_args_t;
-#define SAVAN_INTF_TO_IMPL(trans) ((savan_service_storage_mgr_t *) trans)
+#define SAVAN_INTF_TO_IMPL(trans) ((savan_service_subs_mgr_t *) trans)
static axis2_status_t
-savan_service_storage_mgr_add_subscriber_to_subs_mgr(
+savan_service_subs_mgr_add_subscriber_to_subs_mgr(
const axutil_env_t *env,
savan_subscriber_t *subscriber,
axis2_char_t *subs_mgr_url);
static axiom_node_t *
-savan_service_storage_mgr_build_add_subscriber_om_payload(
+savan_service_subs_mgr_build_add_subscriber_om_payload(
const axutil_env_t *env,
savan_subscriber_t *subscriber);
static axutil_array_list_t *
-savan_service_storage_mgr_process_subscriber_list_node(
+savan_service_subs_mgr_process_subscriber_list_node(
const axutil_env_t *env,
axiom_node_t *subs_list_node);
static savan_subscriber_t *AXIS2_CALL
-savan_service_storage_mgr_process_savan_specific_subscriber_node(
+savan_service_subs_mgr_process_savan_specific_subscriber_node(
const axutil_env_t *env,
axiom_node_t *subs_node);
static axiom_node_t *
-savan_service_storage_mgr_build_subscriber_request_om_payload(
+savan_service_subs_mgr_build_subscriber_request_om_payload(
const axutil_env_t *env,
const axis2_char_t *subs_id);
static axiom_node_t *
-savan_service_storage_mgr_build_subscribers_request_om_payload(
+savan_service_subs_mgr_build_subscribers_request_om_payload(
const axutil_env_t *env,
const axis2_char_t *topic);
static axiom_node_t *
-savan_service_storage_mgr_build_topics_request_om_payload(
+savan_service_subs_mgr_build_topics_request_om_payload(
const axutil_env_t *env);
static axutil_array_list_t *
-savan_service_storage_mgr_process_topic_list_node(
+savan_service_subs_mgr_process_topic_list_node(
const axutil_env_t *env,
axiom_node_t *topic_list_node);
AXIS2_EXTERN void AXIS2_CALL
-savan_service_storage_mgr_free(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_free(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id);
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_service_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subcriber_id);
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_service_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *filter);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_insert_topic(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_insert_topic(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url);
-static const savan_storage_mgr_ops_t storage_mgr_ops =
+static const savan_subs_mgr_ops_t subs_mgr_ops =
{
- savan_service_storage_mgr_free,
- savan_service_storage_mgr_insert_subscriber,
- savan_service_storage_mgr_update_subscriber,
- savan_service_storage_mgr_remove_subscriber,
- savan_service_storage_mgr_retrieve_subscriber,
- savan_service_storage_mgr_retrieve_all_subscribers,
- savan_service_storage_mgr_insert_topic
+ savan_service_subs_mgr_free,
+ savan_service_subs_mgr_insert_subscriber,
+ savan_service_subs_mgr_update_subscriber,
+ savan_service_subs_mgr_remove_subscriber,
+ savan_service_subs_mgr_retrieve_subscriber,
+ savan_service_subs_mgr_retrieve_all_subscribers,
+ savan_service_subs_mgr_insert_topic
};
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create(
const axutil_env_t *env,
axis2_conf_t *conf)
{
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
- storage_mgr_impl = AXIS2_MALLOC(env->allocator, sizeof(savan_service_storage_mgr_t));
- if (!storage_mgr_impl)
+ subs_mgr_impl = AXIS2_MALLOC(env->allocator, sizeof(savan_service_subs_mgr_t));
+ if (!subs_mgr_impl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_STORAGE_MANAGER_CREATION_FAILED, AXIS2_FAILURE);
return NULL;
}
- memset ((void *) storage_mgr_impl, 0, sizeof(savan_service_storage_mgr_t));
+ memset ((void *) subs_mgr_impl, 0, sizeof(savan_service_subs_mgr_t));
- storage_mgr_impl->subs_mgr_url = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
- storage_mgr_impl->conf = conf;
- storage_mgr_impl->storage_mgr.ops = &storage_mgr_ops;
+ subs_mgr_impl->subs_mgr_url = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
+ subs_mgr_impl->conf = conf;
+ subs_mgr_impl->subs_mgr.ops = &subs_mgr_ops;
- return (savan_storage_mgr_t *) storage_mgr_impl;
+ return (savan_subs_mgr_t *) subs_mgr_impl;
}
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create_with_connection_info(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create_with_connection_info(
const axutil_env_t *env,
axis2_char_t *connection_string,
axis2_char_t *username,
@@ -176,88 +176,88 @@
}
AXIS2_EXTERN void AXIS2_CALL
-savan_service_storage_mgr_free(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_free(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env)
{
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_service_storage_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_service_subs_mgr_free");
- if(storage_mgr_impl->subs_mgr_url)
+ if(subs_mgr_impl->subs_mgr_url)
{
- AXIS2_FREE(env->allocator, storage_mgr_impl->subs_mgr_url);
- storage_mgr_impl->subs_mgr_url = NULL;
+ AXIS2_FREE(env->allocator, subs_mgr_impl->subs_mgr_url);
+ subs_mgr_impl->subs_mgr_url = NULL;
}
- storage_mgr_impl->conf = NULL;
+ subs_mgr_impl->conf = NULL;
- if(storage_mgr_impl)
+ if(subs_mgr_impl)
{
- AXIS2_FREE(env->allocator, storage_mgr_impl);
- storage_mgr_impl = NULL;
+ AXIS2_FREE(env->allocator, subs_mgr_impl);
+ subs_mgr_impl = NULL;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_service_storage_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_service_subs_mgr_free");
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
axis2_status_t status = AXIS2_FAILURE;
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
- status = savan_service_storage_mgr_add_subscriber_to_subs_mgr(env, subscriber,
- storage_mgr_impl->subs_mgr_url);
+ status = savan_service_subs_mgr_add_subscriber_to_subs_mgr(env, subscriber,
+ subs_mgr_impl->subs_mgr_url);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_insert_subscriber");
+ "[savan] Exit:savan_service_subs_mgr_insert_subscriber");
return status;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_update_subscriber");
+ "[savan] Entry:savan_service_subs_mgr_update_subscriber");
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_update_subscriber");
+ "[savan] Entry:savan_service_subs_mgr_update_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id)
{
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_remove_subscriber");
+ "[savan] Entry:savan_service_subs_mgr_remove_subscriber");
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_remove_subscriber");
+ "[savan] Exit:savan_service_subs_mgr_remove_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_service_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subs_id)
{
@@ -268,22 +268,22 @@
axiom_node_t *ret_node = NULL;
savan_subscriber_t *subscriber = NULL;
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_retrieve_subscriber");
+ "[savan] Entry:savan_service_subs_mgr_retrieve_subscriber");
svc_client = (axis2_svc_client_t *) savan_util_get_svc_client(env);
options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
- endpoint_ref = axis2_endpoint_ref_create(env, storage_mgr_impl->subs_mgr_url);
+ endpoint_ref = axis2_endpoint_ref_create(env, subs_mgr_impl->subs_mgr_url);
axis2_options_set_to(options, env, endpoint_ref);
- payload = savan_service_storage_mgr_build_subscriber_request_om_payload(env, subs_id);
+ payload = savan_service_subs_mgr_build_subscriber_request_om_payload(env, subs_id);
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
if (ret_node)
{
- subscriber = savan_service_storage_mgr_process_savan_specific_subscriber_node(env, ret_node);
+ subscriber = savan_service_subs_mgr_process_savan_specific_subscriber_node(env, ret_node);
}
else
{
@@ -292,18 +292,18 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_retrieve_subscriber");
+ "[savan] Exit:savan_service_subs_mgr_retrieve_subscriber");
return subscriber;
}
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_service_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *filter)
{
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -313,18 +313,18 @@
axutil_array_list_t *subscriber_list = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_retrieve_all_subscribers");
+ "[savan] Entry:savan_service_subs_mgr_retrieve_all_subscribers");
svc_client = (axis2_svc_client_t *) savan_util_get_svc_client(env);
options = (axis2_options_t *)axis2_svc_client_get_options(svc_client, env);
- endpoint_ref = axis2_endpoint_ref_create(env, storage_mgr_impl->subs_mgr_url);
+ endpoint_ref = axis2_endpoint_ref_create(env, subs_mgr_impl->subs_mgr_url);
axis2_options_set_to(options, env, endpoint_ref);
- payload = savan_service_storage_mgr_build_subscribers_request_om_payload(env, filter);
+ payload = savan_service_subs_mgr_build_subscribers_request_om_payload(env, filter);
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
if (ret_node)
{
- subscriber_list = savan_service_storage_mgr_process_subscriber_list_node(env, ret_node);
+ subscriber_list = savan_service_subs_mgr_process_subscriber_list_node(env, ret_node);
}
else
{
@@ -333,25 +333,25 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_retrieve_all_subscribers");
+ "[savan] Exit:savan_service_subs_mgr_retrieve_all_subscribers");
return subscriber_list;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_service_storage_mgr_insert_topic(
- savan_storage_mgr_t *storage_mgr,
+savan_service_subs_mgr_insert_topic(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url)
{
- savan_service_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_service_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_insert_topic");
+ "[savan] Entry:savan_service_subs_mgr_insert_topic");
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_insert_topic");
+ "[savan] Exit:savan_service_subs_mgr_insert_topic");
return AXIS2_SUCCESS;
}
@@ -386,7 +386,7 @@
}*/
axutil_array_list_t *AXIS2_CALL
-savan_service_storage_mgr_get_topic_list_from_subs_mgr(
+savan_service_subs_mgr_get_topic_list_from_subs_mgr(
const axutil_env_t *env,
axis2_char_t *subs_mgr_url,
void *s_client)
@@ -399,7 +399,7 @@
axutil_array_list_t *topic_list = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_get_topic_list_from_subs_mgr");
+ "[savan] Entry:savan_service_subs_mgr_get_topic_list_from_subs_mgr");
if(!s_client)
{
@@ -413,11 +413,11 @@
endpoint_ref = axis2_endpoint_ref_create(env, subs_mgr_url);
axis2_options_set_to(options, env, endpoint_ref);
- payload = savan_service_storage_mgr_build_topics_request_om_payload(env);
+ payload = savan_service_subs_mgr_build_topics_request_om_payload(env);
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
if (ret_node)
{
- topic_list = savan_service_storage_mgr_process_topic_list_node(env, ret_node);
+ topic_list = savan_service_subs_mgr_process_topic_list_node(env, ret_node);
}
else
{
@@ -431,12 +431,12 @@
/*axis2_svc_client_free(svc_client, env);*/
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_get_topic_list_from_subs_mgr");
+ "[savan] Exit:savan_service_subs_mgr_get_topic_list_from_subs_mgr");
return topic_list;
}
static axis2_status_t
-savan_service_storage_mgr_add_subscriber_to_subs_mgr(
+savan_service_subs_mgr_add_subscriber_to_subs_mgr(
const axutil_env_t *env,
savan_subscriber_t *subscriber,
axis2_char_t *subs_mgr_url)
@@ -454,7 +454,7 @@
axis2_options_set_to(options, env, endpoint_ref);
axis2_options_set_action(options, env, SAVAN_SUBS_MGR_ADD_SUBSCRIBER_URL);
- payload = savan_service_storage_mgr_build_add_subscriber_om_payload(env, subscriber);
+ payload = savan_service_subs_mgr_build_add_subscriber_om_payload(env, subscriber);
/* Send request */
axis2_svc_client_send_robust(svc_client, env, payload);
if(svc_client)
@@ -466,7 +466,7 @@
}
static axiom_node_t *
-savan_service_storage_mgr_build_add_subscriber_om_payload(
+savan_service_subs_mgr_build_add_subscriber_om_payload(
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
@@ -548,7 +548,7 @@
}
static axutil_array_list_t *
-savan_service_storage_mgr_process_subscriber_list_node(
+savan_service_subs_mgr_process_subscriber_list_node(
const axutil_env_t *env,
axiom_node_t *subs_list_node)
{
@@ -559,7 +559,7 @@
axis2_status_t status = AXIS2_SUCCESS;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_process_subscriber_list_node");
+ "[savan] Entry:savan_service_subs_mgr_process_subscriber_list_node");
subs_list_element = axiom_node_get_data_element(subs_list_node, env);
/* Get Subscriber elements from subscriber list */
@@ -587,7 +587,7 @@
if(subs_node) /* Iterate Savan specific subscriber elements */
{
/* Now read Savan specific Subscribe element */
- subscriber = savan_service_storage_mgr_process_savan_specific_subscriber_node(env, subs_node);
+ subscriber = savan_service_subs_mgr_process_savan_specific_subscriber_node(env, subs_node);
if(!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -602,12 +602,12 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] savan_service_storage_mgr_process_subscriber_list_node");
+ "[savan] savan_service_subs_mgr_process_subscriber_list_node");
return subscriber_list;
}
static savan_subscriber_t *AXIS2_CALL
-savan_service_storage_mgr_process_savan_specific_subscriber_node(
+savan_service_subs_mgr_process_savan_specific_subscriber_node(
const axutil_env_t *env,
axiom_node_t *subs_node)
{
@@ -624,7 +624,7 @@
axis2_status_t status = AXIS2_SUCCESS;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_process_savan_specific_subscriber_node");
+ "[savan] Entry:savan_service_subs_mgr_process_savan_specific_subscriber_node");
AXIS2_PARAM_CHECK(env->error, subs_node, AXIS2_FAILURE);
@@ -685,12 +685,12 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_process_savan_specific_subscriber_node");
+ "[savan] Exit:savan_service_subs_mgr_process_savan_specific_subscriber_node");
return subscriber;
}
static axiom_node_t *
-savan_service_storage_mgr_build_subscriber_request_om_payload(
+savan_service_subs_mgr_build_subscriber_request_om_payload(
const axutil_env_t *env,
const axis2_char_t *subs_id)
{
@@ -718,7 +718,7 @@
}
static axiom_node_t *
-savan_service_storage_mgr_build_subscribers_request_om_payload(
+savan_service_subs_mgr_build_subscribers_request_om_payload(
const axutil_env_t *env,
const axis2_char_t *topic)
{
@@ -784,7 +784,7 @@
}*/
static axiom_node_t *
-savan_service_storage_mgr_build_topics_request_om_payload(
+savan_service_subs_mgr_build_topics_request_om_payload(
const axutil_env_t *env)
{
axiom_node_t *om_node = NULL;
@@ -806,7 +806,7 @@
}
static axutil_array_list_t *
-savan_service_storage_mgr_process_topic_list_node(
+savan_service_subs_mgr_process_topic_list_node(
const axutil_env_t *env,
axiom_node_t *topic_list_node)
{
@@ -816,7 +816,7 @@
axutil_array_list_t *topic_list = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_service_storage_mgr_process_topic_list_node");
+ "[savan] Entry:savan_service_subs_mgr_process_topic_list_node");
topic_list_element = axiom_node_get_data_element(topic_list_node, env);
@@ -854,7 +854,7 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_service_storage_mgr_process_topic_list_node");
+ "[savan] Exit:savan_service_subs_mgr_process_topic_list_node");
return topic_list;
}
diff --git a/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h b/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h
index 5a981d1..4f74373 100644
--- a/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h
+++ b/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef WSFES_SUBSCRIPTION_H
-#define WSFES_SUBSCRIPTION_H
+#ifndef SAVAN_SUBS_MGR_H
+#define SAVAN_SUBS_MGR_H
#include <axis2_svc_skeleton.h>
@@ -25,34 +25,34 @@
#include <axiom_element.h>
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_add_subscriber(
+savan_subs_mgr_svc_add_subscriber(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN void * AXIS2_CALL
-savan_subs_mgr_remove_subscriber(
+savan_subs_mgr_svc_remove_subscriber(
const axutil_env_t *env,
axiom_node_t *remove_sub_node,
axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_get_subscriber(
+savan_subs_mgr_svc_get_subscriber(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_get_subscriber_list(
+savan_subs_mgr_svc_get_subscriber_list(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_get_topic_list(
+savan_subs_mgr_svc_get_topic_list(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
-#endif /* WSFES_SUBSCRIPTION_H*/
+#endif /* SAVAN_SUBS_MGR_H*/
diff --git a/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c b/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
index 5d6a007..38aff22 100644
--- a/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
+++ b/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
@@ -24,11 +24,11 @@
#include <savan_error.h>
#include <savan_constants.h>
-#include "savan_subs_mgr.h"
+#include "savan_subs_mgr_svc.h"
#include <savan_storage_mgr.h>
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_add_subscriber(
+savan_subs_mgr_svc_add_subscriber(
const axutil_env_t *env,
axiom_node_t *add_sub_node,
axis2_msg_ctx_t *msg_ctx)
@@ -50,7 +50,7 @@
axis2_char_t *id = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_subs_mgr_add_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_subs_mgr_svc_add_subscriber");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -116,12 +116,12 @@
"[savan] Subscriber %s could not be added", id);
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_subs_mgr_add_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_subs_mgr_svc_add_subscriber");
return NULL;
}
AXIS2_EXTERN void * AXIS2_CALL
-savan_subs_mgr_remove_subscriber(
+savan_subs_mgr_svc_remove_subscriber(
const axutil_env_t *env,
axiom_node_t *remove_sub_node,
axis2_msg_ctx_t *msg_ctx)
@@ -139,7 +139,7 @@
axis2_conf_t *conf = NULL;
savan_storage_mgr_t *storage_mgr = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_subs_mgr_remove_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_subs_mgr_svc_remove_subscriber");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -175,13 +175,13 @@
"[savan] Subscriber %s removed", subscriber_id);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_subs_mgr_remove_subscriber");
+ "[savan] Exit:savan_subs_mgr_svc_remove_subscriber");
return NULL;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_get_subscriber(
+savan_subs_mgr_svc_get_subscriber(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx)
@@ -197,7 +197,7 @@
savan_storage_mgr_t *storage_mgr = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_subs_mgr_get_subscriber");
+ "[savan] Entry:savan_subs_mgr_svc_get_subscriber");
/* Expected request format is :-
* <ns1:get_subscriber xmlns:ns1="http://ws.apache.org/savan">
@@ -267,12 +267,12 @@
}
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_subs_mgr_get_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_subs_mgr_svc_get_subscriber");
return subs_node;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_get_subscriber_list(
+savan_subs_mgr_svc_get_subscriber_list(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx)
@@ -289,7 +289,7 @@
axiom_node_t *filter_node = NULL;
axis2_char_t *filter = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_subs_mgr_get_subscriber_list");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_subs_mgr_svc_get_subscriber_list");
/* Expected request format is :-
* <ns1:get_subscriber_list xmlns:ns1="http://ws.apache.org/savan">
* <ns:Susbscriber xmlns:ns="http://schemas.xmlsoap.org/ws/2004/08/eventing">
@@ -381,12 +381,12 @@
}
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_subs_mgr_get_subscriber_list");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_subs_mgr_svc_get_subscriber_list");
return subs_list_node;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-savan_subs_mgr_get_topic_list(
+savan_subs_mgr_svc_get_topic_list(
const axutil_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx)
diff --git a/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c b/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
index 4e85335..f83a8a1 100644
--- a/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
+++ b/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
@@ -30,19 +30,19 @@
#include <axis2_svc_client.h>
#include <axis2_options.h>
-#include "savan_subs_mgr.h"
+#include "savan_subs_mgr_svc.h"
#include <savan_constants.h>
#include <savan_storage_mgr.h>
#include <savan_util.h>
#include <savan_error.h>
int AXIS2_CALL
-savan_subs_mgr_free(
+savan_subs_mgr_svc_free(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
-savan_subs_mgr_free_void_arg(
+savan_subs_mgr_svc_free_void_arg(
void *svc_skeleton,
const axutil_env_t *env);
@@ -50,7 +50,7 @@
* This method invokes the right service method
*/
axiom_node_t* AXIS2_CALL
-savan_subs_mgr_invoke(
+savan_subs_mgr_svc_invoke(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env,
axiom_node_t *node,
@@ -58,45 +58,45 @@
int AXIS2_CALL
-savan_subs_mgr_init(
+savan_subs_mgr_svc_init(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env);
int AXIS2_CALL
-savan_subs_mgr_init_with_conf(
+savan_subs_mgr_svc_init_with_conf(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env,
axis2_conf_t *conf);
axiom_node_t* AXIS2_CALL
-savan_subs_mgr_on_fault(
+savan_subs_mgr_svc_on_fault(
axis2_svc_skeleton_t *svc_skeli,
const axutil_env_t *env,
axiom_node_t *node);
-static const axis2_svc_skeleton_ops_t savan_subs_mgr_skeleton_ops_var = {
- savan_subs_mgr_init,
- savan_subs_mgr_invoke,
- savan_subs_mgr_on_fault,
- savan_subs_mgr_free,
- savan_subs_mgr_init_with_conf
+static const axis2_svc_skeleton_ops_t savan_subs_mgr_svc_skeleton_ops_var = {
+ savan_subs_mgr_svc_init,
+ savan_subs_mgr_svc_invoke,
+ savan_subs_mgr_svc_on_fault,
+ savan_subs_mgr_svc_free,
+ savan_subs_mgr_svc_init_with_conf
};
/*Create function */
axis2_svc_skeleton_t *
-savan_subs_mgr_create(
+savan_subs_mgr_svc_create(
const axutil_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "savan_subs_mgr service create called");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "savan_subs_mgr_svc service create called");
/* Allocate memory for the structs */
svc_skeleton = AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_skeleton_t));
- svc_skeleton->ops = &savan_subs_mgr_skeleton_ops_var;
+ svc_skeleton->ops = &savan_subs_mgr_svc_skeleton_ops_var;
svc_skeleton->func_array = NULL;
/* Assign function pointers */
@@ -106,7 +106,7 @@
/* Initialize the service */
int AXIS2_CALL
-savan_subs_mgr_init(
+savan_subs_mgr_svc_init(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
@@ -114,7 +114,7 @@
}
int AXIS2_CALL
-savan_subs_mgr_init_with_conf(
+savan_subs_mgr_svc_init_with_conf(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env,
axis2_conf_t *conf)
@@ -125,7 +125,7 @@
axis2_op_t *op = NULL;
int i = 0, size = 0;*/
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Start:savan_subs_mgr_init_with_conf");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Start:savan_subs_mgr_svc_init_with_conf");
/*storage_mgr = savan_util_get_storage_mgr(env, NULL, conf);
if(!storage_mgr)
@@ -137,7 +137,7 @@
return AXIS2_FAILURE;
}*/
- savan_subs_mgr_init(svc_skeleton, env);
+ savan_subs_mgr_svc_init(svc_skeleton, env);
/*subs_svc = axis2_conf_get_svc(conf, env, "subscription");
op = axis2_svc_get_op_with_name(subs_svc, env, "get_topic_list");
topic_param_list = axis2_op_get_all_params(op, env);
@@ -169,7 +169,7 @@
}
}*/
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] End:savan_subs_mgr_init_with_conf");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] End:savan_subs_mgr_svc_init_with_conf");
return AXIS2_SUCCESS;
}
@@ -178,7 +178,7 @@
* This method invokes the right service method
*/
axiom_node_t* AXIS2_CALL
-savan_subs_mgr_invoke(
+savan_subs_mgr_svc_invoke(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env,
axiom_node_t *node,
@@ -200,17 +200,17 @@
if(op_name)
{
if (axutil_strcmp(op_name, "add_subscriber") == 0)
- return savan_subs_mgr_add_subscriber(env, node, msg_ctx);
+ return savan_subs_mgr_svc_add_subscriber(env, node, msg_ctx);
if (axutil_strcmp(op_name, "remove_subscriber") == 0)
- return savan_subs_mgr_remove_subscriber(env, node, msg_ctx);
+ return savan_subs_mgr_svc_remove_subscriber(env, node, msg_ctx);
if (axutil_strcmp(op_name, "get_subscriber") == 0)
- return savan_subs_mgr_get_subscriber(env, node, msg_ctx);
+ return savan_subs_mgr_svc_get_subscriber(env, node, msg_ctx);
if (axutil_strcmp(op_name, "get_subscriber_list") == 0)
- return savan_subs_mgr_get_subscriber_list(env, node, msg_ctx);
+ return savan_subs_mgr_svc_get_subscriber_list(env, node, msg_ctx);
if (axutil_strcmp(op_name, "get_topic_list") == 0)
- return savan_subs_mgr_get_topic_list(env, node, msg_ctx);
+ return savan_subs_mgr_svc_get_topic_list(env, node, msg_ctx);
/*if (axutil_strcmp(op_name, "add_topic") == 0)
- return savan_subs_mgr_add_topic(env, node, msg_ctx);*/
+ return savan_subs_mgr_svc_add_topic(env, node, msg_ctx);*/
}
}
return NULL;
@@ -218,7 +218,7 @@
/* On fault, handle the fault */
axiom_node_t* AXIS2_CALL
-savan_subs_mgr_on_fault(
+savan_subs_mgr_svc_on_fault(
axis2_svc_skeleton_t *svc_skeli,
const axutil_env_t *env,
axiom_node_t *node)
@@ -238,7 +238,7 @@
/* Free the resources used */
int AXIS2_CALL
-savan_subs_mgr_free(
+savan_subs_mgr_svc_free(
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
@@ -265,7 +265,7 @@
axis2_svc_skeleton_t **inst,
const axutil_env_t *env)
{
- *inst = savan_subs_mgr_create(env);
+ *inst = savan_subs_mgr_svc_create(env);
if(!(*inst))
{
return AXIS2_FAILURE;
diff --git a/src/subs_mgrs/sqlite/Makefile.am b/src/subs_mgrs/sqlite/Makefile.am
index 607f499..228d5bd 100644
--- a/src/subs_mgrs/sqlite/Makefile.am
+++ b/src/subs_mgrs/sqlite/Makefile.am
@@ -1,8 +1,8 @@
-lib_LTLIBRARIES = libsavan_storage.la
+lib_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_storage_la_SOURCES = storage_mgr.c sqlite3.c
+libsavan_subs_mgr_la_SOURCES = storage_mgr.c sqlite3.c
-libsavan_storage_la_LIBADD = ../common/libsavan_common_storage.la
+libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/savan \
diff --git a/src/subs_mgrs/sqlite/storage_mgr.c b/src/subs_mgrs/sqlite/storage_mgr.c
index 3a47fa7..30c4a77 100644
--- a/src/subs_mgrs/sqlite/storage_mgr.c
+++ b/src/subs_mgrs/sqlite/storage_mgr.c
@@ -27,7 +27,7 @@
#include <sqlite3.h>
/**
- * Savan sqlite storage manager maintain two database tables. They are namely
+ * Savan sqlite subscription manager maintain two database tables. They are namely
* subscriber and topic.
* subscriber table has following schema
* id varchar(100) primary key,
@@ -48,33 +48,33 @@
* @brief Savan Permanent Storage Manager Struct Impl
* Savan Permanent Storage Manager
*/
-typedef struct savan_sqlite_storage_mgr
+typedef struct savan_sqlite_subs_mgr
{
- savan_storage_mgr_t storage_mgr;
+ savan_subs_mgr_t subs_mgr;
axis2_char_t *dbname;
axis2_conf_t *conf;
-} savan_sqlite_storage_mgr_t;
+} savan_sqlite_subs_mgr_t;
-typedef AXIS2_DECLARE_DATA struct savan_sqlite_storage_mgr_args
+typedef AXIS2_DECLARE_DATA struct savan_sqlite_subs_mgr_args
{
const axutil_env_t *env;
void *data;
-} savan_sqlite_storage_mgr_args_t;
+} savan_sqlite_subs_mgr_args_t;
-#define SAVAN_INTF_TO_IMPL(trans) ((savan_sqlite_storage_mgr_t *) trans)
+#define SAVAN_INTF_TO_IMPL(trans) ((savan_sqlite_subs_mgr_t *) trans)
static axis2_status_t
-savan_sqlite_storage_mgr_create_db(
+savan_sqlite_subs_mgr_create_db(
const axutil_env_t *env,
const axis2_char_t *dbname);
static void * AXIS2_CALL
-savan_sqlite_storage_mgr_get_dbconn(
+savan_sqlite_subs_mgr_get_dbconn(
const axutil_env_t *env,
const axis2_char_t *dbname);
static int
-savan_sqlite_storage_mgr_busy_handler(
+savan_sqlite_subs_mgr_busy_handler(
sqlite3* dbconn,
char *sql_stmt,
int (*callback_func)(void *, int, char **, char **),
@@ -83,84 +83,84 @@
int rc);
AXIS2_EXTERN void AXIS2_CALL
-savan_sqlite_storage_mgr_free(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_free(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id);
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_sqlite_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subcriber_id);
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_sqlite_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *filter);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_insert_topic(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_insert_topic(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url);
-static const savan_storage_mgr_ops_t storage_mgr_ops =
+static const savan_subs_mgr_ops_t subs_mgr_ops =
{
- savan_sqlite_storage_mgr_free,
- savan_sqlite_storage_mgr_insert_subscriber,
- savan_sqlite_storage_mgr_update_subscriber,
- savan_sqlite_storage_mgr_remove_subscriber,
- savan_sqlite_storage_mgr_retrieve_subscriber,
- savan_sqlite_storage_mgr_retrieve_all_subscribers,
- savan_sqlite_storage_mgr_insert_topic
+ savan_sqlite_subs_mgr_free,
+ savan_sqlite_subs_mgr_insert_subscriber,
+ savan_sqlite_subs_mgr_update_subscriber,
+ savan_sqlite_subs_mgr_remove_subscriber,
+ savan_sqlite_subs_mgr_retrieve_subscriber,
+ savan_sqlite_subs_mgr_retrieve_all_subscribers,
+ savan_sqlite_subs_mgr_insert_topic
};
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create(
const axutil_env_t *env,
axis2_conf_t *conf)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
- storage_mgr_impl = AXIS2_MALLOC(env->allocator, sizeof(savan_sqlite_storage_mgr_t));
- if (!storage_mgr_impl)
+ subs_mgr_impl = AXIS2_MALLOC(env->allocator, sizeof(savan_sqlite_subs_mgr_t));
+ if (!subs_mgr_impl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_STORAGE_MANAGER_CREATION_FAILED, AXIS2_FAILURE);
return NULL;
}
- memset ((void *) storage_mgr_impl, 0, sizeof(savan_sqlite_storage_mgr_t));
+ memset ((void *) subs_mgr_impl, 0, sizeof(savan_sqlite_subs_mgr_t));
- storage_mgr_impl->dbname = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
- storage_mgr_impl->conf = conf;
- storage_mgr_impl->storage_mgr.ops = &storage_mgr_ops;
+ subs_mgr_impl->dbname = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
+ subs_mgr_impl->conf = conf;
+ subs_mgr_impl->subs_mgr.ops = &subs_mgr_ops;
- savan_sqlite_storage_mgr_create_db(env, storage_mgr_impl->dbname);
- return (savan_storage_mgr_t *) storage_mgr_impl;
+ savan_sqlite_subs_mgr_create_db(env, subs_mgr_impl->dbname);
+ return (savan_subs_mgr_t *) subs_mgr_impl;
}
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_storage_mgr_create_with_connection_info(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_subs_mgr_create_with_connection_info(
const axutil_env_t *env,
axis2_char_t *connection_string,
axis2_char_t *username,
@@ -170,41 +170,41 @@
}
AXIS2_EXTERN void AXIS2_CALL
-savan_sqlite_storage_mgr_free(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_free(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sqlite_storage_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sqlite_subs_mgr_free");
- if(storage_mgr_impl->dbname)
+ if(subs_mgr_impl->dbname)
{
- AXIS2_FREE(env->allocator, storage_mgr_impl->dbname);
- storage_mgr_impl->dbname = NULL;
+ AXIS2_FREE(env->allocator, subs_mgr_impl->dbname);
+ subs_mgr_impl->dbname = NULL;
}
- storage_mgr_impl->conf = NULL;
+ subs_mgr_impl->conf = NULL;
- if(storage_mgr_impl)
+ if(subs_mgr_impl)
{
- AXIS2_FREE(env->allocator, storage_mgr_impl);
- storage_mgr_impl = NULL;
+ AXIS2_FREE(env->allocator, subs_mgr_impl);
+ subs_mgr_impl = NULL;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sqlite_storage_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sqlite_subs_mgr_free");
}
/*static int
-savan_sqlite_storage_mgr_topic_find_callback(
+savan_sqlite_subs_mgr_topic_find_callback(
void *not_used,
int argc,
char **argv,
char **col_name)
{
int i = 0;
- savan_sqlite_storage_mgr_args_t *args = (savan_sqlite_storage_mgr_args_t *) not_used;
+ savan_sqlite_subs_mgr_args_t *args = (savan_sqlite_subs_mgr_args_t *) not_used;
const axutil_env_t *env = args->env;
axutil_array_list_t *topic_list = (axutil_array_list_t *) args->data;
if(argc < 1)
@@ -229,7 +229,7 @@
}*/
static int
-savan_sqlite_storage_mgr_subscriber_find_callback(
+savan_sqlite_subs_mgr_subscriber_find_callback(
void *not_used,
int argc,
char **argv,
@@ -237,7 +237,7 @@
{
savan_subscriber_t *subscriber = NULL;
int i = 0;
- savan_sqlite_storage_mgr_args_t *args = (savan_sqlite_storage_mgr_args_t *) not_used;
+ savan_sqlite_subs_mgr_args_t *args = (savan_sqlite_subs_mgr_args_t *) not_used;
const axutil_env_t *env = args->env;
axutil_array_list_t *subscriber_list = (axutil_array_list_t *) args->data;
@@ -310,7 +310,7 @@
}
static int
-savan_sqlite_storage_mgr_subs_retrieve_callback(
+savan_sqlite_subs_mgr_subs_retrieve_callback(
void *not_used,
int argc,
char **argv,
@@ -319,10 +319,10 @@
int i = 0;
savan_subscriber_t *subscriber = NULL;
const axutil_env_t *env = NULL;
- savan_sqlite_storage_mgr_args_t *args = (savan_sqlite_storage_mgr_args_t *) not_used;
+ savan_sqlite_subs_mgr_args_t *args = (savan_sqlite_subs_mgr_args_t *) not_used;
env = args->env;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sqlite_storage_mgr_subs_retrieve_callback");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sqlite_subs_mgr_subs_retrieve_callback");
subscriber = (savan_subscriber_t *) args->data;
if(argc < 1)
@@ -380,18 +380,18 @@
}
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sqlite_storage_mgr_subs_retrieve_callback");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sqlite_subs_mgr_subs_retrieve_callback");
return 0;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_insert_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_insert_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
axis2_char_t sql_insert[1028];
sqlite3 *dbconn = NULL;
axis2_char_t *id = NULL;
@@ -407,7 +407,7 @@
struct sqlite3_stmt* insertqry;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_insert_subscriber");
+ "[savan] Entry:savan_sqlite_subs_mgr_insert_subscriber");
sprintf(sql_insert, "%s", "insert into subscriber(id");
@@ -490,7 +490,7 @@
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_insert:%s", sql_insert);
- dbconn = (sqlite3 *) savan_sqlite_storage_mgr_get_dbconn(env, storage_mgr_impl->dbname);
+ dbconn = (sqlite3 *) savan_sqlite_subs_mgr_get_dbconn(env, subs_mgr_impl->dbname);
if(!dbconn)
{
return AXIS2_FAILURE;
@@ -597,18 +597,18 @@
sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_sqlite_storage_mgr_insert_subscriber");
+ "[savan] Exit:savan_sqlite_subs_mgr_insert_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_update_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_update_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
savan_subscriber_t *subscriber)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
axis2_char_t *sql_update = NULL;
sqlite3 *dbconn = NULL;
axis2_char_t *id = NULL;
@@ -624,7 +624,7 @@
struct sqlite3_stmt* updateqry;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_update_subscriber");
+ "[savan] Entry:savan_sqlite_subs_mgr_update_subscriber");
sql_update = AXIS2_MALLOC(env->allocator, 1028);
if(!sql_update)
@@ -703,7 +703,7 @@
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_update:%s", sql_update);
- dbconn = (sqlite3 *) savan_sqlite_storage_mgr_get_dbconn(env, storage_mgr_impl->dbname);
+ dbconn = (sqlite3 *) savan_sqlite_subs_mgr_get_dbconn(env, subs_mgr_impl->dbname);
if(!dbconn)
{
AXIS2_FREE(env->allocator, sql_update);
@@ -812,27 +812,27 @@
sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_update_subscriber");
+ "[savan] Entry:savan_sqlite_subs_mgr_update_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_remove_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_remove_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subscriber_id)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
axis2_char_t *error_msg = NULL;
sqlite3 *dbconn = NULL;
int rc = -1;
axis2_char_t sql_remove[256];
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_remove_subscriber");
+ "[savan] Entry:savan_sqlite_subs_mgr_remove_subscriber");
- dbconn = (sqlite3 *) savan_sqlite_storage_mgr_get_dbconn(env, storage_mgr_impl->dbname);
+ dbconn = (sqlite3 *) savan_sqlite_subs_mgr_get_dbconn(env, subs_mgr_impl->dbname);
if(!dbconn)
{
return AXIS2_FAILURE;
@@ -841,21 +841,21 @@
rc = sqlite3_exec(dbconn, "BEGIN;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "BEGIN;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "BEGIN;", 0, 0, &error_msg, rc);
}
sprintf(sql_remove, "delete from subscriber where id='%s'", subscriber_id);
rc = sqlite3_exec(dbconn, sql_remove, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, sql_remove, 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, sql_remove, 0, 0, &error_msg, rc);
}
if(rc != SQLITE_OK )
{
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "ROLLBACK;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "ROLLBACK;", 0, 0, &error_msg, rc);
}
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[savan] Error sql statement:%s. Sql remove error:%s", sql_remove, error_msg);
@@ -868,26 +868,26 @@
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg, rc);
}
sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_sqlite_storage_mgr_remove_subscriber");
+ "[savan] Exit:savan_sqlite_subs_mgr_remove_subscriber");
return AXIS2_SUCCESS;
}
AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
-savan_sqlite_storage_mgr_retrieve_subscriber(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_retrieve_subscriber(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *subcriber_id)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
- savan_sqlite_storage_mgr_args_t *args = NULL;
+ savan_sqlite_subs_mgr_args_t *args = NULL;
axis2_char_t *error_msg = NULL;
savan_subscriber_t *subscriber = NULL;
sqlite3 *dbconn = NULL;
@@ -895,16 +895,16 @@
axis2_char_t sql_retrieve[256];
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_retrieve_subscriber");
+ "[savan] Entry:savan_sqlite_subs_mgr_retrieve_subscriber");
- args = AXIS2_MALLOC(env->allocator, sizeof(savan_sqlite_storage_mgr_args_t));
+ args = AXIS2_MALLOC(env->allocator, sizeof(savan_sqlite_subs_mgr_args_t));
if(!args)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_STORAGE_MANAGER_CREATION_FAILED, AXIS2_FAILURE);
return NULL;
}
- dbconn = (sqlite3 *) savan_sqlite_storage_mgr_get_dbconn(env, storage_mgr_impl->dbname);
+ dbconn = (sqlite3 *) savan_sqlite_subs_mgr_get_dbconn(env, subs_mgr_impl->dbname);
if(!dbconn)
{
AXIS2_FREE(env->allocator, args);
@@ -914,7 +914,7 @@
rc = sqlite3_exec(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg, rc);
}
args->env = (axutil_env_t*)env;
@@ -924,12 +924,12 @@
"expires, filter, renewed from subscriber "\
"where id='%s';", subcriber_id);
- rc = sqlite3_exec(dbconn, sql_retrieve, savan_sqlite_storage_mgr_subs_retrieve_callback, args,
+ rc = sqlite3_exec(dbconn, sql_retrieve, savan_sqlite_subs_mgr_subs_retrieve_callback, args,
&error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, sql_retrieve,
- savan_sqlite_storage_mgr_subs_retrieve_callback, args, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, sql_retrieve,
+ savan_sqlite_subs_mgr_subs_retrieve_callback, args, &error_msg, rc);
}
if(rc != SQLITE_OK )
@@ -937,7 +937,7 @@
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "ROLLBACK;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "ROLLBACK;", 0, 0, &error_msg, rc);
}
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[savan] Sql error statement:%s. Sql retrieve error:%s", sql_retrieve, error_msg);
@@ -963,25 +963,25 @@
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg, rc);
}
sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_sqlite_storage_mgr_retrieve_subscriber");
+ "[savan] Exit:savan_sqlite_subs_mgr_retrieve_subscriber");
return subscriber;
}
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-savan_sqlite_storage_mgr_retrieve_all_subscribers(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_retrieve_all_subscribers(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *filter)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
- savan_sqlite_storage_mgr_args_t *args = NULL;
+ savan_sqlite_subs_mgr_args_t *args = NULL;
axutil_array_list_t *data_list = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
@@ -989,7 +989,7 @@
axis2_char_t sql_retrieve[256];
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_retrieve_all_subscribers");
+ "[savan] Entry:savan_sqlite_subs_mgr_retrieve_all_subscribers");
data_list = axutil_array_list_create(env, 0);
if(!data_list)
{
@@ -997,7 +997,7 @@
return NULL;
}
- args = AXIS2_MALLOC(env->allocator, sizeof(savan_sqlite_storage_mgr_args_t));
+ args = AXIS2_MALLOC(env->allocator, sizeof(savan_sqlite_subs_mgr_args_t));
if(!args)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_STORAGE_MANAGER_CREATION_FAILED, AXIS2_FAILURE);
@@ -1007,7 +1007,7 @@
args->env = (axutil_env_t*)env;
args->data = NULL;
- dbconn = (sqlite3 *) savan_sqlite_storage_mgr_get_dbconn(env, storage_mgr_impl->dbname);
+ dbconn = (sqlite3 *) savan_sqlite_subs_mgr_get_dbconn(env, subs_mgr_impl->dbname);
if(!dbconn)
{
axutil_array_list_free(data_list, env);
@@ -1018,7 +1018,7 @@
rc = sqlite3_exec(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg, rc);
}
if(filter)
@@ -1032,12 +1032,12 @@
"renewed from subscriber;");
}
- rc = sqlite3_exec(dbconn, sql_retrieve, savan_sqlite_storage_mgr_subscriber_find_callback, args, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_retrieve, savan_sqlite_subs_mgr_subscriber_find_callback, args, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn, sql_retrieve,
- savan_sqlite_storage_mgr_subscriber_find_callback, args, &error_msg, rc);
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn, sql_retrieve,
+ savan_sqlite_subs_mgr_subscriber_find_callback, args, &error_msg, rc);
}
if(args->data)
@@ -1050,7 +1050,7 @@
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn,
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn,
"ROLLBACK;", 0, 0, &error_msg, rc);
}
@@ -1083,35 +1083,35 @@
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_sqlite_storage_mgr_busy_handler(dbconn,
+ rc = savan_sqlite_subs_mgr_busy_handler(dbconn,
"COMMIT;", 0, 0, &error_msg, rc);
}
sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_sqlite_storage_mgr_retrieve_all_subscribers");
+ "[savan] Exit:savan_sqlite_subs_mgr_retrieve_all_subscribers");
return data_list;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_sqlite_storage_mgr_insert_topic(
- savan_storage_mgr_t *storage_mgr,
+savan_sqlite_subs_mgr_insert_topic(
+ savan_subs_mgr_t *subs_mgr,
const axutil_env_t *env,
const axis2_char_t *topic_name,
const axis2_char_t *topic_url)
{
- savan_sqlite_storage_mgr_t *storage_mgr_impl = NULL;
- storage_mgr_impl = SAVAN_INTF_TO_IMPL(storage_mgr);
+ savan_sqlite_subs_mgr_t *subs_mgr_impl = NULL;
+ subs_mgr_impl = SAVAN_INTF_TO_IMPL(subs_mgr);
axis2_char_t *sql_insert = NULL;
sqlite3 *dbconn = NULL;
struct sqlite3_stmt* insertqry;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Entry:savan_sqlite_storage_mgr_insert_topic");
+ "[savan] Entry:savan_sqlite_subs_mgr_insert_topic");
sql_insert = "insert into topic(topic_name, topic_url) values(?, ?);";
- dbconn = (sqlite3 *) savan_sqlite_storage_mgr_get_dbconn(env, storage_mgr_impl->dbname);
+ dbconn = (sqlite3 *) savan_sqlite_subs_mgr_get_dbconn(env, subs_mgr_impl->dbname);
if(!dbconn)
{
return AXIS2_FAILURE;
@@ -1155,12 +1155,12 @@
sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[savan] Exit:savan_sqlite_storage_mgr_insert_topic");
+ "[savan] Exit:savan_sqlite_subs_mgr_insert_topic");
return AXIS2_SUCCESS;
}
static axis2_status_t
-savan_sqlite_storage_mgr_create_db(
+savan_sqlite_subs_mgr_create_db(
const axutil_env_t *env,
const axis2_char_t *dbname)
{
@@ -1170,7 +1170,7 @@
axis2_char_t *sql_stmt = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sqlite_storage_mgr_create_db");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_sqlite_subs_mgr_create_db");
if(AXIS2_SUCCESS == axutil_file_handler_access(dbname, AXIS2_F_OK))
{
@@ -1178,7 +1178,7 @@
return AXIS2_SUCCESS;
}
- dbconn = savan_sqlite_storage_mgr_get_dbconn(env, dbname);
+ dbconn = savan_sqlite_subs_mgr_get_dbconn(env, dbname);
#if !defined(WIN32)
{
@@ -1219,13 +1219,13 @@
return AXIS2_FAILURE;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sqlite_storage_mgr_create_db");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_sqlite_subs_mgr_create_db");
return status;
}
static int
-savan_sqlite_storage_mgr_busy_handler(
+savan_sqlite_subs_mgr_busy_handler(
sqlite3* dbconn,
char *sql_stmt,
int (*callback_func)(void *, int, char **, char **),
@@ -1249,7 +1249,7 @@
}
static void * AXIS2_CALL
-savan_sqlite_storage_mgr_get_dbconn(
+savan_sqlite_subs_mgr_get_dbconn(
const axutil_env_t *env,
const axis2_char_t *dbname)
{
diff --git a/src/util/savan_util.c b/src/util/savan_util.c
index 12fa028..41b1047 100644
--- a/src/util/savan_util.c
+++ b/src/util/savan_util.c
@@ -217,7 +217,7 @@
savan_util_get_subscriber_from_msg(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axis2_char_t *sub_id)
{
savan_subscriber_t *subscriber = NULL;
@@ -231,7 +231,7 @@
}
axutil_allocator_switch_to_global_pool(env->allocator);
- subscriber = savan_storage_mgr_retrieve_subscriber(storage_mgr, env, sub_id);
+ subscriber = savan_subs_mgr_retrieve_subscriber(subs_mgr, env, sub_id);
axutil_allocator_switch_to_local_pool(env->allocator);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_util_get_subscriber_from_msg");
@@ -243,7 +243,7 @@
savan_util_get_subscriber_from_renew_msg(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
const axis2_char_t *sub_id)
{
savan_subscriber_t *subscriber = NULL;
@@ -273,7 +273,7 @@
}
axutil_allocator_switch_to_global_pool(env->allocator);
- subscriber = savan_storage_mgr_retrieve_subscriber(storage_mgr, env, sub_id);
+ subscriber = savan_subs_mgr_retrieve_subscriber(subs_mgr, env, sub_id);
axutil_allocator_switch_to_local_pool(env->allocator);
if(!subscriber)
@@ -355,7 +355,7 @@
savan_util_add_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
savan_subscriber_t *subscriber)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -363,7 +363,7 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_util_add_subscriber");
axutil_allocator_switch_to_global_pool(env->allocator);
- status = savan_storage_mgr_insert_subscriber(storage_mgr, env, subscriber);
+ status = savan_subs_mgr_insert_subscriber(subs_mgr, env, subscriber);
if(status)
{
axutil_property_t *subs_prop = NULL;
@@ -381,13 +381,13 @@
savan_util_update_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
savan_subscriber_t *subscriber)
{
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_util_update_subscriber");
axutil_allocator_switch_to_global_pool(env->allocator);
- savan_storage_mgr_update_subscriber(storage_mgr, env, subscriber);
+ savan_subs_mgr_update_subscriber(subs_mgr, env, subscriber);
axutil_allocator_switch_to_local_pool(env->allocator);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_util_update_subscriber");
@@ -398,7 +398,7 @@
savan_util_remove_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_storage_mgr_t *storage_mgr,
+ savan_subs_mgr_t *subs_mgr,
savan_subscriber_t *subscriber)
{
const axis2_char_t *subs_id = NULL;
@@ -408,7 +408,7 @@
axutil_allocator_switch_to_global_pool(env->allocator);
subs_id = savan_subscriber_get_id(subscriber, env);
- savan_storage_mgr_remove_subscriber(storage_mgr, env, subs_id);
+ savan_subs_mgr_remove_subscriber(subs_mgr, env, subs_id);
axutil_allocator_switch_to_local_pool(env->allocator);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_util_remove_subscriber");
@@ -912,39 +912,39 @@
return subs_node;
}
-AXIS2_EXTERN savan_storage_mgr_t * AXIS2_CALL
-savan_util_get_storage_mgr(
+AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+savan_util_get_subs_mgr(
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_conf_t *conf)
{
- axutil_property_t *storage_mgr_prop = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ axutil_property_t *subs_mgr_prop = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
axutil_allocator_switch_to_global_pool(env->allocator);
if(conf_ctx)
{
- storage_mgr_prop = axis2_conf_ctx_get_property(conf_ctx, env, SAVAN_STORAGE_MANAGER);
- if(storage_mgr_prop)
+ subs_mgr_prop = axis2_conf_ctx_get_property(conf_ctx, env, SAVAN_STORAGE_MANAGER);
+ if(subs_mgr_prop)
{
- storage_mgr = (savan_storage_mgr_t *) axutil_property_get_value(storage_mgr_prop, env);
+ subs_mgr = (savan_subs_mgr_t *) axutil_property_get_value(subs_mgr_prop, env);
}
}
- if(!storage_mgr)
+ if(!subs_mgr)
{
- storage_mgr = savan_storage_mgr_create(env, conf);
+ subs_mgr = savan_subs_mgr_create(env, conf);
- if(storage_mgr && conf_ctx)
+ if(subs_mgr && conf_ctx)
{
- storage_mgr_prop = axutil_property_create_with_args(env, 0, 0, 0, storage_mgr);
- axis2_conf_ctx_set_property(conf_ctx, env, SAVAN_STORAGE_MANAGER, storage_mgr_prop);
+ subs_mgr_prop = axutil_property_create_with_args(env, 0, 0, 0, subs_mgr);
+ axis2_conf_ctx_set_property(conf_ctx, env, SAVAN_STORAGE_MANAGER, subs_mgr_prop);
}
}
axutil_allocator_switch_to_local_pool(env->allocator);
- return storage_mgr;
+ return subs_mgr;
}
AXIS2_EXTERN savan_filter_mod_t * AXIS2_CALL
