You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/08/04 07:54:07 UTC

svn commit: r428635 - in /webservices/axis2/trunk/c/modules/core/clientapi: async_result.c svc_client.c

Author: samisa
Date: Thu Aug  3 22:54:07 2006
New Revision: 428635

URL: http://svn.apache.org/viewvc?rev=428635&view=rev
Log:
Fixed spellings and formatting

Modified:
    webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c

Modified: webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/async_result.c?rev=428635&r1=428634&r2=428635&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/async_result.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/async_result.c Thu Aug  3 22:54:07 2006
@@ -30,21 +30,25 @@
 #define AXIS2_INTF_TO_IMPL(async_result) ((axis2_async_result_impl_t *)async_result)
 
 
-axiom_soap_envelope_t* AXIS2_CALL 
-axis2_async_result_get_envelope(struct axis2_async_result *async_result, 
-                                const axis2_env_t *env);
+axiom_soap_envelope_t *AXIS2_CALL 
+axis2_async_result_get_envelope(
+    axis2_async_result_t *async_result, 
+    const axis2_env_t *env);
                                 
-axis2_msg_ctx_t* AXIS2_CALL 
-axis2_async_result_get_result(struct axis2_async_result *async_result, 
-                              const axis2_env_t *env);
+axis2_msg_ctx_t *AXIS2_CALL 
+axis2_async_result_get_result(
+    axis2_async_result_t *async_result, 
+    const axis2_env_t *env);
                               
 axis2_status_t AXIS2_CALL 
-axis2_async_result_free (struct axis2_async_result *async_result, 
-                         const axis2_env_t *env);
-
-axis2_async_result_t* AXIS2_CALL 
-axis2_async_result_create(const axis2_env_t *env, 
-                          axis2_msg_ctx_t *result) 
+axis2_async_result_free (
+    axis2_async_result_t *async_result, 
+    const axis2_env_t *env);
+
+axis2_async_result_t *AXIS2_CALL 
+axis2_async_result_create(
+    const axis2_env_t *env, 
+    axis2_msg_ctx_t *result) 
 {
     axis2_async_result_impl_t *async_result_impl = NULL;
     
@@ -88,9 +92,10 @@
     return &(async_result_impl->async_result);
 }
 
-axiom_soap_envelope_t* AXIS2_CALL 
-axis2_async_result_get_envelope(struct axis2_async_result *async_result, 
-                                const axis2_env_t *env)
+axiom_soap_envelope_t *AXIS2_CALL 
+axis2_async_result_get_envelope(
+    axis2_async_result_t *async_result, 
+    const axis2_env_t *env)
 {
     axis2_async_result_impl_t *async_result_impl = NULL;
         
@@ -106,17 +111,19 @@
     return NULL;
 }
 
-axis2_msg_ctx_t* AXIS2_CALL 
-axis2_async_result_get_result(struct axis2_async_result *async_result, 
-                              const axis2_env_t *env)
+axis2_msg_ctx_t *AXIS2_CALL 
+axis2_async_result_get_result(
+    axis2_async_result_t *async_result, 
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(async_result)->result;
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_async_result_free (struct axis2_async_result *async_result, 
-                         const axis2_env_t *env)
+axis2_async_result_free (
+    axis2_async_result_t *async_result, 
+    const axis2_env_t *env)
 {
     axis2_async_result_impl_t *async_result_impl = NULL;
     
@@ -130,7 +137,8 @@
         async_result_impl->async_result.ops = NULL;
     }
     
-    /*if (async_result_impl->result)
+    /* We have a shallow copy here, so it is not appropriate to free it here.
+    if (async_result_impl->result)
     {
         AXIS2_MSG_CTX_FREE(async_result_impl->result, env);
         async_result_impl->result = NULL;

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?rev=428635&r1=428634&r2=428635&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu Aug  3 22:54:07 2006
@@ -1,18 +1,18 @@
 /*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #include <axis2_svc_client.h>
 #include <axis2_phases_info.h>
@@ -37,170 +37,205 @@
     /** svc_client base struct */
     axis2_svc_client_t svc_client;
 
-   axis2_svc_t *svc;
+    axis2_svc_t *svc;
 
-   axis2_conf_t *conf;
+    axis2_conf_t *conf;
 
-   axis2_conf_ctx_t *conf_ctx;
+    axis2_conf_ctx_t *conf_ctx;
 
-   axis2_svc_ctx_t *svc_ctx;
+    axis2_svc_ctx_t *svc_ctx;
 
-   axis2_options_t *options;
+    axis2_options_t *options;
 
-   axis2_options_t *override_options;
+    axis2_options_t *override_options;
+
+    axis2_array_list_t *headers;
+
+    /** for receiving the async messages */
+    axis2_callback_recv_t *callback_recv;
 
-   axis2_array_list_t *headers;
-   
-   /** for receiving the async messages */
-   axis2_callback_recv_t *callback_recv;
-    
     axis2_listener_manager_t *listener_manager;
-    
+
     axis2_op_client_t *op_client;
 
-} axis2_svc_client_impl_t;
+}
+axis2_svc_client_impl_t;
 
 /** Interface to implementation conversion macro */
 #define AXIS2_INTF_TO_IMPL(svc_client) ((axis2_svc_client_impl_t *)svc_client)
 
 /** private functions */
