axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r427043 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/transport/http/sender/ modules/core/util/ modules/mod_addr/ samples/client/math/ ...
Date Mon, 31 Jul 2006 08:29:34 GMT
Author: damitha
Date: Mon Jul 31 01:29:32 2006
New Revision: 427043

URL: http://svn.apache.org/viewvc?rev=427043&view=rev
Log:
Fixed Jira AXIS2C-218.
Also did some fixes in Woden.

Modified:
    webservices/axis2/trunk/c/include/axis2_op.h
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/core/description/svc_grp.c
    webservices/axis2/trunk/c/modules/core/engine/conf.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/transport/http/sender/soap_over_http_sender.c
    webservices/axis2/trunk/c/modules/core/util/core_utils.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
    webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c
    webservices/axis2/trunk/c/samples/client/math/math_client.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_deserializer.h
    webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_deserializer.h
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c

Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Mon Jul 31 01:29:32 2006
@@ -35,7 +35,6 @@
 #include <axis2_msg_ctx.h>
 #include <axis2_op_ctx.h>
 #include <axis2_svc_ctx.h>
-#include <axis2_conf_ctx.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -60,7 +59,6 @@
 struct axis2_op_ctx;
 struct axis2_svc_ctx;    
 struct axis2_msg_ctx; 
-struct axis2_conf_ctx;    
 struct axis2_msg;
 typedef struct axis2_op_ops axis2_op_ops_t;    
 typedef struct axis2_op axis2_op_t;    
@@ -77,16 +75,16 @@
      * De-allocate memory
       * @return status code
       */
