axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From din...@apache.org
Subject svn commit: r517537 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/context/ modules/core/description/ modules/core/engine/ modules/core/receivers/ modules/core/transport/http/common/ modules/core/transport/http/sender/ m...
Date Tue, 13 Mar 2007 05:47:48 GMT
Author: dinesh
Date: Mon Mar 12 22:47:46 2007
New Revision: 517537

URL: http://svn.apache.org/viewvc?view=rev&rev=517537
Log:
removed macros from conf_ctx.c

Modified:
    webservices/axis2/trunk/c/include/axis2_op_ctx.h
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
    webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
    webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
    webservices/axis2/trunk/c/test/core/engine/test_engine.c

Modified: webservices/axis2/trunk/c/include/axis2_op_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op_ctx.h?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op_ctx.h Mon Mar 12 22:47:46 2007
@@ -229,56 +229,6 @@
     axis2_op_ctx_get_response_written(const axis2_op_ctx_t *op_ctx,
         const axis2_env_t *env);
 
-
-/** Gets base context struct. */
-#define AXIS2_OP_CTX_GET_BASE(op_ctx, env) \
-      axis2_op_ctx_get_base(op_ctx, env)
-
-/** Frees operation context. */
-#define AXIS2_OP_CTX_FREE(op_ctx, env)\
-      axis2_op_ctx_free(op_ctx, env)
-
-/** Initializes operation context. */
-#define AXIS2_OP_CTX_INIT(op_ctx, env, conf) \
-      axis2_op_ctx_init(op_ctx, env, conf)
-
-/** Gets operating related to operation context. */
-#define AXIS2_OP_CTX_GET_OP(op_ctx, env)\
-      axis2_op_ctx_get_op(op_ctx, env)
-
-/** Gets parent which is of type service context. */
-#define AXIS2_OP_CTX_GET_PARENT(op_ctx, env) \
-      axis2_op_ctx_get_parent(op_ctx, env)
-
-/** Adds message context. */
-#define AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx) \
-      axis2_op_ctx_add_msg_ctx(op_ctx, env, msg_ctx)
-
-/** Gets message context with given message ID. */
-#define AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, message_id) \
-      axis2_op_ctx_get_msg_ctx(op_ctx, env, message_id)
-
-/** Gets bool value indicating the complete status. */
-#define AXIS2_OP_CTX_GET_IS_COMPLETE(op_ctx, env) \
-      axis2_op_ctx_get_is_complete(op_ctx, env)
-
-/** Sets bool value indicating the complete status. */
-#define AXIS2_OP_CTX_SET_IS_COMPLETE(op_ctx, env, is_complete) \
-      axis2_op_ctx_set_complete(op_ctx, env, is_complete)
-
-/** Cleans up operation context. */
-#define AXIS2_OP_CTX_CLEANUP(op_ctx, env) \
-      axis2_op_ctx_cleanup(op_ctx, env)
-
-/** Sets parent service context. */
-#define AXIS2_OP_CTX_SET_PARENT(op_ctx, env, svc_ctx) \
-      axis2_op_ctx_set_parent(op_ctx, env, svc_ctx)
-
-/** Gets message context map. */
-#define AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_ctx, env) \
-      axis2_op_ctx_get_msg_ctx_map(op_ctx, env)
-
-/** @} */
 #ifdef __cplusplus
 }
 #endif

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 12 22:47:46 2007
@@ -271,7 +271,7 @@
 
     op_client_impl = AXIS2_INTF_TO_IMPL(op_client);
 
-    msg_ctx_map = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_client_impl->op_ctx, env);
+    msg_ctx_map =  axis2_op_ctx_get_msg_ctx_map(op_client_impl->op_ctx, env);
 
     out_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT];
     in_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN];
@@ -286,7 +286,7 @@
          axis2_msg_ctx_free(in_msg_ctx, env);
         in_msg_ctx = NULL;
         msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN] = NULL;
