You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by na...@apache.org on 2007/03/11 12:42:49 UTC

svn commit: r516892 - in /webservices/sandesha/trunk/c/src: client/ msgprocessors/ storage/permanent/ util/

Author: nandika
Date: Sun Mar 11 04:42:48 2007
New Revision: 516892

URL: http://svn.apache.org/viewvc?view=rev&rev=516892
Log:
compile errors fixed

Modified:
    webservices/sandesha/trunk/c/src/client/client.c
    webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
    webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
    webservices/sandesha/trunk/c/src/util/ack_mgr.c
    webservices/sandesha/trunk/c/src/util/fault_mgr.c
    webservices/sandesha/trunk/c/src/util/msg_creator.c
    webservices/sandesha/trunk/c/src/util/msg_init.c
    webservices/sandesha/trunk/c/src/util/sandesha2_utils.c

Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Sun Mar 11 04:42:48 2007
@@ -1820,7 +1820,7 @@
         return AXIS2_FAILURE;
     }
 
-    AXIS2_OP_SET_MSG_RECV(op, env,
+    axis2_op_set_msg_recv(op, env,
             AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, env));
     AXIS2_OP_CLIENT_SET_CALLBACK_RECV(op_client, env, callback_recv);
     return AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_FALSE);
@@ -1877,7 +1877,7 @@
         {
             AXIS2_SVC_CLIENT_FREE(svc_client, env);
         }
-        AXIS2_OP_SET_MSG_RECV(op, env, AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, 
+        axis2_op_set_msg_recv(op, env, AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, 
             env));
         AXIS2_OP_CLIENT_SET_CALLBACK_RECV(op_client, env, callback_recv);
         block = AXIS2_FALSE;

Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Sun Mar 11 04:42:48 2007
@@ -195,27 +195,27 @@
     }
     acks_to = axis2_endpoint_ref_create(env, acks_to_str);
     ack_op = axis2_op_create(env);
-    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(ack_op, env, AXIS2_MEP_URI_IN_ONLY);
-    rm_msg_op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+    axis2_op_set_msg_exchange_pattern(ack_op, env, AXIS2_MEP_URI_IN_ONLY);
+    rm_msg_op = axis2_msg_ctx_get_op(msg_ctx, env);
     if(rm_msg_op)
     {
         axis2_array_list_t *out_flow = NULL;
         axis2_array_list_t *new_out_flow = NULL;
         axis2_array_list_t *out_fault_flow = NULL;
         axis2_array_list_t *new_out_fault_flow = NULL;
-        out_flow = AXIS2_OP_GET_OUT_FLOW(rm_msg_op, env);
+        out_flow = axis2_op_get_out_flow(rm_msg_op, env);
         new_out_flow = axis2_phases_info_copy_flow(env, out_flow);
-        out_fault_flow = AXIS2_OP_GET_OUT_FLOW(rm_msg_op, env);
+        out_fault_flow = axis2_op_get_out_flow(rm_msg_op, env);
         new_out_fault_flow = axis2_phases_info_copy_flow(env, out_fault_flow);
         if(new_out_flow)
-            AXIS2_OP_SET_OUT_FLOW(ack_op, env, new_out_flow);
+            axis2_op_set_out_flow(ack_op, env, new_out_flow);
         if(new_out_fault_flow)
-            AXIS2_OP_SET_FAULT_OUT_FLOW(ack_op, env, new_out_fault_flow);
+            axis2_op_set_fault_out_flow(ack_op, env, new_out_fault_flow);
     }
     ack_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, rm_msg_ctx, 
         ack_op);
     property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
