axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From din...@apache.org
Subject svn commit: r596096 - in /webservices/axis2/scratch/c/dinesh/axis2c-762: src/core/deployment/ src/core/engine/ util/src/
Date Sun, 18 Nov 2007 16:49:38 GMT
Author: dinesh
Date: Sun Nov 18 08:49:37 2007
New Revision: 596096

URL: http://svn.apache.org/viewvc?rev=596096&view=rev
Log:
cleaned up source files, removed unwanted debugging messages.

Modified:
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/arch_reader.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_builder.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_init.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/dep_engine.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/repos_listener.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/ws_info_list.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/engine/conf.c
    webservices/axis2/scratch/c/dinesh/axis2c-762/util/src/dir_handler.c

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/arch_reader.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/arch_reader.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/arch_reader.c Sun Nov
18 08:49:37 2007
@@ -287,7 +287,6 @@
         module_xml = axutil_strcat (env, repos_path, AXIS2_PATH_SEP_STR,
                                     file_name, AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML,
                                     NULL);
-		AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", module_xml);
 	}
 	
     if (!module_xml)

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_builder.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_builder.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_builder.c Sun Nov
18 08:49:37 2007
@@ -339,6 +339,7 @@
         {
             axutil_qname_free(qref, env);
         }
+
         if (module_ref_att)
         {
             axutil_qname_t *qrefname = NULL;
@@ -707,7 +708,7 @@
             axis2_flag = axis2_conf_get_axis2_flag (conf, env);
 
             name = axiom_attribute_get_value(trs_name, env);
-            AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Transport out name:%s", name);
+
             if (name)
             {
                 if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
@@ -800,8 +801,7 @@
                                                          dll_name,
                                                          NULL);
             }
-            AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", path_qualified_dll_name);
-
+            /* AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", path_qualified_dll_name);
*/
             axutil_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
             AXIS2_FREE(env->allocator, path_qualified_dll_name);
             axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
@@ -954,10 +954,16 @@
     axiom_children_qname_iterator_t * trs_recvs)
 {
     axis2_status_t status = AXIS2_FAILURE;
+    axis2_conf_t *conf;
+    axis2_bool_t axis2_flag = AXIS2_FALSE;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, trs_recvs, AXIS2_FAILURE);
 
+    conf = conf_builder->conf;
+    axis2_flag = axis2_conf_get_axis2_flag (conf, env);
+
+
     while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(trs_recvs, env))
     {
         axis2_transport_in_desc_t *transport_in = NULL;
@@ -1060,6 +1066,9 @@
                 axis2_char_t *temp_path = NULL;
                 axis2_char_t *temp_path2 = NULL;
                 axis2_char_t *temp_path3 = NULL;
+                
+                axutil_param_t *tnsparam;
+                axis2_char_t *libpath;
 
                 class_name = axiom_attribute_get_value(trs_class_name, env);
                 impl_info_param = axutil_param_create(env, class_name, NULL);
@@ -1068,20 +1077,37 @@
                     axutil_dll_desc_create_platform_specific_dll_name(dll_desc,
                                                                       env,
                                                                       class_name);
-
-                repos_name =
-                    axis2_dep_engine_get_repos_path
-                    (axis2_desc_builder_get_dep_engine
-                     (conf_builder->desc_builder, env), env);
-                temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
-                temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER);
-                temp_path3 =
-                    axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
-                path_qualified_dll_name =
-                    axutil_stracat(env, temp_path3, dll_name);
-                AXIS2_FREE(env->allocator, temp_path);
-                AXIS2_FREE(env->allocator, temp_path2);
-                AXIS2_FREE(env->allocator, temp_path3);
+                if (axis2_flag == AXIS2_FALSE)
+                {
+                    repos_name =
+                        axis2_dep_engine_get_repos_path
+                        (axis2_desc_builder_get_dep_engine
+                         (conf_builder->desc_builder, env), env);
+                    temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
+                    temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER);
+                    temp_path3 =
+                        axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
+                    path_qualified_dll_name =
+                        axutil_stracat(env, temp_path3, dll_name);
+                    AXIS2_FREE(env->allocator, temp_path);
+                    AXIS2_FREE(env->allocator, temp_path2);
+                    AXIS2_FREE(env->allocator, temp_path3);
+                }
+                else
+                {
+                    tnsparam = axis2_conf_get_param (conf, env, "libDir");
+                    if (tnsparam)
+                    {
+                        libpath = (axis2_char_t *)axutil_param_get_value (tnsparam, env);
+
+                        if (libpath)
+                        {
+                            path_qualified_dll_name = axutil_strcat (env, libpath,
+                                                                     AXIS2_PATH_SEP_STR,
+                                                                     dll_name, NULL);
+                        }
+                    }
+                }
 
                 axutil_dll_desc_set_name(dll_desc, env,
                                          path_qualified_dll_name);

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_init.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_init.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/conf_init.c Sun Nov
18 08:49:37 2007
@@ -203,7 +203,8 @@
     if (!dep_engine)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                        "dep engine create with repos name failed, dep_engine value is NULL");