-        AXIS2_OP_CTX_SET_IS_COMPLETE(op_client_impl->op_ctx, env, AXIS2_FALSE);
+         axis2_op_ctx_set_complete(op_client_impl->op_ctx, env, AXIS2_FALSE);
     }
 
     if (!out_msg_ctx)
@@ -296,7 +296,7 @@
     else
     {
         msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN] = mc;
-        AXIS2_OP_CTX_SET_IS_COMPLETE(op_client_impl->op_ctx, env, AXIS2_TRUE);
+         axis2_op_ctx_set_complete(op_client_impl->op_ctx, env, AXIS2_TRUE);
     }
 
     if (out_msg_ctx && !mc)
@@ -336,7 +336,7 @@
 
     op_client_impl = AXIS2_INTF_TO_IMPL(op_client);
 
-    msg_ctx_map = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_client_impl->op_ctx, env);
+    msg_ctx_map =  axis2_op_ctx_get_msg_ctx_map(op_client_impl->op_ctx, env);
 
     msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT] = mc;
 
@@ -363,7 +363,7 @@
         return NULL;
     }
     */
-    return AXIS2_OP_CTX_GET_MSG_CTX(op_client_impl->op_ctx, env, message_label);
+    return  axis2_op_ctx_get_msg_ctx(op_client_impl->op_ctx, env, message_label);
 }
 
 axis2_status_t AXIS2_CALL
@@ -490,7 +490,7 @@
          axis2_msg_ctx_set_transport_in_desc(msg_ctx, env, transport_in);
     }
 
-    op = AXIS2_OP_CTX_GET_OP(op_client_impl->op_ctx, env);
+    op =  axis2_op_ctx_get_op(op_client_impl->op_ctx, env);
     if (!op)
         return AXIS2_FAILURE;
 
@@ -614,7 +614,7 @@
 
     /*TODO:check
     if (op_client_impl->op_ctx)
-       AXIS2_OP_CTX_FREE(op_client_impl->op_ctx, env);
+        axis2_op_ctx_free(op_client_impl->op_ctx, env);
     */
     op_client_impl->op_ctx = NULL;
 
@@ -693,7 +693,7 @@
 
     if (op_client_impl->op_ctx)
     {
-        AXIS2_OP_CTX_FREE(op_client_impl->op_ctx, env);
+         axis2_op_ctx_free(op_client_impl->op_ctx, env);
         op_client_impl->op_ctx = NULL;
     }
 
@@ -764,7 +764,7 @@
     /* clean up memory */
     AXIS2_ASYNC_RESULT_FREE(args_list->op_client_impl->async_result, th_env);
     
-    AXIS2_OP_CTX_FREE(op_ctx, th_env);
+     axis2_op_ctx_free(op_ctx, th_env);
         
     th_pool = th_env->thread_pool;
     

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 12 22:47:46 2007
@@ -326,7 +326,7 @@
         if (ctx)
         {
             axis2_op_ctx_t *op_ctx = (axis2_op_ctx_t*) ctx;
-            AXIS2_OP_CTX_INIT(op_ctx, env, conf);
+             axis2_op_ctx_init(op_ctx, env, conf);
         }
     }
 
@@ -378,7 +378,7 @@
             axis2_hash_this(hi, NULL, NULL, &val);
             op_ctx = (axis2_op_ctx_t *) val;
             if (op_ctx)
-                AXIS2_OP_CTX_FREE(op_ctx, env);
+                 axis2_op_ctx_free(op_ctx, env);
             val = NULL;
             op_ctx = NULL;
 
@@ -550,7 +550,7 @@
         return NULL;
     }
 
-    AXIS2_OP_CTX_SET_PARENT(op_ctx, env, svc_ctx);
+     axis2_op_ctx_set_parent(op_ctx, env, svc_ctx);
      axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
      axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx);
     return svc_grp_ctx;

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 12 22:47:46 2007
@@ -400,9 +400,6 @@
     return AXIS2_SUCCESS;
 }
 