-static axis2_bool_t axis2_svc_client_init_transports_from_conf_ctx(const axis2_env_t *env, 
-                           axis2_svc_client_impl_t *svc_client_impl,
-                           axis2_conf_ctx_t *conf_ctx,
-                           const axis2_char_t *client_home);
-static axis2_bool_t axis2_svc_client_init_data(const axis2_env_t *env,
-                           axis2_svc_client_impl_t *svc_client_impl);
-static void axis2_svc_client_init_ops(axis2_svc_client_t *svc_client);
-static axis2_svc_t* axis2_svc_client_create_annonymous_svc(
-        axis2_svc_client_t *svc_client,
-        const axis2_env_t *env);
-static axis2_bool_t axis2_svc_client_fill_soap_envelope(const axis2_env_t *env, 
+static axis2_bool_t
+axis2_svc_client_init_transports_from_conf_ctx(
+    const axis2_env_t *env,
+    axis2_svc_client_impl_t *svc_client_impl,
+    axis2_conf_ctx_t *conf_ctx,
+    const axis2_char_t *client_home);
+
+static axis2_bool_t
+axis2_svc_client_init_data(
+    const axis2_env_t *env,
+    axis2_svc_client_impl_t *svc_client_impl);
+
+static void
+axis2_svc_client_init_ops(
+    axis2_svc_client_t *svc_client);
+
+static axis2_svc_t *
+axis2_svc_client_create_annonymous_svc(
+    axis2_svc_client_t *svc_client,
+    const axis2_env_t *env);
+
+static axis2_bool_t
+axis2_svc_client_fill_soap_envelope(
+    const axis2_env_t *env,
     axis2_svc_client_impl_t *svc_client_impl,
-    axis2_msg_ctx_t *msg_ctx, 
+    axis2_msg_ctx_t *msg_ctx,
     const axiom_node_t *payload);
 
-/** public funcitons */
-const axis2_svc_t* AXIS2_CALL 
-axis2_svc_client_get_svc(const axis2_svc_client_t *svc_client, 
+/** public functions */
+const axis2_svc_t *AXIS2_CALL
+axis2_svc_client_get_svc(
+    const axis2_svc_client_t *svc_client,
     const axis2_env_t *env);
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_set_options(struct axis2_svc_client *svc_client,
-                const axis2_env_t *env,
-                const axis2_options_t *options);
+axis2_status_t AXIS2_CALL
+axis2_svc_client_set_options(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_options_t *options);
 
-const axis2_options_t* AXIS2_CALL 
-axis2_svc_client_get_options(const axis2_svc_client_t *svc_client,
+const axis2_options_t *AXIS2_CALL
+axis2_svc_client_get_options(
+    const axis2_svc_client_t *svc_client,
     const axis2_env_t *env);
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_set_override_options(struct axis2_svc_client *svc_client,
+axis2_status_t AXIS2_CALL
+axis2_svc_client_set_override_options(
+    struct axis2_svc_client *svc_client,
     const axis2_env_t *env,
     const axis2_options_t *override_options);
 
-const axis2_options_t* AXIS2_CALL 
-axis2_svc_client_get_override_options(const axis2_svc_client_t *svc_client,
+const axis2_options_t *AXIS2_CALL
+axis2_svc_client_get_override_options(
+    const axis2_svc_client_t *svc_client,
     const axis2_env_t *env);
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_engage_module(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_char_t *module_name);
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_disengage_module(struct axis2_svc_client *svc_client,
-                        const axis2_env_t *env,
-                        const axis2_char_t *module_name);
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_add_header(struct axis2_svc_client *svc_client,
-                            const axis2_env_t *env,
-                            axiom_node_t *header);
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_remove_all_headers(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_send_robust(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload);
-
-void AXIS2_CALL 
-axis2_svc_client_fire_and_forget(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload);
-
-axiom_node_t* AXIS2_CALL 
-axis2_svc_client_send_receive(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload);
-
-void AXIS2_CALL 
-axis2_svc_client_send_receive_non_blocking(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload,
-                    axis2_callback_t *callback);
-
-axis2_op_client_t* AXIS2_CALL 
-axis2_svc_client_create_op_client(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname);
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_finalize_invoke(struct axis2_svc_client *svc_client,
-                        const axis2_env_t *env);
-    
-const axis2_endpoint_ref_t* AXIS2_CALL 
-axis2_svc_client_get_own_endpoint_ref(const struct axis2_svc_client *svc_client,
-                const axis2_env_t *env,
-                const axis2_char_t *transport);
-
-const axis2_endpoint_ref_t* AXIS2_CALL 
-axis2_svc_client_get_target_endpoint_ref(const struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_set_target_endpoint_ref(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    axis2_endpoint_ref_t *target_endpoint_ref);
-    
-const axis2_svc_ctx_t* AXIS2_CALL 
-axis2_svc_client_get_svc_ctx(const axis2_svc_client_t *svc_client,
-                    const axis2_env_t *env);
+axis2_status_t AXIS2_CALL
+axis2_svc_client_engage_module(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_char_t *module_name);
 
 axis2_status_t AXIS2_CALL
-axis2_svc_client_free(struct axis2_svc_client *svc_client,
-                  const axis2_env_t *env);
+axis2_svc_client_disengage_module(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_char_t *module_name);
 
-axis2_svc_client_t* AXIS2_CALL
-axis2_svc_client_create(const axis2_env_t *env, 
+axis2_status_t AXIS2_CALL
+axis2_svc_client_add_header(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    axiom_node_t *header);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_remove_all_headers(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_send_robust(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload);
+
+void AXIS2_CALL
+axis2_svc_client_fire_and_forget(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload);
+
+axiom_node_t *AXIS2_CALL
+axis2_svc_client_send_receive(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload);
+
+void AXIS2_CALL
+axis2_svc_client_send_receive_non_blocking(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload,
+    axis2_callback_t *callback);
+
+axis2_op_client_t *AXIS2_CALL
+axis2_svc_client_create_op_client(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_finalize_invoke(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env);
+
+const axis2_endpoint_ref_t *AXIS2_CALL
+axis2_svc_client_get_own_endpoint_ref(
+    const struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_char_t *transport);
+
+const axis2_endpoint_ref_t *AXIS2_CALL
+axis2_svc_client_get_target_endpoint_ref(
+    const struct axis2_svc_client *svc_client,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_set_target_endpoint_ref(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    axis2_endpoint_ref_t *target_endpoint_ref);
+
+const axis2_svc_ctx_t *AXIS2_CALL
+axis2_svc_client_get_svc_ctx(
+    const axis2_svc_client_t *svc_client,
+    const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_free(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env);
+
+axis2_svc_client_t *AXIS2_CALL
+axis2_svc_client_create(
+    const axis2_env_t *env,
     const axis2_char_t *client_home)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
-    
+
     AXIS2_ENV_CHECK(env, NULL);
-      svc_client_impl = AXIS2_INTF_TO_IMPL(axis2_svc_client_create_with_conf_ctx_and_svc
-                                 (env, client_home, NULL, NULL));
-   
-   if (!svc_client_impl)
-      return NULL;
- 
-   return &(svc_client_impl->svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(axis2_svc_client_create_with_conf_ctx_and_svc
+            (env, client_home, NULL, NULL));
+
+    if (!svc_client_impl)
+        return NULL;
+
+    return &(svc_client_impl->svc_client);
 }
 
-axis2_svc_client_t* AXIS2_CALL
+axis2_svc_client_t *AXIS2_CALL
 axis2_svc_client_create_for_dynamic_invocation(
-        const axis2_env_t *env,
-        axis2_conf_ctx_t *conf_ctx,
-        const axis2_uri_t *wsdl_uri,
-        const axis2_qname_t *wsdl_svc_qname,
-        const axis2_char_t *endpoint_name,
-        const axis2_char_t *client_home)
+    const axis2_env_t *env,
+    axis2_conf_ctx_t *conf_ctx,
+    const axis2_uri_t *wsdl_uri,
+    const axis2_qname_t *wsdl_svc_qname,
+    const axis2_char_t *endpoint_name,
+    const axis2_char_t *client_home)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     axis2_svc_grp_t *svc_grp = NULL;
@@ -209,7 +244,7 @@
     axis2_hash_t *ops = NULL;
     axis2_char_t *repos_path = NULL;
     axis2_char_t *wsdl_path = NULL;
-    
+
     AXIS2_ENV_CHECK(env, NULL);
 
     svc_client_impl = AXIS2_MALLOC( env->allocator, sizeof(axis2_svc_client_impl_t));
@@ -218,7 +253,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    
+
     svc_client_impl->svc = NULL;
     svc_client_impl->conf = NULL;
     svc_client_impl->conf_ctx = NULL;
@@ -226,84 +261,81 @@
     svc_client_impl->options = NULL;
     svc_client_impl->override_options = NULL;
     svc_client_impl->headers = NULL;
-    svc_client_impl->callback_recv = NULL;   
+    svc_client_impl->callback_recv = NULL;
     svc_client_impl->listener_manager = NULL;
     svc_client_impl->op_client = NULL;
-  
-
 
     /** initialize private data to NULL, create options */
     if (!axis2_svc_client_init_data(env, svc_client_impl))
-   {
-      axis2_svc_client_free(&(svc_client_impl->svc_client), env);
-      return NULL;
-   }
-
-    /* the following method call will create the deafult conf_ctx if it is NULL */
-   if (!axis2_svc_client_init_transports_from_conf_ctx(env, svc_client_impl, 
-               conf_ctx, client_home))
-   {
-      axis2_svc_client_free(&(svc_client_impl->svc_client), env);
-      return NULL;
-   }
-
-   svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
-   repos_path = AXIS2_CONF_GET_REPOS(svc_client_impl->conf, env);
-   wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
-
-   svc_client_impl->options = axis2_options_create(env);
-   svc_client_impl->svc = axis2_client_utils_create_axis2_svc(env, wsdl_uri, 
-           wsdl_svc_qname, endpoint_name, wsdl_path, svc_client_impl->options);
-   if(svc_client_impl->svc)
-   {
+    {
+        axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+        return NULL;
+    }
+
+    /* the following method call will create the default conf_ctx if it is NULL */
+    if (!axis2_svc_client_init_transports_from_conf_ctx(env, svc_client_impl,
+            conf_ctx, client_home))
+    {
+        axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+        return NULL;
+    }
+
+    svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
+    repos_path = AXIS2_CONF_GET_REPOS(svc_client_impl->conf, env);
+    wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
+
+    svc_client_impl->options = axis2_options_create(env);
+    svc_client_impl->svc = axis2_client_utils_create_axis2_svc(env, wsdl_uri,
+            wsdl_svc_qname, endpoint_name, wsdl_path, svc_client_impl->options);
+    if (svc_client_impl->svc)
+    {
         axis2_hash_index_t *i = NULL;
         void *v = NULL;
         axis2_op_t *op = NULL;
-       
+
         ops = AXIS2_SVC_GET_OPS(svc_client_impl->svc, env);
         for (i = axis2_hash_first (ops, env); i; i = axis2_hash_next (env, i))
         {
-            axis2_phases_info_t *info = NULL;
+            axis2_phases_info_t * info = NULL;
             axis2_hash_this (i, NULL, NULL, &v);
             op = (axis2_op_t *) v;
-        
+
             /* Setting operation phase */
             info = AXIS2_CONF_GET_PHASESINFO(svc_client_impl->conf, env);
             AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
         }
-   }
-   /** add the service to the config context if it isn't in there already */
-   if (NULL == AXIS2_CONF_GET_SVC(svc_client_impl->conf, env, 
-               AXIS2_SVC_GET_NAME(svc_client_impl->svc, env)))
-   {
-      AXIS2_CONF_ADD_SVC(svc_client_impl->conf, env, svc_client_impl->svc);
-   }
+    }
+    /** add the service to the config context if it isn't in there already */
+    if (NULL == AXIS2_CONF_GET_SVC(svc_client_impl->conf, env,
+            AXIS2_SVC_GET_NAME(svc_client_impl->svc, env)))
+    {
+        AXIS2_CONF_ADD_SVC(svc_client_impl->conf, env, svc_client_impl->svc);
+    }
 
     /** create a service context for myself: create a new service group
      context and then get the service context for myself as I'll need that
-     later for stuff that I gotta do
-    */
-   svc_grp = AXIS2_SVC_GET_PARENT(svc_client_impl->svc, env);
+     later for stuff that I gotta do */
+    svc_grp = AXIS2_SVC_GET_PARENT(svc_client_impl->svc, env);
     if (!svc_grp)
         return NULL;
-    
-   svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env, 
-               svc_client_impl->conf_ctx);
+
+    svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env,
+            svc_client_impl->conf_ctx);
     if (!svc_grp_ctx)
         return NULL;
-    
+
     svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
     if (!svc_grp_name)
-        return NULL; /* cannot proceed without svc group name */
-        
-   AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env, 
-      svc_grp_name, svc_grp_ctx);
-    
-   svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
-              AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
-    
+        return NULL; /* service group name is mandatory */
+
+    AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env,
+            svc_grp_name, svc_grp_ctx);
+
+    svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
+            AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
+
     /* create ops */
-    svc_client_impl->svc_client.ops  =
+    svc_client_impl->svc_client.ops =
         AXIS2_MALLOC( env->allocator, sizeof(axis2_svc_client_ops_t));
 
     if (!svc_client_impl->svc_client.ops)
@@ -321,14 +353,15 @@
 
 
 axis2_svc_client_t* AXIS2_CALL
-axis2_svc_client_create_with_conf_ctx_and_svc(const axis2_env_t *env,
+axis2_svc_client_create_with_conf_ctx_and_svc(
+    const axis2_env_t *env,
     const axis2_char_t *client_home,
     axis2_conf_ctx_t *conf_ctx,
     axis2_svc_t *svc)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
-   axis2_svc_grp_t *svc_grp = NULL;
-   axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
+    axis2_svc_grp_t *svc_grp = NULL;
+    axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
     axis2_char_t *svc_grp_name = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -339,7 +372,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    
+
     svc_client_impl->svc = NULL;
     svc_client_impl->conf = NULL;
     svc_client_impl->conf_ctx = NULL;
@@ -347,73 +380,73 @@
     svc_client_impl->options = NULL;
     svc_client_impl->override_options = NULL;
     svc_client_impl->headers = NULL;
-    svc_client_impl->callback_recv = NULL;   
+    svc_client_impl->callback_recv = NULL;
     svc_client_impl->listener_manager = NULL;
     svc_client_impl->op_client = NULL;
 
-
     /** initialize private data to NULL, create options */
     if (!axis2_svc_client_init_data(env, svc_client_impl))
-   {
-      axis2_svc_client_free(&(svc_client_impl->svc_client), env);
-      return NULL;
-   }
-
-    /* the following method call will create the deafult conf_ctx if it is NULL */
-   if (!axis2_svc_client_init_transports_from_conf_ctx(env, svc_client_impl, conf_ctx, client_home))
-   {
-      axis2_svc_client_free(&(svc_client_impl->svc_client), env);
-      return NULL;
-   }
-
-   svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
-   
-   if (svc)
-   {
-      svc_client_impl->svc = svc;
-   }
-   else
-   {
-      if (NULL == (svc_client_impl->svc = 
-                  axis2_svc_client_create_annonymous_svc(&(svc_client_impl->svc_client), env)))
-      {
-         axis2_svc_client_free(&(svc_client_impl->svc_client), env);
-         return NULL;
-      }
-   }
-   
-   /** add the service to the config context if it isn't in there already */
-   if (NULL == AXIS2_CONF_GET_SVC(svc_client_impl->conf, env, 
-               AXIS2_SVC_GET_NAME(svc_client_impl->svc, env)))
-   {
-      AXIS2_CONF_ADD_SVC(svc_client_impl->conf, env, svc_client_impl->svc);
-   }
+    {
+        axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+        return NULL;
+    }
+
+    /* the following method call will create the default conf_ctx if it is NULL */
+    if (!axis2_svc_client_init_transports_from_conf_ctx(env, svc_client_impl, 
+            conf_ctx, client_home))
+    {
+        axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+        return NULL;
+    }
+
+    svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
+
+    if (svc)
+    {
+        svc_client_impl->svc = svc;
+    }
+    else
+    {
+        if (NULL == (svc_client_impl->svc =
+                    axis2_svc_client_create_annonymous_svc(
+                        &(svc_client_impl->svc_client), env)))
+        {
+            axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+            return NULL;
+        }
+    }
+
+    /** add the service to the config context if it isn't in there already */
+    if (NULL == AXIS2_CONF_GET_SVC(svc_client_impl->conf, env,
+            AXIS2_SVC_GET_NAME(svc_client_impl->svc, env)))
+    {
+        AXIS2_CONF_ADD_SVC(svc_client_impl->conf, env, svc_client_impl->svc);
+    }
 
     /** create a service context for myself: create a new service group
      context and then get the service context for myself as I'll need that
-     later for stuff that I gotta do
-    */
-   svc_grp = AXIS2_SVC_GET_PARENT(svc_client_impl->svc, env);
+     later for stuff that I gotta do */
+    svc_grp = AXIS2_SVC_GET_PARENT(svc_client_impl->svc, env);
     if (!svc_grp)
         return NULL;
-    
-   svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env, 
-               svc_client_impl->conf_ctx);
+
+    svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env,
+            svc_client_impl->conf_ctx);
     if (!svc_grp_ctx)
         return NULL;
-    
+
     svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
     if (!svc_grp_name)
-        return NULL; /* cannot proceed without svc group name */
-        
-   AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env, 
-      svc_grp_name, svc_grp_ctx);
-    
-   svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
-              AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
-    
+        return NULL; /* service group name is mandatory */
+
+    AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env,
+            svc_grp_name, svc_grp_ctx);
+
+    svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
+            AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
+
     /* create ops */
-    svc_client_impl->svc_client.ops  =
+    svc_client_impl->svc_client.ops =
         AXIS2_MALLOC( env->allocator, sizeof(axis2_svc_client_ops_t));
 
     if (!svc_client_impl->svc_client.ops)
@@ -429,206 +462,215 @@
     return &(svc_client_impl->svc_client);
 }
 
-
-
-const axis2_svc_t* AXIS2_CALL 
-axis2_svc_client_get_svc(const axis2_svc_client_t *svc_client, const axis2_env_t *env)
+const axis2_svc_t *AXIS2_CALL
+axis2_svc_client_get_svc(
+    const axis2_svc_client_t *svc_client, 
+    const axis2_env_t *env)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-      svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-   return svc_client_impl->svc;
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    return svc_client_impl->svc;
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_set_options(struct axis2_svc_client *svc_client,
-                const axis2_env_t *env,
-                const axis2_options_t *options)
+axis2_status_t AXIS2_CALL
+axis2_svc_client_set_options(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_options_t *options)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-   
-   /*TODO:double check whether we need to free*/
-   if (svc_client_impl->options)
-      AXIS2_OPTIONS_FREE(svc_client_impl->options, env);
-      svc_client_impl->options = (axis2_options_t *)options;
-   return AXIS2_SUCCESS;   
+
+    if (svc_client_impl->options)
+        AXIS2_OPTIONS_FREE(svc_client_impl->options, env);
+    svc_client_impl->options = (axis2_options_t *)options;
+    return AXIS2_SUCCESS;
 }
 
-const axis2_options_t* AXIS2_CALL 
-axis2_svc_client_get_options(const axis2_svc_client_t *svc_client, 
+const axis2_options_t* AXIS2_CALL
+axis2_svc_client_get_options(
+    const axis2_svc_client_t *svc_client,
     const axis2_env_t *env)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   return svc_client_impl->options;
+    return svc_client_impl->options;
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_set_override_options(struct axis2_svc_client *svc_client,
-                        const axis2_env_t *env,
-                        const axis2_options_t *override_options)
+axis2_status_t AXIS2_CALL
+axis2_svc_client_set_override_options(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_options_t *override_options)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   if (svc_client_impl->override_options)
-      AXIS2_OPTIONS_FREE(svc_client_impl->override_options, env);
+    if (svc_client_impl->override_options)
+        AXIS2_OPTIONS_FREE(svc_client_impl->override_options, env);
 
-   svc_client_impl->override_options = (axis2_options_t *)override_options;
+    svc_client_impl->override_options = (axis2_options_t *)override_options;
 
-   return AXIS2_SUCCESS;
+    return AXIS2_SUCCESS;
 }
 
-const axis2_options_t* AXIS2_CALL 
-axis2_svc_client_get_override_options(const axis2_svc_client_t *svc_client,
+const axis2_options_t* AXIS2_CALL
+axis2_svc_client_get_override_options(
+    const axis2_svc_client_t *svc_client,
     const axis2_env_t *env)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-   return svc_client_impl->override_options;
+    return svc_client_impl->override_options;
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_engage_module(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_char_t *module_name)
+axis2_status_t AXIS2_CALL
+axis2_svc_client_engage_module(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_char_t *module_name)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
-   axis2_module_desc_t *module = NULL;
+    axis2_module_desc_t *module = NULL;
     axis2_qname_t *mod_qname = NULL;
-    
+
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
     mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
-    
-   module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, mod_qname);
 
-   if (module)
-   {
-      return AXIS2_SVC_ENGAGE_MODULE(svc_client_impl->svc, env, module,
-                              svc_client_impl->conf);
-   }
-   return AXIS2_FAILURE;
+    module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, mod_qname);
+
+    if (module)
+    {
+        return AXIS2_SVC_ENGAGE_MODULE(svc_client_impl->svc, env, module,
+                svc_client_impl->conf);
+    }
+    return AXIS2_FAILURE;
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_disengage_module(struct axis2_svc_client *svc_client,
-                        const axis2_env_t *env,
-                        const axis2_char_t *module_name)
+axis2_status_t AXIS2_CALL
+axis2_svc_client_disengage_module(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_char_t *module_name)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
-   axis2_module_desc_t *module = NULL;
+    axis2_module_desc_t *module = NULL;
     axis2_qname_t *mod_qname = NULL;
-    
+
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
-    
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
     mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
-    
-   module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, mod_qname);
 
