You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/12/13 07:26:29 UTC

svn commit: r356488 [4/8] - in /webservices/axis2/trunk/c: include/ modules/core/addr/src/ modules/core/context/src/ modules/core/deployment/src/ modules/core/description/src/ modules/core/engine/src/ modules/core/phaseresolver/src/ modules/core/transp...

Modified: webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c Mon Dec 12 22:23:36 2005
@@ -60,25 +60,25 @@
                                         axis2_env_t **env);
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_inphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_inphases(axis2_phases_info_t *phases_info,
                                         axis2_env_t **env);
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_outphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_outphases(axis2_phases_info_t *phases_info,
                                             axis2_env_t **env);
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_in_faultphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_in_faultphases(axis2_phases_info_t *phases_info,
                                                 axis2_env_t **env);
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_out_faultphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_out_faultphases(axis2_phases_info_t *phases_info,
                                                 axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL 
-axis2_phases_info_set_operation_phases(axis2_phases_info_t *phases_info,
+axis2_phases_info_set_op_phases(axis2_phases_info_t *phases_info,
                                         axis2_env_t **env,
-                                        struct axis2_operation *axis2_opt);
+                                        struct axis2_op *axis2_opt);
                                     
 /***************************** End of function headers ************************/
 
@@ -137,20 +137,20 @@
     phases_info_impl->phases_info.ops->get_out_faultphases = 
             axis2_phases_info_get_out_faultphases;
 
-    phases_info_impl->phases_info.ops->get_operation_inphases = 
-            axis2_phases_info_get_operation_inphases;
+    phases_info_impl->phases_info.ops->get_op_inphases = 
+            axis2_phases_info_get_op_inphases;
                                         
-    phases_info_impl->phases_info.ops->get_operation_outphases = 
-            axis2_phases_info_get_operation_outphases;                                   
+    phases_info_impl->phases_info.ops->get_op_outphases = 
+            axis2_phases_info_get_op_outphases;                                   
                                         
-    phases_info_impl->phases_info.ops->get_operation_in_faultphases = 
-            axis2_phases_info_get_operation_in_faultphases;                                    
+    phases_info_impl->phases_info.ops->get_op_in_faultphases = 
+            axis2_phases_info_get_op_in_faultphases;                                    
     
-    phases_info_impl->phases_info.ops->get_operation_out_faultphases = 
-            axis2_phases_info_get_operation_out_faultphases;
+    phases_info_impl->phases_info.ops->get_op_out_faultphases = 
+            axis2_phases_info_get_op_out_faultphases;
 
-    phases_info_impl->phases_info.ops->set_operation_phases = 
-            axis2_phases_info_set_operation_phases;                                      
+    phases_info_impl->phases_info.ops->set_op_phases = 
+            axis2_phases_info_set_op_phases;                                      
     
 	return &(phases_info_impl->phases_info);
 }
@@ -287,29 +287,29 @@
 }
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_inphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_inphases(axis2_phases_info_t *phases_info,
                                         axis2_env_t **env) 
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     struct axis2_phase *phase = NULL;
     int i = 0; 
     axis2_char_t *phase_name = NULL;
-    axis2_array_list_t * operation_inphases = NULL; 
+    axis2_array_list_t * op_inphases = NULL; 
     axis2_status_t status = AXIS2_FAILURE;    
     
     AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
-    operation_inphases = axis2_array_list_create(env, 0);
+    op_inphases = axis2_array_list_create(env, 0);
     phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
     
-    status = AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+    status = AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
     if(AXIS2_FAILURE == status)
     {
         AXIS2_PHASE_FREE(phase, env);
         phase = NULL;
-        AXIS2_ARRAY_LIST_FREE(operation_inphases, env);
-        operation_inphases = NULL;
+        AXIS2_ARRAY_LIST_FREE(op_inphases, env);
+        op_inphases = NULL;
         return NULL;
     }
     for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(info_impl->inphases, env); i++) 
@@ -324,35 +324,35 @@
         } else 
         {
             phase = axis2_phase_create(env, phase_name);
-            status = AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+            status = AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
             if(AXIS2_FAILURE == status)
             {
                 AXIS2_PHASE_FREE(phase, env);
                 phase = NULL;
-                AXIS2_ARRAY_LIST_FREE(operation_inphases, env);
-                operation_inphases = NULL;
+                AXIS2_ARRAY_LIST_FREE(op_inphases, env);
+                op_inphases = NULL;
                 return NULL;
             }
         }
     }
