axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r521163 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/context/ rampart/samples/client/sec_echo/ samples/client/dynamic_client/ samples/client/echo/ samples/client/google/ samples/client/mtom/ samples/client/...
Date Thu, 22 Mar 2007 09:28:52 GMT
Author: pini
Date: Thu Mar 22 02:28:51 2007
New Revision: 521163

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

Modified:
    webservices/axis2/trunk/c/include/axis2_options.h
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/stub.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.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/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_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_options.h?view=diff&rev=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_options.h (original)
+++ webservices/axis2/trunk/c/include/axis2_options.h Thu Mar 22 02:28:51 2007
@@ -677,211 +677,6 @@
     axis2_options_create_with_parent(const axis2_env_t *env,
         axis2_options_t *parent);
 
-/** Gets WSA action. */
-#define AXIS2_OPTIONS_GET_ACTION(options, env) \
-      axis2_options_get_action(options, env)
-
-/** Get WSA fault to address. */
-#define AXIS2_OPTIONS_GET_FAULT_TO(options, env) \
-      axis2_options_get_fault_to(options, env)
-
-/** Gets WSA from address. */
-#define AXIS2_OPTIONS_GET_FROM(options, env) \
-      axis2_options_get_from(options, env)
-
-/** Gets the transport receiver. */
-#define AXIS2_OPTIONS_GET_TRANSPORT_RECEIVER(options, env) \
-      axis2_options_get_transport_receiver(options, env)
-
-/** Gets transport in. */
-#define AXIS2_OPTIONS_GET_TRANSPORT_IN(options, env) \
-      axis2_options_get_transport_in(options, env)
-
-/** Gets the transport in protocol. */
-#define AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(options, env) \
-      axis2_options_get_transport_in_protocol(options, env)
-
-/** Gets the message id. */
-#define AXIS2_OPTIONS_GET_MESSAGE_ID(options, env) \
-      axis2_options_get_message_id(options, env)
-
-/** Gets the properties. */
-#define AXIS2_OPTIONS_GET_PROPERTIES(options, env) \
-      axis2_options_get_properties(options, env)
-
-/** Gets a property corresponding to given key. */
-#define AXIS2_OPTIONS_GET_PROPERTY(options, env, key) \
-      axis2_options_get_property(options, env, key)
-
-/** Get WSA relates to information. */
-#define AXIS2_OPTIONS_GET_RELATES_TO(options, env) \
-      axis2_options_get_relates_to(options, env)
-
-/** Get WSA reply to address. */
-#define AXIS2_OPTIONS_GET_REPLY_TO(options, env) \
-      axis2_options_get_reply_to(options, env)
-
-/** Gets the transport out. */
-#define AXIS2_OPTIONS_GET_TRANSPORT_OUT(options, env) \
-      axis2_options_get_transport_out(options, env)
-
-/** Gets the sender protocol. */
-#define AXIS2_OPTIONS_GET_SENDER_PROTOCOL(options, env) \
-      axis2_options_get_sender_transport_protocol(options, env)
-
-/** Gets the soap version uri. */
-#define AXIS2_OPTIONS_GET_SOAP_VERSION_URI(options, env) \
-      axis2_options_get_soap_version_uri(options, env)
-
-/** Gets the timeout in milli seconds. */
-#define AXIS2_OPTIONS_GET_TIMEOUT_IN_MILLI_SECONDS(options, env) \
-      axis2_options_get_timeout_in_milli_seconds(options, env)
-
-/** Get WSA to address. */
-#define AXIS2_OPTIONS_GET_TO(options, env) \
-      axis2_options_get_to(options, env)
-
-/** Get xml parser reset value */
-#define AXIS2_OPTIONS_GET_XML_PARSER_RESET(options, env) \
-      axis2_options_get_xml_parser_reset(options, env)
-
-/** Whether to use a separate listener. */
-#define AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(options, env) \
-      axis2_options_get_use_separate_listener(options, env)
-
-/** Gets the parent. */
-#define AXIS2_OPTIONS_GET_PARENT(options, env) \
-      axis2_options_get_parent(options, env)
-
-/** Sets the parent. */
-#define AXIS2_OPTIONS_SET_PARENT(options, env, parent) \
-      axis2_options_set_parent(options, env, parent)
-
-/** Sets the WSA action. */
-#define AXIS2_OPTIONS_SET_ACTION(options, env, action) \
-      axis2_options_set_action(options, env, action)
-
-/** Set WSA fault to address. */
-#define AXIS2_OPTIONS_SET_FAULT_TO(options, env, fault_to) \
-      axis2_options_set_fault_to(options, env, fault_to)
-
-/** Set WSA from address. */
-#define AXIS2_OPTIONS_SET_FROM(options, env, from) \
-      axis2_options_set_from(options, env, from)
-
-/** Set WSA to address. */
-#define AXIS2_OPTIONS_SET_TO(options, env, to) \
-      axis2_options_set_to(options, env, to)
-
-/** Sets the transport receiver. */
-#define AXIS2_OPTIONS_SET_TRANSPORT_RECEIVER(options, env, receiver) \
-      axis2_options_set_transport_receiver(options, env, receiver)
-
-/** Set transport in. */
-#define AXIS2_OPTIONS_SET_TRANSPORT_IN(options, env, transport_in) \
-      axis2_options_set_transport_in(options, env, transport_in)
-
-/** Sets the transport in protocol. */
-#define AXIS2_OPTIONS_SET_TRANSPORT_IN_PROTOCOL(options, env, transport_in_protocol) \
-      axis2_options_set_transport_in_protocol(options, env, transport_in_protocol)
-
-/** Sets the message id. */
-#define AXIS2_OPTIONS_SET_MESSAGE_ID(options, env, message_id) \
-      axis2_options_set_message_id(options, env, message_id)
-
-/** Sets the properties. */
-#define AXIS2_OPTIONS_SET_PROPERTIES(options, env, properties) \
-      axis2_options_set_properties(options, env, properties)
-
-/** Sets a property with a given key. */
-#define AXIS2_OPTIONS_SET_PROPERTY(options, env, key, property) \
-      axis2_options_set_property(options, env, key, property)
-
-/** Set WSA relates to information. */
-#define AXIS2_OPTIONS_SET_RELATES_TO(options, env, relates_to) \
-      axis2_options_set_relates_to(options, env, relates_to)
-
-/** Set WSA reply to address. */
-#define AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to) \
-      axis2_options_set_reply_to(options, env, reply_to)
-
-/** Sets transport out. */
-#define AXIS2_OPTIONS_SET_TRANSPORT_OUT(options, env, transport_out) \
-      axis2_options_set_transport_out(options, env, transport_out)
-
-/** Sets sender transport. */
-#define AXIS2_OPTIONS_SET_SENDER_TRANSPORT(options, env, sender_transport, conf) \
-      axis2_options_set_sender_transport(options, env, sender_transport, conf)
-
-/** Sets SOAP version uri. */
-#define AXIS2_OPTIONS_SET_SOAP_VERSION_URI(options, env, soap_version_uri) \
-      axis2_options_set_soap_version_uri(options, env, soap_version_uri)
-
-/** Sets timeout in milli seconds. */
-#define AXIS2_OPTIONS_SET_TIMEOUT_IN_MILLI_SECONDS(options, env, timeout_in_milli_seconds) \
-      axis2_options_set_timeout_in_milli_seconds(options, env, timeout_in_milli_seconds)
-
-/** Sets transport information. */
-#define AXIS2_OPTIONS_SET_TRANSPORT_INFO(options, env, sender_transport, \
-    receiver_transport, user_separate_listener) \
-    axis2_options_set_tranport_info(options, env, sender_transport, \
-    receiver_transport, user_separate_listener)
-
-/** Sets use separate listener. */
-#define AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, use_separate_listener) \
-      axis2_options_set_use_separate_listener(options, env, use_separate_listener)
-
-/** Adds a reference parameter. */
-#define AXIS2_OPTIONS_ADD_REFERENCE_PARAMETER(options, env, reference_parameter) \
-      axis2_options_add_reference_parameter(options, env, reference_parameter)
-
-/** Whether to manage session. */
-#define AXIS2_OPTIONS_GET_MANAGE_SESSION(options, env) \
-      axis2_options_get_manage_session(options, env)
-
-/** Sets manage session. */
-#define AXIS2_OPTIONS_SET_MANAGE_SESSION(options, env, manage_session) \
-      axis2_options_set_manage_session(options, env, manage_session)
-
-/** Sets message information headers. */
-#define AXIS2_OPTIONS_SET_MSG_INFO_HEADERS(options, env, msg_info_headers) \
-      axis2_options_set_msg_info_headers(options, env, msg_info_headers)
-
-/** Gets message information headers. */
-#define AXIS2_OPTIONS_GET_MSG_INFO_HEADERS(options, env) \
-      axis2_options_get_msg_info_headers(options, env)
-
-/** Sets SOAP version. */
-#define AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, soap_version) \
-      axis2_options_set_soap_version(options, env, soap_version)
-
-/** Gets SOAP version. */
-#define AXIS2_OPTIONS_GET_SOAP_VERSION(options, env) \
-      axis2_options_get_soap_version(options, env)
-
-/** Sets enable mtom. */
-#define AXIS2_OPTIONS_SET_ENABLE_MTOM(options, env, enable_mtom) \
-      axis2_options_set_enable_mtom(options, env, enable_mtom)
-
-/** Gets enable mtom. */
-#define AXIS2_OPTIONS_GET_ENABLE_MTOM(options, env) \
-      axis2_options_get_enable_mtom(options, env)
-
-/** Gets SOAP action. */
-#define AXIS2_OPTIONS_GET_SOAP_ACTION(options, env) \
-      axis2_options_get_soap_action(options, env)
-
-/** Sets the SOAP action. */
-#define AXIS2_OPTIONS_SET_SOAP_ACTION(options, env, action) \
-      axis2_options_set_soap_action(options, env, action)
-
-/** Sets xml parser reset value  */
-#define AXIS2_OPTIONS_SET_XML_PARSER_RESET(options, env, flag) \
-      axis2_options_set_xml_parser_reset(options, env, flag)
-
-/** Frees the options struct. */
-#define AXIS2_OPTIONS_FREE(options, env) \
-      axis2_options_free(options, env)
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Thu Mar 22 02:28:51 2007
@@ -131,7 +131,7 @@
 
     if(op_client->options)
     {
-        AXIS2_OPTIONS_FREE(op_client->options, env);
+        axis2_options_free(op_client->options, env);
     }
     op_client->options = (axis2_options_t *)options;
 
