axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r356101 - in /webservices/axis2/trunk/c: include/axis2_disp.h include/axis2_msg_ctx.h modules/core/context/src/msg_ctx.c modules/core/engine/src/Makefile.am modules/core/engine/src/disp.c
Date Mon, 12 Dec 2005 01:51:32 GMT
Author: samisa
Date: Sun Dec 11 17:51:13 2005
New Revision: 356101

URL: http://svn.apache.org/viewcvs?rev=356101&view=rev
Log:
Changes to get the dispather hierarchy working

Modified:
    webservices/axis2/trunk/c/include/axis2_disp.h
    webservices/axis2/trunk/c/include/axis2_msg_ctx.h
    webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am
    webservices/axis2/trunk/c/modules/core/engine/src/disp.c

Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_disp.h?rev=356101&r1=356100&r2=356101&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Sun Dec 11 17:51:13 2005
@@ -25,6 +25,7 @@
 #include <axis2_defines.h>
 #include <axis2_qname.h>
 #include <axis2_handler.h>
+#include <axis2_svc.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?rev=356101&r1=356100&r2=356101&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Sun Dec 11 17:51:13 2005
@@ -131,9 +131,8 @@
     /**
      * @return
      */
-    /*axis2_char_t* (AXIS2_CALL *get_msg_id)(struct axis2_msg_ctx *msg_ctx, 
+    axis2_char_t* (AXIS2_CALL *get_msg_id)(struct axis2_msg_ctx *msg_ctx, 
                                                 axis2_env_t **env);
-    */
     
     /**
      * @return
@@ -144,9 +143,8 @@
     /**
      * @return
      */
-    /*RelatesTo (AXIS2_CALL *get_relates_to)(struct axis2_msg_ctx *msg_ctx, 
-                                                axis2_env_t **env);
-    */
+    axis2_relates_to_t* (AXIS2_CALL *get_relates_to)(struct axis2_msg_ctx *msg_ctx, 
+                                                axis2_env_t **env);    
     
     /**
      * @return
@@ -618,13 +616,11 @@
 */
 #define AXIS2_MSG_CTX_GET_IN_FAULT_FLOW(msg_ctx, env) ((msg_ctx)->ops->get_in_fault_flow(msg_ctx,
env))
 #define AXIS2_MSG_CTX_GET_IN_GET_SOAP_ENVELOPE(msg_ctx, env) ((msg_ctx)->ops->get_soap_envelope(msg_ctx,
env))
-/*
 #define AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env) ((msg_ctx)->ops->get_msg_id(msg_ctx,
env))
-*/
 #define AXIS2_MSG_CTX_GET_PROCESS_FAULT(msg_ctx, env) ((msg_ctx)->ops->get_process_fault(msg_ctx,
env))
-/*
+
 #define AXIS2_MSG_CTX_GET_RELATES_TO(msg_ctx, env) ((msg_ctx)->ops->get_relates_to(msg_ctx,
env))
-*/
+
 /*
 #define AXIS2_MSG_CTX_GET_REPLY_TO(msg_ctx, env) ((msg_ctx)->ops->get_reply_to(msg_ctx,
env))
 */

Modified: webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c?rev=356101&r1=356100&r2=356101&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c Sun Dec 11 17:51:13 2005
@@ -144,17 +144,16 @@
 struct axis2_soap_envelope* AXIS2_CALL
 axis2_msg_ctx_get_soap_envelope(struct axis2_msg_ctx *msg_ctx, 
                                 axis2_env_t **env);
-/*axis2_char_t* AXIS2_CALL
+axis2_char_t* AXIS2_CALL
 axis2_msg_ctx_get_msg_id(struct axis2_msg_ctx *msg_ctx, 
                             axis2_env_t **env);
-*/
 axis2_bool_t AXIS2_CALL
 axis2_msg_ctx_get_process_fault(struct axis2_msg_ctx *msg_ctx, 
                                 axis2_env_t **env);
