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 di...@apache.org on 2007/03/13 07:00:07 UTC

svn commit: r517543 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/context/ modules/core/engine/ modules/core/receivers/ test/core/engine/

Author: dinesh
Date: Mon Mar 12 23:00:06 2007
New Revision: 517543

URL: http://svn.apache.org/viewvc?view=rev&rev=517543
Log:
svc_ctx.c , removed macros

Modified:
    webservices/axis2/trunk/c/include/axis2_svc_ctx.h
    webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/stub.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_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/context/op_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.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/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
    webservices/axis2/trunk/c/test/core/engine/test_engine.c

Modified: webservices/axis2/trunk/c/include/axis2_svc_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_ctx.h?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_ctx.h Mon Mar 12 23:00:06 2007
@@ -181,47 +181,6 @@
         const axis2_env_t *env,
         const axis2_qname_t *qname);
 
-/** Gets base which is of type context. */
-#define AXIS2_SVC_CTX_GET_BASE(svc_ctx, env) \
-      axis2_svc_ctx_get_base(svc_ctx, env)
-
-/** Gets parent which is of type service group context. */
-#define AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env) \
-      axis2_svc_ctx_get_parent(svc_ctx, env)
-
-/** Gets parent which is of type service group context.*/
-#define AXIS2_SVC_CTX_SET_PARENT(svc_ctx, env, parent) \
-      axis2_svc_ctx_set_parent(svc_ctx, env, parent)
-
-/** Frees service context. */
-#define AXIS2_SVC_CTX_FREE(svc_ctx, env) \
-      axis2_svc_ctx_free(svc_ctx, env)
-
-/** Initializes service context. */
-#define AXIS2_SVC_CTX_INIT(svc_ctx, env, conf) \
-      axis2_svc_ctx_init(svc_ctx, env, conf)
-
-/** Gets service id of the related service. */
-#define AXIS2_SVC_CTX_GET_SVC_ID(svc_ctx, env) \
-      axis2_svc_ctx_get_svc_id(svc_ctx, env)
-
-/** Gets service that this service context is an instance of. */
-#define AXIS2_SVC_CTX_GET_SVC(svc_ctx, env) \
-      axis2_svc_ctx_get_svc(svc_ctx, env)
-
-/** Sets service that this service context is an instance of. */
-#define AXIS2_SVC_CTX_SET_SVC(svc_ctx, env, svc) \
-        axis2_svc_ctx_set_svc(svc_ctx, env, svc)
-
-/** Gets configuration context. */
-#define AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env) \
-      axis2_svc_ctx_get_conf_ctx(svc_ctx, env)
-
-/** Creates operation context for the named service. */
-#define AXIS2_SVC_CTX_CREATE_OP_CTX(svc_ctx, env, qname) \
-      axis2_svc_ctx_create_op_ctx(svc_ctx, env, qname)
-
-/** @} */
 #ifdef __cplusplus
 }
 #endif

Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 12 23:00:06 2007
@@ -231,11 +231,11 @@
     svc = axis2_op_get_parent(op, env);
     if (svc)
     {
-        AXIS2_SVC_CTX_SET_SVC(mep_client_impl->svc_ctx, env, svc);
+         axis2_svc_ctx_set_svc(mep_client_impl->svc_ctx, env, svc);
     }
     else
     {
-        svc = AXIS2_SVC_CTX_GET_SVC(mep_client_impl->svc_ctx, env);
+        svc =  axis2_svc_ctx_get_svc(mep_client_impl->svc_ctx, env);
         if (svc)
         {
             axis2_op_t *temp_op = NULL;
@@ -279,7 +279,7 @@
     if (mep_client_impl->svc_ctx)
     {
         msg_ctx = axis2_msg_ctx_create(env,
-                AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env),
+                 axis2_svc_ctx_get_conf_ctx(mep_client_impl->svc_ctx, env),
                 NULL, NULL);
     }
 
@@ -359,7 +359,7 @@
 			transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
 		}
 