-/**
- * @return
- */
 axis2_endpoint_ref_t *AXIS2_CALL
 axis2_msg_ctx_get_fault_to(
     const axis2_msg_ctx_t *msg_ctx,
@@ -492,8 +489,8 @@
 
     if (msg_ctx->msg_info_headers)
     {
-        return axis2_msg_info_headers_set_message_id(
-            msg_ctx->msg_info_headers, env, msg_id);
+        return axis2_msg_info_headers_set_message_id(msg_ctx->msg_info_headers,
+                                                     env, msg_id);
     }
 
     return AXIS2_SUCCESS;
@@ -955,14 +952,14 @@
 
         if (msg_ctx->svc_ctx)
         {
-            if (!(AXIS2_OP_CTX_GET_PARENT(msg_ctx->op_ctx, env)))
+            if (!( axis2_op_ctx_get_parent(msg_ctx->op_ctx, env)))
             {
-                AXIS2_OP_CTX_SET_PARENT(msg_ctx->op_ctx, env,
+                 axis2_op_ctx_set_parent(msg_ctx->op_ctx, env,
                         msg_ctx->svc_ctx);
             }
         }
         axis2_msg_ctx_set_parent(msg_ctx, env, op_ctx);
-        axis2_msg_ctx_set_op(msg_ctx, env, AXIS2_OP_CTX_GET_OP(op_ctx, env));
+        axis2_msg_ctx_set_op(msg_ctx, env,  axis2_op_ctx_get_op(op_ctx, env));
     }
     return AXIS2_SUCCESS;
 }
@@ -1063,8 +1060,8 @@
 
         if (msg_ctx->op_ctx)
         {
-            if (!AXIS2_OP_CTX_GET_PARENT(msg_ctx->op_ctx, env))
-                AXIS2_OP_CTX_SET_PARENT(msg_ctx->op_ctx, env, svc_ctx);
+            if (! axis2_op_ctx_get_parent(msg_ctx->op_ctx, env))
+                 axis2_op_ctx_set_parent(msg_ctx->op_ctx, env, svc_ctx);
         }
         axis2_msg_ctx_set_svc(msg_ctx, env, AXIS2_SVC_CTX_GET_SVC(svc_ctx, env));
     }
@@ -1163,7 +1160,7 @@
 
     if (msg_ctx->op_ctx)
     {
-        ctx = AXIS2_OP_CTX_GET_BASE(msg_ctx->op_ctx, env);
+        ctx = axis2_op_ctx_get_base(msg_ctx->op_ctx, env);
         if (ctx)
         {
             obj =  axis2_ctx_get_property(ctx, env, key, persistent);

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar 12 22:47:46 2007
@@ -869,7 +869,7 @@
     status = axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
     if (AXIS2_FAILURE == status)
     {
-        AXIS2_OP_CTX_FREE(op_ctx, env);
+         axis2_op_ctx_free(op_ctx, env);
         return NULL;
     }
     else
@@ -955,9 +955,9 @@
         op_ctx_map = (axis2_hash_t *)  axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
         axis2_hash_set(op_ctx_map, msg_id, AXIS2_HASH_KEY_STRING, NULL);
     }
-    if (AXIS2_TRUE == AXIS2_OP_CTX_GET_IS_COMPLETE(op_ctx, env))
+    if (AXIS2_TRUE ==  axis2_op_ctx_get_is_complete(op_ctx, env))
     {
-        AXIS2_OP_CTX_CLEANUP(op_ctx, env);
+         axis2_op_ctx_cleanup(op_ctx, env);
     }
     return AXIS2_SUCCESS;
 }
@@ -972,12 +972,12 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op_ctx, AXIS2_FAILURE);
     
-    if (AXIS2_TRUE != AXIS2_OP_CTX_GET_IS_COMPLETE(op_ctx, env))
+    if (AXIS2_TRUE !=  axis2_op_ctx_get_is_complete(op_ctx, env))
     {
         axis2_msg_ctx_t **msg_ctxs = NULL;
-        msg_ctxs = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_ctx, env);
+        msg_ctxs =  axis2_op_ctx_get_msg_ctx_map(op_ctx, env);
         msg_ctxs[AXIS2_WSDL_MESSAGE_LABEL_IN] = msg_ctx;
