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 [7/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/wsdl/src/wsdl_binding_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_operation.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_operation.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_operation.c Mon Dec 12 22:23:36 2005
@@ -1,13 +1,13 @@
-#include <axis2_wsdl_binding_operation.h>
+#include <axis2_wsdl_binding_op.h>
 #include <string.h>
 
 /** 
  * @brief Wsdl Component struct impl
  *	Axis2 Wsdl Component impl  
  */
-typedef struct axis2_wsdl_binding_operation_impl
+typedef struct axis2_wsdl_binding_op_impl
 {
-	axis2_wsdl_binding_operation_t binding_operation;
+	axis2_wsdl_binding_op_t binding_op;
 	    /**
      * Field name
      */
@@ -25,9 +25,9 @@
     axis2_linked_list_t *outfaults;
 
     /**
-     * Field operation
+     * Field op
      */
-    void *operation;
+    void *op;
 
     /**
      * Field input
@@ -39,225 +39,225 @@
      */
     struct axis2_wsdl_binding_msg_ref *output;
         
-} axis2_wsdl_binding_operation_impl_t;
+} axis2_wsdl_binding_op_impl_t;
 
-#define AXIS2_INTF_TO_IMPL(wsdl_binding_operation) \
-        ((axis2_wsdl_binding_operation_impl_t *)(wsdl_binding_operation))
+#define AXIS2_INTF_TO_IMPL(wsdl_binding_op) \
+        ((axis2_wsdl_binding_op_impl_t *)(wsdl_binding_op))
 
 /***************************** Function headers *******************************/
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_free (axis2_wsdl_binding_operation_t *wsdl_binding_operation,
+axis2_wsdl_binding_op_free (axis2_wsdl_binding_op_t *wsdl_binding_op,
                             axis2_env_t **env);
 
 
 struct axis2_wsdl_binding_msg_ref * AXIS2_CALL
-axis2_wsdl_binding_operation_get_input(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_input(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_input(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_input(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env,
                                         struct axis2_wsdl_binding_msg_ref *input);
 
 void *AXIS2_CALL
-axis2_wsdl_binding_operation_get_operation(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_op(axis2_wsdl_binding_op_t *binding_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_operation(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_op(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
-                                            void *operation);
+                                            void *op);
 
 struct axis2_wsdl_binding_msg_ref * AXIS2_CALL
-axis2_wsdl_binding_operation_get_output(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_output(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_output(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_output(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env,
                                         struct axis2_wsdl_binding_msg_ref *output);
 
 axis2_qname_t *AXIS2_CALL
-axis2_wsdl_binding_operation_get_qname(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_qname(axis2_wsdl_binding_op_t *binding_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_qname(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_qname(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             axis2_qname_t *qname);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_add_infault(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_add_infault(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             struct axis2_wsdl_binding_fault *infault);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_add_outfault(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_add_outfault(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             struct axis2_wsdl_binding_fault *outfault);
 
 axis2_linked_list_t * AXIS2_CALL
-axis2_wsdl_binding_operation_get_infaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_infaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_infaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_infaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             axis2_linked_list_t *infaults);
 
 axis2_linked_list_t * AXIS2_CALL
-axis2_wsdl_binding_operation_get_outfaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_outfaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_outfaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_outfaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             axis2_linked_list_t *outfaults);
 
 		
 /***************************** End of function headers ************************/
 
-axis2_wsdl_binding_operation_t * AXIS2_CALL 
-axis2_wsdl_binding_operation_create (axis2_env_t **env)
+axis2_wsdl_binding_op_t * AXIS2_CALL 
+axis2_wsdl_binding_op_create (axis2_env_t **env)
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     
-	binding_operation_impl = (axis2_wsdl_binding_operation_impl_t *) 
-        AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_binding_operation_impl_t));
+	binding_op_impl = (axis2_wsdl_binding_op_impl_t *) 
+        AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_binding_op_impl_t));
     
-	if(NULL == binding_operation_impl)
+	if(NULL == binding_op_impl)
 	{
 		AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;
 	}
     
-    binding_operation_impl->qname = NULL;
-    binding_operation_impl->operation = NULL;
-    binding_operation_impl->input = NULL;
-    binding_operation_impl->output = NULL;
-    binding_operation_impl->infaults = NULL;
-    binding_operation_impl->outfaults = NULL;
-    binding_operation_impl->binding_operation.extensible_component = NULL;
-    binding_operation_impl->binding_operation.ops = NULL;
+    binding_op_impl->qname = NULL;
+    binding_op_impl->op = NULL;
+    binding_op_impl->input = NULL;
+    binding_op_impl->output = NULL;
+    binding_op_impl->infaults = NULL;
+    binding_op_impl->outfaults = NULL;
+    binding_op_impl->binding_op.extensible_component = NULL;
+    binding_op_impl->binding_op.ops = NULL;
 	
-    binding_operation_impl->infaults = axis2_linked_list_create (env);
+    binding_op_impl->infaults = axis2_linked_list_create (env);
     
-	if(NULL == binding_operation_impl->infaults)
+	if(NULL == binding_op_impl->infaults)
 	{
-		axis2_wsdl_binding_operation_free(&(binding_operation_impl->binding_operation),
+		axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
             env);
 		AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;        
 	}
     
-    binding_operation_impl->outfaults = axis2_linked_list_create (env);
+    binding_op_impl->outfaults = axis2_linked_list_create (env);
     
-	if(NULL == binding_operation_impl->outfaults)
+	if(NULL == binding_op_impl->outfaults)
 	{
-        axis2_wsdl_binding_operation_free(&(binding_operation_impl->binding_operation),
+        axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
             env);
 		AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);	
         return NULL;
 	}
     
-    binding_operation_impl->binding_operation.extensible_component = 
+    binding_op_impl->binding_op.extensible_component = 
         axis2_wsdl_extensible_component_create(env);
     
-	if(NULL == binding_operation_impl->binding_operation.extensible_component)
+	if(NULL == binding_op_impl->binding_op.extensible_component)
 	{
-        axis2_wsdl_binding_operation_free(&(binding_operation_impl->binding_operation),
+        axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
             env);
 		AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;        
 	}
     
-	binding_operation_impl->binding_operation.ops = (axis2_wsdl_binding_operation_ops_t *)
-		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_binding_operation_ops_t));
+	binding_op_impl->binding_op.ops = (axis2_wsdl_binding_op_ops_t *)
+		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_binding_op_ops_t));
     
-	if(NULL == binding_operation_impl->binding_operation.ops)
+	if(NULL == binding_op_impl->binding_op.ops)
 	{
-        axis2_wsdl_binding_operation_free(&(binding_operation_impl->binding_operation),
+        axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
             env);
 		AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;        
 	}
     
-	binding_operation_impl->binding_operation.ops->free = axis2_wsdl_binding_operation_free;
+	binding_op_impl->binding_op.ops->free = axis2_wsdl_binding_op_free;
     
-	binding_operation_impl->binding_operation.ops->get_input =
-        axis2_wsdl_binding_operation_get_input;
+	binding_op_impl->binding_op.ops->get_input =
+        axis2_wsdl_binding_op_get_input;
     
-    binding_operation_impl->binding_operation.ops->set_input =
-        axis2_wsdl_binding_operation_set_input;
+    binding_op_impl->binding_op.ops->set_input =
+        axis2_wsdl_binding_op_set_input;
     
-    binding_operation_impl->binding_operation.ops->get_operation =
-        axis2_wsdl_binding_operation_get_operation;
+    binding_op_impl->binding_op.ops->get_op =
+        axis2_wsdl_binding_op_get_op;
     
-    binding_operation_impl->binding_operation.ops->set_operation =
-        axis2_wsdl_binding_operation_set_operation;
+    binding_op_impl->binding_op.ops->set_op =
+        axis2_wsdl_binding_op_set_op;
     
-    binding_operation_impl->binding_operation.ops->get_output =
-        axis2_wsdl_binding_operation_get_output;
+    binding_op_impl->binding_op.ops->get_output =
+        axis2_wsdl_binding_op_get_output;
     
-    binding_operation_impl->binding_operation.ops->set_output =
-        axis2_wsdl_binding_operation_set_output;
+    binding_op_impl->binding_op.ops->set_output =
+        axis2_wsdl_binding_op_set_output;
     
-    binding_operation_impl->binding_operation.ops->get_qname =
-        axis2_wsdl_binding_operation_get_qname;
+    binding_op_impl->binding_op.ops->get_qname =
+        axis2_wsdl_binding_op_get_qname;
     
-    binding_operation_impl->binding_operation.ops->set_qname =
-        axis2_wsdl_binding_operation_set_qname;
+    binding_op_impl->binding_op.ops->set_qname =
+        axis2_wsdl_binding_op_set_qname;
         
-    binding_operation_impl->binding_operation.ops->add_infault =
-        axis2_wsdl_binding_operation_add_infault;
+    binding_op_impl->binding_op.ops->add_infault =
+        axis2_wsdl_binding_op_add_infault;
     
-    binding_operation_impl->binding_operation.ops->add_outfault =
-        axis2_wsdl_binding_operation_add_outfault;
+    binding_op_impl->binding_op.ops->add_outfault =
+        axis2_wsdl_binding_op_add_outfault;
 
-    binding_operation_impl->binding_operation.ops->get_infaults =
-        axis2_wsdl_binding_operation_get_infaults; 
+    binding_op_impl->binding_op.ops->get_infaults =
+        axis2_wsdl_binding_op_get_infaults; 
         
-    binding_operation_impl->binding_operation.ops->set_infaults =
-        axis2_wsdl_binding_operation_set_infaults; 
+    binding_op_impl->binding_op.ops->set_infaults =
+        axis2_wsdl_binding_op_set_infaults; 
 
-    binding_operation_impl->binding_operation.ops->get_outfaults =
-        axis2_wsdl_binding_operation_get_outfaults; 
+    binding_op_impl->binding_op.ops->get_outfaults =
+        axis2_wsdl_binding_op_get_outfaults; 
         
-    binding_operation_impl->binding_operation.ops->set_outfaults =
-        axis2_wsdl_binding_operation_set_outfaults; 
+    binding_op_impl->binding_op.ops->set_outfaults =
+        axis2_wsdl_binding_op_set_outfaults; 
     
-	return &(binding_operation_impl->binding_operation);
+	return &(binding_op_impl->binding_op);
 }
 
 /******************************************************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_binding_operation_free (axis2_wsdl_binding_operation_t *binding_operation, 
+axis2_wsdl_binding_op_free (axis2_wsdl_binding_op_t *binding_op, 
                             axis2_env_t **env)
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
     
-	if(NULL != binding_operation->ops)
+	if(NULL != binding_op->ops)
     {
-        AXIS2_FREE((*env)->allocator, binding_operation->ops);
-        binding_operation->ops = NULL;
+        AXIS2_FREE((*env)->allocator, binding_op->ops);
+        binding_op->ops = NULL;
     }
     
-    if(NULL != binding_operation_impl->infaults)
+    if(NULL != binding_op_impl->infaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_operation_impl->infaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_op_impl->infaults, env); i++)
         {
             struct axis2_wsdl_binding_fault *binding_fault = NULL;
-            binding_fault = AXIS2_LINKED_LIST_GET(binding_operation_impl->infaults, env, i);
+            binding_fault = AXIS2_LINKED_LIST_GET(binding_op_impl->infaults, env, i);
             
             binding_fault = (struct axis2_wsdl_binding_fault *) val;
             if (binding_fault)
@@ -267,18 +267,18 @@
             binding_fault = NULL;
                
         }
-        AXIS2_LINKED_LIST_FREE(binding_operation_impl->infaults, env);
-        binding_operation_impl->infaults = NULL;
+        AXIS2_LINKED_LIST_FREE(binding_op_impl->infaults, env);
+        binding_op_impl->infaults = NULL;
     }
     
-    if(NULL != binding_operation_impl->outfaults)
+    if(NULL != binding_op_impl->outfaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_operation_impl->outfaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_op_impl->outfaults, env); i++)
         {
             struct axis2_wsdl_binding_fault *binding_fault = NULL;
-            binding_fault = AXIS2_LINKED_LIST_GET(binding_operation_impl->outfaults, env, i);
+            binding_fault = AXIS2_LINKED_LIST_GET(binding_op_impl->outfaults, env, i);
             
             binding_fault = (struct axis2_wsdl_binding_fault *) val;
             if (binding_fault)
@@ -288,196 +288,196 @@
             binding_fault = NULL;
                
         }
-        AXIS2_LINKED_LIST_FREE(binding_operation_impl->outfaults, env);
-        binding_operation_impl->outfaults = NULL;
+        AXIS2_LINKED_LIST_FREE(binding_op_impl->outfaults, env);
+        binding_op_impl->outfaults = NULL;
     }
     
-    if(NULL != binding_operation->extensible_component)
+    if(NULL != binding_op->extensible_component)
     {
-        AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(binding_operation->
+        AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(binding_op->
             extensible_component, env);
-        binding_operation->extensible_component = NULL;
+        binding_op->extensible_component = NULL;
     }
     
-    if(binding_operation_impl)
-        AXIS2_FREE((*env)->allocator, binding_operation_impl);
-    binding_operation_impl = NULL;
+    if(binding_op_impl)
+        AXIS2_FREE((*env)->allocator, binding_op_impl);
+    binding_op_impl = NULL;
     
 	return AXIS2_SUCCESS;
 }
 
 struct axis2_wsdl_binding_msg_ref * AXIS2_CALL
-axis2_wsdl_binding_operation_get_input(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_input(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, NULL);
-    return AXIS2_INTF_TO_IMPL(binding_operation)->input;
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+    return AXIS2_INTF_TO_IMPL(binding_op)->input;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_input(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_input(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env,
                                         struct axis2_wsdl_binding_msg_ref *input) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, input, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
-    if(binding_operation_impl->input)
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
+    if(binding_op_impl->input)
     {
-        AXIS2_WSDL_BINDING_MSG_REF_FREE(binding_operation_impl->input, env);
-        binding_operation_impl->input = NULL;
+        AXIS2_WSDL_BINDING_MSG_REF_FREE(binding_op_impl->input, env);
+        binding_op_impl->input = NULL;
     }
-    binding_operation_impl->input = input;
+    binding_op_impl->input = input;
     return AXIS2_SUCCESS;
 }
 
 void *AXIS2_CALL
-axis2_wsdl_binding_operation_get_operation(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_op(axis2_wsdl_binding_op_t *binding_op,
                                     axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, NULL);
-    return AXIS2_INTF_TO_IMPL(binding_operation)->operation;
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+    return AXIS2_INTF_TO_IMPL(binding_op)->op;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_operation(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_op(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
-                                            void *operation) 
+                                            void *op) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
-    struct axis2_operation *optr = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
+    struct axis2_op *optr = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK((*env)->error, operation, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
     
-    if(NULL != binding_operation_impl->operation)
+    if(NULL != binding_op_impl->op)
     {
-        optr = binding_operation_impl->operation;
+        optr = binding_op_impl->op;
         AXIS2_OPERATION_FREE(optr , env);
-        binding_operation_impl->operation = NULL;
+        binding_op_impl->op = NULL;
     }
-    binding_operation_impl->operation = operation;
+    binding_op_impl->op = op;
     return AXIS2_SUCCESS;
 }
 
 struct axis2_wsdl_binding_msg_ref * AXIS2_CALL
-axis2_wsdl_binding_operation_get_output(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_output(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, NULL);
-    return AXIS2_INTF_TO_IMPL(binding_operation)->output;
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+    return AXIS2_INTF_TO_IMPL(binding_op)->output;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_output(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_output(axis2_wsdl_binding_op_t *binding_op,
                                         axis2_env_t **env,
                                         struct axis2_wsdl_binding_msg_ref *output) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, output, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
-    if(binding_operation_impl->output)
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
+    if(binding_op_impl->output)
     {
-        AXIS2_WSDL_BINDING_MSG_REF_FREE(binding_operation_impl->output, env);
-        binding_operation_impl->output = NULL;
+        AXIS2_WSDL_BINDING_MSG_REF_FREE(binding_op_impl->output, env);
+        binding_op_impl->output = NULL;
     }
-    binding_operation_impl->output = output;
+    binding_op_impl->output = output;
     return AXIS2_SUCCESS;
 }
 
 axis2_qname_t *AXIS2_CALL
-axis2_wsdl_binding_operation_get_qname(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_qname(axis2_wsdl_binding_op_t *binding_op,
                                     axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, NULL);
-    return AXIS2_INTF_TO_IMPL(binding_operation)->qname;
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+    return AXIS2_INTF_TO_IMPL(binding_op)->qname;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_qname(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_qname(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             axis2_qname_t *qname) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
     
-    if(binding_operation_impl->qname)
+    if(binding_op_impl->qname)
     {
-        AXIS2_QNAME_FREE(binding_operation_impl->qname, env);
-        binding_operation_impl->qname = NULL;
+        AXIS2_QNAME_FREE(binding_op_impl->qname, env);
+        binding_op_impl->qname = NULL;
     }
-    binding_operation_impl->qname = qname;
+    binding_op_impl->qname = qname;
     return AXIS2_SUCCESS;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_add_infault(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_add_infault(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             struct axis2_wsdl_binding_fault *infault) 
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, infault, AXIS2_FAILURE);
     
-    return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(binding_operation)->infaults,
+    return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(binding_op)->infaults,
         env, infault);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_add_outfault(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_add_outfault(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             struct axis2_wsdl_binding_fault *outfault) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, outfault, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
     
-    return AXIS2_LINKED_LIST_ADD(binding_operation_impl->outfaults,
+    return AXIS2_LINKED_LIST_ADD(binding_op_impl->outfaults,
         env, outfault);
 }
 
 axis2_linked_list_t * AXIS2_CALL
-axis2_wsdl_binding_operation_get_infaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_infaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, NULL);
-    return AXIS2_INTF_TO_IMPL(binding_operation)->infaults;
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+    return AXIS2_INTF_TO_IMPL(binding_op)->infaults;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_infaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_infaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             axis2_linked_list_t *infaults) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, infaults, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
     
-    if(NULL != binding_operation_impl->outfaults)
+    if(NULL != binding_op_impl->outfaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_operation_impl->outfaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_op_impl->outfaults, env); i++)
         {
             struct axis2_wsdl_binding_fault *binding_fault = NULL;
-            binding_fault = AXIS2_LINKED_LIST_GET(binding_operation_impl->outfaults, env, i);
+            binding_fault = AXIS2_LINKED_LIST_GET(binding_op_impl->outfaults, env, i);
             
             binding_fault = (struct axis2_wsdl_binding_fault *) val;
             if (binding_fault)
@@ -487,41 +487,41 @@
             binding_fault = NULL;
                
         }
-        AXIS2_LINKED_LIST_FREE(binding_operation_impl->outfaults, env);
-        binding_operation_impl->outfaults = NULL;
+        AXIS2_LINKED_LIST_FREE(binding_op_impl->outfaults, env);
+        binding_op_impl->outfaults = NULL;
     }
-    binding_operation_impl->infaults = infaults;
+    binding_op_impl->infaults = infaults;
     return AXIS2_SUCCESS;
 }
 
 axis2_linked_list_t * AXIS2_CALL
-axis2_wsdl_binding_operation_get_outfaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_get_outfaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, NULL);
-    return AXIS2_INTF_TO_IMPL(binding_operation)->outfaults;
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+    return AXIS2_INTF_TO_IMPL(binding_op)->outfaults;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_binding_operation_set_outfaults(axis2_wsdl_binding_operation_t *binding_operation,
+axis2_wsdl_binding_op_set_outfaults(axis2_wsdl_binding_op_t *binding_op,
                                             axis2_env_t **env,
                                             axis2_linked_list_t *outfaults) 
 {
-    axis2_wsdl_binding_operation_impl_t *binding_operation_impl = NULL;
+    axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(binding_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, outfaults, AXIS2_FAILURE);
     
-    binding_operation_impl = AXIS2_INTF_TO_IMPL(binding_operation);
+    binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
     
-    if(NULL != binding_operation_impl->outfaults)
+    if(NULL != binding_op_impl->outfaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_operation_impl->outfaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(binding_op_impl->outfaults, env); i++)
         {
             struct axis2_wsdl_binding_fault *binding_fault = NULL;
-            binding_fault = AXIS2_LINKED_LIST_GET(binding_operation_impl->outfaults, env, i);
+            binding_fault = AXIS2_LINKED_LIST_GET(binding_op_impl->outfaults, env, i);
             
             binding_fault = (struct axis2_wsdl_binding_fault *) val;
             if (binding_fault)
@@ -531,10 +531,10 @@
             binding_fault = NULL;
                
         }
-        AXIS2_LINKED_LIST_FREE(binding_operation_impl->outfaults, env);
-        binding_operation_impl->outfaults = NULL;
+        AXIS2_LINKED_LIST_FREE(binding_op_impl->outfaults, env);
+        binding_op_impl->outfaults = NULL;
     }
     
-    binding_operation_impl->outfaults = outfaults;
+    binding_op_impl->outfaults = outfaults;
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c Mon Dec 12 22:23:36 2005
@@ -40,9 +40,9 @@
     axis2_linked_list_t *faults;
 
     /**
-     * Field operations
+     * Field ops
      */
-    axis2_hash_t *operations;
+    axis2_hash_t *ops;
 
     /**
      * Field style_default
@@ -60,7 +60,7 @@
                         axis2_env_t **env);	
 
 axis2_hash_t *AXIS2_CALL
-axis2_wsdl_interface_get_defined_operations(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_get_defined_ops(axis2_wsdl_interface_t *wsdl_interface,
                                             axis2_env_t **env);
 
 axis2_linked_list_t *AXIS2_CALL
@@ -72,11 +72,11 @@
                                 axis2_env_t **env);
 
 axis2_hash_t *AXIS2_CALL
-axis2_wsdl_interface_get_operations(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_get_ops(axis2_wsdl_interface_t *wsdl_interface,
                                     axis2_env_t **env);
 
 void *AXIS2_CALL
-axis2_wsdl_interface_get_operation(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_get_op(axis2_wsdl_interface_t *wsdl_interface,
                                 axis2_env_t **env,
                                 axis2_char_t *nc_name);
 
@@ -104,15 +104,15 @@
                                 axis2_qname_t *qName);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_interface_set_operations(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_set_ops(axis2_wsdl_interface_t *wsdl_interface,
                                     axis2_env_t **env,
                                     axis2_hash_t *list);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_interface_set_operation(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_set_op(axis2_wsdl_interface_t *wsdl_interface,
                                     axis2_env_t **env,
-                                    void *operation,
-                                    axis2_operation_type_t opt_type);
+                                    void *op,
+                                    axis2_op_type_t opt_type);
 
 axis2_status_t AXIS2_CALL
 axis2_wsdl_interface_set_super_interfaces(axis2_wsdl_interface_t *wsdl_interface,
@@ -163,8 +163,8 @@
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);		
 	}
     
-    wsdl_interface_impl->operations = axis2_hash_make(env);		
-	if(NULL == wsdl_interface_impl->operations)
+    wsdl_interface_impl->ops = axis2_hash_make(env);		
+	if(NULL == wsdl_interface_impl->ops)
 	{
         axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
         AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
@@ -176,7 +176,7 @@
     
 	if(NULL == wsdl_interface_impl->wsdl_interface.extensible_component)
 	{
-        axis2_hash_free(wsdl_interface_impl->operations, env);
+        axis2_hash_free(wsdl_interface_impl->ops, env);
         axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
         AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);	
@@ -189,7 +189,7 @@
         AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_interface_impl->wsdl_interface.
             extensible_component, env);
         axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
-        axis2_hash_free(wsdl_interface_impl->operations, env);
+        axis2_hash_free(wsdl_interface_impl->ops, env);
         AXIS2_LINKED_LIST_FREE(wsdl_interface_impl->faults, env);
         AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
 		AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
@@ -197,8 +197,8 @@
 	
 	wsdl_interface_impl->wsdl_interface.ops->free = axis2_wsdl_interface_free;
     
-	wsdl_interface_impl->wsdl_interface.ops->get_defined_operations = 
-        axis2_wsdl_interface_get_defined_operations;
+	wsdl_interface_impl->wsdl_interface.ops->get_defined_ops = 
+        axis2_wsdl_interface_get_defined_ops;
     
 	wsdl_interface_impl->wsdl_interface.ops->get_faults = 
         axis2_wsdl_interface_get_faults;
@@ -206,11 +206,11 @@
 	wsdl_interface_impl->wsdl_interface.ops->get_name = 
         axis2_wsdl_interface_get_name;
     
-	wsdl_interface_impl->wsdl_interface.ops->get_operations = 
-        axis2_wsdl_interface_get_operations;
+	wsdl_interface_impl->wsdl_interface.ops->get_ops = 
+        axis2_wsdl_interface_get_ops;
     
-    wsdl_interface_impl->wsdl_interface.ops->get_operation =
-        axis2_wsdl_interface_get_operation;
+    wsdl_interface_impl->wsdl_interface.ops->get_op =
+        axis2_wsdl_interface_get_op;
     
 	wsdl_interface_impl->wsdl_interface.ops->get_super_interfaces = 
         axis2_wsdl_interface_get_super_interfaces;
@@ -227,11 +227,11 @@
 	wsdl_interface_impl->wsdl_interface.ops->set_name = 
         axis2_wsdl_interface_set_name;
     
-	wsdl_interface_impl->wsdl_interface.ops->set_operations = 
-        axis2_wsdl_interface_set_operations;
+	wsdl_interface_impl->wsdl_interface.ops->set_ops = 
+        axis2_wsdl_interface_set_ops;
     
-	wsdl_interface_impl->wsdl_interface.ops->set_operation = 
-        axis2_wsdl_interface_set_operation;
+	wsdl_interface_impl->wsdl_interface.ops->set_op = 
+        axis2_wsdl_interface_set_op;
     
     wsdl_interface_impl->wsdl_interface.ops->set_super_interfaces = 
         axis2_wsdl_interface_set_super_interfaces;
@@ -273,24 +273,24 @@
         axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
     }
     
-    if(NULL != wsdl_interface_impl->operations)
+    if(NULL != wsdl_interface_impl->ops)
     {
         axis2_hash_index_t *hi = NULL;
         void *val = NULL;
-        for (hi = axis2_hash_first (wsdl_interface_impl->operations, env); hi;
+        for (hi = axis2_hash_first (wsdl_interface_impl->ops, env); hi;
                  hi = axis2_hash_next ( env, hi))
         {
-            struct axis2_wsdl_operation *wsdl_optr = NULL;
-            struct axis2_operation *optr = NULL;
+            struct axis2_wsdl_op *wsdl_optr = NULL;
+            struct axis2_op *optr = NULL;
             axis2_hash_this (hi, NULL, NULL, &val);
             if(AXIS2_OPERATION == wsdl_interface->optr_type)
             {
-                optr = (struct axis2_operation *) val;
+                optr = (struct axis2_op *) val;
                 AXIS2_OPERATION_FREE (optr, env);
             }
             if(AXIS2_WSDL_OPERATION == wsdl_interface->optr_type)
             {
-                wsdl_optr = (struct axis2_wsdl_operation *) val;
+                wsdl_optr = (struct axis2_wsdl_op *) val;
                 AXIS2_WSDL_OPERATION_FREE(wsdl_optr, env);
             }
             
@@ -299,8 +299,8 @@
             wsdl_optr = NULL;
                
         }
-        axis2_hash_free(wsdl_interface_impl->operations, env);
-        wsdl_interface_impl->operations = NULL;
+        axis2_hash_free(wsdl_interface_impl->ops, env);
+        wsdl_interface_impl->ops = NULL;
     }
     
     if(NULL != wsdl_interface_impl->faults)
@@ -328,10 +328,10 @@
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_wsdl_interface_get_defined_operations(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_get_defined_ops(axis2_wsdl_interface_t *wsdl_interface,
                                             axis2_env_t **env) 
 {
-    return AXIS2_INTF_TO_IMPL(wsdl_interface)->operations;
+    return AXIS2_INTF_TO_IMPL(wsdl_interface)->ops;
 }
 
 axis2_linked_list_t *AXIS2_CALL
@@ -349,19 +349,19 @@
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_wsdl_interface_get_operations(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_get_ops(axis2_wsdl_interface_t *wsdl_interface,
                                     axis2_env_t **env) 
 {
-    return AXIS2_INTF_TO_IMPL(wsdl_interface)->operations;
+    return AXIS2_INTF_TO_IMPL(wsdl_interface)->ops;
 }
 
 void *AXIS2_CALL
-axis2_wsdl_interface_get_operation(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_get_op(axis2_wsdl_interface_t *wsdl_interface,
                                 axis2_env_t **env,
                                 axis2_char_t *nc_name) 
 {
-    return (struct axis2_operation *) axis2_hash_get(AXIS2_INTF_TO_IMPL(
-        wsdl_interface)->operations, nc_name, AXIS2_HASH_KEY_STRING);
+    return (struct axis2_op *) axis2_hash_get(AXIS2_INTF_TO_IMPL(
+        wsdl_interface)->ops, nc_name, AXIS2_HASH_KEY_STRING);
 }
 
 axis2_hash_t *AXIS2_CALL
@@ -406,29 +406,29 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_interface_set_operations(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_set_ops(axis2_wsdl_interface_t *wsdl_interface,
                                     axis2_env_t **env,
                                     axis2_hash_t *list) 
 {
-    AXIS2_INTF_TO_IMPL(wsdl_interface)->operations = list;
+    AXIS2_INTF_TO_IMPL(wsdl_interface)->ops = list;
     return AXIS2_SUCCESS;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_interface_set_operation(axis2_wsdl_interface_t *wsdl_interface,
+axis2_wsdl_interface_set_op(axis2_wsdl_interface_t *wsdl_interface,
                                     axis2_env_t **env,
-                                    void *operation,
-                                    axis2_operation_type_t optr_type) 
+                                    void *op,
+                                    axis2_op_type_t optr_type) 
 {
-    struct axis2_operation *operation_l = NULL;
+    struct axis2_op *op_l = NULL;
     axis2_qname_t *wsdl_opt_name = NULL;
     axis2_char_t *op_name = NULL;
         
     AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK((*env)->error, operation, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
     
-    operation_l = (struct axis2_operation *) operation;
-    wsdl_opt_name = AXIS2_WSDL_OPERATION_GET_NAME(operation_l->wsdl_operation, env);    
+    op_l = (struct axis2_op *) op;
+    wsdl_opt_name = AXIS2_WSDL_OPERATION_GET_NAME(op_l->wsdl_op, env);    
     if (!wsdl_opt_name) 
     {
         /* The Operation name cannot be null (required) */
@@ -439,8 +439,8 @@
     
     op_name = AXIS2_QNAME_GET_LOCALPART(wsdl_opt_name, env);
     
-    axis2_hash_set(AXIS2_INTF_TO_IMPL(wsdl_interface)->operations, op_name,  
-        AXIS2_HASH_KEY_STRING, operation);
+    axis2_hash_set(AXIS2_INTF_TO_IMPL(wsdl_interface)->ops, op_name,  
+        AXIS2_HASH_KEY_STRING, op);
     wsdl_interface->optr_type = optr_type;
     
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_operation.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_operation.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_operation.c Mon Dec 12 22:23:36 2005
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
  
-#include <axis2_wsdl_operation.h>
+#include <axis2_wsdl_op.h>
 
-typedef struct axis2_wsdl_operation_impl axis2_wsdl_operation_impl_t;
+typedef struct axis2_wsdl_op_impl axis2_wsdl_op_impl_t;
 
 /** 
  * @brief Wsdl Component struct impl
  *	Axis2 Wsdl Component impl  
  */
-struct axis2_wsdl_operation_impl
+struct axis2_wsdl_op_impl
 {
-	axis2_wsdl_operation_t wsdl_operation;
+	axis2_wsdl_op_t wsdl_op;
     /**
      * URI of the MEP
      */
@@ -66,257 +66,257 @@
 		
 };
 
-#define AXIS2_INTF_TO_IMPL(wsdl_operation) \
-        ((axis2_wsdl_operation_impl_t *)(wsdl_operation))
+#define AXIS2_INTF_TO_IMPL(wsdl_op) \
+        ((axis2_wsdl_op_impl_t *)(wsdl_op))
 
 /***************************** Function headers *******************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_free (axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_free (axis2_wsdl_op_t *wsdl_op, 
                             axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_set_msg_exchange_pattern (
-		                                axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_msg_exchange_pattern (
+		                                axis2_wsdl_op_t *wsdl_op,
                                         axis2_env_t **env,
                                         axis2_char_t *msg_exchange_pattern);
 
 axis2_char_t * AXIS2_CALL 
-axis2_wsdl_operation_get_msg_exchange_pattern 
-		                                (axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_get_msg_exchange_pattern 
+		                                (axis2_wsdl_op_t *wsdl_op, 
                                             axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_set_name (axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_set_name (axis2_wsdl_op_t *wsdl_op, 
                                 axis2_env_t **env,
 		                        axis2_qname_t *name);
 
 axis2_qname_t * AXIS2_CALL 
-axis2_wsdl_operation_get_name (axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_name (axis2_wsdl_op_t *wsdl_op,
                                 axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_set_style (axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_style (axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
 		                            axis2_char_t *style);
 
 axis2_char_t * AXIS2_CALL 
-axis2_wsdl_operation_get_style (axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_style (axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env);
 		
 
 axis2_linked_list_t * AXIS2_CALL
-axis2_wsdl_operation_get_infaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_infaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_infaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_infaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_linked_list_t *infaults);
 
 axis2_wsdl_msg_ref_t *AXIS2_CALL 
-axis2_wsdl_operation_get_input_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_input_msg(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_input_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_input_msg(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_wsdl_msg_ref_t *input_msg);
 
 axis2_linked_list_t *AXIS2_CALL
-axis2_wsdl_operation_get_outfaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_outfaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_outfaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_outfaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_linked_list_t *outfaults);
 
 axis2_wsdl_msg_ref_t *AXIS2_CALL
-axis2_wsdl_operation_get_output_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_output_msg(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_output_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_output_msg(axis2_wsdl_op_t *wsdl_op,
                                         axis2_env_t **env,
                                         axis2_wsdl_msg_ref_t *output_msg);
 
 axis2_bool_t AXIS2_CALL
-axis2_wsdl_operation_is_safe(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_is_safe(axis2_wsdl_op_t *wsdl_op,
                                 axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_safety(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_safety(axis2_wsdl_op_t *wsdl_op,
                                 axis2_env_t **env,
                                 axis2_bool_t safe);
 
 axis2_char_t *AXIS2_CALL
-axis2_wsdl_operation_get_target_namespace(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_target_namespace(axis2_wsdl_op_t *wsdl_op,
                                             axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_add_infault(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_add_infault(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_wsdl_fault_ref_t *infault);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_add_outfault(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_add_outfault(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_wsdl_fault_ref_t *outfault);
 
 /***************************** End of function headers ************************/
 
-axis2_wsdl_operation_t * AXIS2_CALL 
-axis2_wsdl_operation_create (axis2_env_t **env)
+axis2_wsdl_op_t * AXIS2_CALL 
+axis2_wsdl_op_create (axis2_env_t **env)
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-	wsdl_operation_impl = (axis2_wsdl_operation_impl_t *) AXIS2_MALLOC ((*env)->
-        allocator, sizeof(axis2_wsdl_operation_impl_t));
+	wsdl_op_impl = (axis2_wsdl_op_impl_t *) AXIS2_MALLOC ((*env)->
+        allocator, sizeof(axis2_wsdl_op_impl_t));
     
-	if(!wsdl_operation_impl)
+	if(!wsdl_op_impl)
 	{
 		AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
 	}
     
-    wsdl_operation_impl->infaults = NULL;
-    wsdl_operation_impl->outfaults = NULL;
-    wsdl_operation_impl->wsdl_operation.extensible_component = NULL;
-    wsdl_operation_impl->msg_exchange_pattern = NULL;
-	wsdl_operation_impl->style = STYLE_DOC;
-	wsdl_operation_impl->name = NULL;
-    wsdl_operation_impl->input_msg = NULL;
-    wsdl_operation_impl->output_msg = NULL;
-    wsdl_operation_impl->safety = AXIS2_FALSE;
+    wsdl_op_impl->infaults = NULL;
+    wsdl_op_impl->outfaults = NULL;
+    wsdl_op_impl->wsdl_op.extensible_component = NULL;
+    wsdl_op_impl->msg_exchange_pattern = NULL;
+	wsdl_op_impl->style = STYLE_DOC;
+	wsdl_op_impl->name = NULL;
+    wsdl_op_impl->input_msg = NULL;
+    wsdl_op_impl->output_msg = NULL;
+    wsdl_op_impl->safety = AXIS2_FALSE;
     
-    wsdl_operation_impl->infaults = axis2_linked_list_create(env);
-    if(NULL == wsdl_operation_impl->infaults)
+    wsdl_op_impl->infaults = axis2_linked_list_create(env);
+    if(NULL == wsdl_op_impl->infaults)
     {
-        axis2_wsdl_operation_free(&(wsdl_operation_impl->wsdl_operation), env);
+        axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;
 	}
     
-    wsdl_operation_impl->outfaults = axis2_linked_list_create(env);
-    if(NULL == wsdl_operation_impl->outfaults)
+    wsdl_op_impl->outfaults = axis2_linked_list_create(env);
+    if(NULL == wsdl_op_impl->outfaults)
     {
-        axis2_wsdl_operation_free(&(wsdl_operation_impl->wsdl_operation), env);
+        axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;
 	}
     
-    wsdl_operation_impl->wsdl_operation.extensible_component = axis2_wsdl_extensible_component_create(env);
-    if(NULL == wsdl_operation_impl->wsdl_operation.extensible_component)
+    wsdl_op_impl->wsdl_op.extensible_component = axis2_wsdl_extensible_component_create(env);
+    if(NULL == wsdl_op_impl->wsdl_op.extensible_component)
     {
-        axis2_wsdl_operation_free(&(wsdl_operation_impl->wsdl_operation), env);
+        axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;
 	}
     
-	wsdl_operation_impl->wsdl_operation.ops = (axis2_wsdl_operation_ops_t *)
-		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_operation_ops_t));
+	wsdl_op_impl->wsdl_op.ops = (axis2_wsdl_op_ops_t *)
+		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_op_ops_t));
     
