ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r601697 - in /webservices/sandesha/trunk/c/src: storage/sqlite/Makefile.am storage/sqlite/permanent_bean_mgr.c storage/sqlite/permanent_storage_mgr.c workers/sender.c
Date Thu, 06 Dec 2007 10:59:16 GMT
Author: damitha
Date: Thu Dec  6 02:59:15 2007
New Revision: 601697

URL: http://svn.apache.org/viewvc?rev=601697&view=rev
Log:
Code formatting and code cleaning

Modified:
    webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am
    webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
    webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
    webservices/sandesha/trunk/c/src/workers/sender.c

Modified: webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am?rev=601697&r1=601696&r2=601697&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am Thu Dec  6 02:59:15 2007
@@ -6,7 +6,6 @@
 								permanent_sender_mgr.c \
 								permanent_next_msg_mgr.c \
 								permanent_seq_property_mgr.c \
-								permanent_transaction.c \
 								permanent_storage_mgr.c \
 								permanent_bean_mgr.c \
 								msg_store_bean.c \
@@ -21,7 +20,6 @@
 
 EXTRA_DIST=sandesha2_permanent_bean_mgr.h \
 		sandesha2_permanent_next_msg_mgr.h \
-		sandesha2_permanent_transaction.h \
 		sandesha2_permanent_create_seq_mgr.h \
 		sandesha2_permanent_sender_mgr.h \
 		sandesha2_sqls.h \

Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c?rev=601697&r1=601696&r2=601697&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c Thu Dec  6 02:59:15
2007
@@ -227,7 +227,7 @@
 {
     sandesha2_permanent_bean_mgr_impl_t *bean_mgr_impl = NULL;
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Start:sandesha2_permanent_bean_mgr_free_impl");
+        "[sandesha2]Entry:sandesha2_permanent_bean_mgr_free_impl");
     bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
 
     if(bean_mgr_impl->dbconn)
@@ -241,7 +241,7 @@
         bean_mgr_impl = NULL;
     }
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Exit:sandesha2_permanent_bean_mgr_free_impl");
+        "[sandesha2]Exit:sandesha2_permanent_bean_mgr_free_impl");
 }
 
 axis2_bool_t AXIS2_CALL
@@ -625,7 +625,7 @@
 	action = sandesha2_msg_store_bean_get_action(bean, env);
 
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
+        "[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
     sql_size = axutil_strlen(msg_id) + axutil_strlen(stored_key) + 
         axutil_strlen(soap_env_str) + sizeof(int) + sizeof(int) + 
         axutil_strlen(op) + axutil_strlen(svc) + axutil_strlen(svc_grp) + 
@@ -726,7 +726,7 @@
     AXIS2_FREE(env->allocator, sql_stmt_insert);
     axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Exit:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
+        "[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
     return AXIS2_TRUE;
 }
 
@@ -741,7 +741,7 @@
     axis2_char_t *error_msg = NULL;
     int rc = -1;
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Entry:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
+        "[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
     bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
     axutil_thread_mutex_lock(bean_mgr_impl->mutex);
     if(!bean_mgr_impl->dbconn)
@@ -767,7 +767,7 @@
     }
     axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Exit:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
+        "[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
     return AXIS2_TRUE;
 }
 
@@ -791,7 +791,7 @@
 
 	bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2]Start:sandesha2_permanent_bean_mgr_store_response");
+        "[sandesha2]Entry:sandesha2_permanent_bean_mgr_store_response");
     sql_size = axutil_strlen(seq_id) + axutil_strlen(response) + 
         sizeof(int) + sizeof(int) + 512;
     sprintf(sql_stmt_count, "select count(seq_id)"\
@@ -867,7 +867,7 @@
         axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
     }
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Exit:sandesha2_permanent_bean_mgr_store_response");
+        "[sandesha2]Exit:sandesha2_permanent_bean_mgr_store_response");
     return AXIS2_TRUE;
 }
 