@@ -300,13 +300,13 @@
      if the transport to use for sending is not specified, try to find it
      from the URL
     */
-    transport_out = AXIS2_OPTIONS_GET_TRANSPORT_OUT(op_client->options,
+    transport_out = axis2_options_get_transport_out(op_client->options,
             env);
     if(!transport_out)
     {
         axis2_endpoint_ref_t *to_epr = NULL;
         axis2_property_t *property = NULL;
-        property = AXIS2_OPTIONS_GET_PROPERTY(op_client->options, env, 
+        property = axis2_options_get_property(op_client->options, env, 
             AXIS2_TARGET_EPR);
         if(property)
 	{
@@ -314,7 +314,7 @@
 	}
         if(!to_epr)
 	{
-            to_epr = AXIS2_OPTIONS_GET_TO(op_client->options, env);
+            to_epr = axis2_options_get_to(op_client->options, env);
 	}
         if(!to_epr)
 	{
@@ -334,7 +334,7 @@
     }
 
 
-    transport_in = AXIS2_OPTIONS_GET_TRANSPORT_IN(op_client->options, env);
+    transport_in = axis2_options_get_transport_in(op_client->options, env);
     if(!transport_in)
     {
         axis2_conf_ctx_t *conf_ctx =  axis2_svc_ctx_get_conf_ctx(op_client->svc_ctx, env);
@@ -374,7 +374,7 @@
         msg_id = NULL;
     }
 
-    if(AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(op_client->options, env))
+    if(axis2_options_get_use_separate_listener(op_client->options, env))
     {
         axis2_engine_t *engine = NULL;
 
@@ -542,7 +542,7 @@
         op_client->op_ctx = NULL;
     }
 
-	if(AXIS2_OPTIONS_GET_XML_PARSER_RESET(op_client->options, env))
+	if(axis2_options_get_xml_parser_reset(op_client->options, env))
 	{
             axiom_xml_reader_cleanup(); 
 	}

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/stub.c Thu Mar 22 02:28:51 2007
@@ -86,7 +86,7 @@
             env,
             stub-> options);
 
-    AXIS2_OPTIONS_SET_TO(stub->options, env, endpoint_ref);
+    axis2_options_set_to(stub->options, env, endpoint_ref);
 
     return stub;
 }
@@ -149,7 +149,7 @@
     axis2_endpoint_ref_t *endpoint_ref)
 {
     AXIS2_PARAM_CHECK(env->error, endpoint_ref, AXIS2_FAILURE);
-    AXIS2_OPTIONS_SET_TO(stub->options , env, endpoint_ref);
+    axis2_options_set_to(stub->options , env, endpoint_ref);
     return AXIS2_SUCCESS;
 }
 
