Author: nandika
Date: Sun Nov 11 21:37:16 2007
New Revision: 594028

URL: http://svn.apache.org/viewvc?rev=594028&view=rev
Log:
soap action dispatching problem fixed

Modified:
    webservices/axis2/trunk/c/include/axis2_disp.h
    webservices/axis2/trunk/c/src/core/engine/conf.c
    webservices/axis2/trunk/c/src/core/engine/soap_action_disp.c
    webservices/axis2/trunk/c/src/core/engine/soap_body_disp.c

Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp.h?rev=594028&r1=594027&r2=594028&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Sun Nov 11 21:37:16 2007
@@ -144,7 +144,7 @@
      * methods implemented based on SOAP body processing.
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL
-    axiom_soap_body_disp_create(
+    axis2_soap_body_disp_create(
         const axutil_env_t * env);
 
     /**
@@ -154,7 +154,7 @@
      * methods implemented based on SOAP action processing
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL
-    axiom_soap_action_disp_create(
+    axis2_soap_action_disp_create(
         const axutil_env_t * env);
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/src/core/engine/conf.c
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/conf.c?rev=594028&r1=594027&r2=594028&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/conf.c Sun Nov 11 21:37:16 2007
@@ -1266,7 +1266,7 @@
         return AXIS2_FAILURE;
     }
 
-    soap_msg_body_based_dispatch = axiom_soap_body_disp_create(env);
+    soap_msg_body_based_dispatch = axis2_soap_body_disp_create(env);
     if (!soap_msg_body_based_dispatch)
     {
         return AXIS2_FAILURE;
@@ -1278,7 +1278,7 @@
     axutil_array_list_add(conf->handlers, env,
                           axis2_handler_get_handler_desc(handler, env));
 
-    soap_action_based_dispatch = axiom_soap_action_disp_create(env);
+    soap_action_based_dispatch = axis2_soap_action_disp_create(env);
     if (!soap_action_based_dispatch)
     {
         return AXIS2_FAILURE;
@@ -1286,7 +1286,7 @@
 
     handler = axis2_disp_get_base(soap_action_based_dispatch, env);
     axis2_disp_free(soap_action_based_dispatch, env);
-    axis2_phase_add_handler_at(dispatch, env, 2, handler);
+    axis2_phase_add_handler_at(dispatch, env, 1, handler);
     axutil_array_list_add(conf->handlers, env,
                           axis2_handler_get_handler_desc(handler, env));
 

Modified: webservices/axis2/trunk/c/src/core/engine/soap_action_disp.c
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/soap_action_disp.c?rev=594028&r1=594027&r2=594028&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/soap_action_disp.c Sun Nov 11 
21:37:16 2007
@@ -29,22 +29,22 @@
 const axis2_char_t *AXIS2_SOAP_ACTION_DISP_NAME =
     "soap_action_based_dispatcher";
 
-axis2_status_t AXIS2_CALL axiom_soap_action_disp_invoke(
+axis2_status_t AXIS2_CALL axis2_soap_action_disp_invoke(
     axis2_handler_t * handler,
     const axutil_env_t * env,
     struct axis2_msg_ctx *msg_ctx);
 
-axis2_svc_t *AXIS2_CALL axiom_soap_action_disp_find_svc(
+axis2_svc_t *AXIS2_CALL axis2_soap_action_disp_find_svc(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env);
 
-axis2_op_t *AXIS2_CALL axiom_soap_action_disp_find_op(
+axis2_op_t *AXIS2_CALL axis2_soap_action_disp_find_op(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env,
     axis2_svc_t * svc);
 
 axis2_disp_t *AXIS2_CALL
-axiom_soap_action_disp_create(
+axis2_soap_action_disp_create(
     const axutil_env_t * env)
 {
     axis2_disp_t *disp = NULL;
@@ -72,7 +72,7 @@
         return NULL;
     }
 
-    axis2_handler_set_invoke(handler, env, axiom_soap_action_disp_invoke);
+    axis2_handler_set_invoke(handler, env, axis2_soap_action_disp_invoke);
 
     axutil_string_free(name, env);
 
@@ -80,7 +80,7 @@
 }
 
 axis2_svc_t *AXIS2_CALL
-axiom_soap_action_disp_find_svc(
+axis2_soap_action_disp_find_svc(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env)
 {
@@ -91,7 +91,7 @@
 }
 
 axis2_op_t *AXIS2_CALL
-axiom_soap_action_disp_find_op(
+axis2_soap_action_disp_find_op(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env,
     axis2_svc_t * svc)
@@ -139,15 +139,15 @@
 }
 
 axis2_status_t AXIS2_CALL
-axiom_soap_action_disp_invoke(
+axis2_soap_action_disp_invoke(
     axis2_handler_t * handler,
     const axutil_env_t * env,
     struct axis2_msg_ctx * msg_ctx)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    axis2_msg_ctx_set_find_svc(msg_ctx, env, axiom_soap_action_disp_find_svc);
-    axis2_msg_ctx_set_find_op(msg_ctx, env, axiom_soap_action_disp_find_op);
+    axis2_msg_ctx_set_find_svc(msg_ctx, env, axis2_soap_action_disp_find_svc);
+    axis2_msg_ctx_set_find_op(msg_ctx, env, axis2_soap_action_disp_find_op);
 
     return axis2_disp_find_svc_and_op(handler, env, msg_ctx);
 }

Modified: webservices/axis2/trunk/c/src/core/engine/soap_body_disp.c
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/soap_body_disp.c?rev=594028&r1=594027&r2=594028&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/soap_body_disp.c Sun Nov 11 
21:37:16 2007
@@ -29,22 +29,22 @@
 const axis2_char_t *AXIS2_SOAP_MESSAGE_BODY_DISP_NAME =
     "soap_message_body_based_dispatcher";
 
-axis2_status_t AXIS2_CALL axiom_soap_body_disp_invoke(
+axis2_status_t AXIS2_CALL axis2_soap_body_disp_invoke(
     axis2_handler_t * handler,
     const axutil_env_t * env,
     struct axis2_msg_ctx *msg_ctx);
 
-axis2_svc_t *AXIS2_CALL axiom_soap_body_disp_find_svc(
+axis2_svc_t *AXIS2_CALL axis2_soap_body_disp_find_svc(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env);
 
-axis2_op_t *AXIS2_CALL axiom_soap_body_disp_find_op(
+axis2_op_t *AXIS2_CALL axis2_soap_body_disp_find_op(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env,
     axis2_svc_t * svc);
 
 axis2_disp_t *AXIS2_CALL
-axiom_soap_body_disp_create(
+axis2_soap_body_disp_create(
     const axutil_env_t * env)
 {
     axis2_disp_t *disp = NULL;
@@ -72,7 +72,7 @@
         return NULL;
     }
 
-    axis2_handler_set_invoke(handler, env, axiom_soap_body_disp_invoke);
+    axis2_handler_set_invoke(handler, env, axis2_soap_body_disp_invoke);
 
     axutil_string_free(name, env);
 
@@ -80,7 +80,7 @@
 }
 
 axis2_svc_t *AXIS2_CALL
-axiom_soap_body_disp_find_svc(
+axis2_soap_body_disp_find_svc(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env)
 {
@@ -184,7 +184,7 @@
 }
 
 axis2_op_t *AXIS2_CALL
-axiom_soap_body_disp_find_op(
+axis2_soap_body_disp_find_op(
     axis2_msg_ctx_t * msg_ctx,
     const axutil_env_t * env,
     axis2_svc_t * svc)
@@ -248,13 +248,13 @@
 }
 
 axis2_status_t AXIS2_CALL
-axiom_soap_body_disp_invoke(
+axis2_soap_body_disp_invoke(
     axis2_handler_t * handler,
     const axutil_env_t * env,
     struct axis2_msg_ctx * msg_ctx)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    axis2_msg_ctx_set_find_svc(msg_ctx, env, axiom_soap_body_disp_find_svc);
-    axis2_msg_ctx_set_find_op(msg_ctx, env, axiom_soap_body_disp_find_op);
+    axis2_msg_ctx_set_find_svc(msg_ctx, env, axis2_soap_body_disp_find_svc);
+    axis2_msg_ctx_set_find_op(msg_ctx, env, axis2_soap_body_disp_find_op);
     return axis2_disp_find_svc_and_op(handler, env, msg_ctx);
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to