@@ -883,7 +883,7 @@
     axis2_char_t *error_msg = NULL;
     int rc = -1;
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Entry:sandesha2_permanent_bean_mgr_remove_response");
+        "[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_response");
     bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
     axutil_thread_mutex_lock(bean_mgr_impl->mutex);
     if(!bean_mgr_impl->dbconn)
@@ -910,7 +910,7 @@
     }
     axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
-        "[sandesha2] Exit:sandesha2_permanent_bean_mgr_remove_response");
+        "[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_response");
     return AXIS2_TRUE;
 }
 

Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c?rev=601697&r1=601696&r2=601697&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Thu Dec  6 02:59:15
2007
@@ -29,9 +29,7 @@
 #include "sandesha2_permanent_sender_mgr.h"
 #include <sandesha2_seq_property_mgr.h>
 #include "sandesha2_permanent_seq_property_mgr.h"
-#include <sandesha2_transaction.h>
 #include <sandesha2_property_bean.h>
-#include "sandesha2_permanent_transaction.h"
 #include <sandesha2_constants.h>
 #include <sandesha2_error.h>
 #include <sandesha2_utils.h>
@@ -70,7 +68,6 @@
     sandesha2_invoker_mgr_t *invoker_mgr;
     axis2_conf_ctx_t *conf_ctx;
     axis2_char_t *db_name;
-    axutil_array_list_t *transactions;
     sandesha2_permanent_bean_mgr_t *bean_mgr;
     axutil_hash_t *msg_ctx_map;
     axutil_thread_mutex_t *mutex;
@@ -89,17 +86,6 @@
     sandesha2_storage_mgr_t *storage,
     const axutil_env_t *envv);
 