+                        "dep engine create with repos name failed, dep_engine \
+value is NULL");
         return NULL;
     }
 
@@ -222,7 +223,8 @@
     if (!phase_resolver)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                        "phase resolver create with config failed. phase resolver value is
NULL");
+                        "phase resolver create with config failed. \
+phase resolver value is NULL");
         return NULL;
     }
 
@@ -324,8 +326,10 @@
                     {
                         axutil_param_t *impl_info_param = NULL;
                         void *impl_class = NULL;
-                        impl_info_param = axis2_svc_get_param(svc_desc, env,
-                                                              AXIS2_SERVICE_CLASS);
+                        impl_info_param = axis2_svc_get_param(
+                            svc_desc, env,
+                            AXIS2_SERVICE_CLASS);
+
                         if (!impl_info_param)
                         {
                             AXIS2_ERROR_SET(env->error,
@@ -348,17 +352,15 @@
                         }
 
                         axis2_svc_set_impl_class(svc_desc, env, impl_class);
-                        status = AXIS2_SVC_SKELETON_INIT_WITH_CONF((axis2_svc_skeleton_t
-                                                           *) impl_class, env,
-                                                          conf);
+                        status = AXIS2_SVC_SKELETON_INIT_WITH_CONF(
+                            (axis2_svc_skeleton_t *) impl_class, env, conf);
                         axutil_allocator_switch_to_local_pool(env->allocator);
                         if(!status)
                         {
                             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                                "Initialization failed for the service %s. "\
-                                "Check the service's init_with_conf() "\
-                                "function for errors and retry",
-                                axis2_svc_get_name(svc_desc, env));
+                                            "Initialization failed for the \
+service %s. Check the service's init_with_conf() function for errors and \
+retry", axis2_svc_get_name(svc_desc, env));
                         }
                     }
                 }
@@ -369,7 +371,8 @@
     else
     {
         AXIS2_LOG_WARNING (env->log, AXIS2_LOG_SI, 
-                           "conf ctx value is NULL, axis2 load services failed");
+                           "conf ctx value is NULL, axis2 load services \
+failed");
     }
 
     return status;

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/dep_engine.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/dep_engine.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/dep_engine.c Sun Nov
18 08:49:37 2007
@@ -717,7 +717,6 @@
 
     if (AXIS2_SUCCESS != status)
     {
-		AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "population unsuccessful\n");
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         return NULL;
@@ -729,8 +728,6 @@
         return NULL;
     }
 
-    AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "population finished \n");
-
     status = axis2_dep_engine_set_dep_features(dep_engine, env);
     if (AXIS2_SUCCESS != status)
     {
@@ -742,7 +739,6 @@
         axis2_repos_listener_free(dep_engine->repos_listener, env);
     }
 	
-    AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "creating repos listener");
     dep_engine->repos_listener =
         axis2_repos_listener_create_with_folder_name_and_dep_engine(env,
                                                                     dep_engine->
@@ -763,7 +759,6 @@
    
 	if (AXIS2_SUCCESS != status)
     {
-		AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "validate system predefined failed \n");
         axis2_repos_listener_free(dep_engine->repos_listener, env);
         axis2_conf_free(dep_engine->conf, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
@@ -775,7 +770,6 @@
                                         dep_engine->phases_info);
 	if (AXIS2_SUCCESS != status)
     {
-		AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "conf set phases_info failed \n");
         axis2_repos_listener_free(dep_engine->repos_listener, env);
         axis2_conf_free(dep_engine->conf, env);
         return NULL;
@@ -792,17 +786,15 @@
                                     new_out_fault_phases);
     if (AXIS2_SUCCESS != status)
     {
-		AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "conf set out fault phase failed \n");
         axis2_repos_listener_free(dep_engine->repos_listener, env);
         axis2_conf_free(dep_engine->conf, env);
         return NULL;
     }
 	