@@ -169,7 +169,7 @@
     {
         return AXIS2_FAILURE;
     }
-    AXIS2_OPTIONS_SET_TO(stub->options , env, endpoint_ref);
+    axis2_options_set_to(stub->options , env, endpoint_ref);
 
     return AXIS2_SUCCESS;
 }
@@ -180,7 +180,7 @@
     const axis2_env_t *env,
     const axis2_bool_t use_separate_listener)
 {
-    return AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(stub-> options, env,
+    return axis2_options_set_use_separate_listener(stub-> options, env,
             use_separate_listener);
 }
 
@@ -205,7 +205,7 @@
     {
         return AXIS2_FAILURE;
     }
-    return AXIS2_OPTIONS_SET_SOAP_VERSION(stub-> options,
+    return axis2_options_set_soap_version(stub-> options,
             env, soap_version);
 }
 

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?view=diff&rev=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu Mar 22 02:28:51 2007
@@ -326,7 +326,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (svc_client->options)
-        AXIS2_OPTIONS_FREE(svc_client->options, env);
+        axis2_options_free(svc_client->options, env);
     svc_client->options = (axis2_options_t *)options;
     return AXIS2_SUCCESS;
 }
@@ -348,7 +348,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (svc_client->override_options)
-        AXIS2_OPTIONS_FREE(svc_client->override_options, env);
+        axis2_options_free(svc_client->override_options, env);
 
     svc_client->override_options = (axis2_options_t *)override_options;
 
