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 10:50:18 UTC

svn commit: r521177 - in /webservices/axis2/trunk/c: include/ samples/client/math/ tools/codegen/samples/client/calculator/ tools/codegen/samples/client/interop_test_svc/

Author: pini
Date: Thu Mar 22 02:50:16 2007
New Revision: 521177

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

Modified:
    webservices/axis2/trunk/c/include/axis2_stub.h
    webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
    webservices/axis2/trunk/c/samples/client/math/math_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_stub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_stub.h?view=diff&rev=521177&r1=521176&r2=521177
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stub.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stub.h Thu Mar 22 02:50:16 2007
@@ -179,43 +179,6 @@
         const axis2_char_t *client_home);
 
 
-/** Frees the axis2 stub. */
-#define AXIS2_STUB_FREE(stub, env) \
-      axis2_stub_free (stub, env)
-
-/** Sets the endpoint reference. */
-#define AXIS2_STUB_SET_ENDPOINT_REF(stub, env, endpoint_ref) \
-      axis2_stub_set_endpoint_ref (stub, env, endpoint_ref)
-
-/** Sets the endpoint uri. */
-#define AXIS2_STUB_SET_ENDPOINT_URI(stub, env, endpoint_uri) \
-      axis2_stub_set_endpoint_uri (stub, env, endpoint_uri)
-
-/** Sets bool value indicating whether to use a separate listener. */
-#define AXIS2_STUB_SET_USE_SEPERATE_LISTENER(stub, env, use_separate_listener) \
-      axis2_stub_set_use_separate_listener (stub, env, use_separate_listener)
-
-/** Engages the module. */
-#define AXIS2_STUB_ENGAGE_MODULE(stub, env, module_name) \
-      axis2_stub_engage_module (stub, env, module_name)
-
-/** Sets the SOAP version. */
-#define AXIS2_STUB_SET_SOAP_VERSION(stub, env, soap_version) \
-      axis2_stub_set_soap_version (stub, env, soap_version)
-
-/** Gets the service context id. */
-#define AXIS2_STUB_GET_SVC_CTX_ID(stub, env) \
-      axis2_stub_get_svc_ctx_id (stub, env)
-
-/** Gets the service client that this stub wraps. */
-#define AXIS2_STUB_GET_SVC_CLIENT(stub, env) \
-      axis2_stub_get_svc_client(stub, env)
-
-/** Gets the options used by service client wrapped by this stub. */
-#define AXIS2_STUB_GET_OPTIONS(stub, env) \
-      axis2_stub_get_options(stub, env)
-
-
     /** @} */
 
 #ifdef __cplusplus

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=521177&r1=521176&r2=521177
==============================================================================
--- 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 02:50:16 2007
@@ -47,7 +47,7 @@
     axis2_op_t* op = NULL;
 
     /*Modifying the Service*/
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     svc = AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
 
     /*creating the operations*/
@@ -113,7 +113,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    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);
     axis2_qname_free(op_qname, env);
@@ -132,7 +132,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    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);
 
@@ -150,7 +150,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    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);
 
@@ -168,7 +168,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    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);
 

Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=521177&r1=521176&r2=521177
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Thu Mar 22 02:50:16 2007
@@ -122,7 +122,7 @@
 
     if (stub)
     {
-        AXIS2_STUB_FREE(stub, env);
+        axis2_stub_free(stub, env);
     }
 
     if (env)

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=521177&r1=521176&r2=521177
==============================================================================
--- 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 02:50:16 2007
@@ -60,7 +60,7 @@
     axis2_op_t *op = NULL;
 
     /* Modifying the Service */
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     svc = (axis2_svc_t*)AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
     axis2_qname_create(env, "Calculator" , NULL, NULL);
     AXIS2_SVC_SET_QNAME(svc, env, svc_qname);
