axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r522481 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/context/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/phaseresolver/ modules/core/receivers/ modules/core/transpo...
Date Mon, 26 Mar 2007 11:08:50 GMT
Author: pini
Date: Mon Mar 26 04:08:43 2007
New Revision: 522481

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

Modified:
    webservices/axis2/trunk/c/include/axis2_svc.h
    webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/context/op_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/svc_grp.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/conf.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c
    webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
    webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
    webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
    webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
    webservices/axis2/trunk/c/savan/src/util/savan_util.c
    webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
    webservices/axis2/trunk/c/test/core/description/test_description.c
    webservices/axis2/trunk/c/test/core/engine/test_engine.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

Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc.h?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Mon Mar 26 04:08:43 2007
@@ -980,299 +980,7 @@
         const axis2_env_t *env,
         void *impl_class);
 
-/** Frees service. */
-#define AXIS2_SVC_FREE(svc, env) \
-        axis2_svc_free (svc, env)
 
-/** Adds operation. */
-#define AXIS2_SVC_ADD_OP(svc, env, op) \
-        axis2_svc_add_op (svc, env, op)
-
-/** Gets operation with given QName. */
-#define AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname) \
-        axis2_svc_get_op_with_qname (svc, env, op_qname)
-
-/** Gets operation with given name string. */
-#define AXIS2_SVC_GET_OP_WITH_NAME(svc, env, op_name) \
-        axis2_svc_get_op_with_name (svc, env, op_name)
-
-/** Gets all operations. */
-#define AXIS2_SVC_GET_ALL_OPS(svc, env) \
-        axis2_svc_get_all_ops (svc, env)
-
-/** Sets parent which is of type service group. */
-#define AXIS2_SVC_SET_PARENT(svc, env , svc_grp) \
-        axis2_svc_set_parent (svc, env, svc_grp)
-
-/** Gets parent which is of type service group. */
-#define AXIS2_SVC_GET_PARENT(svc, env) \
-        axis2_svc_get_parent (svc, env)
-
-/** Sets QName. */
-#define AXIS2_SVC_SET_QNAME(svc, env, qname) \
-        axis2_svc_set_qname(svc , env, qname)
-
-/** Gets QName. */
-#define AXIS2_SVC_GET_QNAME(svc, env) \
-        axis2_svc_get_qname(svc , env)
-
-/** Adds given parameter to parameter list. */
-#define AXIS2_SVC_ADD_PARAM(svc, env, param) \
-        axis2_svc_add_param(svc , env, param)
-
-/** Gets parameter with given name. */
-#define AXIS2_SVC_GET_PARAM(svc, env, name) \
-        axis2_svc_get_param(svc , env, name)
-
-/** Gets all parameters. */
-#define AXIS2_SVC_GET_ALL_PARAMS(svc, env) \
-        axis2_svc_get_all_params(svc , env)
-
-/** Checks if the named parameter is locked. */
-#define AXIS2_SVC_IS_PARAM_LOCKED(svc, env, param_name) \
-        axis2_svc_is_param_locked(svc, env, param_name)
-
-/** Engages given module to service. */
-#define AXIS2_SVC_ENGAGE_MODULE(svc, env, module_desc, axis2_config) \
-        axis2_svc_engage_module(svc, env, module_desc, axis2_config)
-
-/** Check whether given module is engaged to the service. */
-#define AXIS2_SVC_IS_MODULE_ENGAGED(svc, env, module_qname) \
-        axis2_svc_is_module_engaged(svc, env, module_qname)
-
-/** Adds operations defined in module configuration to service. */
-#define AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc, axis2_config) \
-        axis2_svc_add_module_ops(svc, env, module_desc, axis2_config)
-
-/** Adds the named module to engaged module list. */
-#define AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_name) \
-        axis2_svc_add_to_engaged_module_list(svc, env, module_name)
-
-/** Gets all engaged modules. */
-#define AXIS2_SVC_GET_ALL_ENGAGED_MODULES(svc, env) \
-        axis2_svc_get_all_engaged_modules(svc, env)
-
-/** Sets service style. */
-#define AXIS2_SVC_SET_STYLE(svc, env, style) \
-        axis2_svc_set_style(svc, env, style)
-
-/** Gets service style. */
-#define AXIS2_SVC_GET_STYLE(svc, env) \
-        axis2_svc_get_style(svc, env)
-
-/** Gets in flow. */
-#define AXIS2_SVC_GET_IN_FLOW(svc, env) \
-        axis2_svc_get_in_flow(svc, env)
-
-/** Sets in flow. */
-#define AXIS2_SVC_SET_IN_FLOW(svc, env, in_flow) \
-        axis2_svc_set_in_flow(svc, env, in_flow)
-
-/** Gets out flow. */
-#define AXIS2_SVC_GET_OUT_FLOW(svc, env) \
-        axis2_svc_get_out_flow(svc, env)
-
-/** Sets out flow. */
-#define AXIS2_SVC_SET_OUT_FLOW(svc, env, out_flow) \
-        axis2_svc_set_out_flow(svc, env, out_flow)
-
-/** Gets fault in flow. */
-#define AXIS2_SVC_GET_FAULT_IN_FLOW(svc, env) \
-        axis2_svc_get_fault_in_flow(svc, env)
-
-/** Sets fault in flow. */
-#define AXIS2_SVC_SET_FAULT_IN_FLOW(svc, env, fault_in_flow) \
-        axis2_svc_set_fault_in_flow(svc, env, fault_in_flow)
-
-/** Gets fault out flow. */
-#define AXIS2_SVC_GET_FAULT_OUT_FLOW(svc, env) \
-        axis2_svc_get_fault_out_flow(svc, env)
-
-/** Sets fault out flow. */
-#define AXIS2_SVC_SET_FAULT_OUT_FLOW(svc, env, fault_out_flow) \
-        axis2_svc_set_fault_out_flow(svc, env, fault_out_flow)
-
-/** Gets operation corresponding to given soap action. */
-#define AXIS2_SVC_GET_OP_BY_SOAP_ACTION(svc, env, soap_action) \
-        axis2_svc_get_op_by_soap_action(svc, env, soap_action)
-
-/** Gets operation corresponding to given soap action and endpoint. */
-/*#define AXIS2_SVC_GET_OP_BY_SOAP_ACTION_AND_ENDPOINT(svc, env, soap_action, endpoint) \
-        axis2_svc_get_op_by_soap_action_and_endpoint(svc, env, soap_action, endpoint)
-*/
-
-/** Gets name. */
-#define AXIS2_SVC_GET_NAME(svc, env) \
-        axis2_svc_get_name(svc, env)
-
-/** Sets name. */
-#define AXIS2_SVC_SET_NAME(svc, env, axis2_svc_name) \
-        axis2_svc_set_name(svc, env, axis2_svc_name)
-
-/** Sets last update time to current time. */
-#define AXIS2_SVC_SET_LAST_UPDATE(svc, env) \
-        axis2_svc_set_last_update(svc, env)
-
-/** Gets last update time. */
-#define AXIS2_SVC_GET_LAST_UPDATE(svc, env) \
-        axis2_svc_get_last_update(svc, env)
-
-/** Gets service description. */
-#define AXIS2_SVC_GET_SVC_DESC(svc, env) \
-        axis2_svc_get_svc_desc(svc, env)
-
-/** Sets service description. */
-#define AXIS2_SVC_SET_SVC_DESC(svc, env, svc_desc) \
-        axis2_svc_set_svc_desc(svc, env, svc_desc)
-
-/** Gets file name. */
-#define AXIS2_SVC_GET_FILE_NAME(svc, env) \
-        axis2_svc_get_file_name(svc, env)
-
-/** Sets file name. */
-#define AXIS2_SVC_SET_FILE_NAME(svc, env, filename) \
-        axis2_svc_set_file_name(svc, env, filename)
-
-/** Gets all endpoints related to service. */
-/*#define AXIS2_SVC_GET_ALL_ENDPOINTS(svc, env) \
-        axis2_svc_get_all_endpoints(svc, env)
-*/
-/** Sets all endpoints related to service.*/
-/*#define AXIS2_SVC_SET_ALL_ENDPOINTS(svc, env, endpoints) \
-        axis2_svc_set_all_endpoints(svc, env, endpoints)
-*/
-/** Sets endpoint. */
-/*#define AXIS2_SVC_SET_ENDPOINT(svc, env, endpoint) \
-        axis2_svc_set_endpoint(svc, env, endpoint)
-*/
-/** Gets endpoint. */
-/*#define AXIS2_SVC_GET_ENDPOINT(svc, env, qname) \
-        axis2_svc_get_endpoint(svc, env, qname)
-*/
-/** Gets namespace. */
-/*#define AXIS2_SVC_GET_NAMESPACE(svc, env) \
-        axis2_svc_get_namespace(svc, env)
-*/
-/** Adds operation to key mapping for a given key and operation. */
-#define AXIS2_SVC_ADD_MAPPING(svc, env, mapping_key, axis2_opt) \
-        axis2_svc_add_mapping(svc, env, mapping_key, axis2_opt)
-
-/** Adds module QName. */
-#define AXIS2_SVC_ADD_MODULE_QNAME(svc, env, module_qname) \
-        axis2_svc_add_module_qname(svc, env, module_qname)
-
-/** Gets all module QNames. */
-#define AXIS2_SVC_GET_ALL_MODULE_QNAMES(svc, env) \
-        axis2_svc_get_all_module_qnames(svc, env)
-
-/** Checks if the XML schema location is adjusted. */
-/*#define AXIS2_SVC_IS_SCHEMA_LOCATION_ADJUSTED(svc, env) \
-        axis2_svc_is_schema_location_adjusted(svc, env)
-*/
-/** Sets bool value indicating that XML schema location is adjusted. */
-/*#define AXIS2_SVC_SET_SCHEMA_LOCATION_ADJUSTED(svc, env, adjusted) \
-        axis2_svc_set_schema_location_adjusted(svc, env, adjusted)
-*/
-/** Gets XML schema mapping table. */
-/*#define AXIS2_SVC_GET_SCHEMA_MAPPING_TABLE(svc, env) \
-        axis2_svc_get_schema_mapping_table(svc, env)
-*/
-/** Sets XML schema mapping table. */
-/*#define AXIS2_SVC_SET_SCHEMA_MAPPING_TABLE(svc, env, table) \
-        axis2_svc_set_schema_mapping_table(svc, env, table)
-*/
-/** Gets custom XML schema prefix. */
-/*#define AXIS2_SVC_GET_CUSTOM_SCHEMA_PREFIX(svc, env) \
-        axis2_svc_get_custom_schema_prefix(svc, env)
-*/
-
-/** Sets custom XML schema prefix. */
-/*#define AXIS2_SVC_SET_CUSTOM_SCHEMA_PREFIX(svc, env, prefix) \
-        axis2_svc_set_custom_schema_prefix(svc, env, prefix)
-*/
-/** Gets custom XML schema suffix. */
-/*#define AXIS2_SVC_GET_CUSTOM_SCHEMA_SUFFIX(svc, env) \
-        axis2_svc_get_custom_schema_suffix(svc, env)
-*/
-/** Sets custom XML schema suffix. */
-/*#define AXIS2_SVC_SET_CUSTOM_SCHEMA_SUFFIX(svc, env, suffix) \
-        axis2_svc_set_custom_schema_suffix(svc, env, suffix)
-*/
-/** Prints XML schema to given stream. */
-/*#define AXIS2_SVC_PRINT_SCHEMA(svc, env) \
-        axis2_svc_print_schema(svc, env)
-*/
-
-/** Gets XML schema at the given index of the XML schema list. */
-/*#define AXIS2_SVC_GET_SCHEMA(svc, env, index) \
-        axis2_svc_get_schema(svc, env, index)
-*/
-/** Adds all namespaces to the XML schema at the given index of the XML 
-    schema list. */
-/*#define AXIS2_SVC_ADD_ALL_NAMESPACES(svc, env, index) \
-        axis2_svc_add_all_namespaces(svc, env, index)
-*/
-/** Gets all XML schemas. */
-/*#define AXIS2_SVC_GET_ALL_SCHEMAS(svc, env) \
-        axis2_svc_get_all_schemas(svc, env)
-*/
-/** Adds given XML schema. */
-/*#define AXIS2_SVC_ADD_SCHEMA(svc, env, schema) \
-        axis2_svc_add_schema(svc, env, schema)
-*/
-/** Adds the given list as the list of XML schemas. */
-/*#define AXIS2_SVC_ADD_ALL_SCHEMAS(svc, env, schemas) \
-        axis2_svc_add_all_schemas(svc, env, schemas)
-*/
-/** Gets XML schema target namespace. */
-/*#define AXIS2_SVC_GET_SCHEMA_TARGET_NAME_SPACE(svc, env) \
-        axis2_svc_get_schema_target_ns(svc, env)
-*/
-/** Sets XML schema target namespace. */
-/*#define AXIS2_SVC_SET_SCHEMA_TARGET_NAME_SPACE(svc, env, ns) \
-        axis2_svc_set_schema_target_ns(svc, env, ns)
-*/
-/** Gets XML schema target namespace prefix. */
-/*#define AXIS2_SVC_GET_SCHEMA_TARGET_NAME_SPACE_PREFIX(svc, env) \
-        axis2_svc_get_schema_target_ns_prefix(svc, env)
-*/
-/** Sets XML schema target namespace prefix. */
-/*#define AXIS2_SVC_SET_SCHEMA_TARGET_NAME_SPACE_PREFIX(svc, env, prefix) \
-        axis2_svc_set_schema_target_ns_prefix(svc, env, prefix)
-*/
-/** Gets target namespace. */
-#define AXIS2_SVC_GET_TARGET_NS(svc, env) \
-        axis2_svc_get_target_ns(svc, env)
-
-/** Sets target namespace. */
-#define AXIS2_SVC_SET_TARGET_NS(svc, env, ns) \
-        axis2_svc_set_target_ns(svc, env, ns)
-
-/** Gets target namespace prefix. */
-#define AXIS2_SVC_GET_TARGET_NS_PREFIX(svc, env) \
-        axis2_svc_get_target_ns_prefix(svc, env)
-
-/** Sets target namespace prefix. */
-#define AXIS2_SVC_SET_TARGET_NS_PREFIX(svc, env, prefix) \
-        axis2_svc_set_target_ns_prefix(svc, env, prefix)
-
-/** Gets XML schema element. */
-/*#define AXIS2_SVC_GET_SCHEMA_ELEMENT(svc, env) \
-        axis2_svc_get_schema_element(svc, env)
-*/
-
-/** Gets namespace map. */
-#define AXIS2_SVC_GET_NS_MAP(svc, env) \
-        axis2_svc_get_ns_map(svc, env)
-
-/** Sets namespace map. */
-#define AXIS2_SVC_SET_NS_MAP(svc, env, ns_map) \
-        axis2_svc_set_ns_map(svc, env, ns_map)
-
-/** Populates XML schema mappings. */
-/*#define AXIS2_SVC_POPULATE_SCHEMA_MAPPINGS(svc, env) \
-        axis2_svc_populate_schema_mappings(svc, env)
-*/
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 26 04:08:43 2007
@@ -145,10 +145,10 @@
         {
             axis2_op_t *temp_op = NULL;
             const axis2_qname_t *op_qname = axis2_op_get_qname(op, env);
-            temp_op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
+            temp_op = axis2_svc_get_op_with_qname(svc, env, op_qname);
             if (!temp_op)
             {
-                AXIS2_SVC_ADD_OP(svc, env, op);
+                axis2_svc_add_op(svc, env, op);
             }
         }
     }

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=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 26 04:08:43 2007
@@ -165,7 +165,7 @@
         void *v = NULL;
         axis2_op_t *op = NULL;
 