-   /**TODO:uncomment once axis2_svc_disengage_module is implemented
-   if (module)
-   {
-      return AXIS2_SVC_DISENGAGE_MODULE(svc_client_impl->svc, env, module);
-      
-   }
-   */
+    module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, mod_qname);
+
+    /**TODO:uncomment once axis2_svc_disengage_module is implemented
+    if (module)
+    {
+       return AXIS2_SVC_DISENGAGE_MODULE(svc_client_impl->svc, env, module);
+
+    }
+    */
 
-   return AXIS2_FAILURE;
+    return AXIS2_FAILURE;
 
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_add_header(struct axis2_svc_client *svc_client,
-                            const axis2_env_t *env,
-                            axiom_node_t *header)
+axis2_status_t AXIS2_CALL
+axis2_svc_client_add_header(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    axiom_node_t *header)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   if (!svc_client_impl->headers)
-   {
-      svc_client_impl->headers = axis2_array_list_create(env, 0);
-      if(!svc_client_impl->headers)
-      {
-         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-         return AXIS2_FAILURE;
-      }
-   }
-   AXIS2_ARRAY_LIST_ADD(svc_client_impl->headers, env, header);
+    if (!svc_client_impl->headers)
+    {
+        svc_client_impl->headers = axis2_array_list_create(env, 0);
+        if (!svc_client_impl->headers)
+        {
+            AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+            return AXIS2_FAILURE;
+        }
+    }
+    AXIS2_ARRAY_LIST_ADD(svc_client_impl->headers, env, header);
 