-    return operation_inphases;
+    return op_inphases;
 }
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_outphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_outphases(axis2_phases_info_t *phases_info,
                                             axis2_env_t **env) 
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     struct axis2_phase *phase = NULL;
     int i = 0; 
     axis2_char_t *phase_name = NULL;
-    axis2_array_list_t * operation_outphases = NULL;
+    axis2_array_list_t * op_outphases = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
     AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
-    operation_outphases = axis2_array_list_create(env, 0);
+    op_outphases = axis2_array_list_create(env, 0);
     for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(info_impl->outphases, env); i++) 
     {
         phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_impl->outphases, env, i);
@@ -362,119 +362,119 @@
         } else 
         {
             phase = axis2_phase_create(env, phase_name);
-            status = AXIS2_ARRAY_LIST_ADD(operation_outphases, env, phase);
+            status = AXIS2_ARRAY_LIST_ADD(op_outphases, env, phase);
             if(AXIS2_FAILURE == status)
             {
                 AXIS2_PHASE_FREE(phase, env);
                 phase = NULL;
-                AXIS2_ARRAY_LIST_FREE(operation_outphases, env);
-                operation_outphases = NULL;
+                AXIS2_ARRAY_LIST_FREE(op_outphases, env);
+                op_outphases = NULL;
                 return NULL;
             }
         }
     }
     phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
-    status = AXIS2_ARRAY_LIST_ADD(operation_outphases, env, phase);
+    status = AXIS2_ARRAY_LIST_ADD(op_outphases, env, phase);
     if(AXIS2_FAILURE == status)
     {
         AXIS2_PHASE_FREE(phase, env);
         phase = NULL;
-        AXIS2_ARRAY_LIST_FREE(operation_outphases, env);
-        operation_outphases = NULL;
+        AXIS2_ARRAY_LIST_FREE(op_outphases, env);
+        op_outphases = NULL;
         return NULL;
     }
     phase = axis2_phase_create(env, AXIS2_PHASE_MESSAGE_OUT);
-    status = AXIS2_ARRAY_LIST_ADD(operation_outphases, env, phase);
+    status = AXIS2_ARRAY_LIST_ADD(op_outphases, env, phase);
     if(AXIS2_FAILURE == status)
     {
         AXIS2_PHASE_FREE(phase, env);
         phase = NULL;
-        AXIS2_ARRAY_LIST_FREE(operation_outphases, env);
-        operation_outphases = NULL;
+        AXIS2_ARRAY_LIST_FREE(op_outphases, env);
+        op_outphases = NULL;
         return NULL;
         
     }
-    return operation_outphases;
+    return op_outphases;
 }
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_in_faultphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_in_faultphases(axis2_phases_info_t *phases_info,
                                                 axis2_env_t **env) 
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     int i = 0;
     axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t *phase_name = NULL;
-    axis2_array_list_t * operation_in_faultphases = NULL;
+    axis2_array_list_t * op_in_faultphases = NULL;
     struct axis2_phase *phase = NULL;
     
     AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
-    operation_in_faultphases = axis2_array_list_create(env, 0);
+    op_in_faultphases = axis2_array_list_create(env, 0);
     
     for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(info_impl->in_faultphases, env); i++) 
     {
         phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_impl->in_faultphases, env, i);
         phase = axis2_phase_create(env, phase_name);
-        status = AXIS2_ARRAY_LIST_ADD(operation_in_faultphases, env, phase);
+        status = AXIS2_ARRAY_LIST_ADD(op_in_faultphases, env, phase);
         if(AXIS2_FAILURE == status)
         {
             AXIS2_PHASE_FREE(phase, env);
             phase = NULL;
-            AXIS2_ARRAY_LIST_FREE(operation_in_faultphases, env);
-            operation_in_faultphases = NULL;
+            AXIS2_ARRAY_LIST_FREE(op_in_faultphases, env);
+            op_in_faultphases = NULL;
             return NULL;
             
         }
     }