@@ -605,7 +605,7 @@
         {
             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->options, env, action_str);
+            axis2_options_set_action(svc_client->options, env, action_str);
         }
     }
 
@@ -615,7 +615,7 @@
         op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
     }
 
-    if (AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(svc_client->options, env))
+    if (axis2_options_get_use_separate_listener(svc_client->options, env))
     {
         axis2_callback_t *callback = NULL;
         axis2_msg_ctx_t *msg_ctx = NULL;
@@ -634,7 +634,7 @@
         axis2_svc_client_send_receive_non_blocking_with_op_qname(
             svc_client, env, op_qname, payload, callback);
 
-        index = AXIS2_OPTIONS_GET_TIMEOUT_IN_MILLI_SECONDS(svc_client->options, env) / 10;
+        index = axis2_options_get_timeout_in_milli_seconds(svc_client->options, env) / 10;
 
         while (!(axis2_callback_get_complete(callback, env)))
         {
@@ -797,11 +797,11 @@
     AXIS2_OP_CLIENT_SET_CALLBACK(svc_client->op_client, env, callback);
     AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(svc_client->op_client, env, msg_ctx);
 
-    if (AXIS2_OPTIONS_GET_USE_SEPERATE_LISTENER(svc_client->options, env))
+    if (axis2_options_get_use_separate_listener(svc_client->options, env))
     {
         axis2_op_t *op = NULL;
 
-        transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
+        transport_in_protocol = axis2_options_get_transport_in_protocol(
                     svc_client->options, env);
         axis2_listener_manager_make_sure_started(svc_client->listener_manager, env,
                 transport_in_protocol, svc_client->conf_ctx);
@@ -869,7 +869,7 @@
     */
     if (svc_client->override_options)
     {
-        AXIS2_OPTIONS_SET_PARENT(svc_client->override_options, env,
+        axis2_options_set_parent(svc_client->override_options, env,
                 AXIS2_OP_CLIENT_GET_OPTIONS(svc_client->op_client, env));
         AXIS2_OP_CLIENT_SET_OPTIONS(svc_client->op_client, env,
                 svc_client->override_options);
@@ -887,7 +887,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
+    transport_in_protocol = axis2_options_get_transport_in_protocol(
                 svc_client->options, env);
 
     if (svc_client->listener_manager)
@@ -1141,7 +1141,7 @@
 
     if (svc_client->options)
     {
-        AXIS2_OPTIONS_FREE(svc_client->options, env);
+        axis2_options_free(svc_client->options, env);
     }
 
     if (svc_client->listener_manager)
@@ -1170,7 +1170,7 @@
     int soap_version;
     axiom_soap_envelope_t *envelope = NULL;
 
-    soap_version_uri = AXIS2_OPTIONS_GET_SOAP_VERSION_URI(svc_client->options, env);
+    soap_version_uri = axis2_options_get_soap_version_uri(svc_client->options, env);
 
     if (!soap_version_uri)
     {

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Thu Mar 22 02:28:51 2007
@@ -1541,10 +1541,10 @@
     AXIS2_ENV_CHECK(env, NULL);
 
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_MSG_INFO_HEADERS(options, env, 
+    axis2_options_set_msg_info_headers(options, env, 
         msg_ctx->msg_info_headers);
     properties =  axis2_ctx_get_non_persistent_map(msg_ctx->base, env);
-    AXIS2_OPTIONS_SET_PROPERTIES(options, env, properties);
+    axis2_options_set_properties(options, env, properties);
     return options;
 }
 
@@ -1568,13 +1568,13 @@
             msg_ctx->msg_info_headers, env);
     }
     msg_ctx->msg_info_headers =
-        AXIS2_OPTIONS_GET_MSG_INFO_HEADERS(options, env);
+        axis2_options_get_msg_info_headers(options, env);
     msg_ctx->msg_info_headers_deep_copy = AXIS2_FALSE;
     
-    msg_ctx->doing_mtom = AXIS2_OPTIONS_GET_ENABLE_MTOM(options, env);
+    msg_ctx->doing_mtom = axis2_options_get_enable_mtom(options, env);
 
      axis2_ctx_set_non_persistent_map(msg_ctx->base, env,
-            AXIS2_OPTIONS_GET_PROPERTIES(options, env));
+            axis2_options_get_properties(options, env));
     rest_val = (axis2_property_t *)  axis2_msg_ctx_get_property(msg_ctx, env,
             AXIS2_ENABLE_REST, AXIS2_FALSE);
     if (rest_val)
@@ -1592,7 +1592,7 @@
         axis2_string_free(msg_ctx->soap_action, env);
     }
     
-    soap_action = AXIS2_OPTIONS_GET_SOAP_ACTION(options, env);
+    soap_action = axis2_options_get_soap_action(options, env);
     if (soap_action)
     {
         msg_ctx->soap_action = axis2_string_clone(soap_action, env);

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -63,8 +63,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/samples/echoString");
 
 

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c?view=diff&rev=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c Thu Mar 22 02:28:51 2007
@@ -175,7 +175,7 @@
                 endpoint_ref = axis2_endpoint_ref_create(env, address);
                 if (options)
 				{
-                    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+                    axis2_options_set_to(options, env, endpoint_ref);
 				}
             }
         }
@@ -391,7 +391,7 @@
                 endpoint_ref = axis2_endpoint_ref_create(env, address);
                 if (options)
 				{
-                    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+                    axis2_options_set_to(options, env, endpoint_ref);
 				}
             }
         }

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Thu Mar 22 02:28:51 2007
@@ -59,8 +59,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/samples/echoString");
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Thu Mar 22 02:28:51 2007
@@ -79,8 +79,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     /* Set up deploy folder.*/
     client_home = AXIS2_GETENV("AXIS2C_HOME");

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Thu Mar 22 02:28:51 2007
@@ -69,12 +69,12 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/samples/mtomSample");
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
-    AXIS2_OPTIONS_SET_ENABLE_MTOM(options, env, AXIS2_TRUE);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
+    axis2_options_set_enable_mtom(options, env, AXIS2_TRUE);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
      * using the axis2.xml file.

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Thu Mar 22 02:28:51 2007
@@ -55,8 +55,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
             "http://example.org/action/notify");
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Thu Mar 22 02:28:51 2007
@@ -65,15 +65,15 @@
     endpoint_ref = axis2_endpoint_ref_create(env, address);
 
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
 
     rest_property = axis2_property_create(env);
     axis2_property_set_value(rest_property, env, axis2_strdup (AXIS2_VALUE_TRUE, env));