-	if(NULL == wsdl_operation_impl->wsdl_operation.ops)
+	if(NULL == wsdl_op_impl->wsdl_op.ops)
 	{
-        axis2_wsdl_operation_free(&(wsdl_operation_impl->wsdl_operation), env);
+        axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;
 	}
     
-	wsdl_operation_impl->wsdl_operation.ops->free = axis2_wsdl_operation_free;
+	wsdl_op_impl->wsdl_op.ops->free = axis2_wsdl_op_free;
 	
-    wsdl_operation_impl->wsdl_operation.ops->set_msg_exchange_pattern =
-        axis2_wsdl_operation_set_msg_exchange_pattern;
+    wsdl_op_impl->wsdl_op.ops->set_msg_exchange_pattern =
+        axis2_wsdl_op_set_msg_exchange_pattern;
     
-    wsdl_operation_impl->wsdl_operation.ops->get_msg_exchange_pattern =
-        axis2_wsdl_operation_get_msg_exchange_pattern;
+    wsdl_op_impl->wsdl_op.ops->get_msg_exchange_pattern =
+        axis2_wsdl_op_get_msg_exchange_pattern;
     
-    wsdl_operation_impl->wsdl_operation.ops->set_name =
-        axis2_wsdl_operation_set_name;
+    wsdl_op_impl->wsdl_op.ops->set_name =
+        axis2_wsdl_op_set_name;
     
