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 2007/12/14 02:44:07 UTC

svn commit: r604079 - in /webservices/sandesha/trunk/c/src: core/mod_sandesha2.c handlers/sandesha2_global_in_handler.c handlers/sandesha2_out_handler.c storage/sqlite/permanent_storage_mgr.c

Author: damitha
Date: Thu Dec 13 17:44:05 2007
New Revision: 604079

URL: http://svn.apache.org/viewvc?rev=604079&view=rev
Log:
moved storage_mgr_create_db function to out_handler and global_in_handler

Modified:
    webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
    webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
    webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
    webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c

Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?rev=604079&r1=604078&r2=604079&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Thu Dec 13 17:44:05 2007
@@ -75,10 +75,10 @@
     axis2_ctx_t *ctx = NULL;
     /*sandesha2_storage_mgr_t *storage_mgr = NULL;*/
     
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:mod_sandesha2_init");
     AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
     
-    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]Module initializing");
     sandesha2_error_init();
     property_bean = sandesha2_property_mgr_load_properties_from_module_desc(env,
         module_desc);
@@ -101,14 +101,13 @@
     /*storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
     sandesha2_storage_mgr_init_storage(storage_mgr, env, module_desc);*/
     
-    sandesha2_storage_mgr_t *storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
+    /*sandesha2_storage_mgr_t *storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
     sandesha2_storage_mgr_init_storage(storage_mgr, env, module_desc);
-    /*if(!sandesha2_permanent_storage_mgr_create_db(
+    if(!sandesha2_permanent_storage_mgr_create_db(
         storage_mgr, env))
         return AXIS2_FAILURE;*/
     
-    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
-        "[sandesha2]Module initializing completed");
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Exit:mod_sandesha2_init");
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?rev=604079&r1=604078&r2=604079&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Thu Dec 13 17:44:05 2007
@@ -217,6 +217,8 @@
             "storage manager");
         return AXIS2_FAILURE;
     }
+    if(!sandesha2_permanent_storage_mgr_create_db(storage_mgr, env))
+        return AXIS2_FAILURE;
     fault_part = axiom_soap_body_get_fault(axiom_soap_envelope_get_body(
                         soap_envelope, env), env);
     if(fault_part)

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?rev=604079&r1=604078&r2=604079&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Thu Dec 13 17:44:05 2007
@@ -83,12 +83,12 @@
 
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,  
-        "[sandesha2]Entry: sandesha2_out_handler_invoke");
+        "[sandesha2]Entry:sandesha2_out_handler_invoke");
     conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
     if(!conf_ctx)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "[sandesha2] Configuration Context is NULL");
+            "[sandesha2]Configuration Context is NULL");
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, 
             AXIS2_FAILURE);
         return AXIS2_FAILURE;
@@ -161,6 +161,8 @@
         SANDESHA2_APPLICATION_PROCESSING_DONE, temp_prop);
     conf = axis2_conf_ctx_get_conf(conf_ctx, env);
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
+    if(!sandesha2_permanent_storage_mgr_create_db(storage_mgr, env))
+        return AXIS2_FAILURE;
     /* Getting rm message */ 
     rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
     temp_prop = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_DUMMY_MESSAGE);

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=604079&r1=604078&r2=604079&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 13 17:44:05 2007
@@ -269,9 +269,9 @@
     conf = axis2_conf_ctx_get_conf((const axis2_conf_ctx_t *) conf_ctx, env);
     storage_mgr_impl->bean_mgr = sandesha2_permanent_bean_mgr_create(env,
         &(storage_mgr_impl->storage_mgr), conf_ctx, NULL);
-    if(!sandesha2_permanent_storage_mgr_create_db(
+    /*if(!sandesha2_permanent_storage_mgr_create_db(
         &(storage_mgr_impl->storage_mgr), env))
-        return NULL;
+        return NULL;*/
     storage_mgr_impl->create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(
         env, &(storage_mgr_impl->storage_mgr), conf_ctx);
     storage_mgr_impl->next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(



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