-   return AXIS2_SUCCESS;
+    return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_remove_all_headers(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env)
+axis2_status_t AXIS2_CALL
+axis2_svc_client_remove_all_headers(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
-   int i = 0, size = 0;
+    int i = 0, size = 0;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   if (!svc_client_impl->headers)
-      return AXIS2_FAILURE;
-   
-   size = AXIS2_ARRAY_LIST_SIZE(svc_client_impl->headers, env);
-   for (i = 0; i < size; i++)
-   {
-      axiom_node_t *node = NULL;
-      node = AXIS2_ARRAY_LIST_GET(svc_client_impl->headers, env, i);
-      if (node)
-      {
-         AXIOM_NODE_FREE_TREE(node, env);
-         node = NULL;
-      }
-   }
-   return AXIS2_SUCCESS;
-}
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_send_robust(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload)
+    if (!svc_client_impl->headers)
+        return AXIS2_FAILURE;
+
+    size = AXIS2_ARRAY_LIST_SIZE(svc_client_impl->headers, env);
+    for (i = 0; i < size; i++)
+    {
+        axiom_node_t *node = NULL;
+        node = AXIS2_ARRAY_LIST_GET(svc_client_impl->headers, env, i);
+        if (node)
+        {
+            AXIOM_NODE_FREE_TREE(node, env);
+            node = NULL;
+        }
+    }
+    return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_send_robust(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
     axis2_op_client_t *op_client = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-    
+
     if (!op_qname)
     {
         op_qname = axis2_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
     }
-    
-    msg_ctx = axis2_msg_ctx_create(env, 
-        AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
-    if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx, 
-        payload))
+
+    msg_ctx = axis2_msg_ctx_create(env,
+            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+    if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx,
+            payload))
     {
         return AXIS2_FAILURE;
     }
 
-    op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), env, op_qname);
+    op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), 
+                    env, op_qname);
     if (!op_client)
     {
         return AXIS2_FAILURE;
@@ -638,11 +680,12 @@
     return AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_TRUE);
 }
 