@@ -153,7 +153,7 @@
     payload = content0;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -161,7 +161,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -208,7 +208,7 @@
     payload = content0;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -216,7 +216,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -257,7 +257,7 @@
     payload = content2;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -265,7 +265,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -312,7 +312,7 @@
     payload = content2;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -320,7 +320,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -361,7 +361,7 @@
     payload = content4;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -369,7 +369,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -416,7 +416,7 @@
     payload = content4;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -424,7 +424,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -465,7 +465,7 @@
     payload = content6;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -473,7 +473,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -520,7 +520,7 @@
     payload = content6;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -528,7 +528,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {

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=521177&r1=521176&r2=521177
==============================================================================
--- 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 02:50:16 2007
@@ -60,7 +60,7 @@
     axis2_op_t *op = NULL;
 
     /* Modifying the Service */
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     svc = (axis2_svc_t*)AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
     axis2_qname_create(env, "InteropTestPortTypeDocService" , NULL, NULL);
     AXIS2_SVC_SET_QNAME(svc, env, svc_qname);
@@ -273,7 +273,7 @@
     payload = content0;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -281,7 +281,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -328,7 +328,7 @@
     payload = content0;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -336,7 +336,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -377,7 +377,7 @@
     payload = content2;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -385,7 +385,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -432,7 +432,7 @@
     payload = content2;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -440,7 +440,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -481,7 +481,7 @@
     payload = content4;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -489,7 +489,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -536,7 +536,7 @@
     payload = content4;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -544,7 +544,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -585,7 +585,7 @@
     payload = content6;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -593,7 +593,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -640,7 +640,7 @@
     payload = content6;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -648,7 +648,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -689,7 +689,7 @@
     payload = content8;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -697,7 +697,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -744,7 +744,7 @@
     payload = content8;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -752,7 +752,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -793,7 +793,7 @@
     payload = content10;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -801,7 +801,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -848,7 +848,7 @@
     payload = content10;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -856,7 +856,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -897,7 +897,7 @@
     payload = content12;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -905,7 +905,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -952,7 +952,7 @@
     payload = content12;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -960,7 +960,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1001,7 +1001,7 @@
     payload = content14;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1009,7 +1009,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1056,7 +1056,7 @@
     payload = content14;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1064,7 +1064,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1105,7 +1105,7 @@
     payload = content16;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1113,7 +1113,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1160,7 +1160,7 @@
     payload = content16;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1168,7 +1168,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1209,7 +1209,7 @@
     payload = content18;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1217,7 +1217,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1264,7 +1264,7 @@
     payload = content18;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1272,7 +1272,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1313,7 +1313,7 @@
     payload = content20;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1321,7 +1321,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1368,7 +1368,7 @@
     payload = content20;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1376,7 +1376,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1417,7 +1417,7 @@
     payload = content22;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1425,7 +1425,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1472,7 +1472,7 @@
     payload = content22;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1480,7 +1480,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1521,7 +1521,7 @@
     payload = content24;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1529,7 +1529,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1576,7 +1576,7 @@
     payload = content24;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1584,7 +1584,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1625,7 +1625,7 @@
     payload = content26;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1633,7 +1633,7 @@
                 axis2_error_get_message(env->error));
         return NULL;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
@@ -1680,7 +1680,7 @@
     payload = content26;
 
 
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     if (! options)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
@@ -1688,7 +1688,7 @@
                 axis2_error_get_message(env->error));
         return;
     }
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {

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=521177&r1=521176&r2=521177
==============================================================================
--- 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 02:50:16 2007
@@ -45,9 +45,9 @@
         client_home = "../../../deploy";
 
     stub = axis2_stub_interop_test_port_type_doc_service_create(env, client_home , endpoint_uri);
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     /*AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     axis2_options_set_action(options, env, "http://soapinterop.org");
 
     /** testing echoString */
@@ -58,9 +58,9 @@
     printf("\n");
 
     stub = axis2_stub_interop_test_port_type_doc_service_create(env, client_home , endpoint_uri);
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     /*AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     axis2_options_set_action(options, env, "http://soapinterop.org");
 
     /** testing echoInteger*/
@@ -71,9 +71,9 @@
     printf("\n");
 
     stub = axis2_stub_interop_test_port_type_doc_service_create(env, client_home , endpoint_uri);
-    svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
+    svc_client = axis2_stub_get_svc_client(stub, env);
     /*AXIS2_SVC_CLIENT_DISENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
-    options = AXIS2_STUB_GET_OPTIONS(stub, env);
+    options = axis2_stub_get_options(stub, env);
     axis2_options_set_action(options, env, "http://soapinterop.org");
 
     /** testing echoString */



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