-    return operation_in_faultphases;
+    return op_in_faultphases;
 }
 
 axis2_array_list_t *AXIS2_CALL 
-axis2_phases_info_get_operation_out_faultphases(axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_out_faultphases(axis2_phases_info_t *phases_info,
                                                 axis2_env_t **env) 
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     int i = 0;
     axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t *phase_name = NULL;
-    axis2_array_list_t * operation_out_faultphases = NULL;
+    axis2_array_list_t * op_out_faultphases = NULL;
     struct axis2_phase *phase = NULL;
         
     AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
-    operation_out_faultphases = axis2_array_list_create(env, 0);
+    op_out_faultphases = axis2_array_list_create(env, 0);
     
     for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(info_impl->out_faultphases, env); i++) 
     {
         phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_impl->out_faultphases, env, i);
         phase = axis2_phase_create(env, phase_name);
-        status = AXIS2_ARRAY_LIST_ADD(operation_out_faultphases, env, phase);
+        status = AXIS2_ARRAY_LIST_ADD(op_out_faultphases, env, phase);
         if(AXIS2_FAILURE == status)
         {
             AXIS2_PHASE_FREE(phase, env);
             phase = NULL;
-            AXIS2_ARRAY_LIST_FREE(operation_out_faultphases, env);
-            operation_out_faultphases = NULL;
+            AXIS2_ARRAY_LIST_FREE(op_out_faultphases, env);
+            op_out_faultphases = NULL;
             return NULL;
             
         }
     }
-    return operation_out_faultphases;
+    return op_out_faultphases;
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_phases_info_set_operation_phases(axis2_phases_info_t *phases_info,
+axis2_phases_info_set_op_phases(axis2_phases_info_t *phases_info,
                                         axis2_env_t **env,
-                                        struct axis2_operation *axis2_opt) 
+                                        struct axis2_op *axis2_opt) 
 {
     axis2_status_t status = AXIS2_FAILURE;
-    axis2_array_list_t *operation_inphases = NULL;
-    axis2_array_list_t *operation_outphases = NULL;
-    axis2_array_list_t *operation_in_faultphases = NULL;
-    axis2_array_list_t *operation_out_faultphases = NULL;
+    axis2_array_list_t *op_inphases = NULL;
+    axis2_array_list_t *op_outphases = NULL;
+    axis2_array_list_t *op_in_faultphases = NULL;
+    axis2_array_list_t *op_out_faultphases = NULL;
     
     axis2_phases_info_impl_t *info_impl = NULL;
     
@@ -483,32 +483,32 @@
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     
-    operation_inphases = axis2_phases_info_get_operation_inphases(phases_info, env);
-    if(NULL == operation_inphases)
+    op_inphases = axis2_phases_info_get_op_inphases(phases_info, env);
+    if(NULL == op_inphases)
         return AXIS2_FAILURE;
     
-    operation_outphases = axis2_phases_info_get_operation_outphases(phases_info, env);
-    if(NULL == operation_outphases)
+    op_outphases = axis2_phases_info_get_op_outphases(phases_info, env);
+    if(NULL == op_outphases)
         return AXIS2_FAILURE;
     
-    operation_in_faultphases = axis2_phases_info_get_operation_in_faultphases(phases_info, env);
-    if(NULL == operation_in_faultphases)
+    op_in_faultphases = axis2_phases_info_get_op_in_faultphases(phases_info, env);
+    if(NULL == op_in_faultphases)
         return AXIS2_FAILURE;
     
-    operation_out_faultphases = axis2_phases_info_get_operation_out_faultphases(phases_info, env);
-    if(NULL == operation_out_faultphases)
+    op_out_faultphases = axis2_phases_info_get_op_out_faultphases(phases_info, env);
+    if(NULL == op_out_faultphases)
         return AXIS2_FAILURE;
     
-    status = AXIS2_OPERATION_SET_REMAINING_PHASES_INFLOW(axis2_opt, env, operation_inphases);
+    status = AXIS2_OPERATION_SET_REMAINING_PHASES_INFLOW(axis2_opt, env, op_inphases);
     if(AXIS2_FAILURE == status)
         return status;
-    status = AXIS2_OPERATION_SET_PHASES_OUTFLOW(axis2_opt, env, operation_outphases);
+    status = AXIS2_OPERATION_SET_PHASES_OUTFLOW(axis2_opt, env, op_outphases);
     if(AXIS2_FAILURE == status)
         return status;
-    status = AXIS2_OPERATION_SET_PHASES_IN_FAULT_FLOW(axis2_opt, env, operation_in_faultphases);
+    status = AXIS2_OPERATION_SET_PHASES_IN_FAULT_FLOW(axis2_opt, env, op_in_faultphases);
     if(AXIS2_FAILURE == status)
         return status;
-    status = AXIS2_OPERATION_SET_PHASES_OUT_FAULT_FLOW(axis2_opt, env, operation_out_faultphases);
+    status = AXIS2_OPERATION_SET_PHASES_OUT_FAULT_FLOW(axis2_opt, env, op_out_faultphases);
     
     return status;
     

Modified: webservices/axis2/trunk/c/modules/core/description/src/flow.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/flow.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/flow.c Mon Dec 12 22:23:36 2005
@@ -87,7 +87,7 @@
 	return &(flow_impl->flow);
 }
 
