You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2006/07/11 14:07:04 UTC

svn commit: r420809 [1/2] - in /webservices/sandesha/trunk/c: include/ include/sandesha2/ src/storage/inmemory/

Author: damitha
Date: Tue Jul 11 05:07:03 2006
New Revision: 420809

URL: http://svn.apache.org/viewvc?rev=420809&view=rev
Log:
Changing file names

Modified:
    webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h
    webservices/sandesha/trunk/c/include/sandesha2_in_memory_create_seq_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_in_memory_invoker_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_in_memory_next_msg_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_in_memory_sender_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_in_memory_seq_property_mgr.h
    webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_seq_property_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_storage_manager.c
    webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_transaction.c

Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h Tue Jul 11 05:07:03 2006
@@ -24,7 +24,7 @@
   * @brief 
   */
 
-#include <sandesha2/sandesha2_storage_manager.h>
+#include <sandesha2_storage_mgr.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_conf.h>
 #include <axiom_soap_envelope.h>

Modified: webservices/sandesha/trunk/c/include/sandesha2_in_memory_create_seq_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_memory_create_seq_mgr.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_memory_create_seq_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_memory_create_seq_mgr.h Tue Jul 11 05:07:03 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_H
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_H
+#ifndef SANDESHA2_CREATE_SEQ_MGR_H
+#define SANDESHA2_CREATE_SEQ_MGR_H
 
 /**
- * @file sandesha2_in_memory_create_seq_mgr.h
+ * @file sandesha2_create_seq_mgr.h
  * @brief Sandesha In Memory Create Sequence Manager Interface
  */
 
