ws-savan-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r763318 [2/2] - in /webservices/savan/trunk/c: include/ src/client/ src/core/ src/handlers/ src/msgreceivers/ src/publisher/common/ src/publisher/default/ src/publisher/esb/ src/subs_mgrs/common/ src/subs_mgrs/inmemory/ src/subs_mgrs/regist...
Date Wed, 08 Apr 2009 17:07:21 GMT
Modified: webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h?rev=763318&r1=763317&r2=763318&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h Wed Apr
 8 17:07:20 2009
@@ -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*/
 

Modified: webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c?rev=763318&r1=763317&r2=763318&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c Wed Apr  8 17:07:20
2009
@@ -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)

Modified: webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c?rev=763318&r1=763317&r2=763318&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c Wed Apr 
8 17:07:20 2009
@@ -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;

Modified: webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am?rev=763318&r1=763317&r2=763318&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am Wed Apr  8 17:07:20 2009
@@ -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 \

Modified: webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c?rev=763318&r1=763317&r2=763318&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c Wed Apr  8 17:07:20 2009
@@ -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)
 {

Modified: webservices/savan/trunk/c/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/savan_util.c?rev=763318&r1=763317&r2=763318&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Wed Apr  8 17:07:20 2009
@@ -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



Mime
View raw message