[wsf-c-dev] svn commit r415 - wsf/c/wsclient/src

[svn at wso2.com]

Author: dinesh
Date: Fri Jan 12 07:10:51 2007
New Revision: 415

Modified:
   wsf/c/wsclient/src/wsclient.c
   wsf/c/wsclient/src/wsclient_constants.h
   wsf/c/wsclient/src/wsclient_option.c
   wsf/c/wsclient/src/wsclient_stub.c
   wsf/c/wsclient/src/wsclient_util.c
Log:
more error handling

Modified: wsf/c/wsclient/src/wsclient.c
==============================================================================
--- wsf/c/wsclient/src/wsclient.c	(original)
+++ wsf/c/wsclient/src/wsclient.c	Fri Jan 12 07:10:51 2007
@@ -41,7 +41,6 @@
 	    dest_uri = wsclient_destination (argc, argv);
 		AXIS2_LOG_INFO(env->log, "[wsclient]sending request to  %s", dest_uri);
 	    array_list = wsclient_process_options (argc, argv, env);
-		AXIS2_LOG_INFO(env->log, "[wsclient]invoking wsclient stub  ");
 	    status = wsclient_stub_invoke (env, array_list, dest_uri, *input);
 		AXIS2_LOG_INFO(env->log, "[wsclient]wsclient invoked ");
 	    if (status == WSCLIENT_ERROR_NO_DESTURI)

Modified: wsf/c/wsclient/src/wsclient_constants.h
==============================================================================
--- wsf/c/wsclient/src/wsclient_constants.h	(original)
+++ wsf/c/wsclient/src/wsclient_constants.h	Fri Jan 12 07:10:51 2007
@@ -33,13 +33,8 @@
 }
 #endif
  
-#define WSCLIENT_MODULEST "module"
-#define WSCLIENT_OPTIONST "option"
-#define AXIS2_ATTNAME "name"
-#define AXIS2_PARAMETERST "parameter"
-
 #define WSCLIENT_SUCCESS 1;
-#define WSCLIENT_FALIURE 0;
+#define WSCLIENT_FAILURE 0;
 #define WSCLIENT_ERROR -1;
 /* for more details we need to have detailed error codes */
 

Modified: wsf/c/wsclient/src/wsclient_option.c
==============================================================================
--- wsf/c/wsclient/src/wsclient_option.c	(original)
+++ wsf/c/wsclient/src/wsclient_option.c	Fri Jan 12 07:10:51 2007
@@ -52,7 +52,7 @@
 	    }
       }
       else
-		  return WSCLIENT_FALIURE;
+		  return WSCLIENT_FAILURE;
 
       return dest_uri;
 }

Modified: wsf/c/wsclient/src/wsclient_stub.c
==============================================================================
--- wsf/c/wsclient/src/wsclient_stub.c	(original)
+++ wsf/c/wsclient/src/wsclient_stub.c	Fri Jan 12 07:10:51 2007
@@ -570,9 +570,13 @@
 
 	client_home = AXIS2_GETENV("AXIS2C_HOME");
 	if (!client_home)
-	    client_home = "../";
-
-	AXIS2_LOG_INFO(env->log, "[wsclient] AXIS2C_HOME %s", client_home);
+	{
+		printf ("AXIS2C_HOME environment variable doesn't set properly.Please recheck");
+		AXIS2_LOG_INFO(env->log, "[wsclient] AXIS2C_HOME is empty");
+		return WSCLIENT_FAILURE;
+	}
+	else
+		AXIS2_LOG_INFO(env->log, "[wsclient] AXIS2C_HOME %s", client_home);
 
 	if (dest_uri)
 	{
@@ -587,7 +591,7 @@
 	if (address)
 	    endpoint_ref = axis2_endpoint_ref_create(env, address);
 	else
-	    return WSCLIENT_FALIURE;
+	    return WSCLIENT_FAILURE;
 
 	svc_client = axis2_svc_client_create (env, client_home);
 	AXIS2_LOG_INFO(env->log, "[wsclient] svc client created");
@@ -606,7 +610,7 @@
 	if (endpoint_ref)
 	    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
 	else
-	    return WSCLIENT_FALIURE;
+	    return WSCLIENT_FAILURE;
 
 	if (is_soap_enabled)
 	{
@@ -635,7 +639,7 @@
 	if (svc_client && options)
 	    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
 	else
-	    return WSCLIENT_FALIURE;
+	    return WSCLIENT_FAILURE;
 
 
 	if (payload && svc_client)
@@ -655,7 +659,7 @@
 			wsclient_soap_out (env, svc_client, 0);
 	}
 	else
-	    return WSCLIENT_FALIURE;
+	    return WSCLIENT_FAILURE;
 
 	if (ret_node)
 	{

Modified: wsf/c/wsclient/src/wsclient_util.c
==============================================================================
--- wsf/c/wsclient/src/wsclient_util.c	(original)
+++ wsf/c/wsclient/src/wsclient_util.c	Fri Jan 12 07:10:51 2007
@@ -28,7 +28,7 @@
     if (input)
 		reader = axiom_xml_reader_create_for_memory (env, input, strlen (input), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
     else
-		return WSCLIENT_FALIURE;
+		return WSCLIENT_FAILURE;
 
     if (reader)
     {
@@ -36,7 +36,7 @@
 		builder = axiom_stax_builder_create (env, reader);
     }
     else 
-		return WSCLIENT_FALIURE;
+		return WSCLIENT_FAILURE;
 
     if (builder)
     {
@@ -44,13 +44,13 @@
 		if (doc)
 			AXIOM_DOCUMENT_BUILD_ALL (doc, env);
 		else
-			return WSCLIENT_FALIURE;
+			return WSCLIENT_FAILURE;
 		node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT (doc, env);
     }
     else
     {
 		AXIOM_XML_READER_FREE (reader, env);
-		return WSCLIENT_FALIURE;
+		return WSCLIENT_FAILURE;
     }
     return node;
 }