-        conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
+        conf_ctx =  axis2_svc_ctx_get_conf_ctx(mep_client_impl->svc_ctx, env);
         if (conf_ctx)
         {
             conf =  axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -418,7 +418,7 @@
 
     if (mep_client_impl->svc_ctx)
     {
-        conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
+        conf_ctx =  axis2_svc_ctx_get_conf_ctx(mep_client_impl->svc_ctx, env);
         if (conf_ctx)
         {
             conf =  axis2_conf_ctx_get_conf(conf_ctx, env);

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 12 23:00:06 2007
@@ -428,7 +428,7 @@
         return AXIS2_FAILURE;
     }
 
-    conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(op_client_impl->svc_ctx, env);
+    conf_ctx =  axis2_svc_ctx_get_conf_ctx(op_client_impl->svc_ctx, env);
     msg_ctx = (axis2_msg_ctx_t *)axis2_op_client_get_msg_ctx(op_client, env,
             AXIS2_WSDL_MESSAGE_LABEL_OUT);
 
@@ -473,7 +473,7 @@
     transport_in = AXIS2_OPTIONS_GET_TRANSPORT_IN(op_client_impl->options, env);
     if (!transport_in)
     {
-        axis2_conf_ctx_t *conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(op_client_impl->svc_ctx, env);
+        axis2_conf_ctx_t *conf_ctx =  axis2_svc_ctx_get_conf_ctx(op_client_impl->svc_ctx, env);
         if (conf_ctx)
         {
             axis2_conf_t *conf =  axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -533,7 +533,7 @@
             
              axis2_msg_ctx_set_svc_ctx(msg_ctx, env, op_client_impl->svc_ctx);
              axis2_msg_ctx_set_conf_ctx(msg_ctx, env,
-                    AXIS2_SVC_CTX_GET_CONF_CTX(op_client_impl->svc_ctx, env));
+                     axis2_svc_ctx_get_conf_ctx(op_client_impl->svc_ctx, env));
              axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_client_impl->op_ctx);
 
             /*Send the SOAP Message and receive a response */

Modified: webservices/axis2/trunk/c/modules/core/clientapi/stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/stub.c?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/stub.c Mon Mar 12 23:00:06 2007
@@ -347,7 +347,7 @@
 
     svc_ctx = AXIS2_SVC_CLIENT_GET_SVC_CTX(stub_impl->svc_client,
             env);
-    svc_ctx_id = AXIS2_SVC_CTX_GET_SVC_ID(svc_ctx, env);
+    svc_ctx_id =  axis2_svc_ctx_get_svc_id(svc_ctx, env);
     return svc_ctx_id;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 12 23:00:06 2007
@@ -684,7 +684,7 @@
     }
 
     msg_ctx = axis2_msg_ctx_create(env,
-            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+             axis2_svc_ctx_get_conf_ctx(svc_client_impl->svc_ctx, env), NULL, NULL);
     if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx,
             payload))
     {
@@ -733,7 +733,7 @@
     }
 
     msg_ctx = axis2_msg_ctx_create(env,
-            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+             axis2_svc_ctx_get_conf_ctx(svc_client_impl->svc_ctx, env), NULL, NULL);
     if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx,
             payload))
     {
@@ -861,7 +861,7 @@
 
         /* start of hack to get rid of memory leak */
         msg_ctx = axis2_msg_ctx_create(env,
-                        AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+                         axis2_svc_ctx_get_conf_ctx(svc_client_impl->svc_ctx, env), NULL, NULL);
         AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client_impl->op_client, env, msg_ctx);
          axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
         /* end of hack to get rid of memory leak */
@@ -882,7 +882,7 @@
         axis2_msg_ctx_t *msg_ctx = NULL;
 
         msg_ctx = axis2_msg_ctx_create(env,
-                AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+                 axis2_svc_ctx_get_conf_ctx(svc_client_impl->svc_ctx, env), NULL, NULL);
         if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx,
                 payload))
         {
@@ -954,7 +954,7 @@
     }
 
     msg_ctx = axis2_msg_ctx_create(env,
-            AXIS2_SVC_CTX_GET_CONF_CTX(svc_client_impl->svc_ctx, env), NULL, NULL);
+             axis2_svc_ctx_get_conf_ctx(svc_client_impl->svc_ctx, env), NULL, NULL);
     if (!axis2_svc_client_fill_soap_envelope(env, svc_client_impl, msg_ctx, payload))
         return;
 

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 12 23:00:06 2007
@@ -337,7 +337,7 @@
         if (ctx)
         {
             axis2_svc_ctx_t *svc_ctx = (axis2_svc_ctx_t*) ctx;
-            AXIS2_SVC_CTX_INIT(svc_ctx, env, conf);
+             axis2_svc_ctx_init(svc_ctx, env, conf);
         }
     }
 
@@ -397,7 +397,7 @@
             axis2_hash_this(hi, NULL, NULL, &val);
             svc_ctx = (axis2_svc_ctx_t *) val;
             if (svc_ctx)
-                AXIS2_SVC_CTX_FREE(svc_ctx, env);
+                 axis2_svc_ctx_free(svc_ctx, env);
 
             val = NULL;
             svc_ctx = NULL;

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 12 23:00:06 2007
@@ -1063,7 +1063,7 @@
             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));
+        axis2_msg_ctx_set_svc(msg_ctx, env,  axis2_svc_ctx_get_svc(svc_ctx, env));
     }
 
     return AXIS2_SUCCESS;