-void AXIS2_CALL 
-axis2_svc_client_fire_and_forget(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload)
+void AXIS2_CALL
+axis2_svc_client_fire_and_forget(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     axis2_op_client_t *op_client = NULL;
@@ -657,16 +700,17 @@
     {
         op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
     }
-    
-    msg_ctx = axis2_msg_ctx_create(env, 
-        AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
-    if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx, 
-        payload))
+
+    msg_ctx = axis2_msg_ctx_create(env,
+            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+    if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx,
+            payload))
     {
         return;
     }
 
-    op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), env, op_qname);
+    op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), 
+                    env, op_qname);
     if (!op_client)
     {
         return;
@@ -677,13 +721,14 @@
     return;
 }
 
-axiom_node_t* AXIS2_CALL 
-axis2_svc_client_send_receive(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload)
+axiom_node_t* AXIS2_CALL
+axis2_svc_client_send_receive(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
     axiom_soap_envelope_t *soap_envelope = NULL;
     axiom_soap_body_t *soap_body = NULL;
     axiom_node_t *soap_node = NULL;
@@ -692,77 +737,67 @@
     axis2_uri_t *action_uri = NULL;
     axis2_char_t *action_str = NULL;
 
-   AXIS2_ENV_CHECK(env, NULL);
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    AXIS2_ENV_CHECK(env, NULL);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
     op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env, op_qname);
-    if(op)
+    if (op)
     {
         param = AXIS2_OP_GET_PARAM(op, env, AXIS2_SOAP_ACTION);
-        if(param)
+        if (param)
         {
             action_uri = (axis2_uri_t *) AXIS2_PARAM_GET_VALUE(param, env);
             action_str = AXIS2_URI_TO_STRING(action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
             AXIS2_OPTIONS_SET_ACTION(svc_client_impl->options, env, action_str);
         }
     }
-   if (!op_qname)
-   {
-       op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
-   }
-    
-   if (AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(svc_client_impl->options, env))
-   {
+
+    if (!op_qname)
+    {
+        op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
+    }
+
+    if (AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(svc_client_impl->options, env))
+    {
         axis2_callback_t *callback = NULL;
         long index = 0;
-        
 
-        /*axis2_char_t *address = NULL;
-        axis2_char_t *epr_address = NULL;
-        property = axis2_property_create(env);
-        AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
-        epr_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(call_impl->to, env);
-        address = AXIS2_STRDUP(epr_address, env);
-        AXIS2_PROPERTY_SET_VALUE(property, env, address);
-        AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
-                                    AXIS2_TRANSPORT_URL, property, AXIS2_FALSE);
-        */
-        
-        /* This means doing a Request-Response invocation using two channels. 
+        /* This means doing a Request-Response invocation using two channels.
         If the transport is a two way transport (e.g. http), only one channel is used
-        (e.g. in http cases 202 OK is sent to say no repsone avalible). 
-        Axis2 gets blocked and return when the response is avalible.
-        */
-        
+        (e.g. in http cases 202 OK is sent to say no response available).
+        Axis2 gets blocked and return when the response is available. */
+
         callback = axis2_callback_create(env);
         if (!callback)
             return NULL;
-        
-        /* call two channel non blocking invoke to do the work and wait on the callbck */
+
+        /* call two channel non blocking invoke to do the work and wait on the callback */
         axis2_svc_client_send_receive_non_blocking(
             svc_client, env, op_qname, payload, callback);
-                
+
         index = AXIS2_OPTIONS_GET_TIMEOUT_IN_MILLI_SECONDS(svc_client_impl->options, env) / 10;
-        while (!(AXIS2_CALLBACK_GET_COMPLETE(callback, env))) 
+        
+        while (!(AXIS2_CALLBACK_GET_COMPLETE(callback, env)))
         {
-            /*wait till the reponse arrives*/
-            if (index-- >= 0) 
+            /*wait till the response arrives*/
+            if (index-- >= 0)
             {
                 axis2_msg_ctx_t *msg_ctx = NULL;
                 AXIS2_USLEEP(10000);
-                msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CLIENT_GET_MSG_CTX(svc_client_impl->op_client, env, 
-                    AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE); 
+                msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CLIENT_GET_MSG_CTX(
+                                svc_client_impl->op_client, env,
+                                AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE);
                 if (msg_ctx)
                 {
                     axis2_msg_ctx_t *res_msg_ctx =
-                            axis2_mep_client_receive(env, msg_ctx);
+                        axis2_mep_client_receive(env, msg_ctx);
                     if (res_msg_ctx)
                     {
                         soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(res_msg_ctx, env);
                         if (soap_envelope)
                         {
                             soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-                        
+
                             if (soap_body)
                             {
                                 soap_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
@@ -774,27 +809,18 @@
                         }
                     }
                 }
-                
-            } 
-            else 
+
+            }
+            else
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_RESPONSE_TIMED_OUT, AXIS2_FAILURE);
                 return NULL;
             }
         }
-        
+
         soap_envelope = AXIS2_CALLBACK_GET_ENVELOPE(callback, env);
+
         /* process the result of the invocation */
-        /*if (AXIS2_CALLBACK_GET_ENVELOPE(callback, env))
-        {
-            axis2_msg_ctx_t *response_msg_ctx =
-                    axis2_msg_ctx_create(env, AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env), NULL, NULL);
-            if (!response_msg_ctx)
-                return NULL;
-            AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(response_msg_ctx, env, AXIS2_CALLBACK_GET_ENVELOPE(callback, env));
-            return response_msg_ctx;
-        } 
-        else */
         if (!soap_envelope)
         {
             if (AXIS2_CALLBACK_GET_ERROR(callback, env) != AXIS2_ERROR_NONE)
@@ -803,40 +829,39 @@
                 return NULL;
             }
         }
-   }
-   else
-   {
-      axis2_op_client_t *op_client = NULL;
-      axis2_msg_ctx_t *res_msg_ctx = NULL;
-      axis2_msg_ctx_t *msg_ctx = NULL;
-
-        msg_ctx = axis2_msg_ctx_create(env, 
-            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
-      if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx, 
-            payload))
+    }
+    else
+    {
+        axis2_op_client_t *op_client = NULL;
+        axis2_msg_ctx_t *res_msg_ctx = NULL;
+        axis2_msg_ctx_t *msg_ctx = NULL;
+
+        msg_ctx = axis2_msg_ctx_create(env,
+                AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+        if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx,
+                payload))
         {
-         return NULL;
+            return NULL;
         }
-      
-      op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), env, op_qname);
-      if (!op_client)
+
+        op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), env, op_qname);
+        if (!op_client)
         {
             return NULL;
         }
-        
-      AXIS2_OP_CLIENT_ADD_MSG_CTX(op_client, env, msg_ctx);
-      AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_TRUE);
-      res_msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CTX_GET_MSG_CTX(op_client, env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
-      
-      if (!res_msg_ctx)
+
+        AXIS2_OP_CLIENT_ADD_MSG_CTX(op_client, env, msg_ctx);
+        AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_TRUE);
+        res_msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CTX_GET_MSG_CTX(op_client, env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+
+        if (!res_msg_ctx)
         {
-         return NULL;
-      }
+            return NULL;
+        }
 
         soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(res_msg_ctx, env);