-    AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, 
+    axis2_msg_ctx_set_property(ack_msg_ctx, env, 
         SANDESHA2_APPLICATION_PROCESSING_DONE, property, AXIS2_FALSE);
     ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
     sandesha2_msg_ctx_set_rm_ns_val(ack_rm_msg, env, 
@@ -259,7 +259,7 @@
             axis2_op_ctx_t *op_ctx = NULL;
             
             operation = axis2_op_create(env);
-            AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(operation, env, 
+            axis2_op_set_msg_exchange_pattern(operation, env, 
                 AXIS2_MEP_URI_IN_OUT);
             op_ctx = axis2_op_ctx_create(env, operation, NULL);
             AXIS2_MSG_CTX_SET_OP(msg_ctx, env, operation);

Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Sun Mar 11 04:42:48 2007
@@ -531,7 +531,7 @@
         return AXIS2_FAILURE;
     }
     acks_to = axis2_endpoint_ref_create(env, acks_to_str);
-    mep = AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op, env);
+    mep = axis2_op_get_axis_specific_mep_const(op, env);
     back_channel_free = (reply_to_addr && !sandesha2_utils_is_anon_uri(env, 
         reply_to_addr)) || AXIS2_MEP_CONSTANT_IN_ONLY == mep;
     if(!reply_to_epr)
@@ -973,7 +973,7 @@
             }
         }        
     }
-    op_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(AXIS2_OP_CTX_GET_OP(
+    op_name = AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname(AXIS2_OP_CTX_GET_OP(
         axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env);
     if (to_epr)
         to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);

Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Sun Mar 11 04:42:48 2007
@@ -511,9 +511,9 @@
     qname = axis2_qname_create(env, "temp", NULL, NULL);
     
     out_in_op = axis2_op_create_with_qname(env, qname);
-    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(out_in_op, env, AXIS2_MEP_URI_OUT_IN);
-    AXIS2_OP_SET_IN_FLOW(out_in_op, env, 
-         AXIS2_OP_GET_IN_FLOW(old_op, env));
+    axis2_op_set_msg_exchange_pattern(out_in_op, env, AXIS2_MEP_URI_OUT_IN);
+    axis2_op_set_in_flow(out_in_op, env, 
+         axis2_op_get_in_flow(old_op, env));
 
     axis2_allocator_switch_to_global_pool(env->allocator);
     op_ctx = axis2_op_ctx_create(env, out_in_op, NULL);

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Sun Mar 11 04:42:48 2007
@@ -702,14 +702,14 @@
     }
     if(op)
     {
-        axis2_qname_t *qname = (axis2_qname_t *) AXIS2_OP_GET_QNAME(op, env);
+        axis2_qname_t *qname = (axis2_qname_t *) axis2_op_get_qname(op, env);
         axis2_char_t *mep = NULL;
         if(qname)
         {
             axis2_char_t *op_name = AXIS2_QNAME_TO_STRING(qname, env);
             sandesha2_msg_store_bean_set_op(bean, env, op_name);
         }
-        mep = (axis2_char_t *) AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+        mep = (axis2_char_t *) axis2_op_get_msg_exchange_pattern(op, env);
         sandesha2_msg_store_bean_set_op_mep(bean, env, mep);
     }
     sandesha2_msg_store_bean_set_flow(bean, env, AXIS2_MSG_CTX_GET_FLOW(msg_ctx, 
@@ -922,7 +922,7 @@
                 axis2_op_t *temp = NULL;
                 axis2_hash_this(index, NULL, NULL, &v);
                 temp = (axis2_op_t *) v;
-                mep = (axis2_char_t *) AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(temp, 
+                mep = (axis2_char_t *) axis2_op_get_msg_exchange_pattern(temp, 
                     env);
                 if(0 == AXIS2_STRCMP(mep, op_mep_str))
                 {

Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Sun Mar 11 04:42:48 2007
@@ -79,7 +79,7 @@
         return NULL;
     }
     ack_op = axis2_op_create(env);
-    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(ack_op, env, AXIS2_MEP_URI_OUT_ONLY);
+    axis2_op_set_msg_exchange_pattern(ack_op, env, AXIS2_MEP_URI_OUT_ONLY);
     
     ref_op = AXIS2_MSG_CTX_GET_OP(ref_msg, env);
     if(ref_op)
@@ -88,14 +88,14 @@
         axis2_array_list_t *out_fault_flow = NULL;
         axis2_array_list_t *new_out_flow = NULL;
         axis2_array_list_t *new_out_fault_flow = NULL;
-        out_flow = AXIS2_OP_GET_OUT_FLOW(ref_op, env);
+        out_flow = axis2_op_get_out_flow(ref_op, env);
         new_out_flow = axis2_phases_info_copy_flow(env, out_flow);
-        out_fault_flow = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_op, env);
+        out_fault_flow = axis2_op_get_fault_out_flow(ref_op, env);
         new_out_fault_flow = axis2_phases_info_copy_flow(env, out_fault_flow);
         if(new_out_flow)
-            AXIS2_OP_SET_OUT_FLOW(ack_op, env, new_out_flow);
+            axis2_op_set_out_flow(ack_op, env, new_out_flow);
         if(new_out_fault_flow)
-            AXIS2_OP_SET_FAULT_OUT_FLOW(ack_op, env, new_out_fault_flow);
+            axis2_op_set_fault_out_flow(ack_op, env, new_out_fault_flow);
     }
     ack_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, ref_rm_msg,
         ack_op);
@@ -149,7 +149,7 @@
         if(!op_ctx)
         {
             axis2_op_t *op = axis2_op_create(env);
-            AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_IN_OUT);
+            axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_IN_OUT);
             op_ctx = axis2_op_ctx_create(env, op, NULL);
             AXIS2_MSG_CTX_SET_OP(ref_msg, env, op);
             AXIS2_MSG_CTX_SET_OP_CTX(ref_msg, env, op_ctx);            

Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Sun Mar 11 04:42:48 2007
@@ -431,7 +431,7 @@
     AXIS2_MSG_CTX_SET_SVC_CTX_ID(fault_msg_ctx, env, 
                         AXIS2_MSG_CTX_GET_SVC_CTX_ID(ref_msg, env));
     op = axis2_op_create(env);