-        ops = AXIS2_SVC_GET_ALL_OPS(svc_client->svc, env);
+        ops = axis2_svc_get_all_ops(svc_client->svc, env);
         for (i = axis2_hash_first(ops, env); i; i = axis2_hash_next(env, i))
         {
             axis2_phases_info_t * info = NULL;
@@ -182,7 +182,7 @@
 
     /** add the service to the config context if it isn't in there already */
     if (! axis2_conf_get_svc(svc_client->conf, env,
-        AXIS2_SVC_GET_NAME(svc_client->svc, env)))
+        axis2_svc_get_name(svc_client->svc, env)))
     {
          axis2_conf_add_svc(svc_client->conf, env, svc_client->svc);
     }
@@ -190,7 +190,7 @@
     /** create a service context for myself: create a new service group
      context and then get the service context for myself as I'll need that
      later for stuff that I gotta do */
-    svc_grp = AXIS2_SVC_GET_PARENT(svc_client->svc, env);
+    svc_grp = axis2_svc_get_parent(svc_client->svc, env);
     if (!svc_grp)
     {
         return NULL;
@@ -213,7 +213,7 @@
         svc_grp_name, svc_grp_ctx);
 
     svc_client->svc_ctx =  axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env,
-        AXIS2_SVC_GET_NAME(svc_client->svc, env));
+        axis2_svc_get_name(svc_client->svc, env));
 
     return svc_client;
 }