-        AXIS2_OP_CTX_SET_IS_COMPLETE(op_ctx, env, AXIS2_TRUE);
+         axis2_op_ctx_set_complete(op_ctx, env, AXIS2_TRUE);
     }
     else
     {
@@ -999,12 +999,12 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op_ctx, AXIS2_FAILURE);
 
-    if (AXIS2_TRUE != AXIS2_OP_CTX_GET_IS_COMPLETE(op_ctx, env))
+    if (AXIS2_TRUE !=  axis2_op_ctx_get_is_complete(op_ctx, env))
     {
         axis2_msg_ctx_t **msg_ctxs = NULL;
-        msg_ctxs = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_ctx, env);
+        msg_ctxs =  axis2_op_ctx_get_msg_ctx_map(op_ctx, env);
         msg_ctxs[AXIS2_WSDL_MESSAGE_LABEL_OUT] =  msg_ctx;
-        AXIS2_OP_CTX_SET_IS_COMPLETE(op_ctx, env, AXIS2_TRUE);
+         axis2_op_ctx_set_complete(op_ctx, env, AXIS2_TRUE);
     }
     else
     {
@@ -1030,7 +1030,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op_ctx, AXIS2_FAILURE);
 
-    mep = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_ctx, env);
+    mep =  axis2_op_ctx_get_msg_ctx_map(op_ctx, env);
     in_msg_ctx = mep[AXIS2_WSDL_MESSAGE_LABEL_IN];
     out_msg_ctx = mep[AXIS2_WSDL_MESSAGE_LABEL_OUT];
     
@@ -1047,7 +1047,7 @@
     else
     {
         mep[AXIS2_WSDL_MESSAGE_LABEL_OUT] = msg_ctx;
-        AXIS2_OP_CTX_SET_IS_COMPLETE(op_ctx, env, AXIS2_TRUE);
+         axis2_op_ctx_set_complete(op_ctx, env, AXIS2_TRUE);
     }
     return AXIS2_SUCCESS;
 }
@@ -1066,7 +1066,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op_ctx, AXIS2_FAILURE);
 
-    mep = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_ctx, env);
+    mep =  axis2_op_ctx_get_msg_ctx_map(op_ctx, env);
     in_msg_ctx = mep[AXIS2_WSDL_MESSAGE_LABEL_IN];
     out_msg_ctx = mep[AXIS2_WSDL_MESSAGE_LABEL_OUT];
     if (in_msg_ctx && NULL != out_msg_ctx)