-    wsdl_operation_impl->wsdl_operation.ops->get_name =
-        axis2_wsdl_operation_get_name;
+    wsdl_op_impl->wsdl_op.ops->get_name =
+        axis2_wsdl_op_get_name;
     
-    wsdl_operation_impl->wsdl_operation.ops->set_style =
-        axis2_wsdl_operation_set_style;
+    wsdl_op_impl->wsdl_op.ops->set_style =
+        axis2_wsdl_op_set_style;
     
-    wsdl_operation_impl->wsdl_operation.ops->get_style =
-        axis2_wsdl_operation_get_style;
+    wsdl_op_impl->wsdl_op.ops->get_style =
+        axis2_wsdl_op_get_style;
     
-    wsdl_operation_impl->wsdl_operation.ops->get_infaults =
-        axis2_wsdl_operation_get_infaults;
+    wsdl_op_impl->wsdl_op.ops->get_infaults =
+        axis2_wsdl_op_get_infaults;
         
-    wsdl_operation_impl->wsdl_operation.ops->set_infaults =
-        axis2_wsdl_operation_set_infaults;
+    wsdl_op_impl->wsdl_op.ops->set_infaults =
+        axis2_wsdl_op_set_infaults;
  
-    wsdl_operation_impl->wsdl_operation.ops->get_input_msg =
-        axis2_wsdl_operation_get_input_msg;
+    wsdl_op_impl->wsdl_op.ops->get_input_msg =
+        axis2_wsdl_op_get_input_msg;
     
