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 [1/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
Author: damitha
Date: Wed Apr  8 17:07:20 2009
New Revision: 763318

URL: http://svn.apache.org/viewvc?rev=763318&view=rev
Log:
name storage_mgr is changed to subs_mgr

Modified:
    webservices/savan/trunk/c/include/savan_publisher_mod.h
    webservices/savan/trunk/c/include/savan_storage_mgr.h
    webservices/savan/trunk/c/include/savan_sub_processor.h
    webservices/savan/trunk/c/include/savan_util.h
    webservices/savan/trunk/c/src/client/Makefile.am
    webservices/savan/trunk/c/src/core/Makefile.am
    webservices/savan/trunk/c/src/core/savan_sub_processor.c
    webservices/savan/trunk/c/src/handlers/savan_in_handler.c
    webservices/savan/trunk/c/src/handlers/savan_out_handler.c
    webservices/savan/trunk/c/src/msgreceivers/Makefile.am
    webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c
    webservices/savan/trunk/c/src/publisher/common/publisher_mod.c
    webservices/savan/trunk/c/src/publisher/default/publisher_mod.c
    webservices/savan/trunk/c/src/publisher/esb/publisher_mod.c
    webservices/savan/trunk/c/src/subs_mgrs/common/Makefile.am
    webservices/savan/trunk/c/src/subs_mgrs/common/storage_mgr.c
    webservices/savan/trunk/c/src/subs_mgrs/inmemory/Makefile.am
    webservices/savan/trunk/c/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
    webservices/savan/trunk/c/src/subs_mgrs/registry/Makefile.am
    webservices/savan/trunk/c/src/subs_mgrs/registry/storage_mgr.c
    webservices/savan/trunk/c/src/subs_mgrs/service/Makefile.am
    webservices/savan/trunk/c/src/subs_mgrs/service/service_storage_mgr.c
    webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h
    webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
    webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
    webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am
    webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c
    webservices/savan/trunk/c/src/util/savan_util.c

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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



Mime
View raw message