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 pi...@apache.org on 2007/03/22 11:53:53 UTC

svn commit: r521204 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ rampart/samples/client/sec_echo/ samples/client/dynamic_client/ samples/client/echo/ samples/client/google/ samples/client/math/ samples/client/mtom/ samples/client/n...

Author: pini
Date: Thu Mar 22 03:53:49 2007
New Revision: 521204

URL: http://svn.apache.org/viewvc?view=rev&rev=521204
Log:
Dropped macros

Modified:
    webservices/axis2/trunk/c/include/axis2_svc_client.h
    webservices/axis2/trunk/c/modules/core/clientapi/stub.c
    webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
    webservices/axis2/trunk/c/samples/client/echo/echo.c
    webservices/axis2/trunk/c/samples/client/google/google_client.c
    webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
    webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
    webservices/axis2/trunk/c/samples/client/notify/notify_client.c
    webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
    webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
    webservices/axis2/trunk/c/savan/src/client/savan_client.c
    webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c
    webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
    webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
    webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
    webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
    webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
    webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
    webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c

Modified: webservices/axis2/trunk/c/include/axis2_svc_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_client.h?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_client.h Thu Mar 22 03:53:49 2007
@@ -469,109 +469,6 @@
         const axis2_char_t *endpoint_name,
         const axis2_char_t *client_home);
 