-    wsdl_operation_impl->wsdl_operation.ops->set_input_msg = 
-        axis2_wsdl_operation_set_input_msg;
+    wsdl_op_impl->wsdl_op.ops->set_input_msg = 
+        axis2_wsdl_op_set_input_msg;
     
-    wsdl_operation_impl->wsdl_operation.ops->get_outfaults =
-        axis2_wsdl_operation_get_outfaults;
+    wsdl_op_impl->wsdl_op.ops->get_outfaults =
+        axis2_wsdl_op_get_outfaults;
         
-    wsdl_operation_impl->wsdl_operation.ops->set_outfaults =
-        axis2_wsdl_operation_set_outfaults;
+    wsdl_op_impl->wsdl_op.ops->set_outfaults =
+        axis2_wsdl_op_set_outfaults;
         
-    wsdl_operation_impl->wsdl_operation.ops->get_output_msg =
-        axis2_wsdl_operation_get_output_msg;
+    wsdl_op_impl->wsdl_op.ops->get_output_msg =
+        axis2_wsdl_op_get_output_msg;
     
-    wsdl_operation_impl->wsdl_operation.ops->set_output_msg = 
-        axis2_wsdl_operation_set_output_msg;
+    wsdl_op_impl->wsdl_op.ops->set_output_msg = 
+        axis2_wsdl_op_set_output_msg;
         