@@ -1173,7 +1173,7 @@
 
     if (msg_ctx->svc_ctx)
     {
-        ctx = AXIS2_SVC_CTX_GET_BASE(msg_ctx->svc_ctx, env);
+        ctx = axis2_svc_ctx_get_base(msg_ctx->svc_ctx, env);
         if (ctx)
         {
             obj =  axis2_ctx_get_property(ctx, env, key, persistent);

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Mon Mar 12 23:00:06 2007
@@ -319,14 +319,14 @@
     if (op_ctx->parent) /* that is if there is a service context associated */
     {
         axis2_conf_ctx_t *conf_ctx = NULL;
-        conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(op_ctx->parent, env);
+        conf_ctx =  axis2_svc_ctx_get_conf_ctx(op_ctx->parent, env);
         if (conf_ctx)
         {
             op_ctx->op_ctx_map =
                  axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
         }
         op_ctx->svc_qname =
-            (axis2_qname_t *)AXIS2_SVC_GET_QNAME(AXIS2_SVC_CTX_GET_SVC(op_ctx->parent, env), env);
+            (axis2_qname_t *)AXIS2_SVC_GET_QNAME( axis2_svc_ctx_get_svc(op_ctx->parent, env), env);
     }
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Mon Mar 12 23:00:06 2007
@@ -140,7 +140,7 @@
             {
                 axis2_svc_ctx_t *svc_ctx = NULL;
                 svc_ctx = (axis2_svc_ctx_t *)val;
-                AXIS2_SVC_CTX_FREE(svc_ctx, env);
+                 axis2_svc_ctx_free(svc_ctx, env);
             }
         }
 

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 12 23:00:06 2007
@@ -230,12 +230,12 @@
                             axis2_svc_t *svc = NULL;
                             axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
                              axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
-                            svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
+                            svc =  axis2_svc_ctx_get_svc(svc_ctx, env);
                             if (svc)
                             {
                                  axis2_msg_ctx_set_svc(msg_ctx, env, svc);
                             }
-                            svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env);
+                            svc_grp_ctx = axis2_svc_ctx_get_parent(svc_ctx, env);
                             if (svc_grp_ctx)
                             {
                                 axis2_string_t *svc_grp_ctx_id_str = 

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Mon Mar 12 23:00:06 2007
@@ -110,7 +110,7 @@
 
     if (op_ctx && svc_ctx)
     {
-        svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env);
+        svc_grp_ctx = axis2_svc_ctx_get_parent(svc_ctx, env);
         if (svc_grp_ctx)
         {
             axis2_string_t *svc_grp_ctx_id_str = 
@@ -133,7 +133,7 @@
         {
             axis2_string_t *svc_grp_ctx_id_str = NULL;
 
-            svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env);
+            svc_grp_ctx = axis2_svc_ctx_get_parent(svc_ctx, env);
              axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
              axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx);
 

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Mar 12 23:00:06 2007
@@ -254,7 +254,7 @@
         svc_ctx =  axis2_msg_ctx_get_svc_ctx(msg_ctx, env);
         if (svc_ctx)
         {
-            axis2_svc_t *tsvc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
+            axis2_svc_t *tsvc =  axis2_svc_ctx_get_svc(svc_ctx, env);
             if (tsvc)
                  axis2_msg_ctx_set_svc(msg_ctx, env, tsvc);
         }

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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 12 23:00:06 2007
@@ -204,7 +204,7 @@
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
-    svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
+    svc =  axis2_svc_ctx_get_svc(svc_ctx, env);
     if (NULL == svc)
     {
         return NULL;
@@ -252,7 +252,7 @@
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
-    svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
+    svc =  axis2_svc_ctx_get_svc(svc_ctx, env);
     if (NULL == svc)
     {
         return NULL;
@@ -314,7 +314,7 @@
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
-    svc = AXIS2_SVC_CTX_GET_SVC(svc_ctx, env);
+    svc =  axis2_svc_ctx_get_svc(svc_ctx, env);
     if (NULL == svc)
     {
         return AXIS2_FAILURE;
@@ -392,7 +392,7 @@
         return status;
     }
     svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
-    conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_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/receivers/svr_callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?view=diff&rev=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Mon Mar 12 23:00:06 2007
@@ -134,7 +134,7 @@
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
-    conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_ctx, env);
+    conf_ctx =  axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
     engine = axis2_engine_create(env, conf_ctx);
     if (!engine)
     {
@@ -160,7 +160,7 @@
 
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
     svc_ctx =  axis2_op_ctx_get_parent(op_ctx, env);
-    conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(svc_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/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=517543&r1=517542&r2=517543
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 12 23:00:06 2007
@@ -71,7 +71,7 @@
      axis2_msg_ctx_free(msg_ctx, env);
     AXIS2_QNAME_FREE(qname, env);
     AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
-    AXIS2_SVC_CTX_FREE(svc_ctx, env);
+     axis2_svc_ctx_free(svc_ctx, env);
     AXIS2_SVC_FREE(svc, env);
      axis2_op_ctx_free(op_ctx, env);
     axis2_op_free(op, env);



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