-/** Gets the service consumed by service client. */
-#define AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env) \
-        axis2_svc_client_get_svc(svc_client, env)
-
-/** Sets the options to be used by service client.  */
-#define AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options) \
-        axis2_svc_client_set_options(svc_client, env, options)
-
-/** Gets the options being used by service client.  */
-#define AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env) \
-        axis2_svc_client_get_options(svc_client, env)
-
-/** Sets the overriding options to be used by service client.  */
-#define AXIS2_SVC_CLIENT_SET_OVERRIDE_OPTIONS(svc_client, env, override_options) \
-        axis2_svc_client_set_override_options(svc_client, env, override_options)
-
-/** Gets the overriding options being used by service client  */
-#define AXIS2_SVC_CLIENT_GET_OVERRIDE_OPTIONS(svc_client, env) \
-        axis2_svc_client_get_override_options(svc_client, env)
-
-/** Engages the given module.  */
-#define AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, module_name) \
-        axis2_svc_client_engage_module(svc_client, env, module_name)
-
-/** Dis-engages the given module.  */
-#define AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, module_name) \
-        axis2_svc_client_disengage_module(svc_client, env, module_name)
-
-/** Adds a SOAP header to be sent by the service client.  */
-#define AXIS2_SVC_CLIENT_ADD_HEADER(svc_client, env, header) \
-        axis2_svc_client_add_header(svc_client, env, header)
-
-/** Removes all the SOAP headers currently set on service client.  */
-#define AXIS2_SVC_CLIENT_REMOVE_ALL_HEADERS(svc_client, env) \
-        axis2_svc_client_remove_all_headers(svc_client, env)
-
-/** Sends the given payload in a robust manner. 
-    Robust means that SOAP faults are captured and reported.  */
-#define AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload) \
-        axis2_svc_client_send_robust(svc_client, env, payload)
-
-/** Sends the given payload in a robust manner targeted to named operation.  */
-#define AXIS2_SVC_CLIENT_SEND_ROBUST_WITH_OP_QNAME(svc_client, env, op_qname, payload) \
-        axis2_svc_client_send_robust_with_op_qname(svc_client, env, op_qname, payload)
-
-/** Sends the given payload and forgets about it. 
-    No SOAP faults are reported. */
-#define AXIS2_SVC_CLIENT_FIRE_AND_FORGET(svc_client, env, payload) \
-        axis2_svc_client_fire_and_forget(svc_client, env, payload)
-
-/** Sends the given payload targeted to named operation and forgets about it */
-#define AXIS2_SVC_CLIENT_FIRE_AND_FORGET_WITH_OP_QNAME(svc_client, env, op_qname, payload) \
-        axis2_svc_client_fire_and_forget_with_op_qname(svc_client, env, op_qname, payload)
-
-/** Sends the given payload and receives the response.  */
-#define AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload) \
-        axis2_svc_client_send_receive(svc_client, env, payload)
-
-/** Sends the given payload targeted to named operation and receives the response.  */
-#define AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload) \
-        axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload)
-
-/** Sends the given payload and receives the response.
-    Does not block till response arrives. Uses the callback to capture response.  */
-#define AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback) \
-        axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback)
-
-/** Sends the given payload targeted to named operation and receives the response.
-    Does not block till response arrives. Uses the callback to capture response  */
-#define AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING_WITH_OP_QNAME(svc_client, env, op_qname, payload, callback) \
-        axis2_svc_client_send_receive_non_blocking_with_op_qname(svc_client, env, op_qname, payload, callback)
-
-/** Creates an operation client for a specific operation.  */
-#define AXIS2_SVC_CLIENT_CREATE_OP_CLIENT(svc_client, env, op_qname) \
-        axis2_svc_client_create_op_client(svc_client, env, op_qname)
-
-/** Cleans up after the invocations.  */
-#define AXIS2_SVC_CLIENT_FINALIZE_INVOKE(svc_client, env) \
-        axis2_svc_client_finalize_invoke(svc_client, env)
-
-/** Gets the service client's own endpoint ref.  */
-#define AXIS2_SVC_CLIENT_GET_OWN_ENDPOINT_REF(svc_client, env, transport) \
-        axis2_svc_client_get_own_endpoint_ref(svc_client, env, transport)
-
-/** Gets the target endpoint ref.  */
-#define AXIS2_SVC_CLIENT_GET_TARGET_ENDPOINT_REF(svc_client, env) \
-        axis2_svc_client_get_target_endpoint_ref(svc_client, env)
-
-/** Sets the target endpoint ref.  */
-#define AXIS2_SVC_CLIENT_SET_TARGET_ENDPOINT_REF(svc_client, env, target_epr) \
-        axis2_svc_client_set_target_endpoint_ref(svc_client, env, target_epr)
-
-/** Gets the service context being used by the service client.  */
-#define AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env) \
-        axis2_svc_client_get_svc_ctx(svc_client, env)
-
-/** Frees given service client.  */
-#define AXIS2_SVC_CLIENT_FREE(svc_client, env) \
-        axis2_svc_client_free(svc_client, env)
-        
-/** Gets the op_client . */
-    #define AXIS2_SVC_CLIENT_GET_OP_CLIENT(svc_client, env) \
-            axis2_svc_client_get_op_client(svc_client, env)
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/modules/core/clientapi/stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/stub.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/stub.c Thu Mar 22 03:53:49 2007
@@ -78,7 +78,7 @@
         return NULL;
     }
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(stub->svc_client, env, stub-> options);
+    axis2_svc_client_set_options(stub->svc_client, env, stub-> options);
 
     axis2_options_set_to(stub->options, env, endpoint_ref);
 
@@ -123,7 +123,7 @@
 
     if (stub->svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(stub->svc_client, env);
+        axis2_svc_client_free(stub->svc_client, env);
     }
 
     if (stub)
@@ -180,7 +180,7 @@
 {
     AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
 
-    return AXIS2_SVC_CLIENT_ENGAGE_MODULE(stub->svc_client, env, module_name);
+    return axis2_svc_client_engage_module(stub->svc_client, env, module_name);
 }
 
 axis2_status_t AXIS2_CALL
@@ -202,7 +202,7 @@
     const axis2_svc_ctx_t *svc_ctx = NULL;
     const axis2_char_t *svc_ctx_id = NULL;
 
-    svc_ctx = AXIS2_SVC_CLIENT_GET_SVC_CTX(stub->svc_client, env);
+    svc_ctx = axis2_svc_client_get_svc_ctx(stub->svc_client, env);
     svc_ctx_id =  axis2_svc_ctx_get_svc_id(svc_ctx, env);
     return svc_ctx_id;
 }