-   axis2_status_t (AXIS2_CALL *
+    axis2_status_t (AXIS2_CALL *
     free) (axis2_op_t *op, 
            const axis2_env_t *env);
-    
+
     /**
      * De-allocate memory
      * @param void op to be freed
       * @return status code
       */
-   axis2_status_t (AXIS2_CALL *
+    axis2_status_t (AXIS2_CALL *
     free_void_arg) (void *op, 
                     const axis2_env_t *env);
 
@@ -96,40 +94,40 @@
      *
      * @param param Parameter that will be added
      */
-   axis2_status_t (AXIS2_CALL *
+    axis2_status_t (AXIS2_CALL *
     add_param)(axis2_op_t *op, 
                 const axis2_env_t *env, 
                 axis2_param_t *param);
-    
+
     /**
      * Method getParameter
      *
      * @param name Name of the parameter
      */
-   axis2_param_t *(AXIS2_CALL *
+    axis2_param_t *(AXIS2_CALL *
     get_param)(axis2_op_t *op, 
                 const axis2_env_t *env,
                 const axis2_char_t *name);
 
 
-   axis2_array_list_t *(AXIS2_CALL *
+    axis2_array_list_t *(AXIS2_CALL *
     get_params) (axis2_op_t *op, 
                     const axis2_env_t *env);
 
     /**
      * To check whether a given paramter is locked
      */
-   axis2_bool_t (AXIS2_CALL *
+    axis2_bool_t (AXIS2_CALL *
     is_param_locked) (axis2_op_t *op, 
                         const axis2_env_t *env,
                         axis2_char_t *param_name);
-   
-   axis2_status_t (AXIS2_CALL *
+
+    axis2_status_t (AXIS2_CALL *
     set_parent) (axis2_op_t *op, 
                  const axis2_env_t *env,
                  struct axis2_svc *service_desc);
 
-   struct axis2_svc *(AXIS2_CALL *
+    struct axis2_svc *(AXIS2_CALL *
     get_parent) (axis2_op_t *op, 
                  const axis2_env_t *env);
 
@@ -137,32 +135,34 @@
     set_qname) (axis2_op_t *op, 
                 const axis2_env_t *env,
                 axis2_qname_t *qname);
-    
-   axis2_qname_t *(AXIS2_CALL *
+
+    axis2_qname_t *(AXIS2_CALL *
     get_qname) (void *op, 
                 const axis2_env_t *env);
 
-   axis2_status_t (AXIS2_CALL *
+    axis2_status_t (AXIS2_CALL *
     set_msg_exchange_pattern) (axis2_op_t *op, 
                                 const axis2_env_t *env,
                                 const axis2_char_t *pattern);
 
-   axis2_char_t *(AXIS2_CALL *
+    axis2_char_t *(AXIS2_CALL *
     get_msg_exchange_pattern) (axis2_op_t *op, 
                                 const axis2_env_t *env);
 
-   axis2_status_t (AXIS2_CALL *
+    axis2_status_t (AXIS2_CALL *
     set_msg_recv) (axis2_op_t *op, 
                     const axis2_env_t *env,
                     struct axis2_msg_recv *msg_recv);
 
-   struct axis2_msg_recv *(AXIS2_CALL *
-        get_msg_recv) (axis2_op_t *op, 
-                       const axis2_env_t *env);
+    struct axis2_msg_recv *(AXIS2_CALL *
+    get_msg_recv) (
+        axis2_op_t *op, 
+        const axis2_env_t *env);
                                         
     axis2_char_t *(AXIS2_CALL *
-    get_style) (axis2_op_t *op,
-                const axis2_env_t *env);
+    get_style) (
+        axis2_op_t *op,
+        const axis2_env_t *env);
 
     axis2_status_t  (AXIS2_CALL *
     set_style) (axis2_op_t *op,
@@ -178,12 +178,12 @@
     engage_module) (axis2_op_t *op,
                         const axis2_env_t *env,
                         struct axis2_module_desc *moduleref);
-    
+
     axis2_status_t (AXIS2_CALL *
     add_to_engage_module_list) (axis2_op_t *op,
                                 const axis2_env_t *env,
                                 struct axis2_module_desc *module_name);
-    
+
     /**
      * Method getEngadgedModules
      *
@@ -191,7 +191,7 @@
     axis2_array_list_t *(AXIS2_CALL *
     get_modules) (axis2_op_t *op,
                   const axis2_env_t *env);
-    
+
     /**
      * This method will simply map the String URI of the Message exchange
      * pattern to a integer. Further in the first lookup it will cash the looked
@@ -201,26 +201,26 @@
     int (AXIS2_CALL *
     get_axis_specific_mep_const) (axis2_op_t *op,
                                   const axis2_env_t *env);
-    
+
     axis2_array_list_t *(AXIS2_CALL *
     get_phases_in_fault_flow) (axis2_op_t *op,
                                const axis2_env_t *env);
-    
-    
+
+
     axis2_array_list_t *(AXIS2_CALL *
     get_phases_out_fault_flow) (axis2_op_t *op,
                                 const axis2_env_t *env);
-    
-    
+
+
     axis2_array_list_t * (AXIS2_CALL *
     get_phases_outflow) (axis2_op_t *op,
                          const axis2_env_t *env);
-    
-    
+
+
     axis2_array_list_t *(AXIS2_CALL *
     get_remaining_phases_inflow) (axis2_op_t *op,
                                   const axis2_env_t *env);
-    
+
     /**
      * @param list
      */
@@ -228,7 +228,7 @@
     set_phases_in_fault_flow) (axis2_op_t *op,
                         const axis2_env_t *env,
                         axis2_array_list_t *list);
-    
+
     /**
      * @param list
      */
@@ -236,7 +236,7 @@
     set_phases_out_fault_flow) (axis2_op_t *op,
                         const axis2_env_t *env,
                         axis2_array_list_t *list);
-    
+
     /**
      * @param list
      */
@@ -244,7 +244,7 @@
     set_phases_outflow) (axis2_op_t *op,
                    const axis2_env_t *env,
                    axis2_array_list_t *list);
-    
+
     /**
      * @param list
      */
@@ -257,51 +257,51 @@
     add_module) (axis2_op_t *op,
              const axis2_env_t *env,
              axis2_qname_t *module_name);
-    
+
     axis2_array_list_t *(AXIS2_CALL *
     get_module_refs) (axis2_op_t *op,
                       const axis2_env_t *env);
-    
+
     axis2_linked_list_t *(AXIS2_CALL *
     get_in_faults) (axis2_op_t *op,
                     const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     set_in_faults) (axis2_op_t *op,
                     const axis2_env_t *env,
                     axis2_linked_list_t *in_faults);
-    
+
     struct axis2_wsdl_msg_ref *(AXIS2_CALL *
     get_input_msg) (axis2_op_t *op,
                     const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     set_input_msg) (axis2_op_t *op,
                     const axis2_env_t *env,
                     struct axis2_wsdl_msg_ref *input_msg);
-    
+
     axis2_linked_list_t *(AXIS2_CALL *
     get_out_faults) (axis2_op_t *op,
                      const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     set_out_faults) (axis2_op_t *op,
                      const axis2_env_t *env,
                      axis2_linked_list_t *out_faults);
-    
+
     struct axis2_wsdl_msg_ref *(AXIS2_CALL *
     get_output_msg) (axis2_op_t *op,
                      const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     set_output_msg) (axis2_op_t *op,
                      const axis2_env_t *env,
                      struct axis2_wsdl_msg_ref *output_msg);
-    
+
     axis2_bool_t (AXIS2_CALL *
     is_safe) (axis2_op_t *op,
               const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     set_safety) (axis2_op_t *op,
                  const axis2_env_t *env,
@@ -310,35 +310,35 @@
     axis2_char_t *(AXIS2_CALL *
     get_target_namespace) (axis2_op_t *op,
                            const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     add_in_fault) (axis2_op_t *op,
                    const axis2_env_t *env,
                    struct axis2_wsdl_fault_ref *in_fault);
-    
+
     axis2_status_t (AXIS2_CALL *
     add_out_fault) (axis2_op_t *op,
                     const axis2_env_t *env,
                     struct axis2_wsdl_fault_ref *out_fault);
-    
+
     axis2_status_t (AXIS2_CALL *
     add_feature) (axis2_op_t *op,
                   const axis2_env_t *env,
                   struct axis2_wsdl_feature *feature);
-    
+
     axis2_linked_list_t *(AXIS2_CALL *
     get_features) (axis2_op_t *op,
                    const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL *
     add_property) (axis2_op_t *op,
                    const axis2_env_t *env,
                    struct axis2_wsdl_property *wsdl_property);
-    
+
     axis2_linked_list_t *(AXIS2_CALL *
     get_Properties) (axis2_op_t *op,
                      const axis2_env_t *env);
-    
+
     axis2_status_t (AXIS2_CALL * 
     set_wsdl_op) (axis2_op_t *op,
                   const axis2_env_t *env,
@@ -392,7 +392,7 @@
         const axis2_op_t *op, 
         const axis2_env_t *env, 
         const axis2_char_t *label);
-    
+
     axis2_status_t (AXIS2_CALL *
     add_msg)(
         const axis2_op_t *op, 
@@ -465,10 +465,10 @@
 #define AXIS2_OP_GET_PARENT(op, env) \
       ((op)->ops->get_parent (op, env))
 
-#define AXIS2_OP_SET_MSG_RECEIVER(op, env, msg_recv) \
+#define AXIS2_OP_SET_MSG_RECV(op, env, msg_recv) \
         ((op)->ops->set_msg_recv (op, env, msg_recv))
 
-#define AXIS2_OP_GET_MSG_RECEIVER(op, env) \
+#define AXIS2_OP_GET_MSG_RECV(op, env) \
       ((op)->ops->get_msg_recv (op, env))
 
 #define AXIS2_OP_SET_QNAME(op, env, qname) \

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?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Jul 31 01:29:32 2006
@@ -721,7 +721,7 @@
         property = axis2_property_create(env);
         AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
         epr_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(call_impl->to, env);
-      address = AXIS2_STRDUP(epr_address, env);
+        address = AXIS2_STRDUP(epr_address, env);
         AXIS2_PROPERTY_SET_VALUE(property, env, address);
         AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
                                     AXIS2_TRANSPORT_URL, property, AXIS2_FALSE);
@@ -903,7 +903,7 @@
 
         op = AXIS2_SVC_GET_OP_WITH_QNAME(svc_client_impl->svc, env, 
             op_qname);
-        AXIS2_OP_SET_MSG_RECEIVER(op, env, 
+        AXIS2_OP_SET_MSG_RECV(op, env, 
             AXIS2_CALLBACK_RECV_GET_BASE(svc_client_impl->callback_recv, env));
         AXIS2_OP_CLIENT_SET_CALLBACK_RECV(op_client, env, 
             svc_client_impl->callback_recv);

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h Mon Jul 31 01:29:32 2006
@@ -28,9 +28,9 @@
 #include <axis2_env.h>
 #include <axis2_allocator.h>
 #include <axis2_qname.h>
-#include <axis2_desc_builder.h>
+#include "axis2_desc_builder.h"
 #include <axis2_conf.h>
-#include <axis2_dep_engine.h>
+#include "axis2_dep_engine.h"
 #include <axiom_children_qname_iterator.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Mon Jul 31 01:29:32 2006
@@ -27,10 +27,10 @@
 #include <axis2_defines.h>
 #include <axis2_env.h>
 #include <axis2_allocator.h>
-#include <axis2_arch_file_data.h>
-#include <axis2_ws_info.h>
-#include <axis2_conf_builder.h>
-#include <axis2_repos_listener.h>
+#include "axis2_arch_file_data.h"
+#include "axis2_ws_info.h"
+#include "axis2_conf_builder.h"
+#include "axis2_repos_listener.h"
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h Mon Jul 31 01:29:32 2006
@@ -28,8 +28,8 @@
 #include <axis2_env.h>
 #include <axis2_allocator.h>
 
-#include <axis2_deployment.h>
-#include <axis2_dep_engine.h>
+#include "axis2_deployment.h"
+#include "axis2_dep_engine.h"
 #include <axis2_flow.h>
 #include <axiom_stax_builder.h>
 #include <axiom_document.h>
@@ -135,10 +135,6 @@
                                         const axis2_env_t *env,
                                         axiom_element_t *recv_element);
     
-    axis2_msg_recv_t *(AXIS2_CALL *
-    load_default_msg_recv) (axis2_desc_builder_t *desc_builder,
-                                                const axis2_env_t *env);
-    
     /**
      * This method is used to retrive service name form the arechive file name
      * if the archive file name is service1.aar , then axis service name would be service1
@@ -147,14 +143,16 @@
      * @return axis2_char_t *
      */
     axis2_char_t *(AXIS2_CALL *
-    get_short_file_name) (axis2_desc_builder_t *desc_builder,
-                                            const axis2_env_t *env,
-                                            axis2_char_t *file_name);
+    get_short_file_name) (
+        axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axis2_char_t *file_name);
     
     axis2_char_t *(AXIS2_CALL *
-    get_file_name_without_prefix) (axis2_desc_builder_t *desc_builder,
-                                    const axis2_env_t *env,
-                                    axis2_char_t *short_file_name);    
+    get_file_name_without_prefix) (
+        axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axis2_char_t *short_file_name);    
  
  /**
      * this method is to get the value of attribue
@@ -163,15 +161,17 @@
      * @return String
      */
     axis2_char_t *(AXIS2_CALL *
-    get_value) (axis2_desc_builder_t *desc_builder,
-                                    const axis2_env_t *env,
-                                    axis2_char_t *in);
-                                    
-                                        
-
-
+    get_value) (
+        axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axis2_char_t *in);
+                                
 };
 
+struct axis2_msg_recv *AXIS2_CALL
+axis2_desc_builder_load_default_msg_recv(
+    const axis2_env_t *env);
+
 /** 
  * @brief Description Builder struct 
  */  
@@ -235,9 +235,6 @@
 
 #define AXIS2_DESC_BUILDER_LOAD_MSG_RECV(desc_builder, env, recv_element) \
       ((desc_builder)->ops->load_msg_recv (desc_builder, env, recv_element))  
-
-#define AXIS2_DESC_BUILDER_LOAD_DEFAULT_MSG_RECV(desc_builder, env) \
-      ((desc_builder)->ops->load_default_msg_recv (desc_builder, env))  
 
 #define AXIS2_DESC_BUILDER_GET_SHORT_FILE_NAME(desc_builder, env, file_name) \
       ((desc_builder)->ops->get_short_file_name (desc_builder, env, file_name))  

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h Mon Jul 31 01:29:32 2006
@@ -29,8 +29,8 @@
 #include <axis2_allocator.h>
 #include <axis2_qname.h>
 #include <axis2_array_list.h>
-#include <axis2_ws_info_list.h>
-#include <axis2_dep_engine.h>
+#include "axis2_ws_info_list.h"
+#include "axis2_dep_engine.h"
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Mon Jul 31 01:29:32 2006
@@ -29,12 +29,12 @@
 #include <axis2_allocator.h>
 #include <axis2_qname.h>
 #include <axis2_conf.h>
-#include <axis2_deployment.h>
+#include "axis2_deployment.h"
 #include <axis2_file_handler.h>
 #include <axis2_dir_handler.h>
-#include <axis2_ws_info.h>
-#include <axis2_arch_file_data.h>
-#include <axis2_dep_engine.h>
+#include "axis2_ws_info.h"
+#include "axis2_arch_file_data.h"
+#include "axis2_dep_engine.h"
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Mon Jul 31 01:29:32 2006
@@ -84,10 +84,6 @@
                                     const axis2_env_t *env,
                                     axiom_element_t *recv_element);
 
-struct axis2_msg_recv *AXIS2_CALL
-axis2_desc_builder_load_default_msg_recv(axis2_desc_builder_t *desc_builder,
-                                            const axis2_env_t *env);
-
 
 axis2_char_t *AXIS2_CALL
 axis2_desc_builder_get_short_file_name(axis2_desc_builder_t *desc_builder,
@@ -156,8 +152,6 @@
             axis2_desc_builder_process_op_module_refs;
     desc_builder_impl->desc_builder.ops->load_msg_recv = 
             axis2_desc_builder_load_msg_recv;
-    desc_builder_impl->desc_builder.ops->load_default_msg_recv = 
-            axis2_desc_builder_load_default_msg_recv;
     desc_builder_impl->desc_builder.ops->get_short_file_name = 
             axis2_desc_builder_get_short_file_name;
     desc_builder_impl->desc_builder.ops->get_file_name_without_prefix =
@@ -969,8 +963,8 @@
 }
 
 struct axis2_msg_recv *AXIS2_CALL
-axis2_desc_builder_load_default_msg_recv(axis2_desc_builder_t *desc_builder,
-                                            const axis2_env_t *env)
+axis2_desc_builder_load_default_msg_recv(
+    const axis2_env_t *env)
 {
     axis2_msg_recv_t *msg_recv = NULL;
   

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Mon Jul 31 01:29:32 2006
@@ -494,15 +494,14 @@
             
             msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(module_builder->
                 desc_builder, env, recv_element);
-            AXIS2_OP_SET_MSG_RECEIVER(op_desc, env, msg_recv);
+            AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
         }
         else
         {
             axis2_msg_recv_t *msg_recv = NULL;
             /* setting default message reciver */
-            msg_recv = AXIS2_DESC_BUILDER_LOAD_DEFAULT_MSG_RECV(module_builder->
-                desc_builder, env);
-            AXIS2_OP_SET_MSG_RECEIVER(op_desc, env,msg_recv);
+            msg_recv = axis2_desc_builder_load_default_msg_recv(env);
+            AXIS2_OP_SET_MSG_RECV(op_desc, env,msg_recv);
             
         }
         /* Process Module Refs */

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Jul 31 01:29:32 2006
@@ -246,11 +246,9 @@
     axis2_file_t *svc_folder = NULL;
     axis2_char_t *dll_path = NULL;
     axis2_char_t *svc_folder_path = NULL;
-    axis2_param_container_t *param_container_l = NULL;
     int i = 0;
     int size = 0;
     AXIS2_TIME_T timestamp = 0;
-    axis2_property_t *property = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, svc_node, AXIS2_FAILURE);
@@ -270,12 +268,8 @@
     qparamst = NULL;
     parent = AXIS2_SVC_GET_PARENT(builder_impl->svc, env);
     
-    property = (axis2_property_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        builder_impl->svc->wsdl_svc->wsdl_component, env, AXIS2_PARAMETER_KEY);
-    param_container_l = (axis2_param_container_t *) AXIS2_PROPERTY_GET_VALUE(
-        property, env);
     status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(svc_builder->desc_builder, env, 
-        itr, param_container_l, parent->param_container);
+        itr, builder_impl->svc->param_container, parent->param_container);
     if(AXIS2_SUCCESS != status)
     {
         return status;
@@ -338,7 +332,8 @@
      * container taken from svc 
      */
     dll_desc = axis2_dll_desc_create(env);
-    impl_info_param = AXIS2_PARAM_CONTAINER_GET_PARAM(param_container_l, env, 
+    impl_info_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
+            builder_impl->svc->param_container, env, 
         AXIS2_SERVICE_CLASS);
     if(!impl_info_param)
     {
@@ -639,16 +634,15 @@
             axis2_msg_recv_t *msg_recv = NULL;
             msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(svc_builder->desc_builder,
                 env, recv_element);
-            AXIS2_OP_SET_MSG_RECEIVER(op_desc, env, msg_recv);
+            AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
             
         }
         else
         {
             axis2_msg_recv_t *msg_recv = NULL;
             /* setting the default messgae receiver */
-            msg_recv = AXIS2_DESC_BUILDER_LOAD_DEFAULT_MSG_RECV(svc_builder->
-                desc_builder, env);
-            AXIS2_OP_SET_MSG_RECEIVER(op_desc, env, msg_recv);
+            msg_recv = axis2_desc_builder_load_default_msg_recv(env);
+            AXIS2_OP_SET_MSG_RECV(op_desc, env, msg_recv);
         }
         /* process module refs */
         qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);

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?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Jul 31 01:29:32 2006
@@ -18,6 +18,7 @@
 #include <axis2_property.h>
 #include <axis2_msg.h>
 #include <axis2_desc.h>