-        
-   }
-    
+    }
+
     if (!soap_envelope)
     {
         return NULL;
@@ -847,7 +872,7 @@
     {
         return NULL;
     }
-    
+
     soap_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
     if (!soap_node)
     {
@@ -857,32 +882,33 @@
 }
 
 
-void AXIS2_CALL 
-axis2_svc_client_send_receive_non_blocking(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname,
-                    const axiom_node_t *payload,
-                    axis2_callback_t *callback)
+void AXIS2_CALL
+axis2_svc_client_send_receive_non_blocking(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname,
+    const axiom_node_t *payload,
+    axis2_callback_t *callback)
 {
     axis2_svc_client_impl_t *svc_client_impl = NULL;
     axis2_op_client_t *op_client = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
     const axis2_char_t *transport_in_protocol = NULL;
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-    
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+
     if (!op_qname)
     {
         op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
     }
 
-    msg_ctx = axis2_msg_ctx_create(env, 
-    AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+    msg_ctx = axis2_msg_ctx_create(env,
+            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
     if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx, payload))
         return;
-    
-    op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client), 
-        env, op_qname);
+
+    op_client = axis2_svc_client_create_op_client(&(svc_client_impl->svc_client),
+            env, op_qname);
     if (!op_client)
     {
         return;
@@ -890,191 +916,201 @@
 
     AXIS2_OP_CLIENT_SET_CALLBACK(op_client, env, callback);
     AXIS2_OP_CLIENT_ADD_MSG_CTX(op_client, env, msg_ctx);
-    
+
     if (AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(svc_client_impl->options, env))
     {
         axis2_op_t *op = NULL;
 
         transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
-            svc_client_impl->options, env);
+                    svc_client_impl->options, env);
         if (!transport_in_protocol)
             transport_in_protocol = AXIS2_TRANSPORT_HTTP;
-        AXIS2_LISTNER_MANAGER_MAKE_SURE_STARTED(svc_client_impl->listener_manager, env, 
-            transport_in_protocol, svc_client_impl->conf_ctx);
+        AXIS2_LISTNER_MANAGER_MAKE_SURE_STARTED(svc_client_impl->listener_manager, env,
+                transport_in_protocol, svc_client_impl->conf_ctx);
+
+        op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env,
+                op_qname);
+        AXIS2_OP_SET_MSG_RECV(op, env,
+                AXIS2_CALLBACK_RECV_GET_BASE(svc_client_impl->callback_recv, env));
+        AXIS2_OP_CLIENT_SET_CALLBACK_RECV(op_client, env,
+                svc_client_impl->callback_recv);
+    }
 
-        op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env, 
-            op_qname);
-        AXIS2_OP_SET_MSG_RECV(op, env, 
-            AXIS2_CALLBACK_RECV_GET_BASE(svc_client_impl->callback_recv, env));
-        AXIS2_OP_CLIENT_SET_CALLBACK_RECV(op_client, env, 
-            svc_client_impl->callback_recv);
-   }
-    
     AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_FALSE);
-    
+
     return;
 }
 
-axis2_op_client_t* AXIS2_CALL 
-axis2_svc_client_create_op_client(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname)
-{
-   axis2_op_t *op = NULL;
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
-
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-
-   op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env, op_qname);
-   if (!op)
-   {
-      /*TODO:error - svc does not have the operation*/
-      return NULL;
-   }
-   if (!(svc_client_impl->op_client))
-    {
-        svc_client_impl->op_client = axis2_op_client_create(env, op, svc_client_impl->svc_ctx, 
-         svc_client_impl->options);
-    }
-   /**
-    if overide options have been set, that means we need to make sure
-     those options override the options of even the operation client. So,
-     what we do is switch the parents around to make that work.
-   */
-   if (svc_client_impl->override_options)
-   {
-      AXIS2_OPTIONS_SET_PARENT(svc_client_impl->override_options, env, 
-         AXIS2_OP_CLIENT_GET_OPTIONS(svc_client_impl->op_client, env));
-      AXIS2_OP_CLIENT_SET_OPTIONS(svc_client_impl->op_client, env, 
-            svc_client_impl->override_options);
-   }
-
-   return svc_client_impl->op_client;   
-}
-
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_finalize_invoke(struct axis2_svc_client *svc_client,
-                        const axis2_env_t *env)
+axis2_op_client_t* AXIS2_CALL
+axis2_svc_client_create_op_client(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_qname_t *op_qname)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
-   const axis2_char_t *transport_in_protocol = NULL;
+    axis2_op_t *op = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
 
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env, op_qname);
     
-    transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
-        svc_client_impl->options, env);
-    if (!transport_in_protocol)
-        transport_in_protocol = AXIS2_TRANSPORT_HTTP;
+    if (!op)
+    {
+        /*TODO:error - svc does not have the operation*/
+        return NULL;
+    }
+    
+    if (!(svc_client_impl->op_client))
+    {
+        svc_client_impl->op_client = axis2_op_client_create(env, op, svc_client_impl->svc_ctx,
+                svc_client_impl->options);
+    }
 
-   if (svc_client_impl->listener_manager)
-   {
-      return AXIS2_LISTENER_MANAGER_STOP(svc_client_impl->listener_manager, 
-            env, transport_in_protocol);
-   }
+    /**
+      If override options have been set, that means we need to make sure
+      those options override the options of even the operation client. So,
+      what we do is switch the parents around to make that work.
+    */
+    if (svc_client_impl->override_options)
+    {
+        AXIS2_OPTIONS_SET_PARENT(svc_client_impl->override_options, env,
+                AXIS2_OP_CLIENT_GET_OPTIONS(svc_client_impl->op_client, env));
+        AXIS2_OP_CLIENT_SET_OPTIONS(svc_client_impl->op_client, env,
+                svc_client_impl->override_options);
+    }
 
-   return AXIS2_SUCCESS;
+    return svc_client_impl->op_client;
 }
-    
-const axis2_endpoint_ref_t* AXIS2_CALL 
-axis2_svc_client_get_own_endpoint_ref(const struct axis2_svc_client *svc_client,
-                const axis2_env_t *env,
-                const axis2_char_t *transport)
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_finalize_invoke(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
+    const axis2_char_t *transport_in_protocol = NULL;
 
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-   /*TODO:implement-issue - there's not get_own_endpoint_ref in svc_ctx*/
-   
-   return NULL;
+    transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
+                svc_client_impl->options, env);
+    if (!transport_in_protocol)
+        transport_in_protocol = AXIS2_TRANSPORT_HTTP;
+
+    if (svc_client_impl->listener_manager)
+    {
+        return AXIS2_LISTENER_MANAGER_STOP(svc_client_impl->listener_manager,
+                env, transport_in_protocol);
+    }
+
+    return AXIS2_SUCCESS;
 }
 
-const axis2_endpoint_ref_t* AXIS2_CALL 
-axis2_svc_client_get_target_endpoint_ref(const struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env)
+const axis2_endpoint_ref_t *AXIS2_CALL
+axis2_svc_client_get_own_endpoint_ref(
+    const struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    const axis2_char_t *transport)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
 
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-   /*TODO:implement-issue - there's not get_target_endpoint_ref in svc_ctx*/
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    /*TODO:implement-issue - there's not get_own_endpoint_ref in svc_ctx*/
 
-   return NULL;
+    return NULL;
 }
 
-axis2_status_t AXIS2_CALL 
-axis2_svc_client_set_target_endpoint_ref(struct axis2_svc_client *svc_client,
-                    const axis2_env_t *env,
-                    axis2_endpoint_ref_t *target_endpoint_ref)
+const axis2_endpoint_ref_t *AXIS2_CALL
+axis2_svc_client_get_target_endpoint_ref(
+    const struct axis2_svc_client *svc_client,
+    const axis2_env_t *env)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
 
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-   /*TODO:implement-issue - there's not set_my_epr in svc_ctx*/
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    /*TODO:implement-issue - there's not get_target_endpoint_ref in svc_ctx*/
 
-   return AXIS2_FAILURE;
+    return NULL;
 }