Modified: webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c Thu Mar 22 03:53:49 2007
@@ -105,14 +105,14 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
-    /*AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "rampart");*/
+    /*axis2_svc_client_engage_module(svc_client, env, "rampart");*/
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -132,7 +132,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
     /*    if (endpoint_ref)

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Thu Mar 22 03:53:49 2007
@@ -119,7 +119,7 @@
     payload = build_om_programatically_for_wsdl1(env);
     op_qname = axis2_qname_create(env, "add", "http://localhost/axis/Calculator",
             NULL);
-    response = AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env,
+    response = axis2_svc_client_send_receive_with_op_qname(svc_client, env,
             op_qname, payload);
 
     if (response)
@@ -135,7 +135,7 @@
         printf("status:%s\n", "Failure");
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
     return 0;
@@ -181,7 +181,7 @@
     payload = build_om_programatically_for_wsdl2(env);
     op_qname = axis2_qname_create(env, "add", "http://localhost/axis/Calculator",
             NULL);
-    response = AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env,
+    response = axis2_svc_client_send_receive_with_op_qname(svc_client, env,
             op_qname, payload);
 
     if (response)
@@ -197,7 +197,7 @@
         printf("status:%s\n", "Failure");
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
     return 0;

Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Thu Mar 22 03:53:49 2007
@@ -86,16 +86,16 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Engage addressing module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -117,7 +117,7 @@
     }
 
     payload2 = build_om_payload_for_echo_svc(env);
-    ret_node2 = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload2);
+    ret_node2 = axis2_svc_client_send_receive(svc_client, env, payload2);
     if (ret_node2)
     {
         axis2_char_t *om_str = NULL;
@@ -139,7 +139,7 @@
     
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Thu Mar 22 03:53:49 2007
@@ -99,13 +99,13 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_soap_body_content(env, operation, google_key, word_to_spell);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -148,7 +148,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Thu Mar 22 03:53:49 2007
@@ -48,7 +48,7 @@
 
     /*Modifying the Service*/
     svc_client = axis2_stub_get_svc_client(stub, env);
-    svc = AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
+    svc = axis2_svc_client_get_svc(svc_client, env);
 
     /*creating the operations*/
 
@@ -115,7 +115,7 @@
 
     svc_client = axis2_stub_get_svc_client(stub, env);
     op_qname = axis2_qname_create(env, "add" , "", NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, node);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
     axis2_qname_free(op_qname, env);
 
     return ret_node;
@@ -134,7 +134,7 @@
 
     svc_client = axis2_stub_get_svc_client(stub, env);
     op_qname = axis2_qname_create(env, "sub" , "", NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, node);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
 
     return ret_node;
 }
@@ -152,7 +152,7 @@
 
     svc_client = axis2_stub_get_svc_client(stub, env);
     op_qname = axis2_qname_create(env, "mul" , "", NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, node);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
 
     return ret_node;
 }
@@ -170,7 +170,7 @@
 
     svc_client = axis2_stub_get_svc_client(stub, env);
     op_qname = axis2_qname_create(env, "div" , "", NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, node);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
 
     return ret_node;
 }

Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Thu Mar 22 03:53:49 2007
@@ -99,16 +99,16 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Engage addressing module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_programatically(env, image_name, to_save_name, optimized);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -131,7 +131,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/client/notify/notify_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/notify_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Thu Mar 22 03:53:49 2007
@@ -82,16 +82,16 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Engage addressing module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_programatically(env);
 
     /* Send request */