+#include <axis2_conf_ctx.h>
 
 /** 
  * @brief Operaton struct impl
@@ -763,9 +764,8 @@
                               axis2_param_t *param)
 {
     axis2_op_impl_t *op_impl = NULL;
-    axis2_param_container_t *param_container_l = NULL;
     axis2_char_t *param_name = NULL;
-    axis2_property_t *property = NULL;
+    axis2_status_t status = AXIS2_FAILURE;
     
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, param, AXIS2_FALSE);
@@ -780,85 +780,70 @@
     }
     else
     {
-        property = (axis2_property_t *)
-            AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-                op_impl->wsdl_op->extensible_component->wsdl_component, env, 
-                (axis2_char_t *) AXIS2_PARAMETER_KEY);
-        param_container_l = (axis2_param_container_t *) 
-            AXIS2_PROPERTY_GET_VALUE(property, env);
-        return AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container_l, env, param);
+        status = AXIS2_PARAM_CONTAINER_ADD_PARAM(op->param_container, env, 
+                param);
     }
     
-    return AXIS2_SUCCESS;
+    return status;
 }
 
 axis2_param_t * AXIS2_CALL
-axis2_op_get_param (axis2_op_t *op, 
-                                const axis2_env_t *env,
-                              const axis2_char_t *param_name)
+axis2_op_get_param (
+        axis2_op_t *op, 
+        const axis2_env_t *env,
+        const axis2_char_t *param_name)
 {
     axis2_op_impl_t *op_impl = NULL;
-    axis2_param_container_t *param_container_l = NULL;
-    axis2_property_t *property = NULL;
+    axis2_param_t *param = NULL;
  
-   AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-   AXIS2_PARAM_CHECK(env->error, param_name, NULL);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
+    AXIS2_PARAM_CHECK(env->error, param_name, NULL);
     op_impl = AXIS2_INTF_TO_IMPL(op);
 
-    property = (axis2_property_t *) 
-        AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op_impl->wsdl_op->
-            extensible_component->wsdl_component, env, (axis2_char_t *) 
-                AXIS2_PARAMETER_KEY);
-
-    if (!property)
-        return NULL;
-
-    param_container_l = (axis2_param_container_t *) 
-        AXIS2_PROPERTY_GET_VALUE(property, env);
-   return AXIS2_PARAM_CONTAINER_GET_PARAM(param_container_l, env, param_name);
+    param = AXIS2_PARAM_CONTAINER_GET_PARAM(op->param_container, env, param_name);
+    if(param == NULL && op_impl->parent)
+        param = AXIS2_SVC_GET_PARAM(op_impl->parent, env, param_name);
+    return param;
 }
 
 axis2_array_list_t * AXIS2_CALL
-axis2_op_get_params(axis2_op_t *op, 
-                                const axis2_env_t *env)
+axis2_op_get_params(
+        axis2_op_t *op, 
+        const axis2_env_t *env)
 {
     axis2_op_impl_t *op_impl = NULL;
-    /*axis2_param_container_t *param_container_l = NULL; */
     