-    
-const axis2_svc_ctx_t* AXIS2_CALL 
-axis2_svc_client_get_svc_ctx(const axis2_svc_client_t *svc_client,
-                    const axis2_env_t *env)
+
+axis2_status_t AXIS2_CALL
+axis2_svc_client_set_target_endpoint_ref(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env,
+    axis2_endpoint_ref_t *target_endpoint_ref)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
 
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    /*TODO:implement-issue - there's not set_my_epr in svc_ctx*/
 
-   return svc_client_impl->svc_ctx;
+    return AXIS2_FAILURE;
 }
 
+const axis2_svc_ctx_t* AXIS2_CALL
+axis2_svc_client_get_svc_ctx(
+    const axis2_svc_client_t *svc_client,
+    const axis2_env_t *env)
+{
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
+
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
+    return svc_client_impl->svc_ctx;
+}
 
 /** private function implementation */
 
-static axis2_bool_t axis2_svc_client_init_transports_from_conf_ctx(const axis2_env_t *env,
-                                    axis2_svc_client_impl_t *svc_client_impl,
-                                    axis2_conf_ctx_t *conf_ctx,
-                           const axis2_char_t *client_home)
+static axis2_bool_t 
+axis2_svc_client_init_transports_from_conf_ctx(
+    const axis2_env_t *env,
+    axis2_svc_client_impl_t *svc_client_impl,
+    axis2_conf_ctx_t *conf_ctx,
+    const axis2_char_t *client_home)
 {
-    
+
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    
+
     svc_client_impl->conf_ctx = conf_ctx;
     if (!(svc_client_impl->conf_ctx))
     {
         svc_client_impl->conf_ctx = build_client_conf_ctx(env, client_home);
-      if (!(svc_client_impl->conf_ctx))
-      {
-         return AXIS2_FALSE;
-      }
+        if (!(svc_client_impl->conf_ctx))
+        {
+            return AXIS2_FALSE;
+        }
     }
-    
+
     if (!(svc_client_impl->listener_manager))
     {
         svc_client_impl->listener_manager = axis2_listener_manager_create(env);
     }
-    
-   if (!(svc_client_impl->listener_manager))
-   {
+
+    if (!(svc_client_impl->listener_manager))
+    {
         return AXIS2_FALSE;
-   }
-    
+    }
+
 
-   return AXIS2_TRUE;
+    return AXIS2_TRUE;
 }
 
-static axis2_bool_t axis2_svc_client_init_data(const axis2_env_t *env,
-                        axis2_svc_client_impl_t *svc_client_impl)
+static axis2_bool_t 
+axis2_svc_client_init_data(
+    const axis2_env_t *env,
+    axis2_svc_client_impl_t *svc_client_impl)
 {
     svc_client_impl->svc = NULL;
 
@@ -1082,12 +1118,12 @@
 
     svc_client_impl->svc_ctx = NULL;
 
-   svc_client_impl->options = axis2_options_create(env);
+    svc_client_impl->options = axis2_options_create(env);
     if (!svc_client_impl->options)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FALSE;
-   }
+    }
 
     svc_client_impl->override_options = NULL;
 
@@ -1100,176 +1136,172 @@
         return AXIS2_FALSE;
     }
 
-   return AXIS2_TRUE;
+    return AXIS2_TRUE;
 }
 
-static void axis2_svc_client_init_ops(axis2_svc_client_t *svc_client)
+static void 
+axis2_svc_client_init_ops(
+    axis2_svc_client_t *svc_client)
+{
+
+    svc_client->ops->get_svc = axis2_svc_client_get_svc;
+    svc_client->ops->set_options = axis2_svc_client_set_options;
+    svc_client->ops->get_options = axis2_svc_client_get_options;
+    svc_client->ops->set_override_options = axis2_svc_client_set_override_options;
+    svc_client->ops->get_override_options = axis2_svc_client_get_override_options;
+    svc_client->ops->engage_module = axis2_svc_client_engage_module;
+    svc_client->ops->disengage_module = axis2_svc_client_disengage_module;
+    svc_client->ops->add_header = axis2_svc_client_add_header;
+    svc_client->ops->remove_all_headers = axis2_svc_client_remove_all_headers;
+    svc_client->ops->send_robust = axis2_svc_client_send_robust;
+    svc_client->ops->fire_and_forget = axis2_svc_client_fire_and_forget;
+    svc_client->ops->send_receive = axis2_svc_client_send_receive;
+    svc_client->ops->send_receive_non_blocking = axis2_svc_client_send_receive_non_blocking;
+    svc_client->ops->create_op_client = axis2_svc_client_create_op_client;
+    svc_client->ops->finalize_invoke = axis2_svc_client_finalize_invoke;
+    svc_client->ops->get_own_endpoint_ref = axis2_svc_client_get_own_endpoint_ref;
+    svc_client->ops->get_target_endpoint_ref = axis2_svc_client_get_target_endpoint_ref;
+    svc_client->ops->set_target_endpoint_ref = axis2_svc_client_set_target_endpoint_ref;
+    svc_client->ops->get_svc_ctx = axis2_svc_client_get_svc_ctx;
+    svc_client->ops->free_fn = axis2_svc_client_free;
+}
+
+static axis2_svc_t * 
+axis2_svc_client_create_annonymous_svc(
+    axis2_svc_client_t *svc_client,
+    const axis2_env_t *env)
 {
+    /**
+     now add anonymous operations to the axis2 service for use with the
+     shortcut client API. NOTE: We only add the ones we know we'll use
+     later in the convenience API; if you use
+     this constructor then you can't expect any magic!
+    */
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_qname_t *tmp_qname;
+    axis2_svc_t *svc;
+    axis2_op_t *op_out_in, *op_out_only, *op_robust_out_only;
+    axis2_phases_info_t *info = NULL;
+
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
-   svc_client->ops->get_svc = axis2_svc_client_get_svc;
-   svc_client->ops->set_options = axis2_svc_client_set_options;
-   svc_client->ops->get_options = axis2_svc_client_get_options;
-   svc_client->ops->set_override_options = axis2_svc_client_set_override_options;
-   svc_client->ops->get_override_options = axis2_svc_client_get_override_options;
-   svc_client->ops->engage_module = axis2_svc_client_engage_module;
-   svc_client->ops->disengage_module = axis2_svc_client_disengage_module;
-   svc_client->ops->add_header = axis2_svc_client_add_header;
-   svc_client->ops->remove_all_headers = axis2_svc_client_remove_all_headers;
-   svc_client->ops->send_robust = axis2_svc_client_send_robust;
-   svc_client->ops->fire_and_forget = axis2_svc_client_fire_and_forget;
-   svc_client->ops->send_receive = axis2_svc_client_send_receive;
-   svc_client->ops->send_receive_non_blocking = axis2_svc_client_send_receive_non_blocking;
-   svc_client->ops->create_op_client = axis2_svc_client_create_op_client;
-   svc_client->ops->finalize_invoke = axis2_svc_client_finalize_invoke;
-   svc_client->ops->get_own_endpoint_ref = axis2_svc_client_get_own_endpoint_ref;
-   svc_client->ops->get_target_endpoint_ref = axis2_svc_client_get_target_endpoint_ref;
-   svc_client->ops->set_target_endpoint_ref = axis2_svc_client_set_target_endpoint_ref;
-   svc_client->ops->get_svc_ctx = axis2_svc_client_get_svc_ctx;
-   svc_client->ops->free_fn = axis2_svc_client_free;
-}
-
-/**
-  * Create an anonymous axisService with one (anonymous) operation each for
-  * each MEP that I support dealing with anonymously using the convenience
-  * APIs.
-  *
-  * @return the minted anonymous service
-  */
-
-static axis2_svc_t* axis2_svc_client_create_annonymous_svc(
-        axis2_svc_client_t *svc_client,
-        const axis2_env_t *env)
-{
-   /**
-   now add anonymous operations to the axis2 service for use with the
-    shortcut client API. NOTE: We only add the ones we know we'll use
-    later in the convenience API; if you use
-    this constructor then you can't expect any magic!
-   */
-    axis2_svc_client_impl_t *svc_client_impl = NULL;
-   axis2_qname_t *tmp_qname;
-   axis2_svc_t *svc;
-   axis2_op_t *op_out_in, *op_out_only, *op_robust_out_only;
-   axis2_phases_info_t *info = NULL;
-
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-
-   tmp_qname = axis2_qname_create(env, AXIS2_ANON_SERVICE, NULL, NULL);
-   
-   if (!tmp_qname)
-   {
-      AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-      return NULL;
-   }
-
-   svc = axis2_svc_create_with_qname(env, tmp_qname);   
-   
-   if (!svc)
-   {
-      AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-      return NULL;
-   }
-   AXIS2_QNAME_FREE(tmp_qname, env);
+    tmp_qname = axis2_qname_create(env, AXIS2_ANON_SERVICE, NULL, NULL);
+
+    if (!tmp_qname)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    svc = axis2_svc_create_with_qname(env, tmp_qname);
+
+    if (!svc)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+    AXIS2_QNAME_FREE(tmp_qname, env);
 
-   tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
+    tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
 
     if (!tmp_qname)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-   op_out_in = axis2_op_create_with_qname(env, tmp_qname);
-   AXIS2_QNAME_FREE(tmp_qname, env);
+    op_out_in = axis2_op_create_with_qname(env, tmp_qname);
+    AXIS2_QNAME_FREE(tmp_qname, env);
 
-         
-   tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
+
+    tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
 
     if (!tmp_qname)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-   op_out_only = axis2_op_create_with_qname(env, tmp_qname);
-   AXIS2_QNAME_FREE(tmp_qname, env);
+    op_out_only = axis2_op_create_with_qname(env, tmp_qname);
+    AXIS2_QNAME_FREE(tmp_qname, env);
 
-   tmp_qname = axis2_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
+    tmp_qname = axis2_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
 
     if (!tmp_qname)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-   op_robust_out_only = axis2_op_create_with_qname(env, tmp_qname);
-   AXIS2_QNAME_FREE(tmp_qname, env);
+    op_robust_out_only = axis2_op_create_with_qname(env, tmp_qname);
+    AXIS2_QNAME_FREE(tmp_qname, env);
 
-   if (!op_out_in || !op_out_only || !op_robust_out_only)
+    if (!op_out_in || !op_out_only || !op_robust_out_only)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-      if (op_out_in)
-      {
-         AXIS2_OP_FREE(op_out_in, env);
-      }
-      if (op_out_only)
-      {
-         AXIS2_OP_FREE(op_out_only, env);
-      }
-      if (op_robust_out_only)
-      {
-         AXIS2_OP_FREE(op_robust_out_only, env);
-      }
+        if (op_out_in)
+        {
+            AXIS2_OP_FREE(op_out_in, env);
+        }
+        if (op_out_only)
+        {
+            AXIS2_OP_FREE(op_out_only, env);
+        }
+        if (op_robust_out_only)
+        {
+            AXIS2_OP_FREE(op_robust_out_only, env);
+        }
 
         return NULL;
     }
 