@@ -284,7 +284,7 @@
 
     /** add the service to the config context if it isn't in there already */
     if (! axis2_conf_get_svc(svc_client->conf, env,
-        AXIS2_SVC_GET_NAME(svc_client->svc, env)))
+        axis2_svc_get_name(svc_client->svc, env)))
     {
          axis2_conf_add_svc(svc_client->conf, env, svc_client->svc);
     }
@@ -292,7 +292,7 @@
     /** create a service context for myself: create a new service group
      context and then get the service context for myself as I'll need that
      later for stuff that I gotta do */
-    svc_grp = AXIS2_SVC_GET_PARENT(svc_client->svc, env);
+    svc_grp = axis2_svc_get_parent(svc_client->svc, env);
     if (!svc_grp)
     {
         return NULL;
@@ -315,7 +315,7 @@
         svc_grp_name, svc_grp_ctx);
 
     svc_client->svc_ctx =  axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env,
-        AXIS2_SVC_GET_NAME(svc_client->svc, env));
+        axis2_svc_get_name(svc_client->svc, env));
 
     return svc_client;
 }
@@ -400,7 +400,7 @@
 
     if (module)
     {
-        return AXIS2_SVC_ENGAGE_MODULE(svc_client->svc, env, module,
+        return axis2_svc_engage_module(svc_client->svc, env, module,
             svc_client->conf);
     }
     return AXIS2_FAILURE;
@@ -604,7 +604,7 @@
     svc_client->last_response_soap_envelope = NULL;
     svc_client->last_response_has_fault = AXIS2_FALSE;
 
-    op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client->svc, env, op_qname);
+    op = axis2_svc_get_op_with_qname(svc_client->svc, env, op_qname);
     if (op)
     {
         param = axis2_op_get_param(op, env, AXIS2_SOAP_ACTION);
@@ -830,7 +830,7 @@
            If it is missing, the response gets lost. - Samisa */
         AXIS2_USLEEP(1);
 
-        op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client->svc, env, op_qname);
+        op = axis2_svc_get_op_with_qname(svc_client->svc, env, op_qname);
         axis2_op_set_msg_recv(op, env,
             AXIS2_CALLBACK_RECV_GET_BASE(svc_client->callback_recv, env));
         AXIS2_OP_CLIENT_SET_CALLBACK_RECV(svc_client->op_client, env,
@@ -867,7 +867,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client->svc, env, op_qname);
+    op = axis2_svc_get_op_with_qname(svc_client->svc, env, op_qname);
 
     if (!op)
     {
@@ -1121,9 +1121,9 @@
     axis2_phases_info_set_op_phases(info, env, op_out_in);
     axis2_phases_info_set_op_phases(info, env, op_out_only);
     axis2_phases_info_set_op_phases(info, env, op_robust_out_only);
-    AXIS2_SVC_ADD_OP(svc, env, op_out_in);
-    AXIS2_SVC_ADD_OP(svc, env, op_out_only);
-    AXIS2_SVC_ADD_OP(svc, env, op_robust_out_only);
+    axis2_svc_add_op(svc, env, op_out_in);
+    axis2_svc_add_op(svc, env, op_out_only);
+    axis2_svc_add_op(svc, env, op_robust_out_only);
     return svc;
 }
 
@@ -1135,7 +1135,7 @@
 
     if (svc_client->svc)
     {
-        AXIS2_SVC_FREE(svc_client->svc, env);
+        axis2_svc_free(svc_client->svc, env);
     }
 
     if (svc_client->callback_recv)

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 26 04:08:43 2007
@@ -467,7 +467,7 @@
         return NULL;
     }
 