-    AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_ENABLE_REST,
+    axis2_options_set_property(options, env, AXIS2_ENABLE_REST,
             rest_property);
 	get_property = axis2_property_create(env);
 	axis2_property_set_value(get_property, env, axis2_strdup(AXIS2_HTTP_HEADER_GET, env));
-	AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_HTTP_METHOD, get_property);
+	axis2_options_set_property(options, env, AXIS2_HTTP_METHOD, get_property);
 
     client_home = AXIS2_GETENV("AXIS2C_HOME");
     if (!client_home || !strcmp (client_home, ""))

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -51,7 +51,7 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
      * using the axis2.xml file.

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -51,8 +51,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/samples/echoString");
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -52,14 +52,14 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, AXIS2_TRUE);
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_use_separate_listener(options, env, AXIS2_TRUE);
 
     /* Seperate listner needs addressing, hence addressing stuff in options */
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/samples/echoString");
     reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
-    AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to);
+    axis2_options_set_reply_to(options, env, reply_to);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
      * using the axis2.xml file.

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -52,10 +52,10 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
     soap_action = axis2_string_create(env, "http://ws.apache.org/axis2/c/samples/echo/soap_action");
-    AXIS2_OPTIONS_SET_SOAP_ACTION(options, env, soap_action);
+    axis2_options_set_soap_action(options, env, soap_action);
     axis2_string_free(soap_action, env);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -66,7 +66,7 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
      * using the axis2.xml file.

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -69,14 +69,14 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, AXIS2_TRUE);
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_use_separate_listener(options, env, AXIS2_TRUE);
 
     /* Seperate listner needs addressing, hence addressing stuff in options */
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/samples/echoString");
     reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