-    wsdl_operation_impl->wsdl_operation.ops->is_safe =
-        axis2_wsdl_operation_is_safe;
+    wsdl_op_impl->wsdl_op.ops->is_safe =
+        axis2_wsdl_op_is_safe;
     
-    wsdl_operation_impl->wsdl_operation.ops->set_safety = 
-        axis2_wsdl_operation_set_safety; 
+    wsdl_op_impl->wsdl_op.ops->set_safety = 
+        axis2_wsdl_op_set_safety; 
         
-    wsdl_operation_impl->wsdl_operation.ops->get_target_namespace = 
-        axis2_wsdl_operation_get_target_namespace;
+    wsdl_op_impl->wsdl_op.ops->get_target_namespace = 
+        axis2_wsdl_op_get_target_namespace;
         
-    wsdl_operation_impl->wsdl_operation.ops->add_infault = 
-        axis2_wsdl_operation_add_infault;
+    wsdl_op_impl->wsdl_op.ops->add_infault = 
+        axis2_wsdl_op_add_infault;
         
-    wsdl_operation_impl->wsdl_operation.ops->add_outfault = 
-        axis2_wsdl_operation_add_outfault;
+    wsdl_op_impl->wsdl_op.ops->add_outfault = 
+        axis2_wsdl_op_add_outfault;
 	
