axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r368011 - in /webservices/axis2/trunk/c: include/ modules/core/deployment/ modules/core/description/ modules/wsdl/ test/unit/core/phaseresolver/
Date Wed, 11 Jan 2006 11:31:10 GMT
Author: damitha
Date: Wed Jan 11 03:30:48 2006
New Revision: 368011

URL: http://svn.apache.org/viewcvs?rev=368011&view=rev
Log:
Changed axis2_wsd_op_set_name to axis2_wsdl_op_set_qname

Modified:
    webservices/axis2/trunk/c/include/axis2_op.h
    webservices/axis2/trunk/c/include/axis2_wsdl_op.h
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
    webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c

Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_op.h?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Wed Jan 11 03:30:48 2006
@@ -121,7 +121,7 @@
                  axis2_env_t **env);
 
     axis2_status_t (AXIS2_CALL *
-    set_name) (axis2_op_t *op, 
+    set_qname) (axis2_op_t *op, 
                 axis2_env_t **env,
                 axis2_qname_t *qname);
     
@@ -442,8 +442,8 @@
 #define AXIS2_OP_GET_MSG_RECEIVER(op, env) \
 		((op)->ops->get_msg_recv (op, env))
 
-#define AXIS2_OP_SET_NAME(op, env, qname) \
-		((op)->ops->set_name (op, env, qname))
+#define AXIS2_OP_SET_QNAME(op, env, qname) \
+		((op)->ops->set_qname (op, env, qname))
         
 #define AXIS2_OP_GET_QNAME(op, env) \
 		((op)->ops->get_qname (op, env))

Modified: webservices/axis2/trunk/c/include/axis2_wsdl_op.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_op.h?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_op.h Wed Jan 11 03:30:48 2006
@@ -84,7 +84,7 @@
      * @param axis2_qname_t* op name
      */
     axis2_status_t (AXIS2_CALL *
-    set_name) (axis2_wsdl_op_t *wsdl_op, 
+    set_qname) (axis2_wsdl_op_t *wsdl_op, 
                 axis2_env_t **env,
                 axis2_qname_t *name);
                                         
@@ -93,7 +93,7 @@
      * @return axis2_qname_t wsdl op name
      */
     axis2_qname_t *(AXIS2_CALL *
-    get_name) (axis2_wsdl_op_t *wsdl_op,
+    get_qname) (axis2_wsdl_op_t *wsdl_op,
                 axis2_env_t **env);
     
 
@@ -261,11 +261,11 @@
 #define AXIS2_WSDL_OP_SET_MSG_EXCHANGE_PATTERN(wsdl_op, env, pattern) \
 		((wsdl_op)->ops->set_msg_exchange_pattern(wsdl_op, env, pattern))
 		
-#define AXIS2_WSDL_OP_GET_NAME(wsdl_op, env) \
-		((wsdl_op)->ops->get_name(wsdl_op, env))
+#define AXIS2_WSDL_OP_GET_QNAME(wsdl_op, env) \
+		((wsdl_op)->ops->get_qname(wsdl_op, env))
 		
-#define AXIS2_WSDL_OP_SET_NAME(wsdl_op, env, name) \
-		((wsdl_op)->ops->set_name(wsdl_op, env, name))
+#define AXIS2_WSDL_OP_SET_QNAME(wsdl_op, env, name) \
+		((wsdl_op)->ops->set_qname(wsdl_op, env, name))
 		
 #define AXIS2_WSDL_OP_SET_STYLE(wsdl_op, env, style) \
 		((wsdl_op)->ops->set_style(wsdl_op, env, style))

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Wed Jan 11 03:30:48
2006
@@ -390,7 +390,7 @@
         
         op_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(op_name_att, env);
         qopname = axis2_qname_create(env, op_name, NULL, NULL);
-        AXIS2_OP_SET_NAME(op_desc, env, qopname);
+        AXIS2_OP_SET_QNAME(op_desc, env, qopname);
         /* Operation parameters */
         qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
         params = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env, 

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Wed Jan 11 03:30:48 2006
@@ -505,7 +505,7 @@
                /*op_desc = axis2_op_create(env, mep_url); */
                 op_desc = axis2_op_create(env);
             }
-            AXIS2_OP_SET_NAME(op_desc, env, qopname);
+            AXIS2_OP_SET_QNAME(op_desc, env, qopname);
         }
         else
         {

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/op.c?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Wed Jan 11 03:30:48 2006
@@ -83,7 +83,7 @@
                                 axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_op_set_name (axis2_op_t *op, 
+axis2_op_set_qname (axis2_op_t *op, 
                             axis2_env_t **env,
                             axis2_qname_t *qname);
                             
@@ -444,7 +444,7 @@
 	op_impl->op.ops->get_parent = axis2_op_get_parent;
 	op_impl->op.ops->set_msg_recv = axis2_op_set_msg_recv;
 	op_impl->op.ops->get_msg_recv = axis2_op_get_msg_recv;
-    op_impl->op.ops->set_name = axis2_op_set_name;
+    op_impl->op.ops->set_qname = axis2_op_set_qname;
 	op_impl->op.ops->get_qname = axis2_op_get_qname;
     
 	op_impl->op.ops->set_msg_exchange_pattern 
@@ -505,7 +505,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);	
     
-    op_impl = AXIS2_INTF_TO_IMPL(axis2_op_create(env));
+    op_impl = (axis2_op_impl_t *) axis2_op_create(env);
     
 	if(NULL == op_impl)
 	{
@@ -524,7 +524,7 @@
         }
     }
     