-    AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to);
+    axis2_options_set_reply_to(options, env, reply_to);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
      * using the axis2.xml file.

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -78,17 +78,17 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
     /* Enable REST at the client side */
     rest_property = axis2_property_create(env);
     axis2_property_set_value(rest_property, env, axis2_strdup (AXIS2_VALUE_TRUE, env));
-    AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_ENABLE_REST,
+    axis2_options_set_property(options, env, AXIS2_ENABLE_REST,
             rest_property);
     if (AXIS2_TRUE == method_get)
     {
         get_property = axis2_property_create(env);
         axis2_property_set_value(get_property, env, axis2_strdup(AXIS2_HTTP_HEADER_GET, env));
-         AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_HTTP_METHOD,
+         axis2_options_set_property(options, env, AXIS2_HTTP_METHOD,
                 get_property);
     }
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c Thu Mar 22 02:28:51 2007
@@ -65,8 +65,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-/*    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+/*    axis2_options_set_action(options, env,
         "http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe");    
 */
     /* Create service client */
@@ -165,8 +165,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
         "http://ws.apache.org/axis2/c/savan/samples/pubilsher/start");
 
     /* Create service client */

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Thu Mar 22 02:28:51 2007
@@ -103,8 +103,8 @@
     
     /* set wsa action as Subscribe. remember the old action */
     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);