-    qname = AXIS2_SVC_GET_QNAME(svc, env);
+    qname = axis2_svc_get_qname(svc, env);
     if (!qname)
     {
         AXIS2_ERROR_SET(env->error,
@@ -483,7 +483,7 @@
         return NULL;
     }
 
-    svc_grp = AXIS2_SVC_GET_PARENT(svc, env);
+    svc_grp = axis2_svc_get_parent(svc, env);
     if (svc_grp)
     {
         svc_grp_ctx_id = (axis2_char_t*) axis2_svc_grp_get_name(svc_grp, env);
@@ -529,7 +529,7 @@
     if (!svc_grp_ctx)
     {
         axis2_svc_grp_t *svc_grp = NULL;
-        svc_grp = AXIS2_SVC_GET_PARENT(svc, env);
+        svc_grp = axis2_svc_get_parent(svc, env);
         svc_grp_ctx =  axis2_svc_grp_get_svc_grp_ctx(svc_grp, env, conf_ctx);
         svc_ctx =  axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env, svc_id);
         if (!svc_ctx)

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=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 26 04:08:43 2007
@@ -393,7 +393,7 @@
     if (msg_ctx->op_qname)
     {
         if (msg_ctx->svc)
-            msg_ctx->op = AXIS2_SVC_GET_OP_WITH_QNAME(msg_ctx->svc,
+            msg_ctx->op = axis2_svc_get_op_with_qname(msg_ctx->svc,
                     env, msg_ctx->op_qname);
     }
 
@@ -1114,7 +1114,7 @@
 
     if (msg_ctx->svc)
     {
-        param = AXIS2_SVC_GET_PARAM(msg_ctx->svc, env, key);
+        param = axis2_svc_get_param(msg_ctx->svc, env, key);
         if (param)
         {
             return param;
@@ -1432,9 +1432,9 @@
     {
         axis2_svc_grp_t *svc_grp = NULL;
         msg_ctx->svc = svc;
-        msg_ctx->svc_qname = (axis2_qname_t *)AXIS2_SVC_GET_QNAME(svc, env);
+        msg_ctx->svc_qname = (axis2_qname_t *)axis2_svc_get_qname(svc, env);
 
-        svc_grp = AXIS2_SVC_GET_PARENT(svc, env);
+        svc_grp = axis2_svc_get_parent(svc, env);
         if (svc_grp)
         {
             msg_ctx->svc_grp = svc_grp;

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Mon Mar 26 04:08:43 2007
@@ -179,7 +179,7 @@
             if (svc)
             {
                 op_ctx->op =
-                    AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_ctx->op_qname);
+                    axis2_svc_get_op_with_qname(svc, env, op_ctx->op_qname);
             }
         }
     }
@@ -326,7 +326,7 @@
                  axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
         }
         op_ctx->svc_qname =
-            (axis2_qname_t *)AXIS2_SVC_GET_QNAME( axis2_svc_ctx_get_svc(op_ctx->parent, env), env);
+            (axis2_qname_t *)axis2_svc_get_qname( axis2_svc_ctx_get_svc(op_ctx->parent, env), env);
     }
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Mon Mar 26 04:08:43 2007
@@ -67,7 +67,7 @@
     if (svc)
     {
         svc_ctx->svc = svc;
-        svc_ctx->svc_qname = (axis2_qname_t *)AXIS2_SVC_GET_QNAME(svc, env);
+        svc_ctx->svc_qname = (axis2_qname_t *)axis2_svc_get_qname(svc, env);
         if (svc_ctx->svc_qname)
         {
             svc_ctx->svc_id = axis2_qname_get_localpart(svc_ctx->svc_qname, env);
@@ -169,7 +169,7 @@
     AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
 
     svc_ctx->svc = svc;
-    svc_ctx->svc_qname = (axis2_qname_t *)AXIS2_SVC_GET_QNAME(svc, env);
+    svc_ctx->svc_qname = (axis2_qname_t *)axis2_svc_get_qname(svc, env);
     if (svc_ctx->svc_qname)
     {
         svc_ctx->svc_id = axis2_qname_get_localpart(svc_ctx->
@@ -199,7 +199,7 @@
 
     if (svc_ctx->svc)
     {
-        op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_ctx->svc, env, qname);
+        op = axis2_svc_get_op_with_qname(svc_ctx->svc, env, qname);
         return axis2_op_ctx_create(env, op, svc_ctx);
     }
 

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Mon Mar 26 04:08:43 2007
@@ -231,7 +231,7 @@
                     axis2_char_t *svc_name = NULL;
                     svc = (axis2_svc_t*) next_svc;
                     svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
-                    svc_name = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(svc, env), env);
+                    svc_name = axis2_qname_get_localpart(axis2_svc_get_qname(svc, env), env);
                     if (svc_name)
                         axis2_hash_set(svc_grp_ctx->svc_ctx_map, svc_name, AXIS2_HASH_KEY_STRING, svc_ctx);
                 }

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Mon Mar 26 04:08:43 2007
@@ -150,7 +150,7 @@
             svc = (axis2_svc_t *) val;
             if (svc)
             {
-                AXIS2_SVC_FREE(svc, env);
+                axis2_svc_free(svc, env);
             }
         }
         axis2_hash_free(arch_file_data->svc_map, env);
@@ -303,7 +303,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, svc_desc, AXIS2_FAILURE);
 
-    svc_qname = AXIS2_SVC_GET_QNAME(svc_desc, env);
+    svc_qname = axis2_svc_get_qname(svc_desc, env);
     svc_name = axis2_qname_to_string((axis2_qname_t *)svc_qname, env);
     if (!arch_file_data->svc_map)
     {

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Mon Mar 26 04:08:43 2007
@@ -188,11 +188,11 @@
             axis2_qname_free(svc_qname, env);
             if (AXIS2_SUCCESS != status)
             {
-                AXIS2_SVC_FREE(svc, env);
+                axis2_svc_free(svc, env);
                 return status;
             }
         }
-        AXIS2_SVC_SET_PARENT(svc, env, svc_grp);
+        axis2_svc_set_parent(svc, env, svc_grp);
 
         svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
             dep_engine, svc);

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Mar 26 04:08:43 2007
@@ -911,7 +911,7 @@
         /*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
         file = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
         file_name =  axis2_file_get_name(file, env);
-        AXIS2_SVC_SET_FILE_NAME(svc, env, file_name);
+        axis2_svc_set_file_name(svc, env, file_name);
 
         /* modules from svc group */
         grp_modules =  axis2_svc_grp_get_all_module_qnames(svc_metadata, env);
@@ -930,7 +930,7 @@
                 qmodulename);
             if (module_desc)
             {
-                AXIS2_SVC_ENGAGE_MODULE(svc, env, module_desc, dep_engine->conf);
+                axis2_svc_engage_module(svc, env, module_desc, dep_engine->conf);
             }
             else
             {
@@ -943,7 +943,7 @@
         }
 
         /* modules from <service> */