-	status = axis2_op_set_name(&(op_impl->op), env, qname);
+	status = axis2_op_set_qname(&(op_impl->op), env, qname);
     if(AXIS2_FAILURE == status)
     {
         axis2_op_free(&(op_impl->op), env);
@@ -540,9 +540,10 @@
 {
 	axis2_op_impl_t *op_impl = NULL;
     
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, wsdl_op, NULL);
     
-    op_impl = AXIS2_INTF_TO_IMPL(axis2_op_create(env));
+    op_impl = (axis2_op_impl_t *) axis2_op_create(env);
     
 	if(NULL == op_impl)
 	{
@@ -859,13 +860,13 @@
 }
  
 axis2_status_t AXIS2_CALL
-axis2_op_set_name (axis2_op_t *op, 
+axis2_op_set_qname (axis2_op_t *op, 
                             axis2_env_t **env,
                             axis2_qname_t *qname)
 {
     AXIS2_FUNC_PARAM_CHECK(op, env, AXIS2_FAILURE);
 	
-    return AXIS2_WSDL_OP_SET_NAME(op->wsdl_op, env, qname);
+    return AXIS2_WSDL_OP_SET_QNAME(op->wsdl_op, env, qname);
 }
     
 axis2_qname_t * AXIS2_CALL
@@ -874,7 +875,7 @@
 {
     AXIS2_FUNC_PARAM_CHECK(op, env, NULL);
 	
-    return AXIS2_WSDL_OP_GET_NAME(op->wsdl_op,
+    return AXIS2_WSDL_OP_GET_QNAME(op->wsdl_op,
         env);
 }
 
@@ -1154,19 +1155,20 @@
     
     if(op_impl->phases_in_fault_flow)
     {
-        void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->phases_in_fault_flow, env);
i++)
+        int size = 0;
+        
+        size = AXIS2_ARRAY_LIST_SIZE(op_impl->phases_in_fault_flow, env);
+        for (i = 0; i < size; i++)
         {
-            struct axis2_phase *phase = NULL;
+            axis2_phase_t *phase = NULL;
             phase = AXIS2_ARRAY_LIST_GET(op_impl->phases_in_fault_flow, env, i);
             
-            phase = (struct axis2_phase *) val;
             if (phase)
-               AXIS2_PHASE_FREE (phase, env);
-            
-            val = NULL;
-            phase = NULL;
+            {
+                AXIS2_PHASE_FREE (phase, env);
+                phase = NULL;
+            }
                
         }
         AXIS2_WSDL_OP_FREE(op_impl->phases_in_fault_flow, env);
@@ -1182,25 +1184,26 @@
                                             axis2_env_t **env,
                                             axis2_array_list_t *list) 
 {
+    axis2_op_impl_t *op_impl = NULL;
+    
     AXIS2_FUNC_PARAM_CHECK(op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
-    axis2_op_impl_t *op_impl = AXIS2_INTF_TO_IMPL(op);
+    op_impl = AXIS2_INTF_TO_IMPL(op);
+    
     if(op_impl->phases_out_fault_flow)
     {
-        void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->phases_out_fault_flow, env);
i++)
+        int size = 0;
+        size = AXIS2_ARRAY_LIST_SIZE(op_impl->phases_out_fault_flow, env);
+        for (i = 0; i < size; i++)
         {
-            struct axis2_phase *phase = NULL;
+            axis2_phase_t *phase = NULL;
             phase = AXIS2_ARRAY_LIST_GET(op_impl->phases_out_fault_flow, env, i);
-            
-            phase = (struct axis2_phase *) val;
             if (phase)
-               AXIS2_PHASE_FREE (phase, env);
-            
-            val = NULL;
-            phase = NULL;
-               
+            {
+                AXIS2_PHASE_FREE (phase, env);
+                phase = NULL;
+            } 
         }
         AXIS2_WSDL_OP_FREE(op_impl->phases_out_fault_flow, env);
         op_impl->phases_out_fault_flow = NULL;
@@ -1215,25 +1218,26 @@
                                         axis2_env_t **env,
                                         axis2_array_list_t *list) 
 {
+    axis2_op_impl_t *op_impl = NULL;
+    
     AXIS2_FUNC_PARAM_CHECK(op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
-    axis2_op_impl_t *op_impl = AXIS2_INTF_TO_IMPL(op);
+    op_impl = AXIS2_INTF_TO_IMPL(op);
+    
     if(op_impl->phases_outflow)
     {
-        void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->phases_outflow, env); i++)
+        int size = 0;
+        size = AXIS2_ARRAY_LIST_SIZE(op_impl->phases_outflow, env);
+        for (i = 0; i < size; i++)
         {
-            struct axis2_phase *phase = NULL;
+            axis2_phase_t *phase = NULL;
             phase = AXIS2_ARRAY_LIST_GET(op_impl->phases_outflow, env, i);
-            
-            phase = (struct axis2_phase *) val;
             if (phase)
-               AXIS2_PHASE_FREE (phase, env);
-            
-            val = NULL;
-            phase = NULL;
-               
+            {
+                AXIS2_PHASE_FREE (phase, env);
+                phase = NULL;
+            }
         }
         AXIS2_WSDL_OP_FREE(op_impl->phases_outflow, env);
         op_impl->phases_outflow = NULL;
@@ -1256,19 +1260,19 @@
     
     if(op_impl->remaining_phases_inflow)
     {
-        void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->remaining_phases_inflow, env);
i++)
+        int size = 0;
+        
+        size = AXIS2_ARRAY_LIST_SIZE(op_impl->remaining_phases_inflow, env);
+        for (i = 0; i < size; i++)
         {
-            struct axis2_phase *phase = NULL;
+            axis2_phase_t *phase = NULL;
             phase = AXIS2_ARRAY_LIST_GET(op_impl->remaining_phases_inflow, env, i);
-            
-            phase = (struct axis2_phase *) val;
             if (phase)
-               AXIS2_PHASE_FREE (phase, env);
-            
-            val = NULL;
-            phase = NULL;
+            {
+                AXIS2_PHASE_FREE (phase, env);
+                phase = NULL;
+            }
                
         }
         AXIS2_ARRAY_LIST_FREE(op_impl->remaining_phases_inflow, env);

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c Wed Jan 11 03:30:48 2006
@@ -482,7 +482,7 @@
     
     op_l = (struct axis2_op *) op;
         
-    wsdl_op_name = AXIS2_WSDL_OP_GET_NAME(op_l->wsdl_op, env);    
+    wsdl_op_name = AXIS2_WSDL_OP_GET_QNAME(op_l->wsdl_op, env);    
     if (!wsdl_op_name) 
     {
         /* The Operation name cannot be null (required) */

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c Wed Jan 11 03:30:48 2006
@@ -85,12 +85,12 @@
                                             axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_op_set_name (axis2_wsdl_op_t *wsdl_op, 
+axis2_wsdl_op_set_qname (axis2_wsdl_op_t *wsdl_op, 
                                 axis2_env_t **env,
 		                        axis2_qname_t *name);
 
 axis2_qname_t * AXIS2_CALL 
-axis2_wsdl_op_get_name (axis2_wsdl_op_t *wsdl_op,
+axis2_wsdl_op_get_qname (axis2_wsdl_op_t *wsdl_op,
                                 axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL 
@@ -232,8 +232,8 @@
     wsdl_op_impl->wsdl_op.ops->get_msg_exchange_pattern =
         axis2_wsdl_op_get_msg_exchange_pattern;
     
-    wsdl_op_impl->wsdl_op.ops->set_name = axis2_wsdl_op_set_name;
-    wsdl_op_impl->wsdl_op.ops->get_name = axis2_wsdl_op_get_name;
+    wsdl_op_impl->wsdl_op.ops->set_qname = axis2_wsdl_op_set_qname;
+    wsdl_op_impl->wsdl_op.ops->get_qname = axis2_wsdl_op_get_qname;
     wsdl_op_impl->wsdl_op.ops->set_style = axis2_wsdl_op_set_style;
     wsdl_op_impl->wsdl_op.ops->get_style = axis2_wsdl_op_get_style;   
     wsdl_op_impl->wsdl_op.ops->get_in_faults = axis2_wsdl_op_get_in_faults;       
@@ -385,7 +385,7 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_wsdl_op_set_name (axis2_wsdl_op_t *wsdl_op, 
+axis2_wsdl_op_set_qname (axis2_wsdl_op_t *wsdl_op, 
                                 axis2_env_t **env,
 		                        axis2_qname_t *name)
 {
@@ -412,7 +412,7 @@
 
 
 axis2_qname_t * AXIS2_CALL 
-axis2_wsdl_op_get_name (axis2_wsdl_op_t *wsdl_op, 
+axis2_wsdl_op_get_qname (axis2_wsdl_op_t *wsdl_op, 
                                 axis2_env_t **env)
 {
 	AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, NULL);

Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c?rev=368011&r1=368010&r2=368011&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c Wed Jan 11 03:30:48
2006
@@ -30,7 +30,7 @@
         module_desc);
     
     CuAssertIntEquals(tc, expected, actual);
-    AXIS2_FLOW_FREE(flow, env);
+    /*AXIS2_FLOW_FREE(flow, env); */
     /*AXIS2_OP_FREE(optr, env); */
     /*AXIS2_MODULE_DESC_FREE(module_desc, env);*/
     /*AXIS2_PHASE_RESOLVER_FREE(resolver, env); */



Mime
View raw message