-    AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_ONLY);
+    axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_ONLY);
     op_ctx = axis2_op_ctx_create(env, op, NULL);
     AXIS2_MSG_CTX_SET_OP(fault_msg_ctx, env, op);
     AXIS2_MSG_CTX_SET_OP_CTX(fault_msg_ctx, env, op_ctx);

Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Sun Mar 11 04:42:48 2007
@@ -154,20 +154,20 @@
         axis2_array_list_t *new_in_fault_flow = NULL;
         axis2_array_list_t *new_inflow = NULL;
 
-        outflow = AXIS2_OP_GET_OUT_FLOW(app_msg_op_desc, env);
+        outflow = axis2_op_get_out_flow(app_msg_op_desc, env);
         new_outflow = axis2_phases_info_copy_flow(env, outflow);
-        AXIS2_OP_SET_OUT_FLOW(create_seq_op, env, new_outflow);
-        out_fault_flow = AXIS2_OP_GET_FAULT_OUT_FLOW(app_msg_op_desc, env);
+        axis2_op_set_out_flow(create_seq_op, env, new_outflow);
+        out_fault_flow = axis2_op_get_fault_out_flow(app_msg_op_desc, env);
         new_out_fault_flow = axis2_phases_info_copy_flow(env, out_fault_flow);
-        AXIS2_OP_SET_FAULT_OUT_FLOW(create_seq_op, env, new_out_fault_flow);
-        in_fault_flow = AXIS2_OP_GET_FAULT_IN_FLOW(app_msg_op_desc, env);
+        axis2_op_set_fault_out_flow(create_seq_op, env, new_out_fault_flow);
+        in_fault_flow = axis2_op_get_fault_in_flow(app_msg_op_desc, env);
         new_in_fault_flow = axis2_phases_info_copy_flow(env, in_fault_flow);