-/*************************** Start of operation impls *************************/
+/*************************** Start of op impls *************************/
 
 axis2_status_t AXIS2_CALL
 axis2_flow_free (axis2_flow_t *flow, axis2_env_t **env)

Modified: webservices/axis2/trunk/c/modules/core/description/src/flow_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/flow_container.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/flow_container.c Mon Dec 12 22:23:36 2005
@@ -145,7 +145,7 @@
 	return &(flow_container_impl->flow_container);
 }
 
-/*************************** Start of operation impls *************************/
+/*************************** Start of op impls *************************/
 
 axis2_status_t AXIS2_CALL
 axis2_flow_container_free(axis2_flow_container_t *flow_container,

Modified: webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c Mon Dec 12 22:23:36 2005
@@ -114,7 +114,7 @@
         handler_desc_impl->qname = qname; /* shallow copy */
     }
 
-    /* initialize operations */
+    /* initialize ops */
     handler_desc_impl->handler_desc.ops = NULL;
     handler_desc_impl->handler_desc.ops  = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_handler_desc_ops_t) );
     if (!handler_desc_impl->handler_desc.ops)

Modified: webservices/axis2/trunk/c/modules/core/description/src/module_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/module_desc.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/module_desc.c Mon Dec 12 22:23:36 2005
@@ -32,7 +32,7 @@
      * To store module opeartions , which are suppose to be added to a service 
      * if it is engaged to a service
      */
-    axis2_hash_t *operations;
+    axis2_hash_t *ops;
 
 } axis2_module_desc_impl_t;
 
@@ -90,12 +90,12 @@
                                 axis2_qname_t *qname);
 
 axis2_status_t AXIS2_CALL
-axis2_module_desc_add_operation (axis2_module_desc_t *module_desc,
+axis2_module_desc_add_op (axis2_module_desc_t *module_desc,
                                     axis2_env_t **env,
-                                    axis2_operation_t *operation);
+                                    axis2_op_t *op);
 
 axis2_hash_t * AXIS2_CALL
-axis2_module_desc_get_operations (axis2_module_desc_t *module_desc,
+axis2_module_desc_get_ops (axis2_module_desc_t *module_desc,
                                     axis2_env_t **env);
 
 axis2_engine_config_t * AXIS2_CALL
@@ -148,7 +148,7 @@
     module_desc_impl->parent = NULL;	
     module_desc_impl->module_desc.params = NULL;
     module_desc_impl->module_desc.flow_container = NULL;
-    module_desc_impl->operations = NULL;
+    module_desc_impl->ops = NULL;
     
     module_desc_impl->module_desc.params = axis2_param_container_create(env);
     if(NULL == module_desc_impl->module_desc.params)
@@ -166,8 +166,8 @@
         return NULL;
     }
     
-    module_desc_impl->operations = axis2_hash_make(env);
-    if(NULL == module_desc_impl->operations)
+    module_desc_impl->ops = axis2_hash_make(env);
+    if(NULL == module_desc_impl->ops)
     {
         axis2_module_desc_free(&(module_desc_impl->module_desc), env);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL); 
@@ -204,11 +204,11 @@
     module_desc_impl->module_desc.ops->get_name = axis2_module_desc_get_name;
     module_desc_impl->module_desc.ops->set_name = axis2_module_desc_set_name;
     