-   AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-    AXIS2_PARAM_CHECK(env->error, op->param_container, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     op_impl = AXIS2_INTF_TO_IMPL(op);
    
     return AXIS2_PARAM_CONTAINER_GET_PARAMS(op->param_container, env);
 }
 
 axis2_bool_t AXIS2_CALL 
-axis2_op_is_param_locked(axis2_op_t *op, 
-                                    const axis2_env_t *env,
-                                  axis2_char_t *param_name)
+axis2_op_is_param_locked(
+        axis2_op_t *op, 
+        const axis2_env_t *env,
+        axis2_char_t *param_name)
 {
-    axis2_svc_t *parent_l = NULL;
-    axis2_param_t *param_l = NULL;
+    axis2_svc_t *parent = NULL;
+    axis2_param_t *param = NULL;
     axis2_bool_t locked = AXIS2_FALSE;
     
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
     
     /* checking the locked value of parent*/
-    parent_l = axis2_op_get_parent(op, env);
-    if(NULL != parent_l)
+    parent = axis2_op_get_parent(op, env);
+    if(NULL != parent)
     {
-        locked = AXIS2_SVC_IS_PARAM_LOCKED(parent_l, env, param_name);
+        locked = AXIS2_SVC_IS_PARAM_LOCKED(parent, env, param_name);
     }
     if(AXIS2_TRUE == locked)
     {
         return AXIS2_TRUE;
     }        
-    else
-    {
-        param_l = axis2_op_get_param(op, env, param_name);   
-    }
-   return (param_l !=NULL && AXIS2_PARAM_IS_LOCKED(param_l, env));
+    param = axis2_op_get_param(op, env, param_name);   
+    return (param !=NULL && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
 }
 
 axis2_status_t AXIS2_CALL 
@@ -928,14 +913,15 @@
     axis2_op_impl_t *op_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-   op_impl = AXIS2_INTF_TO_IMPL(op);
+    op_impl = AXIS2_INTF_TO_IMPL(op);
     
     return AXIS2_WSDL_OP_SET_QNAME(op_impl->wsdl_op, env, qname);
 }
     
 axis2_qname_t * AXIS2_CALL
-axis2_op_get_qname (void *op, 
-                    const axis2_env_t *env)
+axis2_op_get_qname (
+        void *op, 
+        const axis2_env_t *env)
 {
     axis2_op_impl_t *op_impl = NULL;
     
@@ -999,17 +985,16 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_op_engage_module(axis2_op_t *op,
-                                const axis2_env_t *env,
-                                axis2_module_desc_t *moduleref) 
+axis2_op_engage_module(
+        axis2_op_t *op,
+        const axis2_env_t *env,
+        axis2_module_desc_t *moduleref) 
 {
     axis2_op_impl_t *op_impl = NULL;
     int index = 0;
     int size = 0;
-    axis2_status_t status = AXIS2_FAILURE;
     axis2_array_list_t *collection_module = NULL;
     axis2_module_desc_t *module_desc = NULL;
-    axis2_phase_resolver_t *pr = NULL;
     axis2_property_t *property = NULL;
         
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1044,7 +1029,7 @@
         }
 
     }
-    pr = axis2_phase_resolver_create(env);
+    /*pr = axis2_phase_resolver_create_with_config(env);
     if(pr)
     {
         status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OP(pr, env, 
@@ -1061,7 +1046,7 @@
         return AXIS2_FAILURE;
     }
     AXIS2_PHASE_RESOLVER_FREE(pr, env);
-    pr = NULL;
+    */
     return AXIS2_ARRAY_LIST_ADD(collection_module, env, moduleref);
 }
 

Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Mon Jul 31 01:29:32 2006
@@ -18,6 +18,7 @@
 #include <axis2_addr.h>
 #include <axis2_property.h>
 #include <xml_schema_obj_collection.h>
+#include "../deployment/axis2_desc_builder.h"
 
 typedef struct axis2_svc_impl axis2_svc_impl_t;
    