-        list = AXIS2_SVC_GET_ALL_MODULE_QNAMES(svc, env);
+        list = axis2_svc_get_all_module_qnames(svc, env);
         sizej = axis2_array_list_size(list, env);
         for (j = 0; j < sizej; j++)
         {
@@ -957,7 +957,7 @@
             if (module_desc)
             {
                 axis2_status_t status = AXIS2_FAILURE;
-                status = AXIS2_SVC_ENGAGE_MODULE(svc, env, module_desc, dep_engine->conf);
+                status = axis2_svc_engage_module(svc, env, module_desc, dep_engine->conf);
                 if(!status)
                 {
                     return status;
@@ -973,7 +973,7 @@
             }
         }
 
-        ops = AXIS2_SVC_GET_ALL_OPS(svc, env);
+        ops = axis2_svc_get_all_ops(svc, env);
         for (index_i = axis2_hash_first(ops, env);
             index_i; index_i = axis2_hash_next(env, index_i))
         {

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Mar 26 04:08:43 2007
@@ -191,7 +191,7 @@
         svc_node);
     axis2_qname_free(qparamst, env);
     qparamst = NULL;
-    parent = AXIS2_SVC_GET_PARENT(svc_builder->svc, env);
+    parent = axis2_svc_get_parent(svc_builder->svc, env);
 
     status = axis2_desc_builder_process_params(svc_builder->desc_builder, env,
         itr, 
@@ -224,7 +224,7 @@
         description_text = axiom_element_get_text (desc_element, env, desc_node);
         if (description_text)
         {
-            AXIS2_SVC_SET_SVC_DESC (svc_builder->svc, env, description_text);
+            axis2_svc_set_svc_desc(svc_builder->svc, env, description_text);
         }
     }
 	 /* --------------------services description end -------------------- */
@@ -232,7 +232,7 @@
     qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
     name_attr = axiom_element_get_attribute(svc_element, env, qattname);
     svc_name = axiom_attribute_get_value(name_attr, env);
-    AXIS2_SVC_SET_NAME(svc_builder->svc, env, svc_name);
+    axis2_svc_set_name(svc_builder->svc, env, svc_name);
     axis2_qname_free(qattname, env);
 
     /* create dll_desc and set it in a parameter. then set that param in param
@@ -353,10 +353,10 @@
                 axis2_char_t *key = NULL;
 
                 key = (axis2_char_t *) axis2_param_get_value(param, env);
-                AXIS2_SVC_ADD_MAPPING(svc_builder->svc, env, key, op_desc);
+                axis2_svc_add_mapping(svc_builder->svc, env, key, op_desc);
             }
         }
-        AXIS2_SVC_ADD_OP(svc_builder->svc, env, op_desc);
+        axis2_svc_add_op(svc_builder->svc, env, op_desc);
     }
     axis2_array_list_free(ops, env);
     return AXIS2_SUCCESS;
@@ -571,7 +571,7 @@
             }
             else
             {
-                AXIS2_SVC_ADD_MODULE_QNAME(svc_builder->svc, env, qrefname);
+                axis2_svc_add_module_qname(svc_builder->svc, env, qrefname);
             }
             axis2_qname_free(qrefname, env);
         }

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Mar 26 04:08:43 2007
@@ -199,7 +199,7 @@
             deployable_svcs = axis2_arch_file_data_get_deployable_svcs(file_data,
                 env);
             axis2_array_list_add(deployable_svcs, env, axis_svc);
-            AXIS2_SVC_SET_PARENT(axis_svc, env, svc_grp);
+            axis2_svc_set_parent(axis_svc, env, svc_grp);
             svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
                 axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env), 
                 axis_svc);

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Mon Mar 26 04:08:43 2007
@@ -38,17 +38,15 @@
 };
 
 AXIS2_EXTERN axis2_ws_info_list_t *AXIS2_CALL
-axis2_ws_info_list_create_with_dep_engine(
-    const axis2_env_t *env,
+axis2_ws_info_list_create_with_dep_engine(const axis2_env_t *env,
     struct axis2_dep_engine *dep_engine)
 {
     axis2_ws_info_list_t *ws_info_list = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    ws_info_list = (axis2_ws_info_list_t *) AXIS2_MALLOC(env->
-            allocator, sizeof(axis2_ws_info_list_t));
-
+    ws_info_list = (axis2_ws_info_list_t *) AXIS2_MALLOC(env->allocator, 
+        sizeof(axis2_ws_info_list_t));
 
     if (! ws_info_list)
     {
@@ -82,8 +80,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_list_free(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_free(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -98,8 +95,8 @@
         {
             axis2_char_t *file_name = NULL;
 
-            file_name = (axis2_char_t *) axis2_array_list_get(ws_info_list->
-                    current_info_lists, env, i);
+            file_name = (axis2_char_t *) 
+                axis2_array_list_get(ws_info_list->current_info_lists, env, i);
             AXIS2_FREE(env->allocator, file_name);
         }
         axis2_array_list_free(ws_info_list->current_info_lists, env);
@@ -116,11 +113,10 @@
             axis2_ws_info_t *ws_info = NULL;
 
             ws_info = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
-                    ws_info_list, env, i);
+                ws_info_list, env, i);
             axis2_ws_info_free(ws_info, env);
         }
         axis2_array_list_free(ws_info_list->ws_info_list, env);
-        ws_info_list->ws_info_list = NULL;
     }
 
     if (ws_info_list)
@@ -132,8 +128,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_list_init(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_init(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env)
 {
     int size = 0;
@@ -160,8 +155,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_list_add_ws_info_item(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_add_ws_info_item(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env,
     axis2_file_t *file,
     int type)
@@ -193,9 +187,8 @@
             axis2_arch_file_data_t *file_data = NULL;
 
             last_modified_date =  axis2_file_get_timestamp(file, env);
-            ws_info =
-                axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
-                    env, info_list_name, last_modified_date, AXIS2_SVC);
+            ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
+                env, info_list_name, last_modified_date, AXIS2_SVC);
             status = axis2_array_list_add(ws_info_list->ws_info_list, env, ws_info);
 
             if (AXIS2_SUCCESS != status)
@@ -227,9 +220,8 @@
             axis2_arch_file_data_t *file_data = NULL;
 
             last_modified_date =  axis2_file_get_timestamp(file, env);
-            ws_info =
-                axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
-                    env, info_list_name, last_modified_date, AXIS2_MODULE);
+            ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
+                env, info_list_name, last_modified_date, AXIS2_MODULE);
             status = axis2_array_list_add(ws_info_list->ws_info_list, env, ws_info);
 
             if (AXIS2_SUCCESS != status)
@@ -237,10 +229,10 @@
                 return status;
             }
             file_data = axis2_arch_file_data_create_with_type_and_file(env,
-                    AXIS2_MODULE, file);
+                AXIS2_MODULE, file);
             /* to inform that new web service is deployed */
             status = axis2_dep_engine_add_ws_to_deploy(ws_info_list->deployer,
-                    env, file_data);
+                env, file_data);
             if (AXIS2_SUCCESS != status)
             {
                 return status;
@@ -256,8 +248,7 @@
 }
 
 AXIS2_EXTERN axis2_ws_info_t *AXIS2_CALL
-axis2_ws_info_list_get_file_item(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_get_file_item(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env,
     axis2_char_t *file_name)
 {
@@ -273,7 +264,7 @@
         axis2_char_t *file_name_l = NULL;
 
         ws_info = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
-                ws_info_list, env, i);
+            ws_info_list, env, i);
 
         file_name_l = axis2_ws_info_get_file_name(ws_info, env);
         if (0 == axis2_strcmp(file_name_l, file_name))
@@ -285,8 +276,7 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_ws_info_list_is_modified(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_is_modified(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env,
     axis2_file_t *file,
     axis2_ws_info_t *ws_info)
@@ -302,8 +292,7 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_ws_info_list_is_file_exist(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_is_file_exist(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env,
     axis2_char_t *file_name)
 {
@@ -316,8 +305,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_list_check_for_undeploy(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_check_for_undeploy(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env)
 {
     int list_size = 0;
@@ -346,13 +334,13 @@
                 ws_info_list, env, i);
 
         file_item_name = axis2_ws_info_get_file_name(file_item, env);
-        current_lists_size = axis2_array_list_size(ws_info_list->
-                current_info_lists, env);
+        current_lists_size = axis2_array_list_size(ws_info_list->current_info_lists, 
+	    env);
         for (j = 0; j < current_lists_size; j++)
         {
             axis2_char_t *file_name = NULL;
             file_name = (axis2_char_t *) axis2_array_list_get(ws_info_list->
-                    current_info_lists, env, j);
+                current_info_lists, env, j);
             if (0 == axis2_strcmp(file_name, file_item_name))
             {
                 exist = AXIS2_TRUE;
@@ -366,13 +354,13 @@
             long last_modified_date = 0;
 
             last_modified_date = axis2_ws_info_get_last_modified_date(file_item,
-                    env);
+                env);
             axis2_array_list_add(temp_list, env, file_item);
             ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date(
-                        env, file_item_name, last_modified_date);
+                env, file_item_name, last_modified_date);
             /* this is to be undeployed */
             axis2_dep_engine_add_ws_to_undeploy(ws_info_list->deployer, env,
-                    ws_info);
+                ws_info);
         }
 
     }