-	return &(wsdl_operation_impl->wsdl_operation);	
+	return &(wsdl_op_impl->wsdl_op);	
 }
 
 /******************************************************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_free (axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_free (axis2_wsdl_op_t *wsdl_op,
                             axis2_env_t **env)
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-	AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+	AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(NULL != wsdl_operation->ops)
+    if(NULL != wsdl_op->ops)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_operation->ops);
-        wsdl_operation->ops = NULL;
+        AXIS2_FREE((*env)->allocator, wsdl_op->ops);
+        wsdl_op->ops = NULL;
     }
     
-    if(NULL != wsdl_operation->extensible_component)
+    if(NULL != wsdl_op->extensible_component)
     {
-        AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_operation->extensible_component, env);
-        wsdl_operation->extensible_component = NULL;
+        AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_op->extensible_component, env);
+        wsdl_op->extensible_component = NULL;
     }
     
-    if(NULL != wsdl_operation_impl->infaults)
+    if(NULL != wsdl_op_impl->infaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_operation_impl->infaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_op_impl->infaults, env); i++)
         {
             struct axis2_wsdl_fault_ref *fault = NULL;
-            fault = AXIS2_LINKED_LIST_GET(wsdl_operation_impl->infaults, env, i);
+            fault = AXIS2_LINKED_LIST_GET(wsdl_op_impl->infaults, env, i);
             
             fault = (struct axis2_wsdl_fault_ref *) val;
             if (fault)
@@ -326,18 +326,18 @@
             fault = NULL;
                
         }
-        AXIS2_LINKED_LIST_FREE(wsdl_operation_impl->infaults, env);
-        wsdl_operation_impl->infaults = NULL;
+        AXIS2_LINKED_LIST_FREE(wsdl_op_impl->infaults, env);
+        wsdl_op_impl->infaults = NULL;
     }
     
-    if(NULL != wsdl_operation_impl->outfaults)
+    if(NULL != wsdl_op_impl->outfaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_operation_impl->outfaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_op_impl->outfaults, env); i++)
         {
             struct axis2_wsdl_fault_ref *fault = NULL;
-            fault = AXIS2_LINKED_LIST_GET(wsdl_operation_impl->outfaults, env, i);
+            fault = AXIS2_LINKED_LIST_GET(wsdl_op_impl->outfaults, env, i);
             
             fault = (struct axis2_wsdl_fault_ref *) val;
             if (fault)
@@ -347,76 +347,76 @@
             fault = NULL;
                
         }
-        AXIS2_LINKED_LIST_FREE(wsdl_operation_impl->outfaults, env);
-        wsdl_operation_impl->outfaults = NULL;
+        AXIS2_LINKED_LIST_FREE(wsdl_op_impl->outfaults, env);
+        wsdl_op_impl->outfaults = NULL;
     }
     
-    if(NULL != wsdl_operation_impl->name)
+    if(NULL != wsdl_op_impl->name)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_operation_impl->name);
-        wsdl_operation_impl->name = NULL;
+        AXIS2_FREE((*env)->allocator, wsdl_op_impl->name);
+        wsdl_op_impl->name = NULL;
     }
     
-    if(NULL != wsdl_operation_impl->style)
+    if(NULL != wsdl_op_impl->style)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_operation_impl->style);
-        wsdl_operation_impl->style = NULL;
+        AXIS2_FREE((*env)->allocator, wsdl_op_impl->style);
+        wsdl_op_impl->style = NULL;
     }
-    if(wsdl_operation_impl)
+    if(wsdl_op_impl)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_operation_impl);
-        wsdl_operation_impl = NULL;
+        AXIS2_FREE((*env)->allocator, wsdl_op_impl);
+        wsdl_op_impl = NULL;
     }
 	return AXIS2_SUCCESS;
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_set_msg_exchange_pattern (
-		                                axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_set_msg_exchange_pattern (
+		                                axis2_wsdl_op_t *wsdl_op, 
                                         axis2_env_t **env, 
 		                                axis2_char_t *msg_exchange_pattern)
 {
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, msg_exchange_pattern, AXIS2_FAILURE);
 	
     axis2_char_t *pattern_l = AXIS2_STRDUP(msg_exchange_pattern, env);
     if(NULL == pattern_l)
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
     
-	AXIS2_INTF_TO_IMPL(wsdl_operation)->msg_exchange_pattern = pattern_l;
+	AXIS2_INTF_TO_IMPL(wsdl_op)->msg_exchange_pattern = pattern_l;
 	
 	return AXIS2_SUCCESS;
 }
 
 axis2_char_t * AXIS2_CALL 
-axis2_wsdl_operation_get_msg_exchange_pattern (
-                                        axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_get_msg_exchange_pattern (
+                                        axis2_wsdl_op_t *wsdl_op, 
                                         axis2_env_t **env)
 {
-	AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, NULL);
+	AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, NULL);
     
-	return AXIS2_INTF_TO_IMPL(wsdl_operation)->msg_exchange_pattern;
+	return AXIS2_INTF_TO_IMPL(wsdl_op)->msg_exchange_pattern;
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_set_name (axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_set_name (axis2_wsdl_op_t *wsdl_op, 
                                 axis2_env_t **env,
 		                        axis2_qname_t *name)
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
 	
-    if(wsdl_operation_impl->name)
+    if(wsdl_op_impl->name)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_operation_impl->name);
-        wsdl_operation_impl->name = NULL;
+        AXIS2_FREE((*env)->allocator, wsdl_op_impl->name);
+        wsdl_op_impl->name = NULL;
     }
-	wsdl_operation_impl->name = AXIS2_STRDUP(name, env);
-    if(!wsdl_operation_impl->name)
+	wsdl_op_impl->name = AXIS2_STRDUP(name, env);
+    if(!wsdl_op_impl->name)
     {
         return AXIS2_FAILURE;
     }
@@ -426,72 +426,72 @@
 
 
 axis2_qname_t * AXIS2_CALL 
-axis2_wsdl_operation_get_name (axis2_wsdl_operation_t *wsdl_operation, 
+axis2_wsdl_op_get_name (axis2_wsdl_op_t *wsdl_op, 
                                 axis2_env_t **env)
 {
-	AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, NULL);
+	AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, NULL);
     
-	return AXIS2_INTF_TO_IMPL(wsdl_operation)->name;
+	return AXIS2_INTF_TO_IMPL(wsdl_op)->name;
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_operation_set_style (axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_style (axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
 		                            axis2_char_t *style)
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, style, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(wsdl_operation_impl->style)
+    if(wsdl_op_impl->style)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_operation_impl->style);
-        wsdl_operation_impl->style = NULL;
+        AXIS2_FREE((*env)->allocator, wsdl_op_impl->style);
+        wsdl_op_impl->style = NULL;
     }
-	wsdl_operation_impl->style = style;
+	wsdl_op_impl->style = style;
 	
 	return AXIS2_SUCCESS;		
 }
 
 axis2_char_t * AXIS2_CALL 
-axis2_wsdl_operation_get_style (axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_style (axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env)
 {
-	AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, NULL);
+	AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, NULL);
 	
-	return AXIS2_INTF_TO_IMPL(wsdl_operation)->style;
+	return AXIS2_INTF_TO_IMPL(wsdl_op)->style;
 }
 
 axis2_linked_list_t * AXIS2_CALL
-axis2_wsdl_operation_get_infaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_infaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env) 
 {
-    return AXIS2_INTF_TO_IMPL(wsdl_operation)->infaults;
+    return AXIS2_INTF_TO_IMPL(wsdl_op)->infaults;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_infaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_infaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_linked_list_t *infaults) 
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, infaults, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(wsdl_operation_impl->infaults)
+    if(wsdl_op_impl->infaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_operation_impl->infaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_op_impl->infaults, env); i++)
         {
             struct axis2_wsdl_fault_ref *fault = NULL;
-            fault = AXIS2_LINKED_LIST_GET(wsdl_operation_impl->infaults, env, i);
+            fault = AXIS2_LINKED_LIST_GET(wsdl_op_impl->infaults, env, i);
             
             fault = (struct axis2_wsdl_fault_ref *) val;
             if (fault)
@@ -502,68 +502,68 @@
                
         }
     }
-    AXIS2_INTF_TO_IMPL(wsdl_operation)->infaults = infaults;
+    AXIS2_INTF_TO_IMPL(wsdl_op)->infaults = infaults;
     return AXIS2_SUCCESS;
 }
 
 axis2_wsdl_msg_ref_t *AXIS2_CALL 
-axis2_wsdl_operation_get_input_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_input_msg(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env) 
 {
-    return AXIS2_INTF_TO_IMPL(wsdl_operation)->input_msg;
+    return AXIS2_INTF_TO_IMPL(wsdl_op)->input_msg;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_input_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_input_msg(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_wsdl_msg_ref_t *input_msg) 
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, env, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(wsdl_operation_impl->input_msg)
+    if(wsdl_op_impl->input_msg)
     {
-        AXIS2_WSDL_MSG_REF_FREE(wsdl_operation_impl->input_msg, env);
-        wsdl_operation_impl->input_msg = NULL;
+        AXIS2_WSDL_MSG_REF_FREE(wsdl_op_impl->input_msg, env);
+        wsdl_op_impl->input_msg = NULL;
     }
-    wsdl_operation_impl->input_msg = input_msg;
+    wsdl_op_impl->input_msg = input_msg;
     
     return AXIS2_SUCCESS;
 }
 
 axis2_linked_list_t *AXIS2_CALL
-axis2_wsdl_operation_get_outfaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_outfaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, NULL);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, NULL);
     
-    return AXIS2_INTF_TO_IMPL(wsdl_operation)->outfaults;
+    return AXIS2_INTF_TO_IMPL(wsdl_op)->outfaults;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_outfaults(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_outfaults(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_linked_list_t *outfaults) 
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, outfaults, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(wsdl_operation_impl->infaults)
+    if(wsdl_op_impl->infaults)
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_operation_impl->outfaults, env); i++)
+        for (i = 0; i < AXIS2_LINKED_LIST_SIZE(wsdl_op_impl->outfaults, env); i++)
         {
             struct axis2_wsdl_fault_ref *fault = NULL;
-            fault = AXIS2_LINKED_LIST_GET(wsdl_operation_impl->outfaults, env, i);
+            fault = AXIS2_LINKED_LIST_GET(wsdl_op_impl->outfaults, env, i);
             
             fault = (struct axis2_wsdl_fault_ref *) val;
             if (fault)
@@ -574,81 +574,81 @@
                
         }
     }
-    AXIS2_INTF_TO_IMPL(wsdl_operation)->outfaults = outfaults;
+    AXIS2_INTF_TO_IMPL(wsdl_op)->outfaults = outfaults;
     return AXIS2_SUCCESS;
 }
 
 axis2_wsdl_msg_ref_t *AXIS2_CALL
-axis2_wsdl_operation_get_output_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_output_msg(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env) 
 {
-    return AXIS2_INTF_TO_IMPL(wsdl_operation)->output_msg;
+    return AXIS2_INTF_TO_IMPL(wsdl_op)->output_msg;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_output_msg(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_output_msg(axis2_wsdl_op_t *wsdl_op,
                                         axis2_env_t **env,
                                         axis2_wsdl_msg_ref_t *output_msg) 
 {
-    axis2_wsdl_operation_impl_t *wsdl_operation_impl = NULL;
+    axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, output_msg, AXIS2_FAILURE);
     
-    wsdl_operation_impl = AXIS2_INTF_TO_IMPL(wsdl_operation);
+    wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(wsdl_operation_impl->output_msg)
+    if(wsdl_op_impl->output_msg)
     {
-        AXIS2_WSDL_MSG_REF_FREE(wsdl_operation_impl->output_msg, env);
-        wsdl_operation_impl->output_msg = NULL;
+        AXIS2_WSDL_MSG_REF_FREE(wsdl_op_impl->output_msg, env);
+        wsdl_op_impl->output_msg = NULL;
     }
-    wsdl_operation_impl->output_msg = output_msg;
+    wsdl_op_impl->output_msg = output_msg;
     return AXIS2_SUCCESS;
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_wsdl_operation_is_safe(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_is_safe(axis2_wsdl_op_t *wsdl_op,
                                 axis2_env_t **env) 
 {
-    return AXIS2_INTF_TO_IMPL(wsdl_operation)->safety;
+    return AXIS2_INTF_TO_IMPL(wsdl_op)->safety;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_set_safety(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_set_safety(axis2_wsdl_op_t *wsdl_op,
                                 axis2_env_t **env,
                                 axis2_bool_t safe) 
 {
-    AXIS2_INTF_TO_IMPL(wsdl_operation)->safety = safe;
+    AXIS2_INTF_TO_IMPL(wsdl_op)->safety = safe;
     return AXIS2_SUCCESS;
 }
 
 axis2_char_t *AXIS2_CALL
-axis2_wsdl_operation_get_target_namespace(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_get_target_namespace(axis2_wsdl_op_t *wsdl_op,
                                             axis2_env_t **env) 
 {
     
-    return AXIS2_QNAME_GET_URI(AXIS2_INTF_TO_IMPL(wsdl_operation)->name, env);
+    return AXIS2_QNAME_GET_URI(AXIS2_INTF_TO_IMPL(wsdl_op)->name, env);
     
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_add_infault(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_add_infault(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_wsdl_fault_ref_t *infault) 
 {
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, infault, AXIS2_FAILURE);
     
-    return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(wsdl_operation)->infaults, env, infault);
+    return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(wsdl_op)->infaults, env, infault);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_operation_add_outfault(axis2_wsdl_operation_t *wsdl_operation,
+axis2_wsdl_op_add_outfault(axis2_wsdl_op_t *wsdl_op,
                                     axis2_env_t **env,
                                     axis2_wsdl_fault_ref_t *outfault) 
 {
-    AXIS2_FUNC_PARAM_CHECK(wsdl_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, outfault, AXIS2_FAILURE);
     
-    return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(wsdl_operation)->outfaults, env, outfault);
+    return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(wsdl_op)->outfaults, env, outfault);
 }

Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_operation.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_operation.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_operation.c Mon Dec 12 22:23:36 2005
@@ -14,218 +14,218 @@
  * limitations under the License.
  */
  