-struct sandesha2_transaction *AXIS2_CALL
-sandesha2_permanent_storage_mgr_get_transaction(
-    sandesha2_storage_mgr_t *storage,
-    const axutil_env_t *env);
-
-void AXIS2_CALL
-sandesha2_permanent_storage_mgr_enlist_bean(
-    sandesha2_storage_mgr_t *storage_mgr,
-    const axutil_env_t *env,
-    sandesha2_rm_bean_t *rm_bean);
-
 sandesha2_create_seq_mgr_t *AXIS2_CALL
 sandesha2_permanent_storage_mgr_get_create_seq_mgr(
     sandesha2_storage_mgr_t *storage,
@@ -238,8 +224,8 @@
 {
     sandesha2_permanent_storage_mgr_free,
     sandesha2_permanent_storage_mgr_free_void_arg,
-    sandesha2_permanent_storage_mgr_get_transaction,
-    sandesha2_permanent_storage_mgr_enlist_bean,
+    NULL,
+    NULL,
     sandesha2_permanent_storage_mgr_get_create_seq_mgr,
     sandesha2_permanent_storage_mgr_get_next_msg_mgr,
     sandesha2_permanent_storage_mgr_get_retrans_mgr,
@@ -275,9 +261,6 @@
     storage_mgr_impl->SANDESHA2_MSG_MAP_KEY = axutil_strdup(env, 
         "Sandesha2MessageMap");
     storage_mgr_impl->conf_ctx = conf_ctx;
-    axutil_allocator_switch_to_global_pool(env->allocator);
-    storage_mgr_impl->transactions = axutil_array_list_create(env, 0);
-    axutil_allocator_switch_to_local_pool(env->allocator);
     storage_mgr_impl->bean_mgr = NULL;
     storage_mgr_impl->mutex = axutil_thread_mutex_create(env->allocator,
         AXIS2_THREAD_MUTEX_DEFAULT);
@@ -323,10 +306,6 @@
     sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
     storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
 
-    if(storage_mgr_impl->transactions)
-    {
-        axutil_array_list_free(storage_mgr_impl->transactions, env);
-    }
     if(storage_mgr_impl->create_seq_mgr)
     {
         sandesha2_create_seq_mgr_free(storage_mgr_impl->create_seq_mgr, env);
@@ -372,62 +351,6 @@
     return AXIS2_SUCCESS;
 }
 
-sandesha2_transaction_t *AXIS2_CALL
-sandesha2_permanent_storage_mgr_get_transaction(
-    sandesha2_storage_mgr_t *storage_mgr,
-    const axutil_env_t *env)
-{
-	sandesha2_transaction_t *transaction = NULL;
-    sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
-
-	storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
-
-    axutil_thread_mutex_lock(storage_mgr_impl->mutex);
-    axutil_allocator_switch_to_global_pool(env->allocator);
-    transaction = (sandesha2_transaction_t *) axutil_array_list_get(
-        storage_mgr_impl->transactions, env, 0);
-    
-    if(!transaction)
-    {
-        axutil_thread_mutex_unlock(storage_mgr_impl->mutex);
-        transaction = 
-            sandesha2_permanent_transaction_create(env, storage_mgr, 0);
-        axutil_thread_mutex_lock(storage_mgr_impl->mutex);
-        axutil_array_list_add(storage_mgr_impl->transactions, env, transaction);
-    }
-    axutil_allocator_switch_to_local_pool(env->allocator);
-    axutil_thread_mutex_unlock(storage_mgr_impl->mutex);
-    return transaction;
-}
-
-void AXIS2_CALL
-sandesha2_permanent_storage_mgr_remove_transaction(
-    sandesha2_storage_mgr_t *storage_mgr,
-    const axutil_env_t *env,
-    sandesha2_transaction_t *transaction)
-{
-    sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
-    storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
-
-    axutil_allocator_switch_to_global_pool(env->allocator);
-    axutil_array_list_remove(storage_mgr_impl->transactions, env, 0);
-    axutil_allocator_switch_to_local_pool(env->allocator);
-}
-
-void AXIS2_CALL
-sandesha2_permanent_storage_mgr_enlist_bean(
-    sandesha2_storage_mgr_t *storage_mgr,
-    const axutil_env_t *env,
-    sandesha2_rm_bean_t *rm_bean)
-{
-    /*sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
-    sandesha2_transaction_t *transaction = NULL;
-    storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
-    transaction = sandesha2_permanent_storage_mgr_get_transaction(storage_mgr, 
-        env);
-    sandesha2_transaction_enlist(transaction, env, rm_bean);*/
-}
-
 sandesha2_create_seq_mgr_t *AXIS2_CALL
 sandesha2_permanent_storage_mgr_get_create_seq_mgr(
     sandesha2_storage_mgr_t *storage_mgr,
@@ -1115,26 +1038,6 @@
         axutil_hash_set(map, key, AXIS2_HASH_KEY_STRING, property);
     }
     return map;
-}
-
-void * AXIS2_CALL
-sandesha2_permanent_storage_mgr_get_dbconn(
-    sandesha2_storage_mgr_t *storage_mgr, 
-    const axutil_env_t *env)
-{
-    sqlite3* dbconn = NULL;
-    sandesha2_transaction_t *transaction = NULL;
-    sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
-    storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
-    axutil_allocator_switch_to_global_pool(env->allocator);
-    transaction = (sandesha2_transaction_t *) axutil_array_list_get(
-        storage_mgr_impl->transactions, env, 0);
-    axutil_allocator_switch_to_local_pool(env->allocator);
-    if(transaction)
-    {
-        dbconn = (sqlite3 *) sandesha2_permanent_transaction_get_dbconn(transaction, env);
-    }
-    return dbconn;
 }
 
 axis2_status_t AXIS2_CALL

Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?rev=601697&r1=601696&r2=601697&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Thu Dec  6 02:59:15 2007
@@ -160,7 +160,6 @@
     sandesha2_sender_t *sender, 
     const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     return sender->run_sender;
 }
             



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


Mime
View raw message