@@ -385,7 +373,7 @@
 
         file_item = (axis2_ws_info_t*) axis2_array_list_get(temp_list, env, i);
         index = axis2_array_list_index_of(ws_info_list->ws_info_list, env,
-                file_item);
+            file_item);
         axis2_array_list_remove(ws_info_list->ws_info_list, env, index);
     }
     axis2_array_list_free(temp_list, env);
@@ -393,8 +381,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_ws_info_list_update(
-    axis2_ws_info_list_t *ws_info_list,
+axis2_ws_info_list_update(axis2_ws_info_list_t *ws_info_list,
     const axis2_env_t *env)
 {
     axis2_status_t status = AXIS2_FAILURE;
@@ -417,3 +404,5 @@
 
     return axis2_dep_engine_do_deploy(ws_info_list->deployer, env);
 }
+
+

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar 26 04:08:43 2007
@@ -303,7 +303,7 @@
     param = axis2_param_container_get_param(op->param_container, env, param_name);
     if (!param && op->parent)
     {
-        param = AXIS2_SVC_GET_PARAM(op->parent, env, param_name);
+        param = axis2_svc_get_param(op->parent, env, param_name);
     }
     return param;
 }
@@ -331,7 +331,7 @@
     parent = axis2_op_get_parent(op, env);
     if (parent)
     {
-        locked = AXIS2_SVC_IS_PARAM_LOCKED(parent, env, param_name);
+        locked = axis2_svc_is_param_locked(parent, env, param_name);
     }
     if (AXIS2_TRUE == locked)
     {

Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Mon Mar 26 04:08:43 2007
@@ -198,7 +198,7 @@
         if (!svc_grp->svcs)
             return AXIS2_FAILURE;
     }
-    svc_qname = AXIS2_SVC_GET_QNAME(svc, env);
+    svc_qname = axis2_svc_get_qname(svc, env);
     svc_name = axis2_qname_to_string((axis2_qname_t *)svc_qname, env);
     axis2_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, svc);
 
@@ -223,7 +223,7 @@
         return status;
     }
 
-    status = AXIS2_SVC_SET_LAST_UPDATE(svc, env);
+    status = axis2_svc_set_last_update(svc, env);
     if (AXIS2_SUCCESS != status)
     {
         /* remove the previously added service */
@@ -232,7 +232,7 @@
         return status;
     }
 
-    status = AXIS2_SVC_SET_PARENT(svc, env, svc_grp);
+    status = axis2_svc_set_parent(svc, env, svc_grp);
     if (AXIS2_SUCCESS != status)
     {
         /* remove the previously added service */

Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 26 04:08:43 2007
@@ -175,7 +175,7 @@
                 "Checking for operation using WSA Action : %s", action);
 
         name = axis2_qname_create(env, action, NULL, NULL);
-        op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, name);
+        op = axis2_svc_get_op_with_qname(svc, env, name);
         if (op)
             AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
                     "Operation found using WSA Action");

Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 26 04:08:43 2007
@@ -512,7 +512,7 @@
 
         axis2_hash_this(index_i, NULL, NULL, &value);
         desc = (axis2_svc_t *) value;
-        svc_qname = AXIS2_SVC_GET_QNAME(desc, env);
+        svc_qname = axis2_svc_get_qname(desc, env);
         svc_name = axis2_qname_get_localpart(svc_qname, env);
 
         svc_name2 = axis2_hash_get(conf->all_svcs, svc_name,
@@ -536,7 +536,7 @@
 
         axis2_hash_this(index_i, NULL, NULL, &value);
         desc = (axis2_svc_t *) value;
-        svc_name = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(desc, env), env);
+        svc_name = axis2_qname_get_localpart(axis2_svc_get_qname(desc, env), env);
         axis2_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
                 desc);
         index_i = axis2_hash_next(env, index_i);
@@ -603,7 +603,7 @@
         return AXIS2_FAILURE;
     }
 
-    svc_grp_qname = AXIS2_SVC_GET_QNAME(svc, env);
+    svc_grp_qname = axis2_svc_get_qname(svc, env);
     if (! svc_grp_qname)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
@@ -926,7 +926,7 @@
             axis2_hash_this(index_j, NULL, NULL, &value2);
             svc = (axis2_svc_t *) value2;
             svc_name = 
-                axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(svc, env), env);
+                axis2_qname_get_localpart(axis2_svc_get_qname(svc, env), env);
             axis2_hash_set(conf->all_svcs, svc_name,
                     AXIS2_HASH_KEY_STRING, svc);
 

Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Mon Mar 26 04:08:43 2007
@@ -171,7 +171,7 @@
                              target endpoint uri fragment : %s",
                              url_tokens[1]);
                     op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
-                    op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, 
+                    op = axis2_svc_get_op_with_name(svc, env, 
                              axis2_qname_get_localpart(op_qname, env));
                     axis2_qname_free(op_qname, env);
                     if (op)

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Mon Mar 26 04:08:43 2007
@@ -125,7 +125,7 @@
 
             if (op_name)
             {
-                op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, op_name);
+                op = axis2_svc_get_op_with_name(svc, env, op_name);
             }
         }
 

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Mon Mar 26 04:08:43 2007
@@ -219,7 +219,7 @@
 SOAP message body's first child's local name : %s",
                                         element_name);
 
-                                op = AXIS2_SVC_GET_OP_WITH_NAME(
+                                op = axis2_svc_get_op_with_name(
                                     svc, env, element_name);
 
                                 if (op)

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Mon Mar 26 04:08:43 2007
@@ -115,7 +115,7 @@
 
     phase_resolver->svc = svc;
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "svc name is:%s",
-        AXIS2_SVC_GET_NAME(phase_resolver->svc, env));
+        axis2_svc_get_name(phase_resolver->svc, env));
 
     return phase_resolver;
 }
@@ -148,7 +148,7 @@
     if (!(phase_resolver->svc))
         return AXIS2_FAILURE;
 
-    ops = AXIS2_SVC_GET_ALL_OPS(phase_resolver->svc, env);
+    ops = axis2_svc_get_all_ops(phase_resolver->svc, env);
 
     for (index_i = axis2_hash_first(ops, env); index_i; index_i =
         axis2_hash_next(env, index_i))
@@ -885,9 +885,9 @@
             axis2_hash_this(index_j, NULL, NULL, &w);
             svc = (axis2_svc_t *) w;
             AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "svc name is:%s",
-                AXIS2_SVC_GET_NAME(svc, env));
+                axis2_svc_get_name(svc, env));
 