+    old_action = axis2_options_get_action(wsa_options, env);
+    axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_SUB);
     
     /* extract the values from the options map */
     endto = axis2_hash_get(options, SAVAN_OP_KEY_ENDTO_EPR, AXIS2_HASH_KEY_STRING);
@@ -142,7 +142,7 @@
     reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, sub_node);
     
     /* reset the old action */
-    AXIS2_OPTIONS_SET_ACTION(wsa_options, env, old_action);
+    axis2_options_set_action(wsa_options, env, old_action);
     
     if (!reply)
     {
@@ -198,8 +198,8 @@
     
     /* Set wsa action as Renew. remember the old action */
     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);
+    old_action = axis2_options_get_action(wsa_options, env);
+    axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_RENEW);
     
     /* Extract the values from the options map */
     expires = axis2_hash_get(options, SAVAN_OP_KEY_EXPIRES, AXIS2_HASH_KEY_STRING);
@@ -219,7 +219,7 @@
     reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, renew_node);
     
     /* reset the old action */
-    AXIS2_OPTIONS_SET_ACTION(wsa_options, env, old_action);
+    axis2_options_set_action(wsa_options, env, old_action);
     
     if (!reply)
     {
@@ -253,8 +253,8 @@
     
     /* set wsa action as Unsub. remember the old action */
     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);
+    old_action = axis2_options_get_action(wsa_options, env);
+    axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_UNSUB);
     
     /* create the body of the Unsub request */
     ns = axiom_namespace_create (env, EVENTING_NAMESPACE, EVENTING_NS_PREFIX);
@@ -266,7 +266,7 @@
     reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, unsub_node);
     
     /* reset the old action */
-    AXIS2_OPTIONS_SET_ACTION(wsa_options, env, old_action);
+    axis2_options_set_action(wsa_options, env, old_action);
     
     if (!reply)
     {
@@ -308,8 +308,8 @@
     
     /* Set wsa action as GetStatus. remember the old action */
     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);
+    old_action = axis2_options_get_action(wsa_options, env);
+    axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_GET_STATUS);
     
     /* Create the body of the GetStatus request */
     ns = axiom_namespace_create (env, EVENTING_NAMESPACE, EVENTING_NS_PREFIX);
@@ -321,7 +321,7 @@
     reply = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, status_node);
     
     /* Reset the old action */
-    AXIS2_OPTIONS_SET_ACTION(wsa_options, env, old_action);
+    axis2_options_set_action(wsa_options, env, old_action);
     
     if (!reply)
     {

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -88,8 +88,8 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
-    AXIS2_OPTIONS_SET_ACTION(options, env,
+    axis2_options_set_to(options, env, endpoint_ref);
+    axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/savan/dummy");
     
     op_qname = axis2_qname_create(env, "publish", NULL, NULL);

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Thu Mar 22 02:28:51 2007
@@ -242,7 +242,7 @@
 
     /* Setup options */
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, subscriber->notify_to);
+    axis2_options_set_to(options, env, subscriber->notify_to);
     
     /* Set service client options */
     AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);

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=521163&r1=521162&r2=521163
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c Thu Mar 22 02:28:51 2007
@@ -53,7 +53,7 @@
     svc_client = axis2_svc_client_create(env, client_home);
 
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
     AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
 
     payload = build_om_payload_for_echo_svc(env, echo_text);

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -83,10 +83,10 @@
 
     endpoint_ref = axis2_endpoint_ref_create(env, address);
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
 
     /* this itest requried soap 1.1 message */
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
     client_home = AXIS2_GETENV("AXIS2C_HOME");
     if (!client_home)
         client_home = "../../deploy";

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=521163&r1=521162&r2=521163
==============================================================================
--- 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 02:28:51 2007
@@ -83,10 +83,10 @@
 
     endpoint_ref = axis2_endpoint_ref_create(env, address);
     options = axis2_options_create(env);