-        AXIS2_OP_SET_FAULT_IN_FLOW(create_seq_op, env, new_in_fault_flow);
-        inflow = AXIS2_OP_GET_IN_FLOW(app_msg_op_desc, env);
+        axis2_op_set_fault_in_flow(create_seq_op, env, new_in_fault_flow);
+        inflow = axis2_op_get_in_flow(app_msg_op_desc, env);
         new_inflow = axis2_phases_info_copy_flow(env, inflow);
-        AXIS2_OP_SET_IN_FLOW(create_seq_op, env, new_inflow);
+        axis2_op_set_in_flow(create_seq_op, env, new_inflow);
     }
-    AXIS2_MSG_CTX_SET_OP(create_seq_msg_ctx, env, create_seq_op);
+    axis2_msg_ctx_set_op(create_seq_msg_ctx, env, create_seq_op);
     property = AXIS2_MSG_CTX_GET_PROPERTY(application_msg_ctx, env, 
         AXIS2_TARGET_EPR, AXIS2_FALSE);
     if(property)
@@ -561,18 +561,18 @@
         axis2_array_list_t *new_in_fault_flow = NULL;
         axis2_array_list_t *new_inflow = NULL;
 
-        outflow = AXIS2_OP_GET_OUT_FLOW(ref_msg_op, env);
+        outflow = axis2_op_get_out_flow(ref_msg_op, env);
         new_outflow = axis2_phases_info_copy_flow(env, outflow);
-        AXIS2_OP_SET_OUT_FLOW(terminate_seq_op, env, new_outflow);
-        out_fault_flow = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_msg_op, env);
+        axis2_op_set_out_flow(terminate_seq_op, env, new_outflow);
+        out_fault_flow = axis2_op_get_fault_out_flow(ref_msg_op, env);
         new_out_fault_flow = axis2_phases_info_copy_flow(env, out_fault_flow);
-        AXIS2_OP_SET_FAULT_OUT_FLOW(terminate_seq_op, env, new_out_fault_flow);
-        in_fault_flow = AXIS2_OP_GET_FAULT_IN_FLOW(ref_msg_op, env);
+        axis2_op_set_fault_out_flow(terminate_seq_op, env, new_out_fault_flow);
+        in_fault_flow = axis2_op_get_fault_in_flow(ref_msg_op, env);
         new_in_fault_flow = axis2_phases_info_copy_flow(env, in_fault_flow);
-        AXIS2_OP_SET_FAULT_IN_FLOW(terminate_seq_op, env, new_in_fault_flow);
-        inflow = AXIS2_OP_GET_IN_FLOW(ref_msg_op, env);
+        axis2_op_set_fault_in_flow(terminate_seq_op, env, new_in_fault_flow);
+        inflow = axis2_op_get_in_flow(ref_msg_op, env);
         new_inflow = axis2_phases_info_copy_flow(env, inflow);
-        AXIS2_OP_SET_IN_FLOW(terminate_seq_op, env, new_inflow);
+        axis2_op_set_in_flow(terminate_seq_op, env, new_inflow);
     }
     rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr);
     if(!rm_version)
@@ -604,12 +604,12 @@
         axis2_array_list_t *outphases = NULL;
         axis2_array_list_t *out_fault_phases = NULL;
 
-        outphases = AXIS2_OP_GET_OUT_FLOW(ref_msg_op, env);
-        out_fault_phases = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_msg_op, env);
+        outphases = axis2_op_get_out_flow(ref_msg_op, env);
+        out_fault_phases = axis2_op_get_fault_out_flow(ref_msg_op, env);
         if(outphases)
-            AXIS2_OP_SET_OUT_FLOW(terminate_seq_op, env, outphases);
+            axis2_op_set_out_flow(terminate_seq_op, env, outphases);
         if(out_fault_phases)        
-            AXIS2_OP_SET_FAULT_OUT_FLOW(terminate_seq_op, env, out_fault_phases);
+            axis2_op_set_fault_out_flow(terminate_seq_op, env, out_fault_phases);
     }*/
     temp_envelope = sandesha2_msg_ctx_get_soap_envelope(ref_rm_msg, env);
     soap_version = sandesha2_utils_get_soap_version(env, temp_envelope);