-    module_desc_impl->module_desc.ops->add_operation = 
-            axis2_module_desc_add_operation;
+    module_desc_impl->module_desc.ops->add_op = 
+            axis2_module_desc_add_op;
     
-    module_desc_impl->module_desc.ops->get_operations = 
-            axis2_module_desc_get_operations;
+    module_desc_impl->module_desc.ops->get_ops = 
+            axis2_module_desc_get_ops;
     
     module_desc_impl->module_desc.ops->get_parent = axis2_module_desc_get_parent;
     module_desc_impl->module_desc.ops->set_parent = axis2_module_desc_set_parent;
@@ -239,7 +239,7 @@
 }
 
 
-/*************************** Start of operation impls *************************/
+/*************************** Start of op impls *************************/
 
 axis2_status_t AXIS2_CALL
 axis2_module_desc_free(axis2_module_desc_t *module_desc,
@@ -274,25 +274,25 @@
         module_desc_impl->qname = NULL;
     }
     
-    if(NULL != module_desc_impl->operations)
+    if(NULL != module_desc_impl->ops)
     {
         axis2_hash_index_t *hi = NULL;
         void *val = NULL;
-        for (hi = axis2_hash_first (module_desc_impl->operations, env); hi;
+        for (hi = axis2_hash_first (module_desc_impl->ops, env); hi;
                  hi = axis2_hash_next ( env, hi))
         {
-            struct axis2_operation *operation = NULL;
+            struct axis2_op *op = NULL;
             axis2_hash_this (hi, NULL, NULL, &val);
-            operation = (struct axis2_operation *) val;
-            if (operation)
-                AXIS2_OPERATION_FREE (operation, env);
+            op = (struct axis2_op *) val;
+            if (op)
+                AXIS2_OPERATION_FREE (op, env);
             
             val = NULL;
-            operation = NULL;
+            op = NULL;
                
         }
-        axis2_hash_free(module_desc_impl->operations, env);
-        module_desc_impl->operations = NULL;
+        axis2_hash_free(module_desc_impl->ops, env);
+        module_desc_impl->ops = NULL;
     }
     
     if(module_desc_impl)
@@ -417,40 +417,40 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_module_desc_add_operation (axis2_module_desc_t *module_desc,
+axis2_module_desc_add_op (axis2_module_desc_t *module_desc,
                                     axis2_env_t **env,
-                                    axis2_operation_t *operation)
+                                    axis2_op_t *op)
 {
     axis2_module_desc_impl_t *module_desc_impl = NULL;
     axis2_qname_t *optr_name = NULL;
     
     AXIS2_FUNC_PARAM_CHECK(module_desc, env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK((*env)->error, operation, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
     
     module_desc_impl = AXIS2_INTF_TO_IMPL(module_desc);
-    if (NULL == (module_desc_impl->operations))
+    if (NULL == (module_desc_impl->ops))
 	{                    
-		module_desc_impl->operations = axis2_hash_make (env);
+		module_desc_impl->ops = axis2_hash_make (env);
 	}	
     
-    optr_name = AXIS2_OPERATION_GET_NAME(operation, env);
+    optr_name = AXIS2_OPERATION_GET_NAME(op, env);
     if(NULL == optr_name)
     {
         return AXIS2_FAILURE;
     }
     
-    axis2_hash_set(module_desc_impl->operations, optr_name, sizeof(axis2_qname_t), 
-        operation);
+    axis2_hash_set(module_desc_impl->ops, optr_name, sizeof(axis2_qname_t), 
+        op);
     
     return AXIS2_SUCCESS;
 }
 
 axis2_hash_t * AXIS2_CALL
-axis2_module_desc_get_operations (axis2_module_desc_t *module_desc,
+axis2_module_desc_get_ops (axis2_module_desc_t *module_desc,
                                     axis2_env_t **env)
 {
     AXIS2_FUNC_PARAM_CHECK(module_desc, env, NULL);
-    return AXIS2_INTF_TO_IMPL(module_desc)->operations;
+    return AXIS2_INTF_TO_IMPL(module_desc)->ops;
 }
 
 axis2_engine_config_t * AXIS2_CALL