@@ -29,8 +30,6 @@
 {
     axis2_svc_t svc;
     axis2_svc_grp_t *parent;
-    axis2_hash_t *wasaction_op_map;  
-    axis2_hash_t *op_alias_map;  
     axis2_char_t *axis_svc_name; 
     /** to keep the time that last update time of the service */
     long last_update;
@@ -55,6 +54,7 @@
      * the subsequent requests
      */
     axis2_hash_t *schema_mapping_table;
+    axis2_hash_t *op_alias_map;
     /**
      * Keeps track whether the schema locations are adjusted
      */
@@ -472,7 +472,7 @@
     svc_impl->svc.param_container = NULL;
     svc_impl->svc.flow_container = NULL;
     svc_impl->svc.wsdl_svc = NULL;
-    svc_impl->wasaction_op_map = NULL;
+    svc_impl->op_alias_map = NULL;
     svc_impl->module_list = NULL;
     svc_impl->ns_map = NULL;
     svc_impl->ns_count = 0;
@@ -488,37 +488,37 @@
     svc_impl->sc_calc_count = 0;
     
     svc_impl->svc.param_container = axis2_param_container_create(env);      
-   if(NULL == svc_impl->svc.param_container)
-   {
+    if(NULL == svc_impl->svc.param_container)
+    {
         axis2_svc_free(&(svc_impl->svc), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;      
-   }
-    
+    }
+
     svc_impl->svc.flow_container = axis2_flow_container_create(env);      
-   if(NULL == svc_impl->svc.flow_container)
-   {
+    if(NULL == svc_impl->svc.flow_container)
+    {
         axis2_svc_free(&(svc_impl->svc), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);      
         return NULL;
-   }
-    
+    }
+
     svc_impl->svc.wsdl_svc = axis2_wsdl_svc_create(env);      
-   if(NULL == svc_impl->svc.wsdl_svc)
-   {
+    if(NULL == svc_impl->svc.wsdl_svc)
+    {
         axis2_svc_free(&(svc_impl->svc), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);      
         return NULL;
-   }
-    
-    svc_impl->wasaction_op_map = axis2_hash_make (env);            
-   if(NULL == svc_impl->wasaction_op_map)
-   {
+    }
+
+    svc_impl->op_alias_map = axis2_hash_make (env);            
+    if(NULL == svc_impl->op_alias_map)
+    {
         axis2_svc_free(&(svc_impl->svc), env);
-      AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);      
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);      
         return NULL;
-   }
-    
+    }
+
     /** Create modle list of default size */
     svc_impl->module_list = axis2_array_list_create(env, 0);
     if(NULL == svc_impl->module_list)
@@ -527,14 +527,14 @@
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    
+
     svc_impl->svc.ops = AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_ops_t));
-   if(NULL == svc_impl->svc.ops)
-   {
+    if(NULL == svc_impl->svc.ops)
+    {
         axis2_svc_free(&(svc_impl->svc), env);
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
-   }
+    }
 
     wsdl_interface_l = axis2_wsdl_interface_create(env);
     if(NULL == wsdl_interface_l)
@@ -785,14 +785,6 @@
     
     svc_impl->parent = NULL;
     
-    if(NULL != svc_impl->wasaction_op_map)
-    {
-        /* By this time operations are already freed
-        */
-      axis2_hash_free(svc_impl->wasaction_op_map, env);
-        svc_impl->wasaction_op_map = NULL;
-    }
-    
     if(NULL != svc_impl->module_list)
     {
         int i = 0;
@@ -840,93 +832,110 @@
                     const axis2_env_t *env,
                     axis2_op_t *op)
 {
+    axis2_svc_impl_t *svc_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
+    axis2_array_list_t *modules = NULL;
+    int i = 0, size = 0;
+    axis2_msg_recv_t *msg_recv = NULL;
+    axis2_qname_t *qname = NULL;
+    axis2_char_t *key = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
     
     status = AXIS2_OP_SET_PARENT(op, env, svc);
-    if(AXIS2_SUCCESS == status)
+    if(AXIS2_SUCCESS != status)
     {
-        axis2_wsdl_interface_t *wsdl_interface = NULL;
-        
-        wsdl_interface = axis2_svc_get_svc_interface(svc, env);
-        status = AXIS2_WSDL_INTERFACE_SET_OP(wsdl_interface, env, op);
+        return status;
     }
-    return status;
+    modules = axis2_svc_get_engaged_modules(svc, env);
+    if(modules)
+        size = AXIS2_ARRAY_LIST_SIZE(modules, env);
+    for(i = 0; i < size; i++)
+    {
+        axis2_module_desc_t *module_desc = NULL;
+        axis2_module_t *module_impl = NULL;
+        axis2_svc_grp_t *parent = NULL;
+        axis2_conf_t *conf = NULL;
+
+        module_desc = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(modules, env, i);
+        parent = (axis2_svc_grp_t *) axis2_svc_get_parent(svc, env);
+        if(parent)
+        {
+            conf = (axis2_conf_t *) AXIS2_SVC_GRP_GET_PARENT(parent, env);
+        }
+        if(module_desc)
+            module_impl = AXIS2_MODULE_DESC_GET_MODULE(module_desc, env);
+        if(module_impl)
+        {
+            /* Notify module for service engagement */
+            /*AXIS2_MODULE_ENGAGE_NOTIFY(module_impl, env, op); */
+        }
+        status = AXIS2_OP_ENGAGE_MODULE(op, env, module_desc);
+        if(AXIS2_TRUE != status)
+        {
+            AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_OP, 
+                    AXIS2_FAILURE);
+            return status;
+        }
+    }
+    msg_recv = AXIS2_OP_GET_MSG_RECV(op, env);
+    if(msg_recv == NULL)
+    {
+        msg_recv = axis2_desc_builder_load_default_msg_recv(env);
+        AXIS2_OP_SET_MSG_RECV(op, env, msg_recv);
+    }
+    qname = AXIS2_OP_GET_QNAME(op, env);
+    key = AXIS2_QNAME_GET_LOCALPART(qname, env);
+    axis2_hash_set(svc_impl->op_alias_map, key, AXIS2_HASH_KEY_STRING, op);
+    return AXIS2_SUCCESS;
 }
 
 axis2_op_t * AXIS2_CALL
 axis2_svc_get_op_with_qname (axis2_svc_t *svc,
                                         const axis2_env_t *env,
-                                      const axis2_qname_t *op_name)
+                                      const axis2_qname_t *op_qname)
 {
     axis2_svc_impl_t *svc_impl = NULL;
-    axis2_op_t *op_l = NULL;
-    axis2_char_t *op_str = NULL;
-    axis2_char_t *op_qname_str = NULL;
-    /*axis2_hash_t *all_ops = NULL; */
+    axis2_op_t *op = NULL;
+    axis2_char_t *key = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
-    AXIS2_PARAM_CHECK(env->error, op_name, NULL);
+    AXIS2_PARAM_CHECK(env->error, op_qname, NULL);
     svc_impl = AXIS2_INTF_TO_IMPL(svc);
-    
-    op_qname_str = AXIS2_QNAME_TO_STRING(op_name, env);    
-    if (op_qname_str)
-    {
-        axis2_wsdl_interface_t *wsdl_interface = NULL;
-        
-        wsdl_interface = axis2_svc_get_svc_interface(svc, env);
-        op_l = (axis2_op_t *)AXIS2_WSDL_INTERFACE_GET_OP(wsdl_interface, env, 
-            op_qname_str);
-        if (op_l)
-        {
-            return op_l;
-        }
-    }
+   
+    key = AXIS2_QNAME_GET_LOCALPART(op_qname, env);
+    op = axis2_hash_get(svc_impl->op_alias_map, key, AXIS2_HASH_KEY_STRING);
 
-    /*TODO commented until AXIS2_WSDL_INTERFACE_GET_ALL_OPS is implemented
-    all_ops = AXIS2_WSDL_INTERFACE_GET_ALL_OPS(
-        axis2_svc_get_svc_interface(svc, env), env);
-    op_l = (axis2_op_t) (axis2_hash_get (all_ops, 
-        op_str, AXIS2_HASH_KEY_STRING));
-    */
-    op_str = AXIS2_QNAME_GET_LOCALPART(op_name, env);
-    if(NULL == op_l )
-    {
-        op_l = (axis2_op_t *) (axis2_hash_get (
-            svc_impl->wasaction_op_map, op_str, AXIS2_HASH_KEY_STRING));
-    }
-    
-    return op_l;   
+    return op;   
 }   
 
 axis2_op_t * AXIS2_CALL
 axis2_svc_get_op_with_name (axis2_svc_t *svc, 
-                                    const axis2_env_t *env,
-                                  const axis2_char_t* nc_name)
+    const axis2_env_t *env,
+    const axis2_char_t* nc_name)
 {
-    axis2_wsdl_interface_t *wsdl_interface = NULL;
-    axis2_hash_t *ops = NULL;
+    axis2_svc_impl_t *svc_impl = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, nc_name, NULL);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
     