@@ -1082,7 +1082,7 @@
     else
     {
         mep[AXIS2_WSDL_MESSAGE_LABEL_IN] = msg_ctx;
-        AXIS2_OP_CTX_SET_IS_COMPLETE(op_ctx, env, AXIS2_TRUE);
+         axis2_op_ctx_set_complete(op_ctx, env, AXIS2_TRUE);
     }
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 12 22:47:46 2007
@@ -216,7 +216,7 @@
                 if (op_ctx)
                 {
                     axis2_op_t *op = NULL;
-                    op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+                    op =  axis2_op_ctx_get_op(op_ctx, env);
                     if (op)
                     {
                         axis2_svc_ctx_t *svc_ctx = NULL;
@@ -224,7 +224,7 @@
                          axis2_msg_ctx_set_op(msg_ctx, env, op);
                         axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
 
-                        svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+                        svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
                         if (svc_ctx)
                         {
                             axis2_svc_t *svc = NULL;

Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Mon Mar 12 22:47:46 2007
@@ -128,7 +128,7 @@
     if (op_ctx)
     {
         axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
-        svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+        svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
         if (svc_ctx)
         {
             axis2_string_t *svc_grp_ctx_id_str = NULL;

Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Mar 12 22:47:46 2007
@@ -241,7 +241,7 @@
         op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
         if (op_ctx)
         {
-            axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+            axis2_op_t *op =  axis2_op_ctx_get_op(op_ctx, env);
             if (op)
                  axis2_msg_ctx_set_op(msg_ctx, env, op);
         }

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 12 22:47:46 2007
@@ -259,7 +259,7 @@
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     if (op_ctx)
     {
-        axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+        axis2_op_t *op =  axis2_op_ctx_get_op(op_ctx, env);
         if (op)
         {
             phases = axis2_op_get_out_flow(op, env);
@@ -385,7 +385,7 @@
         op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
         if (op_ctx)
         {
-            op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+            op =  axis2_op_ctx_get_op(op_ctx, env);
             op_specific_phases = axis2_op_get_in_flow(op, env);
             axis2_engine_resume_invocation_phases(engine, env, op_specific_phases, msg_ctx);
             if ( axis2_msg_ctx_is_paused(msg_ctx, env))
@@ -412,7 +412,7 @@
         op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
         if (op_ctx)
         {
-            op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+            op =  axis2_op_ctx_get_op(op_ctx, env);
             op_specific_phases = axis2_op_get_in_flow(op, env);
             status = axis2_engine_invoke_phases(engine, env, op_specific_phases, msg_ctx);
             if (status != AXIS2_SUCCESS)
@@ -542,7 +542,7 @@
     /* find and execute the fault in flow handlers */
     if (op_ctx)
     {
-        axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+        axis2_op_t *op =  axis2_op_ctx_get_op(op_ctx, env);
         axis2_array_list_t *phases = axis2_op_get_fault_in_flow(op, env);
         if ( axis2_msg_ctx_is_paused(msg_ctx, env))
         {
@@ -976,7 +976,7 @@
         op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
         if (op_ctx)
         {
-            axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+            axis2_op_t *op =  axis2_op_ctx_get_op(op_ctx, env);
             if (op)
             {
                 axis2_msg_recv_t *receiver = NULL;
@@ -1008,7 +1008,7 @@
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     if (op_ctx)
     {
-        axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+        axis2_op_t *op =  axis2_op_ctx_get_op(op_ctx, env);
         if (op)
         {
             phases = axis2_op_get_out_flow(op, env);

Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 12 22:47:46 2007
@@ -203,7 +203,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
-    svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+    svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
     svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
     if (NULL == svc)
     {
@@ -251,7 +251,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
-    svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+    svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
     svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
     if (NULL == svc)
     {
@@ -313,7 +313,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
-    svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+    svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
     svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
     if (NULL == svc)
     {
@@ -372,14 +372,14 @@
         return AXIS2_FAILURE;
     }
     
-    status = AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, out_msg_ctx);
+    status =  axis2_op_ctx_add_msg_ctx(op_ctx, env, out_msg_ctx);
     if (!status)
     {
         axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
          axis2_msg_ctx_free(out_msg_ctx, env);
         return status;
     }
-    status = AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx);
+    status =  axis2_op_ctx_add_msg_ctx(op_ctx, env, msg_ctx);
     if(!status)
         return status;
 
@@ -391,7 +391,7 @@
          axis2_msg_ctx_free(out_msg_ctx, env);
         return status;
     }
-    svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+    svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
     conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env);
     engine = axis2_engine_create(env, conf_ctx);
     if (!engine)
@@ -474,7 +474,7 @@
          axis2_msg_ctx_free(new_msg_ctx, env);
         return AXIS2_FAILURE;
     }
-    AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, new_msg_ctx);
+     axis2_op_ctx_add_msg_ctx(op_ctx, env, new_msg_ctx);
     status = AXIS2_MSG_RECV_INVOKE_IN_OUT_BUSINESS_LOGIC_ASYNC(msg_recv, env,
             msg_ctx, new_msg_ctx, callback);
     /* end of code that run in a thread */

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Mar 12
22:47:46 2007
@@ -124,7 +124,7 @@
     else
     {
         op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
-        op_desc = AXIS2_OP_CTX_GET_OP(op_ctx, env);
+        op_desc =  axis2_op_ctx_get_op(op_ctx, env);
 
         style = axis2_op_get_style(op_desc, env);
         if (0 == AXIS2_STRCMP(AXIS2_STYLE_DOC, style))

Modified: webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Mon Mar 12 22:47:46 2007
@@ -133,7 +133,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
-    svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+    svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
     conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env);
     engine = axis2_engine_create(env, conf_ctx);
     if (!engine)
@@ -159,7 +159,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
-    svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+    svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
     conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env);
     engine = axis2_engine_create(env, conf_ctx);
     if (!engine)

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Mon Mar 12
22:47:46 2007
@@ -408,7 +408,7 @@
         axis2_msg_ctx_t *out_msg_ctx = NULL, *in_msg_ctx = NULL;
         axis2_msg_ctx_t **msg_ctx_map = NULL;
 
-        msg_ctx_map = AXIS2_OP_CTX_GET_MSG_CTX_MAP(op_ctx, env);
+        msg_ctx_map =  axis2_op_ctx_get_msg_ctx_map(op_ctx, env);
 
         out_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT];
         in_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN];

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Mar 12
22:47:46 2007
@@ -778,7 +778,7 @@
         if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_MULTIPART_RELATED)
 			&& strstr(content_type, AXIS2_HTTP_HEADER_XOP_XML))
         {
-            axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE(
+            axis2_ctx_t *axis_ctx = axis2_op_ctx_get_base(
 				 axis2_msg_ctx_get_op_ctx(msg_ctx, env), env);
             property = axis2_property_create(env);
             AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -790,7 +790,7 @@
     }
     if (charset)
     {
-        axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE( axis2_msg_ctx_get_op_ctx(
+        axis2_ctx_t *axis_ctx = axis2_op_ctx_get_base( axis2_msg_ctx_get_op_ctx(
 														  msg_ctx, env), env);
         if (axis_ctx)
         {
@@ -844,7 +844,7 @@
     }
 
     axis2_http_sender_get_header_info(sender, env, msg_ctx, response);
-    /*axis_ctx = AXIS2_OP_CTX_GET_BASE( axis2_msg_ctx_get_op_ctx(msg_ctx, env),
+    /*axis_ctx = axis2_op_ctx_get_base( axis2_msg_ctx_get_op_ctx(msg_ctx, env),
 	  env);*/
     property = axis2_property_create(env);
     AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon
Mar 12 22:47:46 2007
@@ -195,7 +195,7 @@
         axis2_op_ctx_t *op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
         if (op_ctx)
         {
-            axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
+            axis2_ctx_t *ctx = axis2_op_ctx_get_base(op_ctx, env);
             if (ctx)
             {
                 property =  axis2_ctx_get_property(ctx, env,

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon
Mar 12 22:47:46 2007
@@ -1088,7 +1088,7 @@
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     if (op_ctx)
     {
-        axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
+        axis2_ctx_t *ctx = axis2_op_ctx_get_base(op_ctx, env);
         if (ctx)
         {
             property =  axis2_ctx_get_property(ctx, env,

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Mon Mar 12 22:47:46 2007
@@ -164,7 +164,7 @@
         if (op_ctx)
         {
             in_msg_ctx =
-                AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
+                 axis2_op_ctx_get_msg_ctx(op_ctx, env,
                         AXIS2_WSDL_MESSAGE_LABEL_IN);
         }
 

Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=517537&r1=517536&r2=517537
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 12 22:47:46 2007
@@ -73,7 +73,7 @@
     AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
     AXIS2_SVC_CTX_FREE(svc_ctx, env);
     AXIS2_SVC_FREE(svc, env);
-    AXIS2_OP_CTX_FREE(op_ctx, env);
+     axis2_op_ctx_free(op_ctx, env);
     axis2_op_free(op, env);
     AXIS2_ENGINE_FREE(engine, env);
     return 0;



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


Mime
View raw message