@@ -36,15 +36,15 @@
 {
 #endif
 
-typedef struct sandesha2_in_memory_create_seq_mgr sandesha2_in_memory_create_seq_mgr_t;
-typedef struct sandesha2_in_memory_create_seq_mgr_ops sandesha2_in_memory_create_seq_mgr_ops_t;
+typedef struct sandesha2_create_seq_mgr sandesha2_create_seq_mgr_t;
+typedef struct sandesha2_create_seq_mgr_ops sandesha2_create_seq_mgr_ops_t;
 
-/** @defgroup sandesha2_in_memory_create_seq_mgr In Memory Create Sequence Manager
+/** @defgroup sandesha2_create_seq_mgr In Memory Create Sequence Manager
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_in_memory_create_seq_mgr_ops
+struct sandesha2_create_seq_mgr_ops
 {
    /** 
      * Deallocate memory
@@ -57,78 +57,78 @@
      
     axis2_bool_t (AXIS2_CALL *
     insert) (
-            sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+            sandesha2_create_seq_mgr_t *seq_mgr,
             const axis2_env_t *env,
             sandesha2_create_seq_bean_t *bean);
 
     axis2_bool_t (AXIS2_CALL *
     remove) (
-            sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+            sandesha2_create_seq_mgr_t *seq_mgr,
             const axis2_env_t *env,
             axis2_char_t *msg_id);
 
     sandesha2_create_seq_bean_t *(AXIS2_CALL *
     retrieve) (
-            sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+            sandesha2_create_seq_mgr_t *seq_mgr,
             const axis2_env_t *env,
             axis2_char_t *msg_id);
 
     axis2_bool_t (AXIS2_CALL *
     update) (
-            sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+            sandesha2_create_seq_mgr_t *seq_mgr,
             const axis2_env_t *env,
             sandesha2_create_seq_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     find) (
-            sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+            sandesha2_create_seq_mgr_t *seq_mgr,
             const axis2_env_t *env,
             sandesha2_create_seq_bean_t *bean);
 
     sandesha2_create_seq_bean_t *(AXIS2_CALL *
     find_unique) (
-            sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+            sandesha2_create_seq_mgr_t *seq_mgr,
             const axis2_env_t *env,
             sandesha2_create_seq_bean_t *bean);
 
 
 };
 
-struct sandesha2_in_memory_create_seq_mgr
+struct sandesha2_create_seq_mgr
 {
-    sandesha2_in_memory_create_seq_mgr_ops_t *ops;
+    sandesha2_create_seq_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_in_memory_create_seq_mgr_t * AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_create(
+AXIS2_EXTERN sandesha2_create_seq_mgr_t * AXIS2_CALL
+sandesha2_create_seq_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx);
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_FREE(seq_mgr, env) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->free (seq_mgr, env))
+#define SANDESHA2_CREATE_SEQ_MGR_FREE(seq_mgr, env) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->free (seq_mgr, env))
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_INSERT(seq_mgr, env, bean) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->\
+#define SANDESHA2_CREATE_SEQ_MGR_INSERT(seq_mgr, env, bean) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->\
        insert (seq_mgr, env, bean))
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_REMOVE(seq_mgr, env, msg_id) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->\
+#define SANDESHA2_CREATE_SEQ_MGR_REMOVE(seq_mgr, env, msg_id) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->\
        remove (seq_mgr, env, msg_id))
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_RETRIEVE(seq_mgr, env, msg_id) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->\
+#define SANDESHA2_CREATE_SEQ_MGR_RETRIEVE(seq_mgr, env, msg_id) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->\
        retrieve (seq_mgr, env, msg_id))
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_UPDATE(seq_mgr, env, bean) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->\
+#define SANDESHA2_CREATE_SEQ_MGR_UPDATE(seq_mgr, env, bean) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->\
        update (seq_mgr, env, bean))
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_FIND(seq_mgr, env, bean) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->\
+#define SANDESHA2_CREATE_SEQ_MGR_FIND(seq_mgr, env, bean) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->\
        find (seq_mgr, env, bean))
 
-#define SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_FIND_UNIQUE(seq_mgr, env, bean) \
-      (((sandesha2_in_memory_create_seq_mgr_t *) seq_mgr)->ops->\
+#define SANDESHA2_CREATE_SEQ_MGR_FIND_UNIQUE(seq_mgr, env, bean) \
+      (((sandesha2_create_seq_mgr_t *) seq_mgr)->ops->\
        find_unique (seq_mgr, env, bean))
 
 
@@ -136,4 +136,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_IN_MEMORY_CREATE_SEQ_MGR_H */
+#endif /* SANDESHA2_CREATE_SEQ_MGR_H */

Modified: webservices/sandesha/trunk/c/include/sandesha2_in_memory_invoker_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_memory_invoker_mgr.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_memory_invoker_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_memory_invoker_mgr.h Tue Jul 11 05:07:03 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_IN_MEMORY_INVOKER_MGR_H
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_H
+#ifndef SANDESHA2_INVOKER_MGR_H
+#define SANDESHA2_INVOKER_MGR_H
 
 /**
- * @file sandesha2_in_memory_invoker_mgr.h
+ * @file sandesha2_invoker_mgr.h
  * @brief Sandesha In Memory Invoker Manager Interface
  */
 
@@ -36,15 +36,15 @@
 {
 #endif
 
-typedef struct sandesha2_in_memory_invoker_mgr sandesha2_in_memory_invoker_mgr_t;
-typedef struct sandesha2_in_memory_invoker_mgr_ops sandesha2_in_memory_invoker_mgr_ops_t;
+typedef struct sandesha2_invoker_mgr sandesha2_invoker_mgr_t;
+typedef struct sandesha2_invoker_mgr_ops sandesha2_invoker_mgr_ops_t;
 
-/** @defgroup sandesha2_in_memory_invoker_mgr In Memory Invoker Manager
+/** @defgroup sandesha2_invoker_mgr In Memory Invoker Manager
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_in_memory_invoker_mgr_ops
+struct sandesha2_invoker_mgr_ops
 {
    /** 
      * Deallocate memory
@@ -57,78 +57,78 @@
      
     axis2_bool_t (AXIS2_CALL *
     insert) (
-            sandesha2_in_memory_invoker_mgr_t *invoker,
+            sandesha2_invoker_mgr_t *invoker,
             const axis2_env_t *env,
             sandesha2_invoker_bean_t *bean);
 
     axis2_bool_t (AXIS2_CALL *
     remove) (
-            sandesha2_in_memory_invoker_mgr_t *invoker,
+            sandesha2_invoker_mgr_t *invoker,
             const axis2_env_t *env,
             axis2_char_t *ref_key);
 
     sandesha2_invoker_bean_t *(AXIS2_CALL *
     retrieve) (
-            sandesha2_in_memory_invoker_mgr_t *invoker,
+            sandesha2_invoker_mgr_t *invoker,
             const axis2_env_t *env,
             axis2_char_t *ref_key);
 
     axis2_bool_t (AXIS2_CALL *
     update) (
-            sandesha2_in_memory_invoker_mgr_t *invoker,
+            sandesha2_invoker_mgr_t *invoker,
             const axis2_env_t *env,
             sandesha2_invoker_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     find) (
-            sandesha2_in_memory_invoker_mgr_t *invoker,
+            sandesha2_invoker_mgr_t *invoker,
             const axis2_env_t *env,
             sandesha2_invoker_bean_t *bean);
 
     sandesha2_invoker_bean_t *(AXIS2_CALL *
     find_unique) (
-            sandesha2_in_memory_invoker_mgr_t *invoker,
+            sandesha2_invoker_mgr_t *invoker,
             const axis2_env_t *env,
             sandesha2_invoker_bean_t *bean);
 
 
 };
 
-struct sandesha2_in_memory_invoker_mgr
+struct sandesha2_invoker_mgr
 {
-    sandesha2_in_memory_invoker_mgr_ops_t *ops;
+    sandesha2_invoker_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_in_memory_invoker_mgr_t * AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_create(
+AXIS2_EXTERN sandesha2_invoker_mgr_t * AXIS2_CALL
+sandesha2_invoker_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx);
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_FREE(invoker, env) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->free (invoker, env))
+#define SANDESHA2_INVOKER_MGR_FREE(invoker, env) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->free (invoker, env))
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_INSERT(invoker, env, bean) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->\
+#define SANDESHA2_INVOKER_MGR_INSERT(invoker, env, bean) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->\
        insert (invoker, env, bean))
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_REMOVE(invoker, env, ref_key) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->\
+#define SANDESHA2_INVOKER_MGR_REMOVE(invoker, env, ref_key) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->\
        remove (invoker, env, ref_key))
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_RETRIEVE(invoker, env, ref_key) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->\
+#define SANDESHA2_INVOKER_MGR_RETRIEVE(invoker, env, ref_key) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->\
        retrieve (invoker, env, ref_key))
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_UPDATE(invoker, env, bean) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->\
+#define SANDESHA2_INVOKER_MGR_UPDATE(invoker, env, bean) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->\
        update (invoker, env, bean))
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_FIND(invoker, env, bean) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->\
+#define SANDESHA2_INVOKER_MGR_FIND(invoker, env, bean) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->\
        find (invoker, env, bean))
 
-#define SANDESHA2_IN_MEMORY_INVOKER_MGR_FIND_UNIQUE(invoker, env, bean) \
-      (((sandesha2_in_memory_invoker_mgr_t *) invoker)->ops->\
+#define SANDESHA2_INVOKER_MGR_FIND_UNIQUE(invoker, env, bean) \
+      (((sandesha2_invoker_mgr_t *) invoker)->ops->\
        find_unique (invoker, env, bean))
 
 
@@ -136,4 +136,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_IN_MEMORY_INVOKER_MGR_H */
+#endif /* SANDESHA2_INVOKER_MGR_H */

Modified: webservices/sandesha/trunk/c/include/sandesha2_in_memory_next_msg_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_memory_next_msg_mgr.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_memory_next_msg_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_memory_next_msg_mgr.h Tue Jul 11 05:07:03 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_IN_MEMORY_NEXT_MSG_MGR_H
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_MGR_H
+#ifndef SANDESHA2_NEXT_MSG_MGR_H
+#define SANDESHA2_NEXT_MSG_MGR_H
 
 /**
- * @file sandesha2_in_memory_next_msg_mgr.h
+ * @file sandesha2_next_msg_mgr.h
  * @brief Sandesha In Memory Next Message Manager Interface
  */
 
@@ -36,15 +36,15 @@
 {
 #endif
 
-typedef struct sandesha2_in_memory_next_msg_mgr sandesha2_in_memory_next_msg_mgr_t;
-typedef struct sandesha2_in_memory_next_msg_mgr_ops sandesha2_in_memory_next_msg_mgr_ops_t;
+typedef struct sandesha2_next_msg_mgr sandesha2_next_msg_mgr_t;
+typedef struct sandesha2_next_msg_mgr_ops sandesha2_next_msg_mgr_ops_t;
 
-/** @defgroup sandesha2_in_memory_next_msg_mgr In Memory Next Message Manager
+/** @defgroup sandesha2_next_msg_mgr In Memory Next Message Manager
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_in_memory_next_msg_mgr_ops
+struct sandesha2_next_msg_mgr_ops
 {
    /** 
      * Deallocate memory
@@ -57,85 +57,85 @@
      
     axis2_bool_t (AXIS2_CALL *
     insert) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env,
             sandesha2_next_msg_bean_t *bean);
 
     axis2_bool_t (AXIS2_CALL *
     remove) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env,
             axis2_char_t *msg_id);
 
     sandesha2_next_msg_bean_t *(AXIS2_CALL *
     retrieve) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env,
             axis2_char_t *msg_id);
 
     axis2_bool_t (AXIS2_CALL *
     update) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env,
             sandesha2_next_msg_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     find) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env,
             sandesha2_next_msg_bean_t *bean);
 
     sandesha2_next_msg_bean_t *(AXIS2_CALL *
     find_unique) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env,
             sandesha2_next_msg_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     retrieve_all) (
-            sandesha2_in_memory_next_msg_mgr_t *next_msg,
+            sandesha2_next_msg_mgr_t *next_msg,
             const axis2_env_t *env);
 };
 
-struct sandesha2_in_memory_next_msg_mgr
+struct sandesha2_next_msg_mgr
 {
-    sandesha2_in_memory_next_msg_mgr_ops_t *ops;
+    sandesha2_next_msg_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_in_memory_next_msg_mgr_t * AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_create(
+AXIS2_EXTERN sandesha2_next_msg_mgr_t * AXIS2_CALL
+sandesha2_next_msg_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx);
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_MGR_FREE(next_msg, env) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->free (next_msg, env))
+#define SANDESHA2_NEXT_MSG_MGR_FREE(next_msg, env) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->free (next_msg, env))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_INSERT(next_msg, env, bean) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_INSERT(next_msg, env, bean) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        insert (next_msg, env, bean))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_REMOVE(next_msg, env, msg_id) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_REMOVE(next_msg, env, msg_id) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        remove (next_msg, env, msg_id))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_RETRIEVE(next_msg, env, msg_id) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_RETRIEVE(next_msg, env, msg_id) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        retrieve (next_msg, env, msg_id))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_UPDATE(next_msg, env, bean) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_UPDATE(next_msg, env, bean) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        update (next_msg, env, bean))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_FIND(next_msg, env, bean) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_FIND(next_msg, env, bean) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        find_by_next_msg_bean (next_msg, env, bean))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_FIND_UNIQUE(next_msg, env, bean) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_FIND_UNIQUE(next_msg, env, bean) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        find_unique (next_msg, env, bean))
 
-#define SANDESHA2_IN_MEMORY_NEXT_MSG_RETRIEVE_ALL(next_msg, env) \
-      (((sandesha2_in_memory_next_msg_mgr_t *) next_msg)->ops->\
+#define SANDESHA2_NEXT_MSG_RETRIEVE_ALL(next_msg, env) \
+      (((sandesha2_next_msg_mgr_t *) next_msg)->ops->\
        retrieve_all (next_msg, env))
 
 
@@ -144,4 +144,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_IN_MEMORY_NEXT_MSG_MGR_H */
+#endif /* SANDESHA2_NEXT_MSG_MGR_H */

Modified: webservices/sandesha/trunk/c/include/sandesha2_in_memory_sender_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_memory_sender_mgr.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_memory_sender_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_memory_sender_mgr.h Tue Jul 11 05:07:03 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_IN_MEMORY_SENDER_MGR_H
-#define SANDESHA2_IN_MEMORY_SENDER_MGR_H
+#ifndef SANDESHA2_SENDER_MGR_H
+#define SANDESHA2_SENDER_MGR_H
 
 /**
- * @file sandesha2_in_memory_sender_mgr.h
+ * @file sandesha2_sender_mgr.h
  * @brief Sandesha In Memory Sender Manager Interface
  */
 
@@ -36,15 +36,15 @@
 {
 #endif
 
-typedef struct sandesha2_in_memory_sender_mgr sandesha2_in_memory_sender_mgr_t;
-typedef struct sandesha2_in_memory_sender_mgr_ops sandesha2_in_memory_sender_mgr_ops_t;
+typedef struct sandesha2_sender_mgr sandesha2_sender_mgr_t;
+typedef struct sandesha2_sender_mgr_ops sandesha2_sender_mgr_ops_t;
 
-/** @defgroup sandesha2_in_memory_sender_mgr In Memory Sender Manager
+/** @defgroup sandesha2_sender_mgr In Memory Sender Manager
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_in_memory_sender_mgr_ops
+struct sandesha2_sender_mgr_ops
 {
    /** 
      * Deallocate memory
@@ -57,105 +57,105 @@
      
     axis2_bool_t (AXIS2_CALL *
     insert) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             sandesha2_sender_bean_t *bean);
 
     axis2_bool_t (AXIS2_CALL *
     remove) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             axis2_char_t *msg_id);
 
     sandesha2_sender_bean_t *(AXIS2_CALL *
     retrieve) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             axis2_char_t *msg_id);
 
     axis2_bool_t (AXIS2_CALL *
     update) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             sandesha2_sender_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     find_by_internal_seq_id) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             axis2_char_t *internal_seq_id);
 
     axis2_array_list_t *(AXIS2_CALL *
     find_by_sender_bean) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             sandesha2_sender_bean_t *bean);
 
     sandesha2_sender_bean_t *(AXIS2_CALL *
     find_unique) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             sandesha2_sender_bean_t *bean);
 
     sandesha2_sender_bean_t *(AXIS2_CALL *
     get_next_msg_to_send) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env);
 
     sandesha2_sender_bean_t *(AXIS2_CALL *
     retrieve_from_msg_ref_key) (
-            sandesha2_in_memory_sender_mgr_t *sender,
+            sandesha2_sender_mgr_t *sender,
             const axis2_env_t *env,
             axis2_char_t *msg_ctx_ref_key);
 };
 
-struct sandesha2_in_memory_sender_mgr
+struct sandesha2_sender_mgr
 {
-    sandesha2_in_memory_sender_mgr_ops_t *ops;
+    sandesha2_sender_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_in_memory_sender_mgr_t * AXIS2_CALL
-sandesha2_in_memory_sender_mgr_create(
+AXIS2_EXTERN sandesha2_sender_mgr_t * AXIS2_CALL
+sandesha2_sender_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx);
 
-#define SANDESHA2_IN_MEMORY_SENDER_MGR_FREE(sender, env) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->free (sender, env))
+#define SANDESHA2_SENDER_MGR_FREE(sender, env) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->free (sender, env))
 
-#define SANDESHA2_IN_MEMORY_SENDER_INSERT(sender, env, bean) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_INSERT(sender, env, bean) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        insert (sender, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SENDER_REMOVE(sender, env, msg_id) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_REMOVE(sender, env, msg_id) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        remove (sender, env, msg_id))
 
-#define SANDESHA2_IN_MEMORY_SENDER_RETRIEVE(sender, env, msg_id) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_RETRIEVE(sender, env, msg_id) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        retrieve (sender, env, msg_id))
 
-#define SANDESHA2_IN_MEMORY_SENDER_UPDATE(sender, env, bean) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_UPDATE(sender, env, bean) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        update (sender, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SENDER_FIND_BY_INTERNAL_SEQ_ID(sender, env, internal_seq_id) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_FIND_BY_INTERNAL_SEQ_ID(sender, env, internal_seq_id) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        find_by_internal_seq_id (sender, env, internal_seq_id))
 
-#define SANDESHA2_IN_MEMORY_SENDER_FIND_BY_SENDER_BEAN(sender, env, bean) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_FIND_BY_SENDER_BEAN(sender, env, bean) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        find_by_sender_bean (sender, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SENDER_FIND_UNIQUE(sender, env, bean) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_FIND_UNIQUE(sender, env, bean) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        find_unique (sender, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SENDER_GET_NEXT_MSG_TO_SEND(sender, env) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_GET_NEXT_MSG_TO_SEND(sender, env) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        get_next_msg_to_send (sender, env))
 
-#define SANDESHA2_IN_MEMORY_SENDER_RETRIEVE_FROM_MSG_REF_KEY(sender, env, ref_key) \
-      (((sandesha2_in_memory_sender_mgr_t *) sender)->ops->\
+#define SANDESHA2_SENDER_RETRIEVE_FROM_MSG_REF_KEY(sender, env, ref_key) \
+      (((sandesha2_sender_mgr_t *) sender)->ops->\
        retrieve_from_msg_ref_key (sender, env, ref_key))
 
 
@@ -164,4 +164,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_IN_MEMORY_SENDER_MGR_H */
+#endif /* SANDESHA2_SENDER_MGR_H */

Modified: webservices/sandesha/trunk/c/include/sandesha2_in_memory_seq_property_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_memory_seq_property_mgr.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_memory_seq_property_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_memory_seq_property_mgr.h Tue Jul 11 05:07:03 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef SANDESHA2_IN_MEMORY_SEQ_PROPERTY_MGR_H
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_MGR_H
+#ifndef SANDESHA2_SEQ_PROPERTY_MGR_H
+#define SANDESHA2_SEQ_PROPERTY_MGR_H
 
 /**
- * @file sandesha2_in_memory_seq_property_mgr.h
+ * @file sandesha2_seq_property_mgr.h
  * @brief Sandesha In Memory Sequence Property Manager Interface
  */
 
@@ -36,15 +36,15 @@
 {
 #endif
 
-typedef struct sandesha2_in_memory_seq_property_mgr sandesha2_in_memory_seq_property_mgr_t;
-typedef struct sandesha2_in_memory_seq_property_mgr_ops sandesha2_in_memory_seq_property_mgr_ops_t;
+typedef struct sandesha2_seq_property_mgr sandesha2_seq_property_mgr_t;
+typedef struct sandesha2_seq_property_mgr_ops sandesha2_seq_property_mgr_ops_t;
 
-/** @defgroup sandesha2_in_memory_seq_property_mgr In Memory Sequence Property Manager
+/** @defgroup sandesha2_seq_property_mgr In Memory Sequence Property Manager
   * @ingroup sandesha2
   * @{
   */
 
-struct sandesha2_in_memory_seq_property_mgr_ops
+struct sandesha2_seq_property_mgr_ops
 {
    /** 
      * Deallocate memory
@@ -57,97 +57,97 @@
      
     axis2_bool_t (AXIS2_CALL *
     insert) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             sandesha2_sequence_property_bean_t *bean);
 
     axis2_bool_t (AXIS2_CALL *
     remove) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             axis2_char_t *seq_id,
             axis2_char_t *name);
 
     sandesha2_sequence_property_bean_t *(AXIS2_CALL *
     retrieve) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             axis2_char_t *seq_id,
             axis2_char_t *name);
 
     axis2_bool_t (AXIS2_CALL *
     update) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             sandesha2_sequence_property_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     find) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             sandesha2_sequence_property_bean_t *bean);
 
     sandesha2_sequence_property_bean_t *(AXIS2_CALL *
     find_unique) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             sandesha2_sequence_property_bean_t *bean);
 
     axis2_array_list_t *(AXIS2_CALL *
     retrieve_all) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env);
 
     axis2_bool_t (AXIS2_CALL *
     update_or_insert) (
-            sandesha2_in_memory_seq_property_mgr_t *seq_property,
+            sandesha2_seq_property_mgr_t *seq_property,
             const axis2_env_t *env,
             sandesha2_sequence_property_bean_t *bean);
 };
 
-struct sandesha2_in_memory_seq_property_mgr
+struct sandesha2_seq_property_mgr
 {
-    sandesha2_in_memory_seq_property_mgr_ops_t *ops;
+    sandesha2_seq_property_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_in_memory_seq_property_mgr_t * AXIS2_CALL
-sandesha2_in_memory_seq_property_mgr_create(
+AXIS2_EXTERN sandesha2_seq_property_mgr_t * AXIS2_CALL
+sandesha2_seq_property_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx);
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_MGR_FREE(seq_property, env) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->free (seq_property, env))
+#define SANDESHA2_SEQ_PROPERTY_MGR_FREE(seq_property, env) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->free (seq_property, env))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_INSERT(seq_property, env, bean) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_INSERT(seq_property, env, bean) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        insert (seq_property, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_REMOVE(seq_property, env, seq_id, name) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_REMOVE(seq_property, env, seq_id, name) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        remove (seq_property, env, seq_id, name))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_RETRIEVE(seq_property, env, seq_id, name) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_RETRIEVE(seq_property, env, seq_id, name) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        retrieve (seq_property, env, seq_id, name))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_UPDATE(seq_property, env, bean) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_UPDATE(seq_property, env, bean) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        update (seq_property, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_FIND(seq_property, env, bean) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_FIND(seq_property, env, bean) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        find (seq_property, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_FIND_UNIQUE(seq_property, env, bean) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_FIND_UNIQUE(seq_property, env, bean) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        find_unique (seq_property, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_UPDATE_OR_INSERT(seq_property, env, bean) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_UPDATE_OR_INSERT(seq_property, env, bean) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        update_or_insert (seq_property, env, bean))
 
-#define SANDESHA2_IN_MEMORY_SEQ_PROPERTY_RETRIEVE_ALL(seq_property, env) \
-      (((sandesha2_in_memory_seq_property_mgr_t *) seq_property)->ops->\
+#define SANDESHA2_SEQ_PROPERTY_RETRIEVE_ALL(seq_property, env) \
+      (((sandesha2_seq_property_mgr_t *) seq_property)->ops->\
        retrieve_all (seq_property, env))
 
 
@@ -156,4 +156,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* SANDESHA2_IN_MEMORY_SEQ_PROPERTY_MGR_H */
+#endif /* SANDESHA2_SEQ_PROPERTY_MGR_H */

Modified: webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Tue Jul 11 05:07:03 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
  
-#ifndef SANDESHA2_STORAGE_MANAGER_H
-#define SANDESHA2_STORAGE_MANAGER_H
+#ifndef SANDESHA2_STORAGE_MGR_H
+#define SANDESHA2_STORAGE_MGR_H
 
 /**
-  * @file sandesha2_storage_manager.h
+  * @file sandesha2_storage_mgr.h
   * @brief 
   */
 
@@ -27,12 +27,12 @@
 #include <axiom_soap_envelope.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_module_desc.h>
-#include <sandesha2/sandesha2_transaction.h>
-#include <sandesha2/sandesha2_create_seq_bean_manager.h>
-#include <sandesha2/sandesha2_next_msg_bean_manager.h>
-#include <sandesha2/sandesha2_sender_bean_manager.h>
-#include <sandesha2/sandesha2_seq_property_bean_manager.h>
-#include <sandesha2/sandesha2_invoker_bean_manager.h>
+#include <sandesha2_transaction.h>
+#include <sandesha2_create_seq_bean_mgr.h>
+#include <sandesha2_next_msg_bean_mgr.h>
+#include <sandesha2_sender_bean_mgr.h>
+#include <sandesha2_seq_property_bean_mgr.h>
+#include <sandesha2_invoker_bean_mgr.h>
 
 
 #ifdef __cplusplus
@@ -41,158 +41,158 @@
 #endif
 
 /** 
- * @ingroup sandesha2_storage_manager
+ * @ingroup sandesha2_storage_mgr
  * @{
  */
  
- typedef struct sandesha2_storage_manager_ops sandesha2_storage_manager_ops_t;
- typedef struct sandesha2_storage_manager sandesha2_storage_manager_t;
+ typedef struct sandesha2_storage_mgr_ops sandesha2_storage_mgr_ops_t;
+ typedef struct sandesha2_storage_mgr sandesha2_storage_mgr_t;
  /**
  * @brief Sandesha2 Storage Manager ops struct
- * Encapsulator struct for ops of sandesha2_storage_manager
+ * Encapsulator struct for ops of sandesha2_storage_mgr
  */
-AXIS2_DECLARE_DATA struct sandesha2_storage_manager_ops
+AXIS2_DECLARE_DATA struct sandesha2_storage_mgr_ops
 {
     
     axis2_conf_ctx_t* (AXIS2_CALL *
         get_context) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
             
     axis2_status_t (AXIS2_CALL *
         set_context) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env,
             axis2_conf_ctx_t *conf_ctx);
             
     axis2_status_t (AXIS2_CALL *
         init_storage) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env,
             axis2_module_desc_t *module_desc);
             
     sandesha2_transaction_t* (AXIS2_CALL *
         get_transaction) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
             
-    sandesha2_create_seq_bean_manager_t* (AXIS2_CALL *
-        get_create_seq_bean_manager) 
-            (sandesha2_storage_manager_t *storage_man,
+    sandesha2_create_seq_bean_mgr_t* (AXIS2_CALL *
+        get_create_seq_bean_mgr) 
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
     
-    sandesha2_next_msg_bean_manager_t* (AXIS2_CALL *
-        get_next_msg_bean_manager) 
-            (sandesha2_storage_manager_t *storage_man,
+    sandesha2_next_msg_bean_mgr_t* (AXIS2_CALL *
+        get_next_msg_bean_mgr) 
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
 
-    sandesha2_sender_bean_manager_t* (AXIS2_CALL *
-        get_retrans_bean_manager) 
-            (sandesha2_storage_manager_t *storage_man,
+    sandesha2_sender_bean_mgr_t* (AXIS2_CALL *
+        get_retrans_bean_mgr) 
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
     
-    sandesha2_seq_property_bean_manager_t* (AXIS2_CALL *
-        get_seq_property_bean_manager) 
-            (sandesha2_storage_manager_t *storage_man,
+    sandesha2_seq_property_bean_mgr_t* (AXIS2_CALL *
+        get_seq_property_bean_mgr) 
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
 
-    sandesha2_invoker_bean_manager_t* (AXIS2_CALL *
-        get_storage_map_bean_manager) 
-            (sandesha2_storage_manager_t *storage_man,
+    sandesha2_invoker_bean_mgr_t* (AXIS2_CALL *
+        get_storage_map_bean_mgr) 
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
             
     axis2_status_t (AXIS2_CALL *
         store_msg_ctx) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env,
             axis2_char_t *storage_key,
             axis2_msg_ctx_t *msg_ctx);
     
     axis2_status_t (AXIS2_CALL *
         update_msg_ctx) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env,
             axis2_char_t *storage_key,
             axis2_msg_ctx_t *msg_ctx);
     
     axis2_msg_ctx_t* (AXIS2_CALL *
         retrieve_msg_ctx) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env,
             axis2_char_t *storage_key,
             axis2_conf_ctx_t *conf_ctx);
             
     axis2_status_t (AXIS2_CALL *
         remove_msg_ctx) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env,
             axis2_char_t *storage_key);
             
     axis2_status_t (AXIS2_CALL *
         free) 
-            (sandesha2_storage_manager_t *storage_man,
+            (sandesha2_storage_mgr_t *storage_man,
             const axis2_env_t *env);
 };
 
 /**
- * @brief sandesha2_storage_manager_ops
- *    sandesha2_storage_manager_ops
+ * @brief sandesha2_storage_mgr_ops
+ *    sandesha2_storage_mgr_ops
  */
-AXIS2_DECLARE_DATA struct sandesha2_storage_manager
+AXIS2_DECLARE_DATA struct sandesha2_storage_mgr
 {
-    sandesha2_storage_manager_ops_t *ops;
+    sandesha2_storage_mgr_ops_t *ops;
 };
 
-AXIS2_EXTERN sandesha2_storage_manager_t* AXIS2_CALL
-sandesha2_storage_manager_create(
+AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
+sandesha2_storage_mgr_create(
 						const axis2_env_t *env, 
 					    axis2_conf_ctx_t *conf_ctx);
                         
 /************************** Start of function macros **************************/
-#define SANDESHA2_STORAGE_MANAGER_FREE(storage_man, env) \
+#define SANDESHA2_STORAGE_MGR_FREE(storage_man, env) \
     ((storage_man)->ops->free (storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_SET_CONEXT(storage_man, env, conf_ctx) \
+#define SANDESHA2_STORAGE_MGR_SET_CONEXT(storage_man, env, conf_ctx) \
     ((storage_man)->ops->set_context(storage_man, env, conf_ctx))
     
-#define SANDESHA2_STORAGE_MANAGER_GET_CONEXT(storage_man, env) \
+#define SANDESHA2_STORAGE_MGR_GET_CONEXT(storage_man, env) \
     ((storage_man)->ops->get_context(storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_INIT_STORAGE(storage_man, env, module_desc) \
+#define SANDESHA2_STORAGE_MGR_INIT_STORAGE(storage_man, env, module_desc) \
     ((storage_man)->ops->init_storage(storage_man, env, module_desc))
     
-#define SANDESHA2_STORAGE_MANAGER_GET_TRANSACTION(storage_man, env) \
+#define SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_man, env) \
     ((storage_man)->ops->get_transaction(storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_GET_CREATE_SEQ_BEAN_MANAGER(storage_man, env)\
-    ((storage_man)->ops->get_create_seq_bean_manager(storage_man, env))
+#define SANDESHA2_STORAGE_MGR_GET_CREATE_SEQ_BEAN_MGR(storage_man, env)\
+    ((storage_man)->ops->get_create_seq_bean_mgr(storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_GET_NEXT_MSG_BEAN_MANAGER(storage_man, env)\
-    ((storage_man)->ops->get_next_msg_bean_manager(storage_man, env))
+#define SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_BEAN_MGR(storage_man, env)\
+    ((storage_man)->ops->get_next_msg_bean_mgr(storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_GET_RETRANS_BEAN_MANAGER(storage_man, env)\
-    ((storage_man)->ops->get_retrans_bean_manager(storage_man, env))
+#define SANDESHA2_STORAGE_MGR_GET_RETRANS_BEAN_MGR(storage_man, env)\
+    ((storage_man)->ops->get_retrans_bean_mgr(storage_man, env))
 
-#define SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(storage_man, env)\
-    ((storage_man)->ops->get_seq_property_bean_manager(storage_man, env))
+#define SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(storage_man, env)\
+    ((storage_man)->ops->get_seq_property_bean_mgr(storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_GET_STORAGE_MAP_BEAN_MANAGER(storage_man, env)\
-    ((storage_man)->ops->get_storage_map_bean_manager(storage_man, env))
+#define SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_BEAN_MGR(storage_man, env)\
+    ((storage_man)->ops->get_storage_map_bean_mgr(storage_man, env))
     
-#define SANDESHA2_STORAGE_MANAGER_STORE_MSG_CTX(storage_man, env, storage_key, \
+#define SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, storage_key, \
     msg_ctx) \
     ((storage_man)->ops->store_msg_ctx(storage_man, env, storage_key, msg_ctx))
 
-#define SANDESHA2_STORAGE_MANAGER_UPDATE_MSG_CTX(storage_man, env, storage_key,\
+#define SANDESHA2_STORAGE_MGR_UPDATE_MSG_CTX(storage_man, env, storage_key,\
     msg_ctx) \
     ((storage_man)->ops->update_msg_ctx(storage_man, env, storage_key, msg_ctx))
 
-#define SANDESHA2_STORAGE_MANAGER_RETRIEVE_MSG_CTX(storage_man, env, \
+#define SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_man, env, \
     storage_key, conf_ctx) \
     ((storage_man)->ops->retrieve_msg_ctx(storage_man, env, storage_key, \
     conf_ctx))
 
-#define SANDESHA2_STORAGE_MANAGER_REMOVE_MSG_CTX(storage_man, env, storage_key)\
+#define SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env, storage_key)\
     ((storage_man)->ops->remove_msg_ctx(storage_man, env, storage_key))
 /************************** End of function macros ****************************/
 
@@ -201,4 +201,4 @@
 }
 #endif
 
-#endif /*SANDESHA2_STORAGE_MANAGER_H*/
+#endif /*SANDESHA2_STORAGE_MGR_H*/

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_create_seq_mgr.c Tue Jul 11 05:07:03 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#include <sandesha2_in_memory_create_seq_mgr.h>
+#include <sandesha2_create_seq_mgr.h>
 #include <sandesha2_constants.h>
 #include <sandesha2_error.h>
 #include <axis2_log.h>
@@ -22,87 +22,87 @@
 #include <axis2_thread.h>
 #include <axis2_property.h>
 
-typedef struct sandesha2_in_memory_create_seq_mgr_impl sandesha2_in_memory_create_seq_mgr_impl_t;
+typedef struct sandesha2_create_seq_mgr_impl sandesha2_create_seq_mgr_impl_t;
 
 /** 
  * @brief Sandesha Sequence Report Struct Impl
  *   Sandesha Sequence Report 
  */ 
-struct sandesha2_in_memory_create_seq_mgr_impl
+struct sandesha2_create_seq_mgr_impl
 {
-    sandesha2_in_memory_create_seq_mgr_t seq_mgr;
+    sandesha2_create_seq_mgr_t seq_mgr;
 	
     axis2_hash_t *table;
     axis2_thread_mutex_t *mutex;
 
 };
 
-#define SANDESHA2_INTF_TO_IMPL(seq_mgr) ((sandesha2_in_memory_create_seq_mgr_impl_t *) seq_mgr)
+#define SANDESHA2_INTF_TO_IMPL(seq_mgr) ((sandesha2_create_seq_mgr_impl_t *) seq_mgr)
 
 axis2_status_t AXIS2_CALL 
-sandesha2_in_memory_create_seq_mgr_free(
+sandesha2_create_seq_mgr_free(
         void *seq_mgr,
         const axis2_env_t *envv);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_insert(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_insert(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_remove(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_remove(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         axis2_char_t *msg_id);
 
 sandesha2_create_seq_bean_t *AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_retrieve(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_retrieve(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         axis2_char_t *msg_id);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_update(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_update(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean);
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_find(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_find(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean);
 
 sandesha2_create_seq_bean_t *AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_find_unique(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_find_unique(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean);
 
-AXIS2_EXTERN sandesha2_in_memory_create_seq_mgr_t * AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_create(
+AXIS2_EXTERN sandesha2_create_seq_mgr_t * AXIS2_CALL
+sandesha2_create_seq_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
     axis2_property_t *property = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     seq_mgr_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_create_seq_mgr_impl_t));
+                    sizeof(sandesha2_create_seq_mgr_impl_t));
 
     seq_mgr_impl->table = NULL;
     seq_mgr_impl->mutex = NULL;
 
     seq_mgr_impl->seq_mgr.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_create_seq_mgr_ops_t)); 
+                    sizeof(sandesha2_create_seq_mgr_ops_t)); 
     
     seq_mgr_impl->mutex = axis2_thread_mutex_create(env->allocator, 
             AXIS2_THREAD_MUTEX_DEFAULT);
     if(!seq_mgr_impl->mutex) 
     {
-        sandesha2_in_memory_create_seq_mgr_free(&(seq_mgr_impl->seq_mgr), env);
+        sandesha2_create_seq_mgr_free(&(seq_mgr_impl->seq_mgr), env);
         return NULL;
     }
 
@@ -125,29 +125,29 @@
         AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_CREATE_SEQUECE, 
                 property, AXIS2_FALSE);
     }
-    seq_mgr_impl->seq_mgr.ops->free = sandesha2_in_memory_create_seq_mgr_free;
+    seq_mgr_impl->seq_mgr.ops->free = sandesha2_create_seq_mgr_free;
     seq_mgr_impl->seq_mgr.ops->insert = 
-        sandesha2_in_memory_create_seq_mgr_insert;
+        sandesha2_create_seq_mgr_insert;
     seq_mgr_impl->seq_mgr.ops->remove = 
-        sandesha2_in_memory_create_seq_mgr_remove;
+        sandesha2_create_seq_mgr_remove;
     seq_mgr_impl->seq_mgr.ops->retrieve = 
-        sandesha2_in_memory_create_seq_mgr_retrieve;
+        sandesha2_create_seq_mgr_retrieve;
     seq_mgr_impl->seq_mgr.ops->update = 
-        sandesha2_in_memory_create_seq_mgr_update;
+        sandesha2_create_seq_mgr_update;
     seq_mgr_impl->seq_mgr.ops->find = 
-        sandesha2_in_memory_create_seq_mgr_find;
+        sandesha2_create_seq_mgr_find;
     seq_mgr_impl->seq_mgr.ops->find_unique = 
-        sandesha2_in_memory_create_seq_mgr_find_unique;
+        sandesha2_create_seq_mgr_find_unique;
 
     return &(seq_mgr_impl->seq_mgr);
 }
 
 axis2_status_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_free(
+sandesha2_create_seq_mgr_free(
         void *seq_mgr,
         const axis2_env_t *env)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
@@ -178,12 +178,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_insert(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_insert(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
     axis2_char_t *msg_id = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -200,12 +200,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_remove(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_remove(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         axis2_char_t *msg_id)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
@@ -220,12 +220,12 @@
 }
 
 sandesha2_create_seq_bean_t *AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_retrieve(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_retrieve(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         axis2_char_t *msg_id)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
     sandesha2_create_seq_bean_t *bean = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -241,12 +241,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_update(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_update(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
     axis2_char_t *msg_id = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -267,12 +267,12 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_find(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_find(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
     axis2_array_list_t *beans = NULL;
     axis2_hash_index_t *i = NULL;
     sandesha2_create_seq_bean_t *temp = NULL;
@@ -340,12 +340,12 @@
 }
 
 sandesha2_create_seq_bean_t *AXIS2_CALL
-sandesha2_in_memory_create_seq_mgr_find_unique(
-        sandesha2_in_memory_create_seq_mgr_t *seq_mgr,
+sandesha2_create_seq_mgr_find_unique(
+        sandesha2_create_seq_mgr_t *seq_mgr,
         const axis2_env_t *env,
         sandesha2_create_seq_bean_t *bean)
 {
-    sandesha2_in_memory_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
+    sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
     axis2_array_list_t *beans = NULL;
     int i = 0, size = 0;
     sandesha2_create_seq_bean_t *ret = NULL;
@@ -356,7 +356,7 @@
 
     axis2_thread_mutex_lock(seq_mgr_impl->mutex);
     
-    beans = sandesha2_in_memory_create_seq_mgr_find(seq_mgr, env, bean);
+    beans = sandesha2_create_seq_mgr_find(seq_mgr, env, bean);
     if(beans)
         size = AXIS2_ARRAY_LIST_SIZE(beans, env);
     if( size > 1)

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_invoker_mgr.c Tue Jul 11 05:07:03 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#include <sandesha2_in_memory_invoker_mgr.h>
+#include <sandesha2_invoker_mgr.h>
 #include <sandesha2_constants.h>
 #include <sandesha2_error.h>
 #include <axis2_log.h>
@@ -22,87 +22,87 @@
 #include <axis2_thread.h>
 #include <axis2_property.h>
 
-typedef struct sandesha2_in_memory_invoker_mgr_impl sandesha2_in_memory_invoker_mgr_impl_t;
+typedef struct sandesha2_invoker_mgr_impl sandesha2_invoker_mgr_impl_t;
 
 /** 
  * @brief Sandesha Sequence Report Struct Impl
  *   Sandesha Sequence Report 
  */ 
-struct sandesha2_in_memory_invoker_mgr_impl
+struct sandesha2_invoker_mgr_impl
 {
-    sandesha2_in_memory_invoker_mgr_t invoker;
+    sandesha2_invoker_mgr_t invoker;
 	
     axis2_hash_t *table;
     axis2_thread_mutex_t *mutex;
 
 };
 
-#define SANDESHA2_INTF_TO_IMPL(invoker) ((sandesha2_in_memory_invoker_mgr_impl_t *) invoker)
+#define SANDESHA2_INTF_TO_IMPL(invoker) ((sandesha2_invoker_mgr_impl_t *) invoker)
 
 axis2_status_t AXIS2_CALL 
-sandesha2_in_memory_invoker_mgr_free(
+sandesha2_invoker_mgr_free(
         void *invoker,
         const axis2_env_t *envv);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_insert(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_insert(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_remove(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_remove(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         axis2_char_t *ref_key);
 
 sandesha2_invoker_bean_t *AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_retrieve(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_retrieve(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         axis2_char_t *ref_key);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_update(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_update(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean);
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_find(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_find(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean);
 
 sandesha2_invoker_bean_t *AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_find_unique(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_find_unique(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean);
 
-AXIS2_EXTERN sandesha2_in_memory_invoker_mgr_t * AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_create(
+AXIS2_EXTERN sandesha2_invoker_mgr_t * AXIS2_CALL
+sandesha2_invoker_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
     axis2_property_t *property = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     invoker_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_invoker_mgr_impl_t));
+                    sizeof(sandesha2_invoker_mgr_impl_t));
 
     invoker_impl->table = NULL;
     invoker_impl->mutex = NULL;
 
     invoker_impl->invoker.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_invoker_mgr_ops_t)); 
+                    sizeof(sandesha2_invoker_mgr_ops_t)); 
     
     invoker_impl->mutex = axis2_thread_mutex_create(env->allocator, 
             AXIS2_THREAD_MUTEX_DEFAULT);
     if(!invoker_impl->mutex) 
     {
-        sandesha2_in_memory_invoker_mgr_free(&(invoker_impl->invoker), env);
+        sandesha2_invoker_mgr_free(&(invoker_impl->invoker), env);
         return NULL;
     }
 
@@ -125,29 +125,29 @@
         AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_STORAGE_MAP, 
                 property, AXIS2_FALSE);
     }
-    invoker_impl->invoker.ops->free = sandesha2_in_memory_invoker_mgr_free;
+    invoker_impl->invoker.ops->free = sandesha2_invoker_mgr_free;
     invoker_impl->invoker.ops->insert = 
-        sandesha2_in_memory_invoker_mgr_insert;
+        sandesha2_invoker_mgr_insert;
     invoker_impl->invoker.ops->remove = 
-        sandesha2_in_memory_invoker_mgr_remove;
+        sandesha2_invoker_mgr_remove;
     invoker_impl->invoker.ops->retrieve = 
-        sandesha2_in_memory_invoker_mgr_retrieve;
+        sandesha2_invoker_mgr_retrieve;
     invoker_impl->invoker.ops->update = 
-        sandesha2_in_memory_invoker_mgr_update;
+        sandesha2_invoker_mgr_update;
     invoker_impl->invoker.ops->find = 
-        sandesha2_in_memory_invoker_mgr_find;
+        sandesha2_invoker_mgr_find;
     invoker_impl->invoker.ops->find_unique = 
-        sandesha2_in_memory_invoker_mgr_find_unique;
+        sandesha2_invoker_mgr_find_unique;
 
     return &(invoker_impl->invoker);
 }
 
 axis2_status_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_free(
+sandesha2_invoker_mgr_free(
         void *invoker,
         const axis2_env_t *env)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
@@ -178,12 +178,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_insert(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_insert(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
     axis2_char_t *ref_key = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -200,12 +200,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_remove(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_remove(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         axis2_char_t *key)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
@@ -220,12 +220,12 @@
 }
 
 sandesha2_invoker_bean_t *AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_retrieve(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_retrieve(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         axis2_char_t *key)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
     sandesha2_invoker_bean_t *bean = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -241,12 +241,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_update(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_update(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
     axis2_char_t *ref_key = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -267,12 +267,12 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_find(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_find(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
     axis2_array_list_t *beans = NULL;
     axis2_hash_index_t *i = NULL;
     sandesha2_invoker_bean_t *temp = NULL;
@@ -345,12 +345,12 @@
 }
 
 sandesha2_invoker_bean_t *AXIS2_CALL
-sandesha2_in_memory_invoker_mgr_find_unique(
-        sandesha2_in_memory_invoker_mgr_t *invoker,
+sandesha2_invoker_mgr_find_unique(
+        sandesha2_invoker_mgr_t *invoker,
         const axis2_env_t *env,
         sandesha2_invoker_bean_t *bean)
 {
-    sandesha2_in_memory_invoker_mgr_impl_t *invoker_impl = NULL;
+    sandesha2_invoker_mgr_impl_t *invoker_impl = NULL;
     axis2_array_list_t *beans = NULL;
     int i = 0, size = 0;
     sandesha2_invoker_bean_t *ret = NULL;
@@ -361,7 +361,7 @@
 
     axis2_thread_mutex_lock(invoker_impl->mutex);
     
-    beans = sandesha2_in_memory_invoker_mgr_find(invoker, env, bean);
+    beans = sandesha2_invoker_mgr_find(invoker, env, bean);
     if(beans)
         size = AXIS2_ARRAY_LIST_SIZE(beans, env);
     if( size > 1)

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_next_msg_mgr.c Tue Jul 11 05:07:03 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#include <sandesha2_in_memory_next_msg_mgr.h>
+#include <sandesha2_next_msg_mgr.h>
 #include <sandesha2_constants.h>
 #include <sandesha2_error.h>
 #include <sandesha2_utils.h>
@@ -23,15 +23,15 @@
 #include <axis2_thread.h>
 #include <axis2_property.h>
 
-typedef struct sandesha2_in_memory_next_msg_mgr_impl sandesha2_in_memory_next_msg_mgr_impl_t;
+typedef struct sandesha2_next_msg_mgr_impl sandesha2_next_msg_mgr_impl_t;
 
 /** 
  * @brief Sandesha Sequence Report Struct Impl
  *   Sandesha Sequence Report 
  */ 
-struct sandesha2_in_memory_next_msg_mgr_impl
+struct sandesha2_next_msg_mgr_impl
 {
-    sandesha2_in_memory_next_msg_mgr_t next_msg;
+    sandesha2_next_msg_mgr_t next_msg;
 	
     axis2_hash_t *table;
     axis2_array_list_t *values;
@@ -39,78 +39,78 @@
 
 };
 
-#define SANDESHA2_INTF_TO_IMPL(next_msg) ((sandesha2_in_memory_next_msg_mgr_impl_t *) next_msg)
+#define SANDESHA2_INTF_TO_IMPL(next_msg) ((sandesha2_next_msg_mgr_impl_t *) next_msg)
 
 axis2_status_t AXIS2_CALL 
-sandesha2_in_memory_next_msg_mgr_free(
+sandesha2_next_msg_mgr_free(
         void *next_msg,
         const axis2_env_t *envv);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_insert(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_insert(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_remove(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_remove(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         axis2_char_t *seq_id);
 
 sandesha2_next_msg_bean_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_retrieve(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_retrieve(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         axis2_char_t *seq_id);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_update(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_update(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean);
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_find(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_find(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean);
 
 sandesha2_next_msg_bean_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_find_unique(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_find_unique(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean);
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_retrieve_all(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_retrieve_all(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env);
 
-AXIS2_EXTERN sandesha2_in_memory_next_msg_mgr_t * AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_create(
+AXIS2_EXTERN sandesha2_next_msg_mgr_t * AXIS2_CALL
+sandesha2_next_msg_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     axis2_property_t *property = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     next_msg_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_next_msg_mgr_impl_t));
+                    sizeof(sandesha2_next_msg_mgr_impl_t));
 
     next_msg_impl->table = NULL;
     next_msg_impl->values = NULL;
     next_msg_impl->mutex = NULL;
 
     next_msg_impl->next_msg.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_next_msg_mgr_ops_t)); 
+                    sizeof(sandesha2_next_msg_mgr_ops_t)); 
     
     next_msg_impl->mutex = axis2_thread_mutex_create(env->allocator, 
             AXIS2_THREAD_MUTEX_DEFAULT);
     if(!next_msg_impl->mutex) 
     {
-        sandesha2_in_memory_next_msg_mgr_free(&(next_msg_impl->next_msg), env);
+        sandesha2_next_msg_mgr_free(&(next_msg_impl->next_msg), env);
         return NULL;
     }
 
@@ -133,31 +133,31 @@
         AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_NEXT_MESSAGE, 
                 property, AXIS2_FALSE);
     }
-    next_msg_impl->next_msg.ops->free = sandesha2_in_memory_next_msg_mgr_free;
+    next_msg_impl->next_msg.ops->free = sandesha2_next_msg_mgr_free;
     next_msg_impl->next_msg.ops->insert = 
-        sandesha2_in_memory_next_msg_mgr_insert;
+        sandesha2_next_msg_mgr_insert;
     next_msg_impl->next_msg.ops->remove = 
-        sandesha2_in_memory_next_msg_mgr_remove;
+        sandesha2_next_msg_mgr_remove;
     next_msg_impl->next_msg.ops->retrieve = 
-        sandesha2_in_memory_next_msg_mgr_retrieve;
+        sandesha2_next_msg_mgr_retrieve;
     next_msg_impl->next_msg.ops->update = 
-        sandesha2_in_memory_next_msg_mgr_update;
+        sandesha2_next_msg_mgr_update;
     next_msg_impl->next_msg.ops->find = 
-        sandesha2_in_memory_next_msg_mgr_find;
+        sandesha2_next_msg_mgr_find;
     next_msg_impl->next_msg.ops->find_unique = 
-        sandesha2_in_memory_next_msg_mgr_find_unique;
+        sandesha2_next_msg_mgr_find_unique;
     next_msg_impl->next_msg.ops->retrieve_all = 
-        sandesha2_in_memory_next_msg_mgr_retrieve_all;
+        sandesha2_next_msg_mgr_retrieve_all;
 
     return &(next_msg_impl->next_msg);
 }
 
 axis2_status_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_free(
+sandesha2_next_msg_mgr_free(
         void *next_msg,
         const axis2_env_t *env)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     next_msg_impl = SANDESHA2_INTF_TO_IMPL(next_msg);
@@ -194,12 +194,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_insert(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_insert(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     axis2_char_t *seq_id = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -223,12 +223,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_remove(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_remove(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         axis2_char_t *seq_id)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
@@ -243,12 +243,12 @@
 }
 
 sandesha2_next_msg_bean_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_retrieve(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_retrieve(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         axis2_char_t *seq_id)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     sandesha2_next_msg_bean_t *bean = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -264,12 +264,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_update(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_update(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     axis2_char_t *seq_id = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -289,12 +289,12 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_find(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_find(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     axis2_array_list_t *beans = NULL;
     axis2_hash_index_t *i = NULL;
 
@@ -348,12 +348,12 @@
 }
 
 sandesha2_next_msg_bean_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_find_unique(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_find_unique(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env,
         sandesha2_next_msg_bean_t *bean)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     axis2_array_list_t *beans = NULL;
     int i = 0, size = 0;
     sandesha2_next_msg_bean_t *ret = NULL;
@@ -364,7 +364,7 @@
 
     axis2_thread_mutex_lock(next_msg_impl->mutex);
     
-    beans = sandesha2_in_memory_next_msg_mgr_find(next_msg, env, 
+    beans = sandesha2_next_msg_mgr_find(next_msg, env, 
             bean);
     if(beans)
         size = AXIS2_ARRAY_LIST_SIZE(beans, env);
@@ -388,11 +388,11 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_next_msg_mgr_retrieve_all(
-        sandesha2_in_memory_next_msg_mgr_t *next_msg,
+sandesha2_next_msg_mgr_retrieve_all(
+        sandesha2_next_msg_mgr_t *next_msg,
         const axis2_env_t *env)
 {
-    sandesha2_in_memory_next_msg_mgr_impl_t *next_msg_impl = NULL;
+    sandesha2_next_msg_mgr_impl_t *next_msg_impl = NULL;
     axis2_hash_index_t *i = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c?rev=420809&r1=420808&r2=420809&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/in_memory_sender_mgr.c Tue Jul 11 05:07:03 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#include <sandesha2_in_memory_sender_mgr.h>
+#include <sandesha2_sender_mgr.h>
 #include <sandesha2_constants.h>
 #include <sandesha2_error.h>
 #include <sandesha2_utils.h>
@@ -23,119 +23,119 @@
 #include <axis2_thread.h>
 #include <axis2_property.h>
 
-typedef struct sandesha2_in_memory_sender_mgr_impl sandesha2_in_memory_sender_mgr_impl_t;
+typedef struct sandesha2_sender_mgr_impl sandesha2_sender_mgr_impl_t;
 
 /** 
  * @brief Sandesha Sequence Report Struct Impl
  *   Sandesha Sequence Report 
  */ 
-struct sandesha2_in_memory_sender_mgr_impl
+struct sandesha2_sender_mgr_impl
 {
-    sandesha2_in_memory_sender_mgr_t sender;
+    sandesha2_sender_mgr_t sender;
 	
     axis2_hash_t *table;
     axis2_thread_mutex_t *mutex;
 
 };
 
-#define SANDESHA2_INTF_TO_IMPL(sender) ((sandesha2_in_memory_sender_mgr_impl_t *) sender)
+#define SANDESHA2_INTF_TO_IMPL(sender) ((sandesha2_sender_mgr_impl_t *) sender)
 
 axis2_status_t AXIS2_CALL 
-sandesha2_in_memory_sender_mgr_free(
+sandesha2_sender_mgr_free(
         void *sender,
         const axis2_env_t *envv);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_insert(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_insert(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_remove(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_remove(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *msg_id);
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_retrieve(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_retrieve(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *msg_id);
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_update(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_update(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean);
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_find_by_internal_seq_id(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_by_internal_seq_id(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *internal_seq_id);
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_find_by_sender_bean(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_by_sender_bean(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean);
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_find_unique(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_unique(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean);
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_get_next_msg_to_send(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_get_next_msg_to_send(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env);
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_retrieve_from_msg_ref_key(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_retrieve_from_msg_ref_key(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *msg_ctx_ref_key);
 
 static axis2_status_t
-sandesha2_in_memory_sender_mgr_update_next_sending_time(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_update_next_sending_time(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean);
 
 /*
 static axis2_array_list_t *
-sandesha2_in_memory_sender_mgr_find_beans_with_msg_no(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_beans_with_msg_no(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_array_list_t *list,
         long msg_no);
 */
 
-AXIS2_EXTERN sandesha2_in_memory_sender_mgr_t * AXIS2_CALL
-sandesha2_in_memory_sender_mgr_create(
+AXIS2_EXTERN sandesha2_sender_mgr_t * AXIS2_CALL
+sandesha2_sender_mgr_create(
         const axis2_env_t *env,
         axis2_ctx_t *ctx)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_property_t *property = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     sender_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_sender_mgr_impl_t));
+                    sizeof(sandesha2_sender_mgr_impl_t));
 
     sender_impl->table = NULL;
     sender_impl->mutex = NULL;
 
     sender_impl->sender.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(sandesha2_in_memory_sender_mgr_ops_t)); 
+                    sizeof(sandesha2_sender_mgr_ops_t)); 
     
     sender_impl->mutex = axis2_thread_mutex_create(env->allocator, 
             AXIS2_THREAD_MUTEX_DEFAULT);
     if(!sender_impl->mutex) 
     {
-        sandesha2_in_memory_sender_mgr_free(&(sender_impl->sender), env);
+        sandesha2_sender_mgr_free(&(sender_impl->sender), env);
         return NULL;
     }
 
@@ -158,35 +158,35 @@
         AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_RETRANSMITTER, 
                 property, AXIS2_FALSE);
     }
-    sender_impl->sender.ops->free = sandesha2_in_memory_sender_mgr_free;
+    sender_impl->sender.ops->free = sandesha2_sender_mgr_free;
     sender_impl->sender.ops->insert = 
-        sandesha2_in_memory_sender_mgr_insert;
+        sandesha2_sender_mgr_insert;
     sender_impl->sender.ops->remove = 
-        sandesha2_in_memory_sender_mgr_remove;
+        sandesha2_sender_mgr_remove;
     sender_impl->sender.ops->retrieve = 
-        sandesha2_in_memory_sender_mgr_retrieve;
+        sandesha2_sender_mgr_retrieve;
     sender_impl->sender.ops->update = 
-        sandesha2_in_memory_sender_mgr_update;
+        sandesha2_sender_mgr_update;
     sender_impl->sender.ops->find_by_internal_seq_id = 
-        sandesha2_in_memory_sender_mgr_find_by_internal_seq_id;
+        sandesha2_sender_mgr_find_by_internal_seq_id;
     sender_impl->sender.ops->find_by_sender_bean = 
-        sandesha2_in_memory_sender_mgr_find_by_sender_bean;
+        sandesha2_sender_mgr_find_by_sender_bean;
     sender_impl->sender.ops->find_unique = 
-        sandesha2_in_memory_sender_mgr_find_unique;
+        sandesha2_sender_mgr_find_unique;
     sender_impl->sender.ops->get_next_msg_to_send = 
-        sandesha2_in_memory_sender_mgr_get_next_msg_to_send;
+        sandesha2_sender_mgr_get_next_msg_to_send;
     sender_impl->sender.ops->retrieve_from_msg_ref_key = 
-        sandesha2_in_memory_sender_mgr_retrieve_from_msg_ref_key;
+        sandesha2_sender_mgr_retrieve_from_msg_ref_key;
 
     return &(sender_impl->sender);
 }
 
 axis2_status_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_free(
+sandesha2_sender_mgr_free(
         void *sender,
         const axis2_env_t *env)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
@@ -217,12 +217,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_insert(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_insert(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_char_t *msg_id = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -246,12 +246,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_remove(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_remove(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *msg_id)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
@@ -266,12 +266,12 @@
 }
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_retrieve(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_retrieve(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *msg_id)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     sandesha2_sender_bean_t *bean = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -287,12 +287,12 @@
 }
 
 axis2_bool_t AXIS2_CALL
-sandesha2_in_memory_sender_mgr_update(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_update(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_char_t *msg_id = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -312,12 +312,12 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_find_by_internal_seq_id(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_by_internal_seq_id(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *internal_seq_id)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_array_list_t *list = NULL;
     axis2_hash_index_t *i = NULL;
 
@@ -360,12 +360,12 @@
 
 
 axis2_array_list_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_find_by_sender_bean(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_by_sender_bean(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_array_list_t *beans = NULL;
     axis2_hash_index_t *i = NULL;
 
@@ -472,12 +472,12 @@
 }
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_find_unique(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_unique(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_array_list_t *beans = NULL;
     int i = 0, size = 0;
     sandesha2_sender_bean_t *ret = NULL;
@@ -488,7 +488,7 @@
 
     axis2_thread_mutex_lock(sender_impl->mutex);
     
-    beans = sandesha2_in_memory_sender_mgr_find_by_sender_bean(sender, env, 
+    beans = sandesha2_sender_mgr_find_by_sender_bean(sender, env, 
             bean);
     if(beans)
         size = AXIS2_ARRAY_LIST_SIZE(beans, env);
@@ -512,11 +512,11 @@
 }
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_get_next_msg_to_send(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_get_next_msg_to_send(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     long lowest_app_msg_no = 0;
     axis2_hash_index_t *i = NULL;
 
@@ -588,7 +588,7 @@
                     valid = AXIS2_TRUE;
                 if(AXIS2_TRUE == valid)
                 {
-                    sandesha2_in_memory_sender_mgr_update_next_sending_time(
+                    sandesha2_sender_mgr_update_next_sending_time(
                             sender, env, temp);
                     axis2_thread_mutex_unlock(sender_impl->mutex);
                     return temp;
@@ -602,8 +602,8 @@
 }
 
 static axis2_status_t
-sandesha2_in_memory_sender_mgr_update_next_sending_time(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_update_next_sending_time(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         sandesha2_sender_bean_t *bean)
 {
@@ -612,13 +612,13 @@
 
 /*
 static axis2_array_list_t *
-sandesha2_in_memory_sender_mgr_find_beans_with_msg_no(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_find_beans_with_msg_no(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_array_list_t *list,
         long msg_no)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_array_list_t *beans = NULL;
     int i = 0, size =0;
 
@@ -657,12 +657,12 @@
 */
 
 sandesha2_sender_bean_t *AXIS2_CALL
-sandesha2_in_memory_sender_mgr_retrieve_from_msg_ref_key(
-        sandesha2_in_memory_sender_mgr_t *sender,
+sandesha2_sender_mgr_retrieve_from_msg_ref_key(
+        sandesha2_sender_mgr_t *sender,
         const axis2_env_t *env,
         axis2_char_t *msg_ctx_ref_key)
 {
-    sandesha2_in_memory_sender_mgr_impl_t *sender_impl = NULL;
+    sandesha2_sender_mgr_impl_t *sender_impl = NULL;
     axis2_hash_index_t *i = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org