-    wsdl_interface = axis2_svc_get_svc_interface(svc, env);
-    ops = AXIS2_WSDL_INTERFACE_GET_OPS(wsdl_interface, env);
-    return (axis2_op_t *) axis2_hash_get(ops, nc_name, AXIS2_HASH_KEY_STRING);
+    return (axis2_op_t *) axis2_hash_get(svc_impl->op_alias_map, nc_name, 
+            AXIS2_HASH_KEY_STRING);
 }
 
 axis2_hash_t * AXIS2_CALL
 axis2_svc_get_ops (axis2_svc_t *svc, 
                             const axis2_env_t *env)
 {
-    axis2_wsdl_interface_t *wsdl_interface = NULL;
+    axis2_svc_impl_t *svc_impl = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
-    
-    wsdl_interface = axis2_svc_get_svc_interface(svc, env);
-    return AXIS2_WSDL_INTERFACE_GET_OPS(wsdl_interface, env);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
+
+    return svc_impl->op_alias_map;
 }
    
 axis2_status_t AXIS2_CALL
@@ -975,18 +984,17 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_svc_add_param (axis2_svc_t *svc, 
-                        const axis2_env_t *env,
-                      axis2_param_t *param)
+axis2_svc_add_param (
+        axis2_svc_t *svc, 
+        const axis2_env_t *env,
+        axis2_param_t *param)
 {
-    axis2_param_container_t *param_container_l = NULL;
-    axis2_property_t *property = NULL;
-        
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
     
    
-    if(axis2_svc_is_param_locked(svc, env, AXIS2_PARAM_GET_NAME(param, env)))
+    if(AXIS2_TRUE == axis2_svc_is_param_locked(svc, env, 
+                AXIS2_PARAM_GET_NAME(param, env)))
     {
         AXIS2_ERROR_SET(env->error, 
             AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -994,67 +1002,50 @@
     } 
     else
     {
-        property = (axis2_property_t *)
-            AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->
-                wsdl_component, env, AXIS2_PARAMETER_KEY);
-        if(property)
-            param_container_l = (axis2_param_container_t *)
-                AXIS2_PROPERTY_GET_VALUE(property, env);
-        if(param_container_l)
-            return AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container_l, env, param);
+        return AXIS2_PARAM_CONTAINER_ADD_PARAM(svc->param_container, env, param);
     }
     return AXIS2_FAILURE;
 }
 
 axis2_param_t * AXIS2_CALL
-axis2_svc_get_param (axis2_svc_t *svc, 
-                        const axis2_env_t *env,
-                      const axis2_char_t *name)
+axis2_svc_get_param (
+        axis2_svc_t *svc, 
+        const axis2_env_t *env,
+        const axis2_char_t *name)
 {
-    axis2_param_container_t *param_container_l = NULL;
-    axis2_property_t *property = NULL;
+    axis2_param_t *param = NULL;
+    axis2_svc_impl_t *svc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, name, NULL);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
 
-    property = (axis2_property_t *)
-        AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->
-            wsdl_component, env, AXIS2_PARAMETER_KEY);
-    if(property)
-        param_container_l = (axis2_param_container_t *)
-            AXIS2_PROPERTY_GET_VALUE(property, env);
-    if(param_container_l)
-        return AXIS2_PARAM_CONTAINER_GET_PARAM(param_container_l, env, name);
-    return NULL;
+    param = AXIS2_PARAM_CONTAINER_GET_PARAM(svc->param_container, env, name);
+    if(param == NULL && svc_impl->parent)
+    {
+        param = AXIS2_SVC_GRP_GET_PARAM(svc_impl->parent, env, name);
+    }
+    return param;
 }
 
 axis2_array_list_t * AXIS2_CALL
-axis2_svc_get_params (axis2_svc_t *svc, 
-                        const axis2_env_t *env)
+axis2_svc_get_params (
+        axis2_svc_t *svc, 
+        const axis2_env_t *env)
 {
-    axis2_param_container_t *param_container_l = NULL;
-    axis2_property_t *property = NULL;
-
-   AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
    
-    property = (axis2_property_t *)
-    AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->
-        wsdl_component, env, AXIS2_PARAMETER_KEY);
-    if(property)
-        param_container_l = (axis2_param_container_t *)
-            AXIS2_PROPERTY_GET_VALUE(property, env);
-    if(param_container_l)
-        return AXIS2_PARAM_CONTAINER_GET_PARAMS(param_container_l, env);
-    return NULL;
+    return AXIS2_PARAM_CONTAINER_GET_PARAMS(svc->param_container, env);
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_svc_is_param_locked (axis2_svc_t *svc, 
-                            const axis2_env_t *env,
-                          axis2_char_t *param_name)
+axis2_svc_is_param_locked (
+        axis2_svc_t *svc, 
+        const axis2_env_t *env,
+        axis2_char_t *param_name)
 {
     axis2_bool_t locked = AXIS2_FALSE;
-    axis2_param_t *param_l = NULL;
-    axis2_conf_t *conf_l = NULL;
+    axis2_param_t *param = NULL;
     axis2_svc_grp_t *parent = NULL;
     axis2_bool_t ret = AXIS2_FALSE;
     
@@ -1064,32 +1055,18 @@
    /*checking the locked value of parent */
 
     parent = axis2_svc_get_parent(svc, env);
-    if(NULL == parent)
-    {
-        return AXIS2_FALSE;
-    }
-    
-    conf_l = AXIS2_SVC_GRP_GET_AXIS_DESC(parent, env);
-    if(NULL == conf_l)
-    {
-        return AXIS2_FALSE;
-    }
-    locked =  AXIS2_CONF_IS_PARAM_LOCKED(conf_l, env, param_name);
-    
-    if(AXIS2_TRUE == locked)
+    if(parent)
+        locked =  AXIS2_SVC_GRP_IS_PARAM_LOCKED(parent, env, param_name);
+    if(parent && AXIS2_TRUE == locked)
     {
         ret = AXIS2_TRUE;
     } 
-    else 
+    param = axis2_svc_get_param(svc, env, param_name);
+    if(NULL == param)
     {
-        param_l = axis2_svc_get_param(svc, env, param_name);
-        if(NULL == param_l)
-        {
-            return AXIS2_FALSE;
-        }
-        ret = AXIS2_PARAM_IS_LOCKED(param_l, env);
+        ret = AXIS2_FALSE;
     }
-    
+    ret = AXIS2_PARAM_IS_LOCKED(param, env);
     return ret;
 }
 
@@ -1854,7 +1831,7 @@
     AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
     svc_impl = AXIS2_INTF_TO_IMPL(svc);
     