-    AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+    axis2_options_set_to(options, env, endpoint_ref);
 
     /* this itest requried soap 1.1 message */
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
     client_home = AXIS2_GETENV("AXIS2C_HOME");
     if (!client_home)
         client_home = "../../deploy";

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=521163&r1=521162&r2=521163
==============================================================================
--- 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:28:51 2007
@@ -162,14 +162,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#add";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "add" ,
@@ -217,14 +217,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#add";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -266,14 +266,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#sub";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "sub" ,
@@ -321,14 +321,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#sub";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -370,14 +370,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#mul";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "mul" ,
@@ -425,14 +425,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#mul";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -474,14 +474,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#div";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "div" ,
@@ -529,14 +529,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "Calculator#div";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);

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=521163&r1=521162&r2=521163
==============================================================================
--- 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:28:51 2007
@@ -282,14 +282,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoString" ,
@@ -337,14 +337,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -386,14 +386,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoStringArray" ,
@@ -441,14 +441,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -490,14 +490,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoInteger" ,
@@ -545,14 +545,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -594,14 +594,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoIntegerArray" ,
@@ -649,14 +649,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -698,14 +698,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoFloat" ,
@@ -753,14 +753,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -802,14 +802,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoFloatArray" ,
@@ -857,14 +857,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -906,14 +906,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoStruct" ,
@@ -961,14 +961,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1010,14 +1010,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoStructArray" ,
@@ -1065,14 +1065,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1114,14 +1114,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoVoid" ,
@@ -1169,14 +1169,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1218,14 +1218,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoBase64" ,
@@ -1273,14 +1273,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1322,14 +1322,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoDate" ,
@@ -1377,14 +1377,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1426,14 +1426,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoHexBinary" ,
@@ -1481,14 +1481,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1530,14 +1530,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoDecimal" ,
@@ -1585,14 +1585,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);
@@ -1634,14 +1634,14 @@
         return NULL;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
     op_qname = axis2_qname_create(env,
             "echoBoolean" ,
@@ -1689,14 +1689,14 @@
         return;
     }
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
-    soap_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+    soap_action = axis2_options_get_action(options, env);
     if (! soap_action)
     {
         soap_action = "";
-        AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
+        axis2_options_set_action(options, env, soap_action);
     }
 
-    AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
+    axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
 
     callback = axis2_callback_create(env);

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=521163&r1=521162&r2=521163
==============================================================================
--- 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:28:51 2007
@@ -48,7 +48,7 @@
     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);
-    AXIS2_OPTIONS_SET_ACTION(options, env, "http://soapinterop.org");
+    axis2_options_set_action(options, env, "http://soapinterop.org");
 
     /** testing echoString */
     printf("echoing string..\n");
@@ -61,7 +61,7 @@
     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);
-    AXIS2_OPTIONS_SET_ACTION(options, env, "http://soapinterop.org");
+    axis2_options_set_action(options, env, "http://soapinterop.org");
 
     /** testing echoInteger*/
     printf("echoing integer..\n");
@@ -74,7 +74,7 @@
     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);
-    AXIS2_OPTIONS_SET_ACTION(options, env, "http://soapinterop.org");
+    axis2_options_set_action(options, env, "http://soapinterop.org");
 
     /** testing echoString */
     printf("echoing float..\n");



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


Mime
View raw message