-/*RelatesTo AXIS2_CALL
+axis2_relates_to_t* AXIS2_CALL
 axis2_msg_ctx_get_relates_to(struct axis2_msg_ctx *msg_ctx, 
                                 axis2_env_t **env);
-*/
+
 /*axis2_endpoint_ref_t *AXIS2_CALL
 axis2_msg_ctx_get_reply_to(struct axis2_msg_ctx *msg_ctx, 
                             axis2_env_t **env);
@@ -530,14 +529,12 @@
 */
     msg_ctx_impl->msg_ctx.ops->get_in_fault_flow = axis2_msg_ctx_get_in_fault_flow;
     msg_ctx_impl->msg_ctx.ops->get_soap_envelope = axis2_msg_ctx_get_soap_envelope;
-/*
     msg_ctx_impl->msg_ctx.ops->get_msg_id = axis2_msg_ctx_get_msg_id;
-*/
     msg_ctx_impl->msg_ctx.ops->get_process_fault = axis2_msg_ctx_get_process_fault;
     
-/*
+
     msg_ctx_impl->msg_ctx.ops->get_relates_to = axis2_msg_ctx_get_relates_to;
-*/
+
 /*
     msg_ctx_impl->msg_ctx.ops->get_reply_to = axis2_msg_ctx_get_reply_to;
 */
@@ -814,13 +811,22 @@
 /**
  * @return
  */
-/*axis2_char_t *AXIS2_CALL axis2_msg_ctx_get_msg_id(struct axis2_msg_ctx *msg_ctx, 
+axis2_char_t *AXIS2_CALL axis2_msg_ctx_get_msg_id(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
+    axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
+    
     AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
-    return AXIS2_INTF_TO_IMPL(msg_ctx)->msg_info_headers.getMessageId();
+    
+    msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
+    
+    if (msg_ctx_impl->msg_info_headers)
+    {
+        return AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID(msg_ctx_impl->msg_info_headers, env);
+    }
+    
+    return NULL;
 }
-*/
 
 /**
  * @return
@@ -835,11 +841,23 @@
 /**
  * @return
  */
-/*RelatesTo AXIS2_CALL axis2_msg_ctx_get_relates_to(struct axis2_msg_ctx *msg_ctx, 
-                                            axis2_env_t **env) {
-    return msg_info_headersgetRelatesTo();
+axis2_relates_to_t* AXIS2_CALL axis2_msg_ctx_get_relates_to(struct axis2_msg_ctx *msg_ctx,

+                                            axis2_env_t **env) 
+{
+    axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
+    
+    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    
+    msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
+    
+    if (msg_ctx_impl->msg_info_headers)
+    {
+        return AXIS2_MSG_INFO_HEADERS_GET_RELATES_TO(msg_ctx_impl->msg_info_headers, env);
+    }
+    
+    return NULL;
 }
-*/
+
 
 /**
  * @return
@@ -891,7 +909,6 @@
     AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
-    
     
     if (msg_ctx_impl->msg_info_headers)
     {

Modified: webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am?rev=356101&r1=356100&r2=356101&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am Sun Dec 11 17:51:13 2005
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libaxis2_engine.la
 AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_engine_la_SOURCES = handler.c msg_recv.c engine_config.c phase.c disp_checker.c
event.c
+libaxis2_engine_la_SOURCES = handler.c msg_recv.c engine_config.c phase.c disp_checker.c
event.c addr_disp.c
 
 libaxis2_engine_la_LIBADD = $(LDFLAGS)
 INCLUDES = -I${CUTEST_HOME}/include \

Modified: webservices/axis2/trunk/c/modules/core/engine/src/disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/disp.c?rev=356101&r1=356100&r2=356101&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/disp.c Sun Dec 11 17:51:13 2005
@@ -177,7 +177,6 @@
                                                 axis2_env_t **env,
                                                 struct axis2_msg_ctx *msg_ctx)
 {
-    axis2_relates_to_t *relates_to = NULL;
     axis2_svc_t *axis_service = NULL;
     axis2_operation_t *operation = NULL;
     



Mime
View raw message