-    status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload);
+    status = axis2_svc_client_send_robust(svc_client, env, payload);
 
     if (status == AXIS2_SUCCESS)
     {
@@ -107,7 +107,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Thu Mar 22 03:53:49 2007
@@ -91,13 +91,13 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_yahoo_rest_payload (env, search_string);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -114,7 +114,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
     return 0;

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c Thu Mar 22 03:53:49 2007
@@ -76,13 +76,13 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -105,7 +105,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c Thu Mar 22 03:53:49 2007
@@ -78,16 +78,16 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Engage addressing module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -110,7 +110,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c Thu Mar 22 03:53:49 2007
@@ -84,15 +84,15 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -116,7 +116,7 @@
     if (svc_client)
     {
         AXIS2_SLEEP(1);
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c Thu Mar 22 03:53:49 2007
@@ -81,13 +81,13 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -110,7 +110,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Thu Mar 22 03:53:49 2007
@@ -91,7 +91,7 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
@@ -108,7 +108,7 @@
 
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env,
+    axis2_svc_client_send_receive_non_blocking(svc_client, env,
             payload, callback);
 
     /** Wait till callback is complete. Simply keep the parent thread running
@@ -131,7 +131,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Thu Mar 22 03:53:49 2007
@@ -101,10 +101,10 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
-    /*AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "sandesha2");*/
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    /*axis2_svc_client_engage_module(svc_client, env, "sandesha2");*/
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
@@ -121,7 +121,7 @@
 
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env,
+    axis2_svc_client_send_receive_non_blocking(svc_client, env,
             payload, callback);
 
     /** Wait till callback is complete. Simply keep the parent thread running
@@ -145,7 +145,7 @@
     if (svc_client)
     {
         AXIS2_SLEEP(1);
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Thu Mar 22 03:53:49 2007
@@ -114,13 +114,13 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Build the SOAP request message payload using OM API.*/
     payload = build_om_payload_for_echo_svc(env);
 
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
     if (ret_node)
     {
@@ -143,7 +143,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
     return 0;

Modified: webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c Thu Mar 22 03:53:49 2007
@@ -78,13 +78,13 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);    
+    axis2_svc_client_set_options(svc_client, env, options);    
     
     /* Engage addressing module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
     
     /* Engage savan module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "savan");
+    axis2_svc_client_engage_module(svc_client, env, "savan");
 
     savan_options = axis2_hash_make(env);
     axis2_hash_set(savan_options, SAVAN_OP_KEY_NOTIFY_EPR, AXIS2_HASH_KEY_STRING,
@@ -137,7 +137,7 @@
 
     if (svc_client)
     {
-        AXIS2_SVC_CLIENT_FREE(svc_client, env);
+        axis2_svc_client_free(svc_client, env);
         svc_client = NULL;
     }
     
@@ -180,15 +180,15 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);    
+    axis2_svc_client_set_options(svc_client, env, options);    
     
     /* Engage addressing module */
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
+    axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
     
     payload = build_om_payload_for_echo_svc(env);
     
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
     
     if(ret_node)
     {

Modified: webservices/axis2/trunk/c/savan/src/client/savan_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Thu Mar 22 03:53:49 2007
@@ -102,7 +102,7 @@
         "subscribe...");
     
     /* set wsa action as Subscribe. remember the old action */
-    wsa_options = (axis2_options_t*)AXIS2_SVC_CLIENT_GET_OPTIONS (svc_client, env);
+    wsa_options = (axis2_options_t*)axis2_svc_client_get_options(svc_client, env);
     old_action = axis2_options_get_action(wsa_options, env);
     axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_SUB);
     
@@ -139,7 +139,7 @@
     axiom_element_set_text(filter_elem, env, filter, filter_node);
     
     /* send the Subscription and wait for the response */
-    reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, sub_node);
+    reply = axis2_svc_client_send_receive(svc_client, env, sub_node);
     
     /* reset the old action */
     axis2_options_set_action(wsa_options, env, old_action);
@@ -197,7 +197,7 @@
         "renew...");
     
     /* Set wsa action as Renew. remember the old action */
-    wsa_options = (axis2_options_t*)AXIS2_SVC_CLIENT_GET_OPTIONS (svc_client, env);
+    wsa_options = (axis2_options_t*)axis2_svc_client_get_options(svc_client, env);
     old_action = axis2_options_get_action(wsa_options, env);
     axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_RENEW);
     
@@ -216,7 +216,7 @@
     savan_client_add_sub_id_to_soap_header(client, env, svc_client);
 
     /* send the Renew request and wait for the response */
-    reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, renew_node);
+    reply = axis2_svc_client_send_receive(svc_client, env, renew_node);
     
     /* reset the old action */
     axis2_options_set_action(wsa_options, env, old_action);
@@ -252,7 +252,7 @@
         "unsubscribe...");
     
     /* set wsa action as Unsub. remember the old action */