-    axis2_hash_set(svc_impl->wasaction_op_map, mapping_key, 
+    axis2_hash_set(svc_impl->op_alias_map, mapping_key, 
         AXIS2_HASH_KEY_STRING, op_desc);
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Mon Jul 31 01:29:32 2006
@@ -15,6 +15,7 @@
  */
  
 #include <axis2_svc_grp.h>
+#include <axis2_conf_ctx.h>
 
 /** 
  * @brief Service group struct impl
@@ -456,43 +457,50 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
     
-    if(NULL == svc_grp->param_container)
+    if(AXIS2_TRUE == axis2_svc_grp_is_param_locked(svc_grp, env, 
+                AXIS2_PARAM_GET_NAME(param, env)))
     {
-        svc_grp->param_container = axis2_param_container_create(env);
-        if(!svc_grp->param_container)
-        {
-            return AXIS2_FAILURE;
-        }
+        AXIS2_ERROR_SET(env->error, 
+            AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
+        return AXIS2_FAILURE;
+    } 
+    else
+    {
+        return AXIS2_PARAM_CONTAINER_ADD_PARAM(svc_grp->param_container, env, param);
     }
-    
-    return AXIS2_PARAM_CONTAINER_ADD_PARAM(svc_grp->param_container, env, param);
+
+    return AXIS2_FAILURE;
 }
 
 axis2_param_t * AXIS2_CALL 
-axis2_svc_grp_get_param (axis2_svc_grp_t *svc_grp, 
-                            const axis2_env_t *env,
-                          const axis2_char_t *name)
+axis2_svc_grp_get_param (
+        axis2_svc_grp_t *svc_grp, 
+        const axis2_env_t *env,
+        const axis2_char_t *name)
 {
+    axis2_param_t *param = NULL;
+    axis2_svc_grp_impl_t *svc_grp_impl = NULL;
+
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, name, NULL);
-   if(NULL == svc_grp->param_container)
+    svc_grp_impl = AXIS2_INTF_TO_IMPL(svc_grp);
+   
+    param = AXIS2_PARAM_CONTAINER_GET_PARAM(svc_grp->param_container, env, name);
+    if(param == NULL && svc_grp_impl->parent)
     {
-       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER,
-            AXIS2_FAILURE);
-        return NULL;
+        param = AXIS2_CONF_GET_PARAM(svc_grp_impl->parent, env, name);
     }
-   
-    return AXIS2_PARAM_CONTAINER_GET_PARAM(svc_grp->param_container, env, name);
+    return param;
 }
 
 axis2_array_list_t * AXIS2_CALL 
-axis2_svc_grp_get_params (axis2_svc_grp_t *svc_grp, 
-                            const axis2_env_t *env)
+axis2_svc_grp_get_params (
+        axis2_svc_grp_t *svc_grp, 
+        const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
    
    return AXIS2_PARAM_CONTAINER_GET_PARAMS(svc_grp->param_container, env);
-   
 }
 
 axis2_bool_t AXIS2_CALL
@@ -510,23 +518,22 @@
 
     parent = axis2_svc_grp_get_parent(svc_grp, env);
     /* checking the locked value of parent */
-    if (NULL != parent) 
+    if (parent) 
     {
         locked =  AXIS2_CONF_IS_PARAM_LOCKED(parent, env, param_name);
     }
-    if(locked)
+    if(AXIS2_TRUE == locked)
+    {
+        ret = AXIS2_TRUE;
+    }  
+    param = axis2_svc_grp_get_param(svc_grp, env, param_name);
+    if(NULL != param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env))
     {
         ret = AXIS2_TRUE;
-    } else 
+    } 
+    else 
     {
-        param = axis2_svc_grp_get_param(svc_grp, env, param_name);
-        if(NULL != param && AXIS2_PARAM_IS_LOCKED(param, env))
-        {
-            ret = AXIS2_TRUE;
-        } else 
-        {
-            ret = AXIS2_FALSE;
-        }
+        ret = AXIS2_FALSE;
     }
     return ret;
 }

Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Jul 31 01:29:32 2006
@@ -1221,9 +1221,10 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_conf_is_param_locked (axis2_conf_t *conf, 
-                            const axis2_env_t *env,
-                          axis2_char_t *param_name)
+axis2_conf_is_param_locked (
+        axis2_conf_t *conf, 
+        const axis2_env_t *env,
+        axis2_char_t *param_name)
 {
     axis2_param_t *param = NULL;
         
@@ -1231,7 +1232,7 @@
     AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
     
     param = axis2_conf_get_param(conf, env, param_name);
-    return (NULL != param  && AXIS2_PARAM_IS_LOCKED(param, env));
+    return (NULL != param  && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
 }
 
 axis2_transport_in_desc_t * AXIS2_CALL

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?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Mon Jul 31 01:29:32 2006
@@ -17,6 +17,7 @@
 #include <axis2_handler_desc.h>
 #include <axis2_qname.h>
 #include <axis2_svc.h>
+#include <axis2_conf_ctx.h>
 
 /**
  * By the time the control comes to this handler, the dispatching must have happened
@@ -114,8 +115,8 @@
     }
     
     op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
-    
-    op_ctx = AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, msg_ctx);
+    if(op) 
+        op_ctx = AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, msg_ctx);
     
     if (op_ctx)
     {
@@ -132,7 +133,7 @@
         }
         return AXIS2_SUCCESS;
     }
-    else /*  2. if no op_ctx, create new op_ctx */
+    else if(op) /*  2. if no op_ctx, create new op_ctx */
     {
         axis2_conf_ctx_t *conf_ctx = NULL;
         op_ctx = axis2_op_ctx_create(env, op, NULL);
@@ -155,5 +156,5 @@
         
     }
     
-    return AXIS2_FAILURE;    
+    return AXIS2_SUCCESS;    
 }

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?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Jul 31 01:29:32 2006
@@ -211,7 +211,7 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
 
     if (!(AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))) /*if is client side, no point in proceeding*/
-        return AXIS2_FAILURE;
+        return AXIS2_SUCCESS;
 
     op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
     

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?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Jul 31 01:29:32 2006
@@ -438,7 +438,7 @@
         /* invoke the Message Receivers */
         if (!op)
             return AXIS2_FAILURE;