-   AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_out_in, env, AXIS2_MEP_URI_OUT_IN);
-   AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_out_only, env, AXIS2_MEP_URI_OUT_ONLY);
-   AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_robust_out_only, env, AXIS2_MEP_URI_ROBUST_OUT_ONLY);
-   
+    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_out_in, env, AXIS2_MEP_URI_OUT_IN);
+    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_out_only, env, AXIS2_MEP_URI_OUT_ONLY);
+    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_robust_out_only, env, AXIS2_MEP_URI_ROBUST_OUT_ONLY);
+
     /* Setting operation phase */
     info = AXIS2_CONF_GET_PHASESINFO(svc_client_impl->conf, env);
     AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_in);
     AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_only);
     AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_robust_out_only);
-   AXIS2_SVC_ADD_OP(svc, env, op_out_in);
-   AXIS2_SVC_ADD_OP(svc, env, op_out_only);
-   AXIS2_SVC_ADD_OP(svc, env, op_robust_out_only);
-   return svc;   
+    AXIS2_SVC_ADD_OP(svc, env, op_out_in);
+    AXIS2_SVC_ADD_OP(svc, env, op_out_only);
+    AXIS2_SVC_ADD_OP(svc, env, op_robust_out_only);
+    return svc;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_svc_client_free(struct axis2_svc_client *svc_client,
-                              const axis2_env_t *env)
+axis2_svc_client_free(
+    struct axis2_svc_client *svc_client,
+    const axis2_env_t *env)
 {
-   axis2_svc_client_impl_t *svc_client_impl = NULL;
+    axis2_svc_client_impl_t *svc_client_impl = NULL;
 
-   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-   svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
+    svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
 
     if (svc_client_impl->callback_recv)
     {
         AXIS2_CALLBACK_RECV_FREE(svc_client_impl->callback_recv, env);
         svc_client_impl->callback_recv = NULL;
-    }   
+    }
 
     if (svc_client_impl->conf_ctx)
     {
         AXIS2_CONF_CTX_FREE(svc_client_impl->conf_ctx, env);
         svc_client_impl->conf_ctx = NULL;
     }
-   
+
     if (svc_client_impl->options)
     {
         AXIS2_OPTIONS_FREE(svc_client_impl->options, env);
         svc_client_impl->options = NULL;
     }
 
-    if(NULL != svc_client_impl->listener_manager)
+    if (NULL != svc_client_impl->listener_manager)
     {
         AXIS2_LISTNER_MANAGER_FREE(svc_client_impl->listener_manager, env);
         svc_client_impl->listener_manager = NULL;
     }
-    
+
     if (svc_client_impl->op_client)
     {
         AXIS2_OP_CLIENT_FREE(svc_client_impl->op_client, env);
@@ -1288,28 +1320,30 @@
     return AXIS2_SUCCESS;
 }
 
-static axis2_bool_t axis2_svc_client_fill_soap_envelope(const axis2_env_t *env, 
+static axis2_bool_t 
+axis2_svc_client_fill_soap_envelope(
+    const axis2_env_t *env,
     axis2_svc_client_impl_t *svc_client_impl,
-    axis2_msg_ctx_t *msg_ctx, 
+    axis2_msg_ctx_t *msg_ctx,
     const axiom_node_t *payload)
 {
-   const axis2_char_t *soap_version_uri;
-   int soap_version;
-   axiom_soap_envelope_t *envelope = NULL;
+    const axis2_char_t *soap_version_uri;
+    int soap_version;
+    axiom_soap_envelope_t *envelope = NULL;
 
-   soap_version_uri = AXIS2_OPTIONS_GET_SOAP_VERSION_URI(svc_client_impl->options, env);
+    soap_version_uri = AXIS2_OPTIONS_GET_SOAP_VERSION_URI(svc_client_impl->options, env);
 
     if (!soap_version_uri)
     {
-      return AXIS2_FALSE;
-   }
+        return AXIS2_FALSE;
+    }
 
     if (AXIS2_STRCMP(soap_version_uri,
-                AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
-       soap_version = AXIOM_SOAP11;
+            AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
+        soap_version = AXIOM_SOAP11;
     else
-       soap_version = AXIOM_SOAP12;
-    
+        soap_version = AXIOM_SOAP12;
+
 
     envelope = axiom_soap_envelope_create_default_soap_envelope(env, soap_version);
     if (!envelope)
@@ -1321,7 +1355,7 @@
     {
         axiom_soap_header_t *soap_header = NULL;
         soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
-    
+
         if (soap_header)
         {
             axiom_node_t *header_node = NULL;
@@ -1361,6 +1395,6 @@
     }
 
     AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, envelope);
-    
-   return AXIS2_TRUE;
+
+    return AXIS2_TRUE;
 }



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