-            status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc,
+            status = axis2_svc_add_module_ops(svc, env, module_desc,
                 phase_resolver->axis2_config);
             if (AXIS2_SUCCESS != status)
             {
@@ -932,7 +932,7 @@
     AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
 
-    ops = AXIS2_SVC_GET_ALL_OPS(svc, env);
+    ops = axis2_svc_get_all_ops(svc, env);
     if (!ops)
     {
         return AXIS2_FAILURE;
@@ -1254,12 +1254,12 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    ops = AXIS2_SVC_GET_ALL_OPS(svc, env);
+    ops = axis2_svc_get_all_ops(svc, env);
     if (!ops)
     {
         return AXIS2_FAILURE;
     }
-    status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc,
+    status = axis2_svc_add_module_ops(svc, env, module_desc,
         phase_resolver->axis2_config);
 
     if (AXIS2_SUCCESS != status)

Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 26 04:08:43 2007
@@ -139,7 +139,7 @@
         return impl_class;
     }
 
-    impl_info_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SERVICE_CLASS);
+    impl_info_param = axis2_svc_get_param(svc, env, AXIS2_SERVICE_CLASS);
     if (!impl_info_param)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
@@ -236,7 +236,7 @@
         return AXIS2_FAILURE;
     }
 
-    scope_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SCOPE);
+    scope_param = axis2_svc_get_param(svc, env, AXIS2_SCOPE);
     if (scope_param)
     {
         param_value = axis2_param_get_value(scope_param, env);
@@ -247,7 +247,7 @@
         return AXIS2_SUCCESS;
     }
 
-    impl_info_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SERVICE_CLASS);
+    impl_info_param = axis2_svc_get_param(svc, env, AXIS2_SERVICE_CLASS);
     if (!impl_info_param)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Mar 26 04:08:43 2007
@@ -99,7 +99,7 @@
 
         if (svc)
         {
-            svc_name = AXIS2_SVC_GET_NAME(svc, env);
+            svc_name = axis2_svc_get_name(svc, env);
         }
         else
         {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon Mar 26 04:08:43 2007
@@ -781,7 +781,7 @@
                 hi; hi = axis2_hash_next(env, hi))
         {
             axis2_hash_this(hi, NULL, NULL, &service);
-            sname = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(
+            sname = axis2_qname_get_localpart(axis2_svc_get_qname(
                         ((axis2_svc_t *)service), env), env);
             ret = axis2_stracat(tmp2, "<h3><u>", env);
             tmp2 = ret;
@@ -794,11 +794,11 @@
 				tmp2 = ret;
 							 /**
 							  *setting services description */
-				ret = axis2_stracat (tmp2, AXIS2_SVC_GET_SVC_DESC ((axis2_svc_t *)service, env), env);
+				ret = axis2_stracat (tmp2, axis2_svc_get_svc_desc((axis2_svc_t *)service, env), env);
 				tmp2 = ret;
 				ret = axis2_stracat (tmp2, "</p>", env);
 				tmp2 = ret;
-            ops = AXIS2_SVC_GET_ALL_OPS(((axis2_svc_t *)service), env);
+            ops = axis2_svc_get_all_ops(((axis2_svc_t *)service), env);
             if (ops && 0 != axis2_hash_count(ops))
             {
                 axis2_hash_index_t *hi2 = NULL;

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Mon Mar 26 04:08:43 2007
@@ -395,7 +395,7 @@
         return axis2_conf_get_enable_security(conf,env);
     }    
             
-    engaged_modules = AXIS2_SVC_GET_ALL_MODULE_QNAMES(svc,env);
+    engaged_modules = axis2_svc_get_all_module_qnames(svc,env);
     if(engaged_modules)
     {
         size = axis2_array_list_size(engaged_modules,env);

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=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c Mon Mar 26 04:08:43 2007
@@ -133,8 +133,8 @@
             ns = axis2_qname_get_uri(svc_qname, env);
             prefix = axis2_qname_get_prefix(svc_qname, env);
             temp_svc_qname = axis2_qname_create(env, localname, ns, prefix);
-            AXIS2_SVC_SET_NAME(axis2_svc, env, localname);
-            AXIS2_SVC_SET_QNAME(axis2_svc, env, temp_svc_qname);
+            axis2_svc_set_name(axis2_svc, env, localname);
+            axis2_svc_set_qname(axis2_svc, env, temp_svc_qname);
             AXIS2_FREE(env->allocator, localname);
             axis2_qname_free(temp_svc_qname, env);
         }
@@ -259,7 +259,7 @@
 			{
                 size = axis2_array_list_size(ext_elements, env);
 			}
-            AXIS2_SVC_ADD_OP(axis2_svc, env, axis2_op);
+            axis2_svc_add_op(axis2_svc, env, axis2_op);
         }
     }
     if (WODEN_WSDL10 == spec)
@@ -312,8 +312,8 @@
             ns = axis2_qname_get_uri(svc_qname, env);
             prefix = axis2_qname_get_prefix(svc_qname, env);
             temp_svc_qname = axis2_qname_create(env, localname, ns, prefix);
-            AXIS2_SVC_SET_NAME(axis2_svc, env, localname);
-            AXIS2_SVC_SET_QNAME(axis2_svc, env, temp_svc_qname);
+            axis2_svc_set_name(axis2_svc, env, localname);
+            axis2_svc_set_qname(axis2_svc, env, temp_svc_qname);
             AXIS2_FREE(env->allocator, localname);
             axis2_qname_free(temp_svc_qname, env);
         }
@@ -498,7 +498,7 @@
                     break;
                 }
             }
-            AXIS2_SVC_ADD_OP(axis2_svc, env, axis2_op);
+            axis2_svc_add_op(axis2_svc, env, axis2_op);
         }
     }
     return axis2_svc;

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=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Mon Mar 26 04:08:43 2007
@@ -55,25 +55,25 @@
     op_qname = axis2_qname_create(env, "add" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
     axis2_qname_free(op_qname, env);
 
     op_qname = axis2_qname_create(env, "sub" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
     axis2_qname_free(op_qname, env);
 
     op_qname = axis2_qname_create(env, "mul" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
     axis2_qname_free(op_qname, env);
 
     op_qname = axis2_qname_create(env, "div" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
     axis2_qname_free(op_qname, env);
 }
 

Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Mon Mar 26 04:08:43 2007
@@ -126,12 +126,12 @@
         return AXIS2_FAILURE;
     }
     
-    param = AXIS2_SVC_GET_PARAM(svc, env, SUBSCRIBER_STORE);
+    param = axis2_svc_get_param(svc, env, SUBSCRIBER_STORE);
     if (!param)
     {
         /* Store not found. Create and set it as a param */
         savan_sub_processor_set_sub_store(svc, env);
-        param = AXIS2_SVC_GET_PARAM(svc, env, SUBSCRIBER_STORE);
+        param = axis2_svc_get_param(svc, env, SUBSCRIBER_STORE);
     }
     
     store = (axis2_hash_t*)axis2_param_get_value(param, env);
@@ -299,7 +299,7 @@
         return AXIS2_FAILURE;
     }
     
-    AXIS2_SVC_ADD_PARAM(svc, env, param);
+    axis2_svc_add_param(svc, env, param);
     
     return AXIS2_SUCCESS;       
 }

Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c Mon Mar 26 04:08:43 2007
@@ -85,7 +85,7 @@
     
     svc =  axis2_msg_ctx_get_svc(msg_ctx, env);
     if (svc)