-	AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "about to engaged_modules \n");
     status = axis2_dep_engine_engage_modules(dep_engine, env);
     if (AXIS2_SUCCESS != status)
     {
-		AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "failed to engaged_modules \n");
+		AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "dep engine failed to engaged_modules");
         axis2_repos_listener_free(dep_engine->repos_listener, env);
         axis2_conf_free(dep_engine->conf, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
@@ -914,10 +906,10 @@
             axis2_repos_listener_free(dep_engine->repos_listener, env);
         }
         dep_engine->repos_listener =
-            axis2_repos_listener_create_with_folder_name_and_dep_engine(env,
-                                                                        dep_engine->
-                                                                        folder_name,
-                                                                        dep_engine);
+            axis2_repos_listener_create_with_folder_name_and_dep_engine(
+                env,
+                dep_engine->folder_name,
+                dep_engine);
     }
 
     axis2_conf_set_repo(dep_engine->conf, env, dep_engine->axis2_repos);
@@ -1425,8 +1417,6 @@
                 axutil_array_list_get(dep_engine->ws_to_deploy, env, i);
 
             type = axis2_arch_file_data_get_type(dep_engine->curr_file, env);
-            AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", 
-                             axis2_arch_file_data_get_name(dep_engine->curr_file, env));
             switch (type)
             {
                 case AXIS2_SVC:

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/repos_listener.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/repos_listener.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/repos_listener.c Sun
Nov 18 08:49:37 2007
@@ -90,9 +90,6 @@
     axis2_bool_t file_flag;
 
     AXIS2_ENV_CHECK(env, NULL);
-    AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, 
-                     "repos listener enter");
-
     repos_listener =
         (axis2_repos_listener_t *) axis2_repos_listener_create(env);
 
@@ -221,7 +218,6 @@
         {
             module_dir = (axis2_char_t *)axutil_param_get_value (module_param, env);
             module_path = axutil_strdup (env, module_dir);
-            AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", module_path);
         }
         else
         {
@@ -285,7 +281,6 @@
         }
     }
 
-    AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", svc_path);
     status =
         axis2_repos_listener_search(repos_listener, 
                                     env, svc_path, AXIS2_SVC);
@@ -359,9 +354,6 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK (env->error, repos_listener, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, folder_name, AXIS2_FAILURE);
-    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "%s in the folder.",
-                    folder_name);
-
     current_info_list = axutil_dir_handler_list_service_or_module_dirs(env,
                                                                        folder_name);
 
@@ -381,9 +373,6 @@
     }
 
     size = axutil_array_list_size(current_info_list, env);
-
-    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, " %d current info list ", size);
-
 
     for (i = 0; i < size; i++)  /* loop until empty */
     {

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/ws_info_list.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/deployment/ws_info_list.c Sun Nov
18 08:49:37 2007
@@ -176,8 +176,6 @@
     AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
 
     temp_name = axutil_file_get_name(file, env);
-
-    AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s file name", temp_name);
     info_list_name = axutil_strdup(env, temp_name);
     if (!info_list_name)
     {

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/engine/conf.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/engine/conf.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/src/core/engine/conf.c Sun Nov 18 08:49:37
2007
@@ -1385,7 +1385,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_ref, AXIS2_FAILURE);
 	AXIS2_PARAM_CHECK (env->error, conf, AXIS2_FAILURE);
-	AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "conf engage module process");
+
     module_desc = axis2_conf_get_module(conf, env, module_ref);
     if (!module_desc)
     {
@@ -1440,7 +1440,6 @@
                                         module_dir, 
                                         AXIS2_PATH_SEP_STR, NULL);
 			path = axutil_strcat (env, temp_path1, file_name, NULL);
-			AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "%s", path);			
 		}
 		
         axutil_file_set_path(file, env, path);

Modified: webservices/axis2/scratch/c/dinesh/axis2c-762/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/axis2c-762/util/src/dir_handler.c?rev=596096&r1=596095&r2=596096&view=diff
==============================================================================
--- webservices/axis2/scratch/c/dinesh/axis2c-762/util/src/dir_handler.c (original)
+++ webservices/axis2/scratch/c/dinesh/axis2c-762/util/src/dir_handler.c Sun Nov 18 08:49:37
2007
@@ -207,9 +207,6 @@
         return NULL;
     }
 
-    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No %dfiles in the path %s.",
-                    count, pathname);
-
     for (i = 1; i < (count + 1); ++i)
     {
         axis2_char_t *fname = NULL;



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


Mime
View raw message