-    wsa_options = (axis2_options_t*)AXIS2_SVC_CLIENT_GET_OPTIONS (svc_client, env);
+    wsa_options = (axis2_options_t*)axis2_svc_client_get_options(svc_client, env);
     old_action = axis2_options_get_action(wsa_options, env);
     axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_UNSUB);
     
@@ -263,7 +263,7 @@
     savan_client_add_sub_id_to_soap_header(client, env, svc_client);
 
     /* send the Unsub request and wait for the response */
-    reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, unsub_node);
+    reply = axis2_svc_client_send_receive(svc_client, env, unsub_node);
     
     /* reset the old action */
     axis2_options_set_action(wsa_options, env, old_action);
@@ -307,7 +307,7 @@
         "get status...");
     
     /* Set wsa action as GetStatus. remember the old action */
-    wsa_options = (axis2_options_t*)AXIS2_SVC_CLIENT_GET_OPTIONS (svc_client, env);
+    wsa_options = (axis2_options_t*)axis2_svc_client_get_options(svc_client, env);
     old_action = axis2_options_get_action(wsa_options, env);
     axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_GET_STATUS);
     
@@ -318,7 +318,7 @@
     savan_client_add_sub_id_to_soap_header(client, env, svc_client);
 
     /* Send the GetStatus request and wait for the response */
-    reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, status_node);
+    reply = axis2_svc_client_send_receive(svc_client, env, status_node);
     
     /* Reset the old action */
     axis2_options_set_action(wsa_options, env, old_action);
@@ -392,7 +392,7 @@
 
     axiom_element_set_text(id_elem, env, client->sub_id, id_node);
 
-    AXIS2_SVC_CLIENT_ADD_HEADER(svc_client, env, id_node);
+    axis2_svc_client_add_header(svc_client, env, id_node);
 
     return AXIS2_SUCCESS;
 

Modified: webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c Thu Mar 22 03:53:49 2007
@@ -106,12 +106,12 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
-    AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "savan");
+    axis2_svc_client_engage_module(svc_client, env, "savan");
 
     /* Send publishing message */
-    AXIS2_SVC_CLIENT_SEND_ROBUST_WITH_OP_QNAME(svc_client, env, op_qname, payload); 
+    axis2_svc_client_send_robust_with_op_qname(svc_client, env, op_qname, payload); 
     
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Thu Mar 22 03:53:49 2007
@@ -245,14 +245,14 @@
     axis2_options_set_to(options, env, subscriber->notify_to);
     
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     /* Engage addressing module */
-    /*AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
+    /*axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
     
     op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
 
-    op_client = AXIS2_SVC_CLIENT_CREATE_OP_CLIENT(svc_client, env,
+    op_client = axis2_svc_client_create_op_client(svc_client, env,
         op_qname);
 
     AXIS2_OP_CLIENT_ADD_MSG_CTX(op_client, env, msg_ctx);

Modified: webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c Thu Mar 22 03:53:49 2007
@@ -54,10 +54,10 @@
 
     options = axis2_options_create(env);
     axis2_options_set_to(options, env, endpoint_ref);
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     payload = build_om_payload_for_echo_svc(env, echo_text);
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
     if (ret_node)
     {
         if (AXIOM_NODE_GET_NODE_TYPE(ret_node, env) == AXIOM_ELEMENT)
@@ -71,7 +71,7 @@
                 printf("axis2_test SVC_CLIENT_SEND_RECEIVE FAILURE\n");
         }
     }
-    AXIS2_SVC_CLIENT_FREE(svc_client, env);
+    axis2_svc_client_free(svc_client, env);
 }
 
 /* build SOAP request message content using OM */

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c Thu Mar 22 03:53:49 2007
@@ -102,12 +102,12 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     payload = build_soap_body_content(env, echo_operation,
             echo_type, word_to_echo);
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
 
 

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c Thu Mar 22 03:53:49 2007
@@ -102,12 +102,12 @@
     }
 
     /* Set service client options */
-    AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
+    axis2_svc_client_set_options(svc_client, env, options);
 
     payload = build_soap_body_content(env, echo_operation,
             echo_type, word_to_echo);
     /* Send request */
-    ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
+    ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
 
 
 

Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c Thu Mar 22 03:53:49 2007
@@ -61,7 +61,7 @@
 
     /* Modifying the Service */
     svc_client = axis2_stub_get_svc_client(stub, env);
