You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/01/31 16:09:47 UTC

svn commit: r373830 - in /webservices/axis2/trunk/c: include/ modules/core/deployment/ modules/core/engine/ modules/core/transport/http/server/ modules/util/

Author: samisa
Date: Tue Jan 31 07:09:22 2006
New Revision: 373830

URL: http://svn.apache.org/viewcvs?rev=373830&view=rev
Log:
Added prefix to LOG_SI

Modified:
    webservices/axis2/trunk/c/include/axis2_log.h
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/phase.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c
    webservices/axis2/trunk/c/modules/util/class_loader.c
    webservices/axis2/trunk/c/modules/util/dir_handler.c

Modified: webservices/axis2/trunk/c/include/axis2_log.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_log.h?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/include/axis2_log.h Tue Jan 31 07:09:22 2006
@@ -28,7 +28,7 @@
     struct axis2_log_ops;
 
 
-#define LOG_SI __FILE__,__LINE__
+#define AXIS2_LOG_SI __FILE__,__LINE__
 
 /**
  * @defgroup axis2_log Log
@@ -41,7 +41,7 @@
 	/**
 	  *Examples
 	  *To write debug information to log
-	  *AXIS2_LOG_DEBUG(log,LOG_SI,"log this %s %d","test",123);
+	  *AXIS2_LOG_DEBUG(log,AXIS2_LOG_SI,"log this %s %d","test",123);
 	  *This would log
 	  *"log this test 123" into the log file
 	  *
@@ -134,7 +134,7 @@
 
 #define AXIS2_LOG_FREE(log) ((log->ops)->free(log))
 
-#define AXIS2_LOG_WRITE(log, buffer, level) ((log)->ops->write(log, buffer, level,LOG_SI))
+#define AXIS2_LOG_WRITE(log, buffer, level) ((log)->ops->write(log, buffer, level,AXIS2_LOG_SI))
 
 #define AXIS2_LOG_DEBUG axis2_log_impl_log_debug 
 #define AXIS2_LOG_INFO axis2_log_impl_log_info 

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Tue Jan 31 07:09:22 2006
@@ -410,7 +410,7 @@
         AXIS2_SVC_BUILDER_FREE(svc_builder, env);
         if(AXIS2_SUCCESS != status)
         {
-            AXIS2_LOG_INFO((*env)->log, LOG_SI, "populating service is not successful");
+            AXIS2_LOG_INFO((*env)->log, AXIS2_LOG_SI, "populating service is not successful");
 
             return AXIS2_FAILURE;
         }

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Tue Jan 31 07:09:22 2006
@@ -350,7 +350,7 @@
     svc_folder_path = AXIS2_FILE_GET_PATH(svc_folder, env);
     temp_path = AXIS2_STRACAT(svc_folder_path, AXIS2_PATH_SEP_STR, env);
     dll_path = AXIS2_STRACAT(temp_path, svc_dll_name, env);
-    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "dll path is : %s", dll_path);
+    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
     status = AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_path);
     if(AXIS2_SUCCESS != status)
     {

Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Tue Jan 31 07:09:22 2006
@@ -98,7 +98,7 @@
         if (address)
         {
             axis2_char_t **url_tokens = NULL;
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for service using WSA enpoint address : %s", address);
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for service using WSA enpoint address : %s", address);
 
             if ( (AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL, address) == 0 ) || 
                   (AXIS2_STRCMP(AXIS2_WSA_NAMESPACE_SUBMISSION, address) == 0 ))
@@ -158,7 +158,7 @@
     
     if (action)
     {
-        AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for operation using WSAAction : %s", action);
+        AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for operation using WSAAction : %s", action);
         
         qname = axis2_qname_create(env, action, NULL, NULL);
         return AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, qname);

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Jan 31 07:09:22 2006
@@ -220,12 +220,12 @@
         }
         else
         {
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Transport out is not set in message context");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Transport out is not set in message context");
             return AXIS2_FAILURE;
         }
     }
     
-    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Axis2 engine send successful");
+    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Axis2 engine send successful");
     return AXIS2_SUCCESS;
 }
 
@@ -316,12 +316,12 @@
         receiver = AXIS2_OP_GET_MSG_RECEIVER(op, env);
         if (!receiver)
         {
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Message receiver not set in operation description");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Message receiver not set in operation description");
             return AXIS2_FAILURE;
         }
         AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx);        
     }
-    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Axis2 engine receive successful");
+    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Axis2 engine receive successful");
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/phase.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Tue Jan 31 07:09:22 2006
@@ -162,7 +162,7 @@
     
     phase_impl = AXIS2_INTF_TO_IMPL(phase);
     
-    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "axis2_handler_t *%s added to the index %d of the phase %s",
+    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "axis2_handler_t *%s added to the index %d of the phase %s",
             AXIS2_QNAME_GET_LOCALPART(AXIS2_HANDLER_GET_NAME(handler, env), env),
             index,
             phase_impl->name);
@@ -232,7 +232,7 @@
             axis2_handler_t *handler = (axis2_handler_t*) AXIS2_ARRAY_LIST_GET(phase_impl->handlers, env, index);
             if (handler) 
             {
-                AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Invoke the handler %s within the phase %s",
+                AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Invoke the handler %s within the phase %s",
                          AXIS2_QNAME_GET_LOCALPART(AXIS2_HANDLER_GET_NAME(handler, env), env), 
                          phase_impl->name);
                 status = AXIS2_HANDLER_INVOKE(handler, env, msg_ctx);

Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Tue Jan 31 07:09:22 2006
@@ -98,7 +98,7 @@
         if (address)
         {
             axis2_char_t **url_tokens = NULL;
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for service using target endpoint address : %s", address);
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for service using target endpoint address : %s", address);
             
             url_tokens = axis2_parse_request_url_for_svc_and_op(env, address);
             
@@ -163,7 +163,7 @@
                 {
                     axis2_qname_t *op_qname = NULL;
                     axis2_op_t *op = NULL;
-                    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for operation using target endpoint uri fragment : %s", url_tokens[1]);
+                    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for operation using target endpoint uri fragment : %s", url_tokens[1]);
                     op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
                     op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, AXIS2_QNAME_GET_LOCALPART(op_qname, env));
                     AXIS2_QNAME_FREE(op_qname, env);

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Tue Jan 31 07:09:22 2006
@@ -86,7 +86,7 @@
 {    
     AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);    
 
-    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for service using SOAPAction is a TODO item");
+    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for service using SOAPAction is a TODO item");
 
     return NULL;
 }
@@ -112,7 +112,7 @@
     if (action)
     {
         axis2_op_t *op = NULL;        
-        AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for operation using SOAPAction : %s", action);
+        AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for operation using SOAPAction : %s", action);
 
         op = AXIS2_SVC_GET_OP_BY_SOAP_ACTION(svc, env, action);
         if (!op)

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Tue Jan 31 07:09:22 2006
@@ -113,7 +113,7 @@
                                 if (uri)
                                 {
                                     axis2_char_t **url_tokens = NULL;
-                                    AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for service using SOAP message body's first child's namespace URI : %s", uri);
+                                    AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for service using SOAP message body's first child's namespace URI : %s", uri);
                                     
                                     url_tokens = axis2_parse_request_url_for_svc_and_op(env, uri);
                                     
@@ -189,7 +189,7 @@
                             {
                                 axis2_qname_t *op_qname = NULL;
                                 axis2_op_t *op = NULL;
-                                AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for operation using SOAP message body's first child's local name : %s", element_name);
+                                AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Checking for operation using SOAP message body's first child's local name : %s", element_name);
                                 op_qname = axis2_qname_create(env, element_name, NULL, NULL);
                                 op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, AXIS2_QNAME_GET_LOCALPART(op_qname, env));
                                 AXIS2_QNAME_FREE(op_qname, env);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c Tue Jan 31 07:09:22 2006
@@ -117,7 +117,7 @@
 	server = axis2_http_server_create(&env, repo_path, port);
 	if(NULL == server)
 	{
-	    AXIS2_LOG_ERROR(env->log, LOG_SI, "Server creation failed: Error code:"
+	    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Server creation failed: Error code:"
 						" %d :: %s", env->error->error_number,
                         AXIS2_ERROR_GET_MESSAGE(env->error));
 		system_exit(allocator, env, -1);
@@ -126,7 +126,7 @@
 	printf("Started Simple Axis2 HTTP Server ...\n");
 	if(AXIS2_TRANSPORT_RECEIVER_START(server, &env) == AXIS2_FAILURE)
 	{
-		AXIS2_LOG_ERROR(env->log, LOG_SI, "Server start failed: Error code:"
+		AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Server start failed: Error code:"
 						" %d :: %s", env->error->error_number,
                         AXIS2_ERROR_GET_MESSAGE(env->error));
 		system_exit(allocator, env, -1);

Modified: webservices/axis2/trunk/c/modules/util/class_loader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/class_loader.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/modules/util/class_loader.c Tue Jan 31 07:09:22 2006
@@ -171,14 +171,14 @@
         if(NULL == msg_recv)
         {
             axis2_class_loader_unload_lib(env, dll_desc);
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "message receiver is NULL");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "message receiver is NULL");
             AXIS2_ERROR_SET((*env)->error, 
                 AXIS2_ERROR_MSG_RECV_CREATION_FAILED,AXIS2_FAILURE);
             return NULL;
         }
         else
         {
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "message receiver loaded successfully");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "message receiver loaded successfully");
         }
         return msg_recv;
     }
@@ -188,14 +188,14 @@
         if(NULL == transport_recv)
         {
             axis2_class_loader_unload_lib(env, dll_desc);
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "transport receiver is NULL");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "transport receiver is NULL");
             AXIS2_ERROR_SET((*env)->error, 
                 AXIS2_ERROR_TRANSPORT_RECV_CREATION_FAILED,AXIS2_FAILURE);
             return NULL;
         }
         else
         {
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "transport receiver loaded successfully");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "transport receiver loaded successfully");
         }
         return transport_recv;
     }
@@ -205,14 +205,14 @@
         if(NULL == transport_sender)
         {
             axis2_class_loader_unload_lib(env, dll_desc);
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "transport sender is NULL");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "transport sender is NULL");
             AXIS2_ERROR_SET((*env)->error, 
                 AXIS2_ERROR_TRANSPORT_SENDER_CREATION_FAILED,AXIS2_FAILURE);
             return NULL;
         }
         else
         {
-            AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "transport sender loaded successfully");
+            AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "transport sender loaded successfully");
         }
         return transport_sender;
     }

Modified: webservices/axis2/trunk/c/modules/util/dir_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/dir_handler.c?rev=373830&r1=373829&r2=373830&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/dir_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/dir_handler.c Tue Jan 31 07:09:22 2006
@@ -42,7 +42,7 @@
 	/* If no files found, make a non-selectable menu item */
 	if (count <= 0)
 	{		 
-        AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "No files in this directory : %s", pathname);
+        AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "No files in this directory : %s", pathname);
 		return NULL;
 	}
     
@@ -115,7 +115,7 @@
 	/* If no files found, make a non-selectable menu item */
 	if (count <= 0)
 	{		 
-        AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "No files in this directory : %s", pathname);
+        AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "No files in this directory : %s", pathname);
 		return NULL;
 	}