@@ -711,7 +711,7 @@
     {
         axis2_array_list_t *op_params = NULL;
 
-        op_params = AXIS2_OP_GET_ALL_PARAMS(old_op, env);
+        op_params = axis2_op_get_all_params(old_op, env);
         if(op_params)
         {
             axis2_op_t *new_op = NULL;
@@ -732,12 +732,12 @@
                 temp_value = AXIS2_PARAM_GET_VALUE(next_param, env);
                 new_param = axis2_param_create(env, temp_name, temp_value);
                 /*new_param->ops->value_free = next_param->ops->value_free;*/
-                AXIS2_OP_ADD_PARAM(new_op, env, new_param); 
+                axis2_op_add_param(new_op, env, new_param); 
             }
         }
     }
     /* Operation context properties */
-    old_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(related_msg, env);
+    old_op_ctx = axis2_msg_ctx_get_op_ctx(related_msg, env);
     if(old_op_ctx)
     {
         axis2_hash_t *old_op_ctx_props = NULL;
@@ -1026,8 +1026,8 @@
     {
         axis2_op_t *op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
         axis2_op_t *make_conn_op = AXIS2_MSG_CTX_GET_OP(make_conn_msg_ctx, env);
-        axis2_array_list_t *out_flow = AXIS2_OP_GET_OUT_FLOW(op, env);
-        axis2_array_list_t *in_flow = AXIS2_OP_GET_IN_FLOW(op, env);
+        axis2_array_list_t *out_flow = axis2_op_get_out_flow(op, env);
+        axis2_array_list_t *in_flow = axis2_op_get_in_flow(op, env);
         int size = axis2_array_list_size(out_flow, env);
         if(size > 0)
         {
@@ -1042,7 +1042,7 @@
                     axis2_array_list_add(new_flow, env, phase);
                 }
             }
-            AXIS2_OP_SET_OUT_FLOW(make_conn_op, env, new_flow);
+            axis2_op_set_out_flow(make_conn_op, env, new_flow);
         }
         size = axis2_array_list_size(in_flow, env);
         if(size > 0)
@@ -1058,7 +1058,7 @@
                     axis2_array_list_add(new_flow, env, phase);
                 }
             }
-            AXIS2_OP_SET_IN_FLOW(make_conn_op, env, new_flow);
+            axis2_op_set_in_flow(make_conn_op, env, new_flow);
         }
     }
     make_conn = sandesha2_make_connection_create(env, rm_ns_value);

Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Sun Mar 11 04:42:48 2007
@@ -495,7 +495,7 @@
             axis2_phases_info_t *info = NULL;
 
             op = axis2_op_create_with_qname(env, tmp_qname);
-            AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+            axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
             conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
             conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
             info = AXIS2_CONF_GET_PHASES_INFO(conf, env);
@@ -506,13 +506,13 @@
                 status = AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
                 if(AXIS2_SUCCESS != status)
                 {
-                    AXIS2_OP_FREE(op, env);
+                    axis2_op_free(op, env);
                     op = NULL;
                 }
             }
             else
             {
-                AXIS2_OP_FREE(op, env);
+                axis2_op_free(op, env);
                 op = NULL;
             }
         }

Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=516892&r1=516891&r2=516892
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Sun Mar 11 04:42:48 2007
@@ -562,7 +562,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, op, NULL);
     
-    param = AXIS2_OP_GET_PARAM(op, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);
+    param = axis2_op_get_param(op, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);
     if(!param)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET,
@@ -713,7 +713,7 @@
     if(svc && op)
     {
         AXIS2_SVC_ADD_OP(svc, env, op);
-        AXIS2_OP_SET_PARENT(op, env, svc);
+        axis2_op_set_parent(op, env, svc);
     }
     
     axis2_allocator_switch_to_global_pool(env->allocator);



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