-        receiver = AXIS2_OP_GET_MSG_RECEIVER(op, env);
+        receiver = AXIS2_OP_GET_MSG_RECV(op, env);
         if (!receiver)
         {
             AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Message receiver not set in operation description");
@@ -1108,7 +1108,7 @@
             if (op)
             {
                 axis2_msg_recv_t *receiver = NULL;
-                receiver = AXIS2_OP_GET_MSG_RECEIVER(op, env);
+                receiver = AXIS2_OP_GET_MSG_RECV(op, env);
                 if (!receiver)
                 {
                     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Message receiver not set in operation description");

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Mon Jul 31 01:29:32 2006
@@ -21,6 +21,7 @@
 #include <axiom_output.h>
 #include <axis2_op_ctx.h>
 #include <axis2_ctx.h>
+#include <axis2_conf_ctx.h>
 #include <axis2_http_client.h>
 #include <axiom_xml_writer.h>
 #include <axis2_property.h>

Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Mon Jul 31 01:29:32 2006
@@ -22,6 +22,7 @@
 #include <axis2_http_transport.h>
 #include <axis2_uuid_gen.h>
 #include <axis2_property.h>
+#include <axis2_conf_ctx.h>
 
 AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
 axis2_core_utils_create_out_msg_ctx(const axis2_env_t *env,

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Mon Jul 31 01:29:32 2006
@@ -24,6 +24,7 @@
 #include <axiom_soap_header_block.h>
 #include <axis2_op.h>
 #include <axis2_msg_ctx.h>
+#include <axis2_conf_ctx.h>
 #include <axis2_msg_info_headers.h>
 #include <axis2_property.h>
 

Modified: webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c Mon Jul 31 01:29:32 2006
@@ -15,6 +15,7 @@
  */
 #include <axis2_module.h>
 #include <axis2_addr_mod.h>
+#include <axis2_conf_ctx.h>
 
 axis2_status_t AXIS2_CALL
 axis2_mod_addr_shutdown(axis2_module_t *module,

Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Mon Jul 31 01:29:32 2006
@@ -47,7 +47,7 @@
     if (!client_home)
         client_home = "../../deploy";
     
-    address = "http://localhost:9090/axis2/services/math";
+    address = "http://localhost:5555/axis2/services/math";
     if (argc > 1 )
         operation = argv[1];
     if (AXIS2_STRCMP(operation, "-h") == 0)

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Mon Jul 31 01:29:32 2006
@@ -50,7 +50,7 @@
     env = axis2_env_create_all("echo_non_blocking_dual.log", AXIS2_LOG_LEVEL_TRACE);
 
     /* Set end point reference of echo service */
-    address = "http://localhost:9090/axis2/services/echo";
+    address = "http://localhost:5555/axis2/services/echo";
     if (argc > 1 )
         address = argv[1];
     if (AXIS2_STRCMP(address, "-h") == 0)

Modified: webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_deserializer.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_wsdl10_ext_deserializer.h Mon Jul 31 01:29:32 2006
@@ -35,6 +35,7 @@
 #include <axiom_node.h>
 #include <woden.h>
 #include <woden_wsdl10_ext_registry.h>
+#include <woden_wsdl10_ext_deserializer.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_deserializer.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_header_block_deserializer.h Mon Jul 31 01:29:32 2006
@@ -26,8 +26,8 @@
  */
 
 #include <woden.h>
-#include <woden_ext_deserializer.h>
-#include <woden_ext_registry.h>
+#include <woden_wsdl10_ext_deserializer.h>
+#include <woden_wsdl10_ext_registry.h>
 #include <axiom_node.h>
 #include <axis2_qname.h>
 
@@ -67,7 +67,7 @@
     /**
      * @return the base implementation class
      */
-    struct woden_ext_deserializer *(AXIS2_CALL *
+    struct woden_wsdl10_ext_deserializer *(AXIS2_CALL *
     get_base_impl) (
             void *mod_deser,
             const axis2_env_t *env);
@@ -81,13 +81,13 @@
             axis2_qname_t *element_type,
             axiom_node_t *el_node,
             void *desc,
-            woden_ext_registry_t *ext_reg);
+            woden_wsdl10_ext_registry_t *ext_reg);
 
 };
 
 struct woden_wsdl10_soap_header_block_deserializer
 {
-    woden_ext_deserializer_t ext_deserializer;
+    woden_wsdl10_ext_deserializer_t ext_deserializer;
     woden_wsdl10_soap_header_block_deserializer_ops_t *ops;
 };
 

Modified: webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_deserializer.h?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_wsdl10_soap_module_deserializer.h Mon Jul 31 01:29:32 2006
@@ -26,8 +26,8 @@
  */
 
 #include <woden.h>
-#include <woden_ext_deserializer.h>
-#include <woden_ext_registry.h>
+#include <woden_wsdl10_ext_deserializer.h>
+#include <woden_wsdl10_ext_registry.h>
 #include <axiom_node.h>
 #include <axis2_qname.h>
 
@@ -67,7 +67,7 @@
     /**
      * @return the base implementation class
      */
-    struct woden_ext_deserializer *(AXIS2_CALL *
+    struct woden_wsdl10_ext_deserializer *(AXIS2_CALL *
     get_base_impl) (
             void *mod_deser,
             const axis2_env_t *env);
@@ -81,13 +81,13 @@
             axis2_qname_t *element_type,
             axiom_node_t *el_node,
             void *desc,
-            woden_ext_registry_t *ext_reg);
+            woden_wsdl10_ext_registry_t *ext_reg);
 
 };
 
 struct woden_wsdl10_soap_module_deserializer
 {
-    woden_ext_deserializer_t ext_deserializer;
+    woden_wsdl10_ext_deserializer_t ext_deserializer;
     woden_wsdl10_soap_module_deserializer_ops_t *ops;
 };
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c Mon Jul 31 01:29:32 2006
@@ -72,7 +72,7 @@
         axis2_qname_t *ext_type,
         axiom_node_t *ext_el_node,
         void *desc,
-        woden_ext_registry_t *ext_reg);
+        woden_wsdl10_ext_registry_t *ext_reg);
 
 static void *
 parse_documentation(
@@ -112,7 +112,7 @@
 
     header_deser_impl->header_deser.ext_deserializer.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(woden_ext_deserializer_ops_t));
+                sizeof(woden_wsdl10_ext_deserializer_ops_t));
     woden_wsdl10_ext_deserializer_resolve_methods(&(header_deser_impl->header_deser.
             ext_deserializer), env, header_deser_impl->methods);
     return header_deser;
@@ -311,7 +311,7 @@
         axis2_qname_t *ext_type,
         axiom_node_t *ext_el_node,
         void *desc,
-        woden_ext_registry_t *ext_reg)
+        woden_wsdl10_ext_registry_t *ext_reg)
 {
     woden_wsdl10_soap_header_block_deserializer_impl_t *header_deser_impl = NULL;
     axis2_hash_t *super = NULL;
@@ -331,7 +331,7 @@
     header_deser_impl = INTF_TO_IMPL(axis2_hash_get(super, 
                 "WODEN_WSDL10_SOAP_HEADER_BLOCK_DESERIALIZER", AXIS2_HASH_KEY_STRING));
    
-    soap_hdr = WODEN_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env, 
+    soap_hdr = WODEN_WSDL10_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env, 
             parent_type, ext_type);
 
     soap_hdr = woden_wsdl10_soap_header_block_to_ext_element(soap_hdr, env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c?rev=427043&r1=427042&r2=427043&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c Mon Jul 31 01:29:32 2006
@@ -73,7 +73,7 @@
         axis2_qname_t *element_type,
         axiom_node_t *el_node,
         void *desc,
-        woden_ext_registry_t *ext_reg);
+        woden_wsdl10_ext_registry_t *ext_reg);
 
 static void *
 parse_documentation(
@@ -113,7 +113,7 @@
 
     mod_deser_impl->mod_deser.ext_deserializer.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(woden_ext_deserializer_ops_t));
+                sizeof(woden_wsdl10_ext_deserializer_ops_t));
     woden_wsdl10_ext_deserializer_resolve_methods(&(mod_deser_impl->mod_deser.
             ext_deserializer), env, mod_deser_impl->methods);
     return mod_deser;
@@ -312,7 +312,7 @@
         axis2_qname_t *element_type,
         axiom_node_t *el_node,
         void *desc,
-        woden_ext_registry_t *ext_reg)
+        woden_wsdl10_ext_registry_t *ext_reg)
 {
     woden_wsdl10_soap_module_deserializer_impl_t *mod_deser_impl = NULL;
     axis2_hash_t *super = NULL;
@@ -330,7 +330,7 @@
     mod_deser_impl = INTF_TO_IMPL(axis2_hash_get(super, 
                 "WODEN_WSDL10_SOAP_MODULE_DESERIALIZER", AXIS2_HASH_KEY_STRING));
    
-    /*soap_mod = WODEN_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env, 
+    /*soap_mod = WODEN_WSDL10_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env, 
             parent_type, element_type);*/
     soap_mod = woden_wsdl10_soap_module_create(env);
 



---------------------------------------------------------------------
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