-    svc = (axis2_svc_t*)AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
+    svc = (axis2_svc_t*)axis2_svc_client_get_svc(svc_client, env);
     axis2_qname_create(env, "Calculator" , NULL, NULL);
     AXIS2_SVC_SET_QNAME(svc, env, svc_qname);
 
@@ -175,7 +175,7 @@
             "add" ,
             "http://localhost/axis/Calculator",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -234,7 +234,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -279,7 +279,7 @@
             "sub" ,
             "http://localhost/axis/Calculator",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -338,7 +338,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -383,7 +383,7 @@
             "mul" ,
             "http://localhost/axis/Calculator",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -442,7 +442,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -487,7 +487,7 @@
             "div" ,
             "http://localhost/axis/Calculator",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -546,7 +546,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 

Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c Thu Mar 22 03:53:49 2007
@@ -61,7 +61,7 @@
 
     /* Modifying the Service */
     svc_client = axis2_stub_get_svc_client(stub, env);
-    svc = (axis2_svc_t*)AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
+    svc = (axis2_svc_t*)axis2_svc_client_get_svc(svc_client, env);
     axis2_qname_create(env, "InteropTestPortTypeDocService" , NULL, NULL);
     AXIS2_SVC_SET_QNAME(svc, env, svc_qname);
 
@@ -295,7 +295,7 @@
             "echoString" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -354,7 +354,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -399,7 +399,7 @@
             "echoStringArray" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -458,7 +458,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -503,7 +503,7 @@
             "echoInteger" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -562,7 +562,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -607,7 +607,7 @@
             "echoIntegerArray" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -666,7 +666,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -711,7 +711,7 @@
             "echoFloat" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -770,7 +770,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -815,7 +815,7 @@
             "echoFloatArray" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -874,7 +874,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -919,7 +919,7 @@
             "echoStruct" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -978,7 +978,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1023,7 +1023,7 @@
             "echoStructArray" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1082,7 +1082,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1127,7 +1127,7 @@
             "echoVoid" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1186,7 +1186,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1231,7 +1231,7 @@
             "echoBase64" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1290,7 +1290,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1335,7 +1335,7 @@
             "echoDate" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1394,7 +1394,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1439,7 +1439,7 @@
             "echoHexBinary" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1498,7 +1498,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1543,7 +1543,7 @@
             "echoDecimal" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1602,7 +1602,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 
@@ -1647,7 +1647,7 @@
             "echoBoolean" ,
             "http://soapinterop.org",
             NULL);
-    ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, payload);
+    ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, payload);
 
 
 
@@ -1706,7 +1706,7 @@
     axis2_callback_set_on_error(callback, on_error);
 
     /* Send request */
-    AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+    axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
 }
 
 

Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c?view=diff&rev=521204&r1=521203&r2=521204
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c Thu Mar 22 03:53:49 2007
@@ -46,7 +46,7 @@
 
     stub = axis2_stub_interop_test_port_type_doc_service_create(env, client_home , endpoint_uri);
     svc_client = axis2_stub_get_svc_client(stub, env);
-    /*AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
+    /*axis2_svc_client_disengage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
     options = axis2_stub_get_options(stub, env);
     axis2_options_set_action(options, env, "http://soapinterop.org");
 
@@ -59,7 +59,7 @@
 
     stub = axis2_stub_interop_test_port_type_doc_service_create(env, client_home , endpoint_uri);
     svc_client = axis2_stub_get_svc_client(stub, env);
-    /*AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
+    /*axis2_svc_client_disengage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
     options = axis2_stub_get_options(stub, env);
     axis2_options_set_action(options, env, "http://soapinterop.org");
 
@@ -72,7 +72,7 @@
 
     stub = axis2_stub_interop_test_port_type_doc_service_create(env, client_home , endpoint_uri);
     svc_client = axis2_stub_get_svc_client(stub, env);
-    /*AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
+    /*axis2_svc_client_disengage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
     options = axis2_stub_get_options(stub, env);
     axis2_options_set_action(options, env, "http://soapinterop.org");
 



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