-        svc_name = AXIS2_SVC_GET_NAME(svc, env);
+        svc_name = axis2_svc_get_name(svc, env);
     
     printf("[%s][savan][in handler] invoke...\n", svc_name);
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[%s][savan][in handler] invoke...",

Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c Mon Mar 26 04:08:43 2007
@@ -93,7 +93,7 @@
     
     svc =  axis2_msg_ctx_get_svc(msg_ctx, env);
     if (svc)
-        svc_name = AXIS2_SVC_GET_NAME(svc, env);
+        svc_name = (xis2_svc_get_namesvc, env);
     
     printf("[%s][savan][out handler] invoke...\n", svc_name);
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[%s][savan][out handler] invoke...",
@@ -115,7 +115,7 @@
             return AXIS2_SUCCESS; /* returning FAILURE will break handler chain */
         }
         
-        param = AXIS2_SVC_GET_PARAM(svc, env, SUBSCRIBER_STORE);
+        param = axis2_svc_get_param(svc, env, SUBSCRIBER_STORE);
         if (!param)
         {
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan][out handler] "

Modified: webservices/axis2/trunk/c/savan/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/util/savan_util.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Mon Mar 26 04:08:43 2007
@@ -179,7 +179,7 @@
         return NULL;
     }
 
-    param = AXIS2_SVC_GET_PARAM(svc, env, SUBSCRIBER_STORE);
+    param = axis2_svc_get_param(svc, env, SUBSCRIBER_STORE);
     if (!param)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the "

Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Mon Mar 26 04:08:43 2007
@@ -81,12 +81,12 @@
 
             axis2_hash_this(hi, NULL, NULL, &service);
             svc = (axis2_svc_t *) service;
-            impl_info_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SERVICE_CLASS);
+            impl_info_param = axis2_svc_get_param(svc, env, AXIS2_SERVICE_CLASS);
             if (!impl_info_param)
             {
                 printf("imple_info_param is null\n");
             }
-            ops = AXIS2_SVC_GET_ALL_OPS(svc, env);
+            ops = axis2_svc_get_all_ops(svc, env);
             if (ops)
             {
                 printf("ops count = %d\n", axis2_hash_count(ops));

Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Mon Mar 26 04:08:43 2007
@@ -76,7 +76,7 @@
     svc = axis2_svc_create_with_qname(env, qname);
     module_desc = axis2_module_desc_create(env);
     axis2_config = axis2_conf_create(env);
-    status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc, axis2_config);
+    status = axis2_svc_add_module_ops(svc, env, module_desc, axis2_config);
     if (status != AXIS2_SUCCESS)
     {
         printf("axis2_test_description_add_module_ops ERROR %d\n", status);
@@ -84,7 +84,7 @@
     else
         printf("axis2_test_add_module_ops SUCCESS\n");
 
-    AXIS2_SVC_FREE(svc, env);
+    axis2_svc_free(svc, env);
     axis2_qname_free(qname, env);
     axis2_module_desc_free(module_desc, env);
      axis2_conf_free(axis2_config, env);
@@ -112,7 +112,7 @@
     moduleref = axis2_module_desc_create(env);
     axis2_config = axis2_conf_create(env);
 
-    status = AXIS2_SVC_ENGAGE_MODULE(svc, env, moduleref, axis2_config);
+    status = axis2_svc_engage_module(svc, env, moduleref, axis2_config);
     moduleref = NULL;
     if (status != AXIS2_SUCCESS)
     {
@@ -121,7 +121,7 @@
     else
         printf("axis2_test_svc_engage_module SUCCESS\n");
 
-    AXIS2_SVC_FREE(svc, env);
+    axis2_svc_free(svc, env);
     axis2_qname_free(qname, env);
      axis2_conf_free(axis2_config, env);
 
@@ -148,13 +148,13 @@
     qname = axis2_qname_create(env, "svc1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
 
-    status = AXIS2_SVC_ADD_OP(svc, env, op);
+    status = axis2_svc_add_op(svc, env, op);
 
     qname = axis2_qname_create(env, "op2", NULL, NULL);
     op = axis2_op_create_with_qname(env, qname);
-    status = AXIS2_SVC_ADD_OP(svc, env, op);
+    status = axis2_svc_add_op(svc, env, op);
 
-    ops = AXIS2_SVC_GET_ALL_OPS(svc, env);
+    ops = axis2_svc_get_all_ops(svc, env);
 
     if (ops)
         printf("SUCCESS AXIS2_SVC_GET_OPS\n");
@@ -176,7 +176,7 @@
         for (hi2 = axis2_hash_first(ops, env); hi2; hi2 = axis2_hash_next(env, hi2))
         {
             printf("count = %d \n", count++);
-            AXIS2_SVC_GET_ALL_OPS(svc, env);
+            axis2_svc_get_all_ops(svc, env);
             if (!(hi2))
                 break;
             axis2_hash_this(hi2, NULL, NULL, &op2);

Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=522481&r1=522480&r2=522481
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 26 04:08:43 2007
@@ -72,7 +72,7 @@
     axis2_qname_free(qname, env);
      axis2_svc_grp_ctx_free(svc_grp_ctx, env);
      axis2_svc_ctx_free(svc_ctx, env);
-    AXIS2_SVC_FREE(svc, env);
+    axis2_svc_free(svc, env);
      axis2_op_ctx_free(op_ctx, env);
     axis2_op_free(op, env);
      axis2_engine_free(engine, 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=522481&r1=522480&r2=522481
==============================================================================
--- 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 Mon Mar 26 04:08:43 2007
@@ -63,7 +63,7 @@
     svc_client = axis2_stub_get_svc_client(stub, env);
     svc = (axis2_svc_t*)axis2_svc_client_get_svc(svc_client, env);
     axis2_qname_create(env, "Calculator" , NULL, NULL);
-    AXIS2_SVC_SET_QNAME(svc, env, svc_qname);
+    axis2_svc_set_qname(svc, env, svc_qname);
 
     /* creating the operations*/
 
@@ -77,7 +77,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -89,7 +89,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -101,7 +101,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -113,7 +113,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 }

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=522481&r1=522480&r2=522481
==============================================================================
--- 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 Mon Mar 26 04:08:43 2007
@@ -63,7 +63,7 @@
     svc_client = axis2_stub_get_svc_client(stub, env);
     svc = (axis2_svc_t*)axis2_svc_client_get_svc(svc_client, env);
     axis2_qname_create(env, "InteropTestPortTypeDocService" , NULL, NULL);
-    AXIS2_SVC_SET_QNAME(svc, env, svc_qname);
+    axis2_svc_set_qname(svc, env, svc_qname);
 
     /* creating the operations*/
 
@@ -77,7 +77,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -89,7 +89,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -101,7 +101,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -113,7 +113,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -125,7 +125,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -137,7 +137,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -149,7 +149,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -161,7 +161,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -173,7 +173,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -185,7 +185,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -197,7 +197,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -209,7 +209,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -221,7 +221,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 
@@ -233,7 +233,7 @@
 
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
 
-    AXIS2_SVC_ADD_OP(svc, env, op);
+    axis2_svc_add_op(svc, env, op);
 
 
 }



---------------------------------------------------------------------
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