-#include <axis2_wsdl_soap_operation.h>
+#include <axis2_wsdl_soap_op.h>
 
 /** 
- * @brief Wsdl soap operation struct impl
+ * @brief Wsdl soap op struct impl
  *	Wsdl soap element
  */ 
-typedef struct axis2_wsdl_soap_operation_impl
+typedef struct axis2_wsdl_soap_op_impl
 {
-	axis2_wsdl_soap_operation_t soap_operation;
+	axis2_wsdl_soap_op_t soap_op;
     
     axis2_char_t *soap_action;
 
     axis2_char_t *style;
     
-} axis2_wsdl_soap_operation_impl_t;
+} axis2_wsdl_soap_op_impl_t;
 
-#define AXIS2_INTF_TO_IMPL(soap_operation) \
-		((axis2_wsdl_soap_operation_impl_t *)soap_operation)
+#define AXIS2_INTF_TO_IMPL(soap_op) \
+		((axis2_wsdl_soap_op_impl_t *)soap_op)
 
 /************************* Function prototypes ********************************/
 
 axis2_status_t AXIS2_CALL
-	axis2_wsdl_soap_operation_free (
-                axis2_wsdl_soap_operation_t *soap_operation,
+	axis2_wsdl_soap_op_free (
+                axis2_wsdl_soap_op_t *soap_op,
 				axis2_env_t **env);
 
 axis2_char_t *AXIS2_CALL
-axis2_wsdl_soap_operation_get_style(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_get_style(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env);
     
 axis2_status_t AXIS2_CALL
-axis2_wsdl_soap_operation_set_style(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_set_style(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env,
                                     axis2_char_t *style);
 
 axis2_char_t * AXIS2_CALL
-axis2_wsdl_soap_operation_get_soap_action(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_get_soap_action(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_soap_operation_set_soap_action(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_set_soap_action(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env,
                                     axis2_char_t *soap_action);
 
                         
 /************************** End of function prototypes ************************/
 
-axis2_wsdl_soap_operation_t * AXIS2_CALL 
-axis2_wsdl_soap_operation_create (axis2_env_t **env)
+axis2_wsdl_soap_op_t * AXIS2_CALL 
+axis2_wsdl_soap_op_create (axis2_env_t **env)
 {
-    axis2_wsdl_soap_operation_impl_t *soap_operation_impl = NULL;
+    axis2_wsdl_soap_op_impl_t *soap_op_impl = NULL;
     
 	AXIS2_ENV_CHECK(env, NULL);
 	
-	soap_operation_impl = (axis2_wsdl_soap_operation_impl_t *) 
-        AXIS2_MALLOC((*env)->allocator, sizeof(axis2_wsdl_soap_operation_impl_t));
+	soap_op_impl = (axis2_wsdl_soap_op_impl_t *) 
+        AXIS2_MALLOC((*env)->allocator, sizeof(axis2_wsdl_soap_op_impl_t));
 	
-	if(NULL == soap_operation_impl)
+	if(NULL == soap_op_impl)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL); 
         return NULL;
     }
     
-    soap_operation_impl->style = NULL;
-    soap_operation_impl->soap_action = NULL;
-    soap_operation_impl->soap_operation.ops = NULL;
+    soap_op_impl->style = NULL;
+    soap_op_impl->soap_action = NULL;
+    soap_op_impl->soap_op.ops = NULL;
     axis2_qname_t *type_l = NULL;
     
-    type_l = axis2_qname_create(env, "operation", SOAP_11_OPERATION, NULL);
+    type_l = axis2_qname_create(env, "op", SOAP_11_OPERATION, NULL);
     
-    AXIS2_WSDL_EXTENSIBLE_ELEMENT_SET_TYPE(soap_operation_impl->soap_operation.
+    AXIS2_WSDL_EXTENSIBLE_ELEMENT_SET_TYPE(soap_op_impl->soap_op.
         extensible_element, env, type_l);
     
-	soap_operation_impl->soap_operation.ops = 
-		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_soap_operation_ops_t));
-	if(NULL == soap_operation_impl->soap_operation.ops)
+	soap_op_impl->soap_op.ops = 
+		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_soap_op_ops_t));
+	if(NULL == soap_op_impl->soap_op.ops)
     {
-        axis2_wsdl_soap_operation_free(&(soap_operation_impl->
-            soap_operation), env);
+        axis2_wsdl_soap_op_free(&(soap_op_impl->
+            soap_op), env);
 		AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         return NULL;
     }
     
-    soap_operation_impl->soap_operation.ops->free =  
-        axis2_wsdl_soap_operation_free;
+    soap_op_impl->soap_op.ops->free =  
+        axis2_wsdl_soap_op_free;
     
-	soap_operation_impl->soap_operation.ops->get_style =  
-        axis2_wsdl_soap_operation_get_style;
-	soap_operation_impl->soap_operation.ops->set_style =  
-        axis2_wsdl_soap_operation_set_style;
-	soap_operation_impl->soap_operation.ops->get_soap_action =  
-        axis2_wsdl_soap_operation_get_soap_action;
-	soap_operation_impl->soap_operation.ops->set_soap_action = 
-        axis2_wsdl_soap_operation_set_soap_action;
+	soap_op_impl->soap_op.ops->get_style =  
+        axis2_wsdl_soap_op_get_style;
+	soap_op_impl->soap_op.ops->set_style =  
+        axis2_wsdl_soap_op_set_style;
+	soap_op_impl->soap_op.ops->get_soap_action =  
+        axis2_wsdl_soap_op_get_soap_action;
+	soap_op_impl->soap_op.ops->set_soap_action = 
+        axis2_wsdl_soap_op_set_soap_action;
     
-	return &(soap_operation_impl->soap_operation);
+	return &(soap_op_impl->soap_op);
 }
 
-axis2_wsdl_soap_operation_t * AXIS2_CALL 
-axis2_wsdl_soap_operation_create_with_type (axis2_env_t **env, axis2_qname_t *type)
+axis2_wsdl_soap_op_t * AXIS2_CALL 
+axis2_wsdl_soap_op_create_with_type (axis2_env_t **env, axis2_qname_t *type)
 {
-    axis2_wsdl_soap_operation_t *soap_operation = NULL;
+    axis2_wsdl_soap_op_t *soap_op = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, type, NULL);
     
-    soap_operation = axis2_wsdl_soap_operation_create(env);
+    soap_op = axis2_wsdl_soap_op_create(env);
     
-    if(AXIS2_FAILURE == AXIS2_WSDL_EXTENSIBLE_ELEMENT_SET_TYPE(soap_operation->
+    if(AXIS2_FAILURE == AXIS2_WSDL_EXTENSIBLE_ELEMENT_SET_TYPE(soap_op->
         extensible_element, env, type))
     {
-        axis2_wsdl_soap_operation_free(soap_operation, env);
-        soap_operation = NULL;
+        axis2_wsdl_soap_op_free(soap_op, env);
+        soap_op = NULL;
     }
-    return soap_operation;
+    return soap_op;
     
 }
 
 /***************************Function implementation****************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_soap_operation_free (
-                        axis2_wsdl_soap_operation_t *soap_operation, 
+axis2_wsdl_soap_op_free (
+                        axis2_wsdl_soap_op_t *soap_op, 
                         axis2_env_t **env)
 {
-    axis2_wsdl_soap_operation_impl_t *soap_operation_impl = NULL;
+    axis2_wsdl_soap_op_impl_t *soap_op_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(soap_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(soap_op, env, AXIS2_FAILURE);
     
-    soap_operation_impl = AXIS2_INTF_TO_IMPL(soap_operation);
+    soap_op_impl = AXIS2_INTF_TO_IMPL(soap_op);
     
-	if(NULL != soap_operation->ops)
+	if(NULL != soap_op->ops)
     {
-        AXIS2_FREE((*env)->allocator, soap_operation->ops);
-        soap_operation->ops = NULL;
+        AXIS2_FREE((*env)->allocator, soap_op->ops);
+        soap_op->ops = NULL;
     }
     
-    if(NULL != soap_operation_impl->style)
+    if(NULL != soap_op_impl->style)
     {
-        AXIS2_FREE((*env)->allocator, soap_operation_impl->style);
-        soap_operation_impl->style = NULL;
+        AXIS2_FREE((*env)->allocator, soap_op_impl->style);
+        soap_op_impl->style = NULL;
     }
     
-    if(NULL != soap_operation_impl->soap_action)
+    if(NULL != soap_op_impl->soap_action)
     {
-        AXIS2_FREE((*env)->allocator, soap_operation_impl->soap_action);
-        soap_operation_impl->soap_action = NULL;
+        AXIS2_FREE((*env)->allocator, soap_op_impl->soap_action);
+        soap_op_impl->soap_action = NULL;
     }
     
-    if(soap_operation_impl)
-        AXIS2_FREE((*env)->allocator, soap_operation_impl);
-    soap_operation_impl = NULL;
+    if(soap_op_impl)
+        AXIS2_FREE((*env)->allocator, soap_op_impl);
+    soap_op_impl = NULL;
     
 	return AXIS2_SUCCESS;
 }
 
 axis2_char_t *AXIS2_CALL
-axis2_wsdl_soap_operation_get_style(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_get_style(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(soap_operation, env, NULL);
+    AXIS2_FUNC_PARAM_CHECK(soap_op, env, NULL);
     
-    return AXIS2_INTF_TO_IMPL(soap_operation)->style;
+    return AXIS2_INTF_TO_IMPL(soap_op)->style;
 }
     
 axis2_status_t AXIS2_CALL
-axis2_wsdl_soap_operation_set_style(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_set_style(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env,
                                     axis2_char_t *style) 
 {
-    axis2_wsdl_soap_operation_impl_t *soap_operation_impl = AXIS2_INTF_TO_IMPL(
-        soap_operation);
+    axis2_wsdl_soap_op_impl_t *soap_op_impl = AXIS2_INTF_TO_IMPL(
+        soap_op);
     
-    AXIS2_FUNC_PARAM_CHECK(soap_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(soap_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, style, AXIS2_FAILURE);
     
-    if(soap_operation_impl->style)
+    if(soap_op_impl->style)
     {
         AXIS2_FREE((*env)->allocator, style);
-        soap_operation_impl->style = NULL;
+        soap_op_impl->style = NULL;
     }
     
-    soap_operation_impl->style = style;
+    soap_op_impl->style = style;
     return AXIS2_SUCCESS;
 }
 
 axis2_char_t * AXIS2_CALL
-axis2_wsdl_soap_operation_get_soap_action(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_get_soap_action(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(soap_operation, env, NULL);
+    AXIS2_FUNC_PARAM_CHECK(soap_op, env, NULL);
     
-    return AXIS2_INTF_TO_IMPL(soap_operation)->soap_action;
+    return AXIS2_INTF_TO_IMPL(soap_op)->soap_action;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_wsdl_soap_operation_set_soap_action(axis2_wsdl_soap_operation_t *soap_operation,
+axis2_wsdl_soap_op_set_soap_action(axis2_wsdl_soap_op_t *soap_op,
                                     axis2_env_t **env,
                                     axis2_char_t *soap_action) 
 {   
-    axis2_wsdl_soap_operation_impl_t *soap_operation_impl = AXIS2_INTF_TO_IMPL(
-        soap_operation);
+    axis2_wsdl_soap_op_impl_t *soap_op_impl = AXIS2_INTF_TO_IMPL(
+        soap_op);
     
-    AXIS2_FUNC_PARAM_CHECK(soap_operation, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(soap_op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_action, AXIS2_FAILURE);
     
-    if(soap_operation_impl->soap_action)
+    if(soap_op_impl->soap_action)
     {
         AXIS2_FREE((*env)->allocator, soap_action);
-        soap_operation_impl->soap_action = NULL;
+        soap_op_impl->soap_action = NULL;
     }
     
-    soap_operation_impl->soap_action = soap_action;
+    soap_op_impl->soap_action = soap_action;
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c Mon Dec 12 22:23:36 2005
@@ -126,7 +126,7 @@
     }
     attribute->ns = ns;
 
-    /** operations */
+    /** ops */
     attribute->qname = NULL;
     attribute->om_attribute.ops = (axis2_om_attribute_ops_t*)AXIS2_MALLOC ((*env)->allocator,
                       sizeof (axis2_om_attribute_ops_t));

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Mon Dec 12 22:23:36 2005
@@ -98,7 +98,7 @@
         AXIS2_OM_NODE_ADD_CHILD((*node), env, parent); 
     }
 
-    /* operations */
+    /* ops */
     comment->om_comment.ops = NULL;
     comment->om_comment.ops = (axis2_om_comment_ops_t *)AXIS2_MALLOC(
                               (*env)->allocator,sizeof(axis2_om_comment_ops_t));

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Mon Dec 12 22:23:36 2005
@@ -99,7 +99,7 @@
         AXIS2_OM_NODE_ADD_CHILD((*node), env, parent);
     }
 
-    /* operations */
+    /* ops */
     doctype->om_doctype.ops = NULL;
     doctype->om_doctype.ops = (axis2_om_doctype_ops_t *) AXIS2_MALLOC (
                                 (*env)->allocator,sizeof(axis2_om_doctype_ops_t));

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c Mon Dec 12 22:23:36 2005
@@ -117,7 +117,7 @@
         }
     }
 
-    /* operations */
+    /* ops */
     ns->om_namespace.ops = NULL;
     ns->om_namespace.ops = (axis2_om_namespace_ops_t *) AXIS2_MALLOC (
                             (*env)->allocator, sizeof(axis2_om_namespace_ops_t));

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c Mon Dec 12 22:23:36 2005
@@ -120,7 +120,7 @@
         AXIS2_OM_NODE_ADD_CHILD((*node), env, parent); 
     }
 
-    /* operations */
+    /* ops */
     processing_instruction->om_pi.ops = NULL;
     processing_instruction->om_pi.ops =
         (axis2_om_processing_instruction_ops_t *) AXIS2_MALLOC (