axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r502451 - in /webservices/axis2/trunk/c: include/ modules/core/clientapi/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/phaseresolver/
Date Fri, 02 Feb 2007 02:35:33 GMT
Author: samisa
Date: Thu Feb  1 18:35:32 2007
New Revision: 502451

URL: http://svn.apache.org/viewvc?view=rev&rev=502451
Log:
Removing WSDL WOM layer form operation and service


Modified:
    webservices/axis2/trunk/c/include/axis2_const.h
    webservices/axis2/trunk/c/include/axis2_op.h
    webservices/axis2/trunk/c/include/axis2_svc.h
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/description/Makefile.am
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c

Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Thu Feb  1 18:35:32 2007
@@ -213,6 +213,10 @@
 #define AXIS2_SINGLE_SERVICE "singleservice"
 #define AXIS2_WSDL_CONTENT "wsdl"
 
+#define AXIS2_STYLE_RPC  "rpc"
+#define AXIS2_STYLE_DOC  "doc"
+#define AXIS2_STYLE_MSG  "msg"
+
 /**
  * Field METHOD_NAME_ESCAPE_CHARACTOR
  */

Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op.h?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Thu Feb  1 18:35:32 2007
@@ -41,12 +41,10 @@
  */
 
 #include <axis2_param_container.h>
-#include <axis2_wsdl_op.h>
 #include <axis2_svc.h>
 #include <axis2_msg_recv.h>
 #include <axis2_array_list.h>
 #include <axis2_module_desc.h>
-#include <axis2_wsdl_msg_ref.h>
 #include <axis2_description.h>
 #include <axis2_phase_meta.h>
 #include <axis2_relates_to.h>
@@ -64,15 +62,11 @@
     /** Type name for struct axis2_op */
     typedef struct axis2_op axis2_op_t;
 
-    struct axis2_wsdl_op;
     struct axis2_svc;
     struct axis2_msg_recv;
     struct axis2_param_container;
     struct axis2_module_desc;
     struct axis2_op;
-    struct axis2_wsdl_feature;
-    struct axis2_wsdl_property;
-    struct axis2_wsdl_fault_ref;
     struct axis2_relates_to;
     struct axis2_op_ctx;
     struct axis2_svc_ctx;
@@ -488,214 +482,6 @@
                     const axis2_env_t *env);
 
         /**
-         * Gets all in faults as a list.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return pointer to linked list containing in faults, 
-         * returns a reference, not a cloned copy
-         */
-        axis2_linked_list_t *(AXIS2_CALL *
-                get_all_in_faults)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets all in faults as a list.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param in_faults pointer to linked list containing in faults, 
-         * operation does not assume the ownership of list
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_in_faults)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    axis2_linked_list_t *in_faults);
-
-        /**
-         * Gets input message as a WSDL message reference.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return pointer to WSDL message reference struct, returns a reference
-         * not a cloned copy
-         */
-        struct axis2_wsdl_msg_ref *(AXIS2_CALL *
-                get_input_msg)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets input message as a WSDL message reference.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param input_msg pointer to WSDL message reference, operation takes 
-         * over the ownership of the struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_input_msg)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_msg_ref *input_msg);
-
-        /**
-         * Gets all out faults as a list.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return pointer to linked list containing out faults, 
-         * returns a reference, not a cloned copy
-         */
-        axis2_linked_list_t *(AXIS2_CALL *
-                get_all_out_faults)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets all out faults as a list.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param out_faults pointer to linked list containing out faults, 
-         * operation does not assume the ownership of list
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_out_faults)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    axis2_linked_list_t *out_faults);
-
-        /**
-         * Gets output message as a WSDL message reference.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return pointer to WSDL message reference struct, returns a reference
-         * not a cloned copy
-         */
-        struct axis2_wsdl_msg_ref *(AXIS2_CALL *
-                get_output_msg)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets output message as a WSDL message reference.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param output_msg pointer to WSDL message reference struct, 
-         * operation assumes ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_output_msg)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_msg_ref *output_msg);
-
-        /**
-         * Gets target namespace associated with operation.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return namespace URI string
-         */
-        const axis2_char_t *(AXIS2_CALL *
-                get_target_namespace)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Adds an in fault.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param in_fault pointer to WSDL fault reference struct, operation
-         * takes over the ownership of the struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_in_fault)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_fault_ref *in_fault);
-
-        /**
-         * Adds an out fault.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param out_fault pointer to WSDL fault reference struct, operation
-         * assumes the ownership of the struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_out_fault)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_fault_ref *out_fault);
-
-        /**
-         * Adds a WSDL feature associated with operation.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param feature pointer to WSDL feature struct, operation assumes 
-         * ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_feature)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_feature *feature);
-
-        /**
-         * Gets list of all WSDL features associated with operation.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return pointer to linked list containing all WSDL features
-         */
-        axis2_linked_list_t *(AXIS2_CALL *
-                get_all_features)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Adds given WSDL property to operation.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param wsdl_property pointer to WSDL property struct, operation 
-         * assumes ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_property)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_property *wsdl_property);
-
-        /**
-         * Gets all properties associated with operation.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @return pointer to linked list containing all properties, returns 
-         * a reference, not a cloned copy
-         */
-        axis2_linked_list_t *(AXIS2_CALL *
-                get_all_properties)(
-                    const axis2_op_t *op,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets WSDL operation that corresponds to this operation.
-         * @param op pointer to operation
-         * @param env pointer to environment struct
-         * @param wsdl_op pointer to WSDL operation struct, operation assumes
-         * ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_wsdl_op)(
-                    axis2_op_t *op,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_op *wsdl_op);
-
-        /**
          * Finds operation context related to this operation using given message
          * context and service context. This method would create a new operation
          * context related to the operation, if one could not be found.
@@ -817,8 +603,6 @@
      */
      struct axis2_op
     {
-        /** base WSDL operation */
-        axis2_wsdl_op_t base;
         /** operations of operation struct */
         axis2_op_ops_t *ops;
         /** parameter container to hold operation related parameters  */
@@ -855,17 +639,6 @@
         const axis2_qname_t *name);
 
     /**
-     * Creates operation struct with given WSDL operation as base.
-     * @param env pointer to environment struct
-     * @param wsdl_op pointer to WSDL operation
-     * @return pointer to newly created operation
-     */
-    AXIS2_EXTERN axis2_op_t *AXIS2_CALL
-    axis2_op_create_with_wsdl_op(
-        const axis2_env_t *env,
-        struct axis2_wsdl_op *wsdl_op);
-
-    /**
      * Frees the operation given as a void pointer. This method would cast the 
      * void parameter to an operation pointer and then call free method.
      * @param pointer to operation as a void pointer
@@ -1024,51 +797,6 @@
 #define AXIS2_OP_GET_ALL_MODULE_QNAMES(op, env) \
         ((op)->ops->get_all_module_qnames (op, env))
 
-/** Gets in faults.
-    @sa axis2_op_ops#get_all_in_faults */
-#define AXIS2_OP_GET_ALL_IN_FAULTS(op, env) \
-        ((op)->ops->get_all_in_faults (op, env))
-
-/** Sets in faults.
-    @sa axis2_op_ops#set_in_faults */
-#define AXIS2_OP_SET_IN_FAULTS(op, env) \
-        ((op)->ops->set_in_faults (op, env, in_faults))
-
-/** Gets input message.
-    @sa axis2_op_ops#get_input_msg */
-#define AXIS2_OP_GET_INPUT_MSG(op, env) \
-        ((op)->ops->get_input_msg (op, env))
-
-/** Sets input message.
-    @sa axis2_op_ops#set_input_msg */
-#define AXIS2_OP_SET_INPUT_MSG(op, env) \
-        ((op)->ops->set_input_msg (op, env, input_msg))
-
-/** Gets out faults.
-    @sa axis2_op_ops#get_all_out_faults */
-#define AXIS2_OP_GET_ALL_OUT_FAULTS(op, env) \
-        ((op)->ops->get_all_out_faults (op, env))
-
-/** Sets out faults.
-    @sa axis2_op_ops#set_out_faults */
-#define AXIS2_OP_SET_OUT_FAULTS(op, env) \
-        ((op)->ops->set_out_faults (op, env, out_faults))
-
-/** Gets output message.
-    @sa axis2_op_ops#get_output_msg */
-#define AXIS2_OP_GET_OUTPUT_MSG(op, env) \
-        ((op)->ops->get_output_msg (op, env))
-
-/** Sets output message.
-    @sa axis2_op_ops#set_output_msg */
-#define AXIS2_OP_SET_OUTPUT_MSG(op, env) \
-        ((op)->ops->set_output_msg (op, env, output_msg))
-
-/** Gets target namespace.
-    @sa axis2_op_ops#get_target_namespace */
-#define AXIS2_OP_GET_TARGET_NAMESPACE(op, env) \
-        ((op)->ops->get_target_namespace (op, env))
-
 /** Adds in fault.
     @sa axis2_op_ops#add_in_fault */
 #define AXIS2_OP_ADD_IN_FAULT(op, env, in_fault) \
@@ -1084,32 +812,16 @@
 #define AXIS2_OP_ADD_FEATURE(op, env, feature) \
         ((op)->ops->add_feature (op, env, feature))
 
-/** Gets all features.
-    @sa axis2_op_ops#get_all_features */
-#define AXIS2_OP_GET_ALL_FEATURES(op, env) \
-        ((op)->ops->get_all_features(op, env))
-
-/** Adds property.
-    @sa axis2_op_ops#add_property */
-#define AXIS2_OP_ADD_PROPERTY(op, env, wsdl_property) \
-        ((op)->ops->add_property (op, env, wsdl_property))
-
 /** Gets all properties.
     @sa axis2_op_ops#get_all_properties */
 #define AXIS2_OP_GET_ALL_PROPERTIES(op, env) \
         ((op)->ops->get_all_properties (op, env))
 
-/** Sets wsdl operation.
-    @sa axis2_op_ops#set_wsdl_op */
-#define AXIS2_OP_SET_WSDL_OP(op, env, wsdl_op) \
-        ((op)->ops->set_wsdl_op (op, env, wsdl_op))
-
-
 /** Finds operation context related to this operation.
     @sa axis2_op_ops#find_op_ctx */
 #define AXIS2_OP_FIND_OP_CTX(op, env, msg_ctx, svc_ctx) \
         ((op)->ops->find_op_ctx (op, env, msg_ctx, svc_ctx))
-
+        
 /** Finds existing operation context related to this operation.
     @sa axis2_op_ops#find_existing_op_ctx */
 #define AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, wsdl_op) \

Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc.h?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Thu Feb  1 18:35:32 2007
@@ -45,7 +45,6 @@
 
 #include <axis2_param_container.h>
 #include <axis2_flow_container.h>
-#include <axis2_wsdl_svc.h>
 #include <axis2_op.h>
 #include <axis2_svc_grp.h>
 #include <axis2_qname.h>
@@ -55,9 +54,7 @@
 #include <axis2_phase_resolver.h>
 #include <axis2_module_desc.h>
 #include <axis2_conf.h>
-#include <axis2_wsdl_soap_op.h>
 #include <axis2_string.h>
-#include <axis2_wsdl_endpoint.h>
 #include <xml_schema.h>
 #include <xml_schema_external.h>
 #include <axis2_stream.h>
@@ -74,16 +71,11 @@
     /** Type name for struct axis2_svc */
     typedef struct axis2_svc axis2_svc_t;
 
-    struct axis2_wsdl_endpoint;
     struct axis2_svc_grp;
-/*    struct axis2_op;*/
     struct axis2_flow_container;
     struct axis2_param_container;
-    struct axis2_wsdl_svc;
-    struct axis2_wsdl_interface;
     struct axis2_module_desc;
     struct axis2_conf;
-    struct axis2_wsdl_soap_op;
 
     /**
      * service ops struct.
@@ -254,31 +246,6 @@
                     const axis2_char_t *param_name);
 
         /**
-         * Sets WSDL interface for service. 
-         * @param svc pointer to service struct
-         * @param env pointer to environment struct
-         * @param wsdl_interface pointer to wsdl interface struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_wsdl_interface)(
-                    axis2_svc_t *svc,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_interface *wsdl_interface);
-
-        /**
-         * Gets WSDL interface for service. 
-         * @param svc pointer to service struct
-         * @param env pointer to environment struct
-         * @return pointer to wsdl interface 
-         */
-        struct axis2_wsdl_interface *(AXIS2_CALL *
-                get_wsdl_interface)(
-                    const axis2_svc_t *svc,
-                    const axis2_env_t *env);
-
-
-        /**
          * Engages given module to service.
          * @param svc pointer to service struct
          * @param env pointer to environment struct
@@ -325,11 +292,11 @@
          * assume the ownership of module description
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
          */
-        axis2_status_t (AXIS2_CALL *
+        /*axis2_status_t (AXIS2_CALL *
                 add_to_engaged_module_list)(
                     axis2_svc_t *svc,
                     const axis2_env_t *env,
-                    struct axis2_module_desc *module_desc);
+                    struct axis2_module_desc *module_desc);*/
 
         /**
          * Gets all engaged modules.
@@ -337,23 +304,10 @@
          * @param env pointer to environment struct
          * @return pointer to array list containing all engaged modules
          */
-        axis2_array_list_t *(AXIS2_CALL *
+/*        axis2_array_list_t *(AXIS2_CALL *
                 get_all_engaged_modules)(
                     const axis2_svc_t *svc,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets the WSDL operation element in service interface.
-         * @param svc pointer to service struct
-         * @param env pointer to environment struct
-         * @param op_qname pointer to QName of required operation
-         * @return  pointer to WSDL operation as a void pointer
-         */
-        void *(AXIS2_CALL *
-                get_wsdl_op)(
-                    const axis2_svc_t *svc,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *op_qname);
+                    const axis2_env_t *env);*/
 
         /**
          * Sets style. Style can be either RPC or document literal.
@@ -386,10 +340,10 @@
          * @param env pointer to environment struct
          * @return pointer to flow representing in flow
          */
-        struct axis2_flow *(AXIS2_CALL *
+        /*struct axis2_flow *(AXIS2_CALL *
                 get_in_flow)(
                     const axis2_svc_t *svc,
-                    const axis2_env_t *env);
+                    const axis2_env_t *env);*/
 
         /**
          * Sets in flow. In flow is the list of phases invoked
@@ -399,11 +353,11 @@
          * @param in_flow pointer to flow representing in flow
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
          */
-        axis2_status_t (AXIS2_CALL *
+        /*axis2_status_t (AXIS2_CALL *
                 set_in_flow)(
                     axis2_svc_t *svc,
                     const axis2_env_t *env,
-                    struct axis2_flow *in_flow);
+                    struct axis2_flow *in_flow);*/
 
         /**
          * Gets out flow. Out flow is the list of phases invoked
@@ -412,10 +366,10 @@
          * @param env pointer to environment struct
          * @return pointer to flow representing out flow
          */
-        struct axis2_flow *(AXIS2_CALL *
+        /*struct axis2_flow *(AXIS2_CALL *
                 get_out_flow)(
                     const axis2_svc_t *svc,
-                    const axis2_env_t *env);
+                    const axis2_env_t *env);*/
 
         /**
          * Sets out flow. Out flow is the list of phases invoked
@@ -425,11 +379,11 @@
          * @return out_flow pointer to flow representing out flow
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
          */
-        axis2_status_t (AXIS2_CALL *
+        /*axis2_status_t (AXIS2_CALL *
                 set_out_flow)(
                     axis2_svc_t *svc,
                     const axis2_env_t *env,
-                    struct axis2_flow *out_flow);
+                    struct axis2_flow *out_flow);*/
 
         /**
          * Gets fault in flow. Fault in flow is the list of phases invoked
@@ -438,10 +392,10 @@
          * @param env pointer to environment struct
          * @return pointer to flow representing fault in flow
          */
-        struct axis2_flow *(AXIS2_CALL *
+        /*struct axis2_flow *(AXIS2_CALL *
                 get_fault_in_flow)(
                     const axis2_svc_t *svc,
-                    const axis2_env_t *env);
+                    const axis2_env_t *env);*/
 
         /**
          * Sets fault in flow. Fault in flow is the list of phases invoked
@@ -451,11 +405,11 @@
          * @param fault_flow pointer to flow representing fault in flow
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
          */
-        axis2_status_t (AXIS2_CALL *
+        /*axis2_status_t (AXIS2_CALL *
                 set_fault_in_flow)(
                     axis2_svc_t *svc,
                     const axis2_env_t *env,
-                    struct axis2_flow *fault_flow);
+                    struct axis2_flow *fault_flow);*/
 
         /**
          * Gets fault out flow. Fault out flow is the list of phases invoked
@@ -464,10 +418,10 @@
          * @param env pointer to environment struct
          * @return pointer to flow representing fault out flow
          */
-        struct axis2_flow *(AXIS2_CALL *
+        /*struct axis2_flow *(AXIS2_CALL *
                 get_fault_out_flow)(
                     const axis2_svc_t *svc,
-                    const axis2_env_t *env);
+                    const axis2_env_t *env);*/
 
         /**
          * Sets fault out flow. Fault out flow is the list of phases invoked
@@ -477,11 +431,11 @@
          * @param fault_flow pointer to flow representing fault out flow
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
          */
-        axis2_status_t (AXIS2_CALL *
+        /*axis2_status_t (AXIS2_CALL *
                 set_fault_out_flow)(
                     axis2_svc_t *svc,
                     const axis2_env_t *env,
-                    struct axis2_flow *fault_flow);
+                    struct axis2_flow *fault_flow);*/
 
         /**
          * Gets operation corresponding to given SOAP Action.
@@ -506,12 +460,12 @@
          * @return pointer operation corresponding to given SOAP Action and 
          * endpoint QName.
          */
-        struct axis2_op *(AXIS2_CALL *
+        /*struct axis2_op *(AXIS2_CALL *
                 get_op_by_soap_action_and_endpoint)(
                     const axis2_svc_t *svc,
                     const axis2_env_t *env,
                     const axis2_char_t *soap_action,
-                    const axis2_qname_t *endpoint);
+                    const axis2_qname_t *endpoint);*/
 
         /**
          * Gets service name.
@@ -619,10 +573,10 @@
          * @param env pointer to environment struct
          * @return pointer to hash map containing all endpoints
          */
-        axis2_hash_t *(AXIS2_CALL *
+        /*axis2_hash_t *(AXIS2_CALL *
                 get_all_endpoints)(
                     const axis2_svc_t *svc,
-                    const axis2_env_t *env);
+                    const axis2_env_t *env);*/
 
         /**
          * Sets the list of endpoints associated with the service. 
@@ -631,40 +585,11 @@
          * @param endpoints pointer to hash map containing all endpoints
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
          */
-        axis2_status_t (AXIS2_CALL *
+        /*axis2_status_t (AXIS2_CALL *
                 set_all_endpoints)(
                     axis2_svc_t *svc,
                     const axis2_env_t *env,
-                    axis2_hash_t *endpoints);
-
-        /**
-         * Adds the given endpoint to the list of endpoints associated with the 
-         * service.
-         * @param svc pointer to service struct
-         * @param env pointer to environment struct
-         * @param endpoint pointer to WSDL endpoint, service assumes ownership 
-         * of endpoint
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE 
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_endpoint)(
-                    axis2_svc_t *svc,
-                    const axis2_env_t *env,
-                    struct axis2_wsdl_endpoint *endpoint);
-
-        /**
-         * Gets endpoint corresponding to given name from list of endpoints 
-         * associated with the service.
-         * @param svc pointer to service struct
-         * @param env pointer to environment struct
-         * @return pointer to WSDL endpoint, returns a reference, not a cloned 
-         * copy
-         */
-        struct axis2_wsdl_endpoint *(AXIS2_CALL *
-                get_endpoint)(
-                    const axis2_svc_t *svc,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *qname);
+                    axis2_hash_t *endpoints);*/
 
         /**
          * Gets namespace. 
@@ -672,10 +597,11 @@
          * @param env pointer to environment struct
          * @return namespace URI string
          */
-        const axis2_char_t *(AXIS2_CALL *
+        /*const axis2_char_t *(AXIS2_CALL *
                 get_namespace)(
                     const axis2_svc_t *svc,
                     const axis2_env_t *env);
+        */
 
         /**
          * Adds WS-Addressing mapping for a given operation. The services.xml
@@ -1062,9 +988,6 @@
         struct axis2_param_container *param_container;
         /** flow container that encapsulates the flow related data */
         struct axis2_flow_container *flow_container;
-        /** WSDL service that holds WSDL related information of the service */
-        struct axis2_wsdl_svc *wsdl_svc;
-
     };
 
     /**
@@ -1087,17 +1010,6 @@
         const axis2_env_t *env,
         const axis2_qname_t *qname);
 
-    /**
-     * Creates service struct with given WSDL service.
-     * @param env pointer to environment struct
-     * @param wsdl_svc pointer to WSDL service struct
-     * @return pointer to newly created service
-     */
-    AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
-    axis2_svc_create_with_wsdl_svc(
-        const axis2_env_t *env,
-        struct axis2_wsdl_svc *wsdl_svc);
-
     AXIS2_EXTERN void *AXIS2_CALL
     axis2_svc_get_impl_class(
         const axis2_svc_t *svc,
@@ -1174,16 +1086,6 @@
 #define AXIS2_SVC_IS_PARAM_LOCKED(svc, env, param_name) \
         ((svc)->ops->is_param_locked(svc, env, param_name))
 
-/** Sets WSDL service interface.
-    @sa axis2_svc_ops#set_wsdl_interface */
-#define AXIS2_SVC_SET_WSDL_INTERFACE(svc, env, wsdl_interface) \
-        ((svc)->ops->set_wsdl_interface(svc, env, wsdl_interface))
-
-/** Gets WSDL service interface.
-    @sa axis2_svc_ops#get_wsdl_interface */
-#define AXIS2_SVC_GET_WSDL_INTERFACE(svc, env) \
-        ((svc)->ops->get_wsdl_interface(svc, env))
-
 /** Engages given module to service.
     @sa axis2_svc_ops#engage_module */
 #define AXIS2_SVC_ENGAGE_MODULE(svc, env, module_desc, axis2_config) \
@@ -1196,19 +1098,14 @@
 
 /** Adds the named module to engaged module list.
     @sa axis2_svc_ops#add_to_engaged_module_list */
-#define AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_name) \
+/*#define AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_name) \
         ((svc)->ops->add_to_engaged_module_list(svc, env, module_name))
-
+*/
 /** Gets all engaged modules.
     @sa axis2_svc_ops#get_all_engaged_modules */
-#define AXIS2_SVC_GET_ALL_ENGAGED_MODULES(svc, env) \
+/*#define AXIS2_SVC_GET_ALL_ENGAGED_MODULES(svc, env) \
         ((svc)->ops->get_all_engaged_modules(svc, env))
-
-/** Gets wsdl operation related to service corresponding to given operation name.
-    @sa axis2_svc_ops#get_wsdl_op */
-#define AXIS2_SVC_GET_WSDL_OP(svc, env, op_name) \
-        ((svc)->ops->get_wsdl_op(svc, env, op_name))
-
+*/
 /** Sets service style.
     @sa axis2_svc_ops#set_style */
 #define AXIS2_SVC_SET_STYLE(svc, env, style) \
@@ -1266,8 +1163,9 @@
 
 /** Gets operation corresponding to given soap action and endpoint.
     @sa axis2_svc_ops#get_op_by_soap_action_and_endpoint */
-#define AXIS2_SVC_GET_OP_BY_SOAP_ACTION_AND_ENDPOINT(svc, env, soap_action, endpoint) \
+/*#define AXIS2_SVC_GET_OP_BY_SOAP_ACTION_AND_ENDPOINT(svc, env, soap_action, endpoint) \
         ((svc)->ops->get_op_by_soap_action_and_endpoint(svc, env, soap_action, endpoint))
+*/
 
 /** Gets name.
     @sa axis2_svc_ops#get_name */
@@ -1311,29 +1209,29 @@
 
 /** Gets all endpoints related to service.
     @sa axis2_svc_ops#get_all_endpoints */
-#define AXIS2_SVC_GET_ALL_ENDPOINTS(svc, env) \
+/*#define AXIS2_SVC_GET_ALL_ENDPOINTS(svc, env) \
         ((svc)->ops->get_all_endpoints(svc, env))
-
+*/
 /** Sets all endpoints related to service.
     @sa axis2_svc_ops#set_all_endpoints */
-#define AXIS2_SVC_SET_ALL_ENDPOINTS(svc, env, endpoints) \
+/*#define AXIS2_SVC_SET_ALL_ENDPOINTS(svc, env, endpoints) \
         ((svc)->ops->set_all_endpoints(svc, env, endpoints))
-
+*/
 /** Sets endpoint.
     @sa axis2_svc_ops#set_endpoint */
-#define AXIS2_SVC_SET_ENDPOINT(svc, env, endpoint) \
+/*#define AXIS2_SVC_SET_ENDPOINT(svc, env, endpoint) \
         ((svc)->ops->set_endpoint(svc, env, endpoint))
-
+*/
 /** Gets endpoint.
     @sa axis2_svc_ops#get_endpoint */
-#define AXIS2_SVC_GET_ENDPOINT(svc, env, qname) \
+/*#define AXIS2_SVC_GET_ENDPOINT(svc, env, qname) \
         ((svc)->ops->get_endpoint(svc, env, qname))
-
+*/
 /** Gets namespace.
     @sa axis2_svc_ops#get_namespace */
-#define AXIS2_SVC_GET_NAMESPACE(svc, env) \
+/*#define AXIS2_SVC_GET_NAMESPACE(svc, env) \
         ((svc)->ops->get_namespace(svc, env))
-
+*/
 /** Adds operation to key mapping for a given key and operation.
     @sa axis2_svc_ops#add_mapping */
 #define AXIS2_SVC_ADD_MAPPING(svc, env, mapping_key, axis2_opt) \

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=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Thu Feb  1 18:35:32 2007
@@ -179,6 +179,7 @@
 
     op_client_impl->options = options;
     op_client_impl->svc_ctx = svc_ctx;
+    op_client_impl->op_client.ops = NULL;
 
     op_client_impl->op_ctx = axis2_op_ctx_create(env, op,
             op_client_impl->svc_ctx);

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=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu Feb  1 18:35:32 2007
@@ -293,8 +293,9 @@
     wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
 
     svc_client_impl->options = axis2_options_create(env);
+    /* TODO: this method should be moved out of core implementation
     svc_client_impl->svc = axis2_client_utils_create_axis2_svc(env, wsdl_uri,
-            wsdl_svc_qname, endpoint_name, wsdl_path, svc_client_impl->options);
+            wsdl_svc_qname, endpoint_name, wsdl_path, svc_client_impl->options); */
     if (svc_client_impl->svc)
     {
         axis2_hash_index_t *i = NULL;

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Feb  1 18:35:32 2007
@@ -193,11 +193,11 @@
  * This method is used to fill the axis service , it dose loading service class and also the provider class
  * and it will also load the service handlers
  */
-static axis2_status_t
+/*static axis2_status_t
 axis2_dep_engine_load_svc_props(
     axis2_dep_engine_t *dep_engine,
     const axis2_env_t *env,
-    axis2_svc_t *svc);
+    axis2_svc_t *svc);*/
 
 static axis2_status_t
 axis2_dep_engine_load_module_dll(
@@ -212,11 +212,11 @@
     axis2_flow_t *flow,
     axis2_hash_t *handler_create_func_map);
 
-static axis2_status_t
+/*static axis2_status_t
 axis2_dep_engine_add_flow_handlers(
     axis2_dep_engine_t *dep_engine,
     const axis2_env_t *env,
-    axis2_flow_t *flow);
+    axis2_flow_t *flow);*/
 
 void *AXIS2_CALL
 axis2_dep_engine_get_handler_dll(
@@ -1097,7 +1097,7 @@
 
         svc = (axis2_svc_t *) AXIS2_ARRAY_LIST_GET(svcs, env, i);
 
-        axis2_dep_engine_load_svc_props(dep_engine, env, svc);
+        /*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
         file = AXIS2_ARCH_FILE_DATA_GET_FILE(dep_engine_impl->curr_file, env);
         file_name = AXIS2_FILE_GET_NAME(file, env);
         AXIS2_SVC_SET_FILE_NAME(svc, env, file_name);
@@ -1204,7 +1204,7 @@
     return AXIS2_CONF_ADD_SVC_GRP(dep_engine_impl->conf, env, svc_metadata);
 }
 
-static axis2_status_t
+/*static axis2_status_t
 axis2_dep_engine_load_svc_props(
     axis2_dep_engine_t *dep_engine,
     const axis2_env_t *env,
@@ -1244,7 +1244,7 @@
         axis2_dep_engine_add_flow_handlers(dep_engine, env, out_fault_flow);
     }
     return AXIS2_SUCCESS;
-}
+}*/
 
 
 static axis2_status_t
@@ -1345,7 +1345,7 @@
     return AXIS2_SUCCESS;
 }
 
-static axis2_status_t
+/*static axis2_status_t
 axis2_dep_engine_add_flow_handlers(
     axis2_dep_engine_t *dep_engine,
     const axis2_env_t *env,
@@ -1374,8 +1374,6 @@
         handler_dll_name =
             AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
                     handler_class_name);
-        /* TODO
-         * set full dll path here instead of dll lib name only */
         AXIS2_DLL_DESC_SET_NAME(dll_desc, env, handler_dll_name);
         AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_HANDLER_DLL);
         axis2_class_loader_init(env);
@@ -1387,7 +1385,7 @@
         AXIS2_HANDLER_DESC_SET_HANDLER(handlermd, env, handler);
     }
     return AXIS2_SUCCESS;
-}
+}*/
 
 void *AXIS2_CALL
 axis2_dep_engine_get_handler_dll(
@@ -1706,7 +1704,7 @@
     node = AXIS2_DESC_BUILDER_BUILD_OM(dep_engine_impl->svc_builder->desc_builder,
             env);
     AXIS2_SVC_BUILDER_POPULATE_SVC(dep_engine_impl->svc_builder, env, node);
-    axis2_dep_engine_load_svc_props(dep_engine, env, svc);
+    /*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
 
     return svc;
 }

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?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Feb  1 18:35:32 2007
@@ -379,7 +379,7 @@
             env, qinflowst, svc_node, &in_flow_node);
     AXIS2_QNAME_FREE(qinflowst, env) ;
     qinflowst = NULL;
-    if (in_flow_element  &&  in_flow_node)
+    /*if (in_flow_element  &&  in_flow_node)
     {
         axis2_flow_t *flow = NULL;
 
@@ -391,14 +391,14 @@
             AXIS2_FLOW_FREE(flow, env);
             return status;
         }
-    }
+    }*/
 
     qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
     out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
             env, qoutflowst, svc_node, &out_flow_node);
     AXIS2_QNAME_FREE(qoutflowst, env) ;
     qoutflowst = NULL;
-    if (out_flow_element && NULL != out_flow_node)
+    /*if (out_flow_element && NULL != out_flow_node)
     {
         axis2_flow_t *flow = NULL;
 
@@ -410,7 +410,7 @@
             AXIS2_FLOW_FREE(flow, env);
             return status;
         }
-    }
+    }*/
 
     qin_faultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
     in_faultflow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
@@ -418,7 +418,7 @@
     AXIS2_QNAME_FREE(qin_faultflowst, env) ;
     qin_faultflowst = NULL;
 
-    if (in_faultflow_element  &&  in_faultflow_node)
+    /*if (in_faultflow_element  &&  in_faultflow_node)
     {
         axis2_flow_t *flow = NULL;
 
@@ -431,14 +431,14 @@
             AXIS2_FLOW_FREE(flow, env);
             return status;
         }
-    }
+    }*/
 
     qout_faultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
     out_faultflow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
             env, qoutflowst, svc_node, &out_faultflow_node);
     AXIS2_QNAME_FREE(qout_faultflowst, env) ;
     qout_faultflowst = NULL;
-    if (out_faultflow_element && NULL != out_faultflow_node)
+    /*if (out_faultflow_element && NULL != out_faultflow_node)
     {
         axis2_flow_t *flow = NULL;
 
@@ -452,7 +452,7 @@
             return status;
         }
 
-    }
+    }*/
 
     /* processing operations */
     qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
@@ -533,7 +533,6 @@
         axis2_qname_t *qattname = NULL;
         axis2_char_t *mep_url = NULL;
         axis2_char_t *op_name = NULL;
-        axis2_wsdl_op_t *wsdl_op = NULL;
         axis2_op_t *op_desc = NULL;
         axiom_children_qname_iterator_t *params_itr = NULL;
         axiom_children_qname_iterator_t *module_itr = NULL;
@@ -570,27 +569,30 @@
         }
         op_name = AXIOM_ATTRIBUTE_GET_VALUE(op_name_att, env);
         qopname = axis2_qname_create(env, op_name, NULL, NULL);
-        wsdl_op = AXIS2_SVC_GET_WSDL_OP(builder_impl->svc, env, qopname);
-        if (NULL == wsdl_op)
-        {
-            if (NULL == mep_url)
-            {
+        /*wsdl_op = AXIS2_SVC_GET_WSDL_OP(builder_impl->svc, env, qopname);*/
+        /*if (NULL == wsdl_op)
+        {*/
+            /*if (NULL == mep_url)
+            {*/
                 /* assumed MEP is in-out */
                 op_desc = axis2_op_create(env);
-            }
+            /*}
             else
             {
-                op_desc = axis2_op_create(env);
+                op_desc = axis2_op_create(env);*/
+            if(mep_url)
+            {
                 AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_desc, env, mep_url);
             }
+            /*}*/
             AXIS2_OP_SET_QNAME(op_desc, env, qopname);
-        }
+        /*}
         else
         {
-            axis2_char_t *mep = NULL;
+            axis2_char_t *mep = NULL;*/
 
             /* Creating operation from existing operation */
-            mep = AXIS2_WSDL_OP_GET_MSG_EXCHANGE_PATTERN(wsdl_op, env);
+        /*    mep = AXIS2_WSDL_OP_GET_MSG_EXCHANGE_PATTERN(wsdl_op, env);
             if (NULL == mep)
             {
                 op_desc = axis2_op_create_with_wsdl_op(env, wsdl_op);
@@ -601,7 +603,7 @@
                 AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_desc, env, mep);
                 AXIS2_OP_SET_WSDL_OP(op_desc, env, wsdl_op);
             }
-        }
+        }*/
         AXIS2_QNAME_FREE(qopname, env);
         qopname = NULL;
         /* operation parameters */

Modified: webservices/axis2/trunk/c/modules/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/Makefile.am?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/Makefile.am Thu Feb  1 18:35:32 2007
@@ -11,13 +11,11 @@
                                 flow_container.c \
                                 transport_in_desc.c \
                                 transport_out_desc.c \
-                                msg.c \
-								client_utils.c
+                                msg.c 
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/wsdl \
             -I$(top_builddir)/modules/core/engine \
-            -I$(top_builddir)/woden/include \
             -I$(top_builddir)/xml_schema/include \
             -I$(top_builddir)/util/include \
             -I$(top_builddir)/axiom/include

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Thu Feb  1 18:35:32 2007
@@ -29,7 +29,6 @@
     axis2_svc_t *parent;
     axis2_desc_t *base;
     axis2_msg_recv_t *msg_recv;
-    axis2_wsdl_op_t *wsdl_op;
 
     int mep;
     /* to store deploy time module QNames */
@@ -37,8 +36,10 @@
     axis2_array_list_t *engaged_module_list;
     axis2_array_list_t *wsamapping_list;
     axis2_bool_t from_module;
-}
-axis2_op_impl_t;
+    axis2_qname_t *qname;
+    axis2_char_t *msg_exchange_pattern;
+    axis2_char_t *style;
+} axis2_op_impl_t;
 
 #define AXIS2_INTF_TO_IMPL(op) ((axis2_op_impl_t *)op)
 
@@ -203,96 +204,6 @@
     const axis2_op_t *op,
     const axis2_env_t *env);
 
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_in_faults(
-    const axis2_op_t *op,
-    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_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
-            axis2_op_get_input_msg(
-                const axis2_op_t *op,
-                const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_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
-axis2_op_get_all_out_faults(
-    const axis2_op_t *op,
-    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_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
-            axis2_op_get_output_msg(
-                const axis2_op_t *op,
-                const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_output_msg(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    struct axis2_wsdl_msg_ref *output_msg);
-
-const axis2_char_t *AXIS2_CALL
-axis2_op_get_target_namespace(
-    const axis2_op_t *op,
-    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_in_fault(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_fault_ref_t *in_fault);
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_out_fault(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_fault_ref_t *out_fault);
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_feature(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_feature_t *feature);
-
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_features(
-    const axis2_op_t *op,
-    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_property(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_property_t *wsdl_property);
-
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_properties(
-    const axis2_op_t *op,
-    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_wsdl_op(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_op_t *wsdl_op);
-
 struct axis2_op_ctx *AXIS2_CALL
             axis2_op_find_op_ctx(
                 axis2_op_t *op,
@@ -374,11 +285,7 @@
 axis2_op_create(
     const axis2_env_t *env)
 {
-    axis2_param_container_t *param_container_l = NULL;
-    axis2_array_list_t *array_list_l = NULL;
     axis2_op_impl_t *op_impl = NULL;
-    axis2_status_t status = AXIS2_FAILURE;
-    axis2_property_t *property = NULL;
     axis2_msg_t *msg = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -397,12 +304,15 @@
     op_impl->msg_recv = NULL;
     op_impl->mep = AXIS2_MEP_CONSTANT_INVALID;
     op_impl->op.param_container = NULL;
-    op_impl->wsdl_op = NULL;
     op_impl->module_qnames = NULL;
     op_impl->engaged_module_list = NULL;
     op_impl->op.ops = NULL;
     op_impl->from_module = AXIS2_FALSE;
     op_impl->wsamapping_list = NULL;
+    op_impl->qname = NULL;
+    op_impl->msg_exchange_pattern = NULL;
+    op_impl->style = NULL;
+    op_impl->style = AXIS2_STRDUP(AXIS2_STYLE_DOC, env);
 
     op_impl->op.param_container = (axis2_param_container_t *)
             axis2_param_container_create(env);
@@ -466,61 +376,9 @@
     AXIS2_MSG_SET_FLOW(msg, env, NULL);
     axis2_op_add_msg(&(op_impl->op), env, AXIS2_MSG_OUT_FAULT, msg);
 
-    op_impl->wsdl_op = (axis2_wsdl_op_t *) axis2_wsdl_op_create(env);
-    if (NULL == op_impl->wsdl_op)
-    {
-        axis2_op_free(&(op_impl->op), env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-    /* set function pointers of base */
-    op_impl->op.base.ops = AXIS2_MALLOC(env->allocator,
-            sizeof(axis2_wsdl_op_ops_t));
-    op_impl->op.base.ops->free_void_arg = axis2_op_free_void_arg;
-    op_impl->op.base.ops->get_qname = axis2_op_get_qname;
-
     axis2_op_set_msg_exchange_pattern(&(op_impl->op), env,
             (axis2_char_t *) AXIS2_MEP_URI_IN_OUT);
 
-    param_container_l = axis2_param_container_create(env);
-    if (NULL == param_container_l)
-    {
-        return NULL;
-    }
-    property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
-            axis2_param_container_free_void_arg);
-    AXIS2_PROPERTY_SET_VALUE(property, env, param_container_l);
-    status = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(op_impl->wsdl_op->
-            extensible_component->wsdl_component, env, AXIS2_PARAMETER_KEY,
-            property);
-    if (AXIS2_SUCCESS != status)
-    {
-        axis2_op_free(&(op_impl->op), env);
-        return NULL;
-    }
-
-    array_list_l = axis2_array_list_create(env, 0);
-    if (NULL == array_list_l)
-    {
-        axis2_op_free(&(op_impl->op), env);
-        return NULL;
-    }
-
-    property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
-            axis2_array_list_free_void_arg);
-    AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
-    AXIS2_PROPERTY_SET_VALUE(property, env, array_list_l);
-
-    status = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(op_impl->wsdl_op->
-            extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY, property);
-    if (AXIS2_SUCCESS != status)
-    {
-        axis2_op_free(&(op_impl->op), env);
-        return NULL;
-    }
-
     op_impl->op.ops = AXIS2_MALLOC(env->allocator, sizeof(axis2_op_ops_t));
     if (NULL == op_impl->op.ops)
     {
@@ -560,22 +418,6 @@
     op_impl->op.ops->set_in_flow = axis2_op_set_in_flow;
     op_impl->op.ops->add_module_qname = axis2_op_add_module_qname;
     op_impl->op.ops->get_all_modules = axis2_op_get_all_modules;
-    op_impl->op.ops->get_all_in_faults = axis2_op_get_all_in_faults;
-    op_impl->op.ops->set_in_faults = axis2_op_set_in_faults;
-    op_impl->op.ops->get_input_msg = axis2_op_get_input_msg;
-    op_impl->op.ops->set_input_msg = axis2_op_set_input_msg;
-    op_impl->op.ops->get_all_out_faults = axis2_op_get_all_out_faults;
-    op_impl->op.ops->set_out_faults = axis2_op_set_out_faults;
-    op_impl->op.ops->get_output_msg = axis2_op_get_output_msg;
-    op_impl->op.ops->set_output_msg = axis2_op_set_output_msg;
-    op_impl->op.ops->get_target_namespace = axis2_op_get_target_namespace;
-    op_impl->op.ops->add_in_fault = axis2_op_add_in_fault;
-    op_impl->op.ops->add_out_fault = axis2_op_add_out_fault;
-    op_impl->op.ops->add_feature = axis2_op_add_feature;
-    op_impl->op.ops->get_all_features = axis2_op_get_all_features;
-    op_impl->op.ops->add_property = axis2_op_add_property;
-    op_impl->op.ops->get_all_properties = axis2_op_get_all_properties;
-    op_impl->op.ops->set_wsdl_op = axis2_op_set_wsdl_op;
     op_impl->op.ops->find_op_ctx = axis2_op_find_op_ctx;
     op_impl->op.ops->find_existing_op_ctx = axis2_op_find_existing_op_ctx;
     op_impl->op.ops->register_op_ctx = axis2_op_register_op_ctx;
@@ -615,22 +457,13 @@
 
     op_impl = (axis2_op_impl_t *) axis2_op_create(env);
 
-    if (NULL == op_impl)
+
+    if (!op_impl)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
-    if (!op_impl->wsdl_op)
-    {
-        op_impl->wsdl_op = (axis2_wsdl_op_t *) axis2_wsdl_op_create(env);
-        if (NULL == op_impl->wsdl_op)
-        {
-            axis2_op_free(&(op_impl->op), env);
-            AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-            return NULL;
-        }
-    }
     status = axis2_op_set_qname(&(op_impl->op), env, qname);
     if (AXIS2_SUCCESS != status)
     {
@@ -641,33 +474,6 @@
     return &(op_impl->op);
 }
 
-axis2_op_t *AXIS2_CALL
-axis2_op_create_with_wsdl_op(
-    const axis2_env_t *env,
-    axis2_wsdl_op_t *wsdl_op)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    AXIS2_PARAM_CHECK(env->error, wsdl_op, NULL);
-
-    op_impl = (axis2_op_impl_t *) axis2_op_create(env);
-
-    if (NULL == op_impl)
-    {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-
-    if (op_impl->wsdl_op)
-    {
-        AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
-    }
-    op_impl->wsdl_op = wsdl_op;
-
-    return &(op_impl->op);
-}
-
 axis2_status_t AXIS2_CALL
 axis2_op_free(
     axis2_op_t *op,
@@ -722,22 +528,27 @@
         AXIS2_ARRAY_LIST_FREE(op_impl->wsamapping_list, env);
         op_impl->wsamapping_list = NULL;
     }
-    if (op_impl->wsdl_op)
+    if (op_impl->op.ops)
     {
-        AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
-        op_impl->wsdl_op = NULL;
+        AXIS2_FREE(env->allocator, op_impl->op.ops);
+        op_impl->op.ops = NULL;
     }
-    if (op_impl->op.base.ops)
+
+    if (op_impl->qname)
     {
-        AXIS2_FREE(env->allocator, op_impl->op.base.ops);
-        op_impl->op.base.ops = NULL;
+        axis2_qname_free(op_impl->qname, env);
     }
-    if (op_impl->op.ops)
+    
+    if (op_impl->msg_exchange_pattern)
     {
-        AXIS2_FREE(env->allocator, op_impl->op.ops);
-        op_impl->op.ops = NULL;
+        AXIS2_FREE(env->allocator, op_impl->msg_exchange_pattern);
     }
 
+    if (op_impl->style)
+    {
+        AXIS2_FREE(env->allocator, op_impl->style);
+    }
+    
     if (op_impl)
     {
         AXIS2_FREE(env->allocator, op_impl);
@@ -924,7 +735,18 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     op_impl = AXIS2_INTF_TO_IMPL(op);
 
-    return AXIS2_WSDL_OP_SET_QNAME(op_impl->wsdl_op, env, qname);
+    if (op_impl->qname)
+    {
+        axis2_qname_free(op_impl->qname, env);
+        op_impl->qname = NULL;
+    }
+
+    if (qname)
+    {
+        op_impl->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+    }
+
+    return AXIS2_SUCCESS;
 }
 
 const axis2_qname_t *AXIS2_CALL
@@ -936,9 +758,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
     op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_GET_QNAME(op_impl->wsdl_op,
-            env);
+    return op_impl->qname;
 }
 
 axis2_status_t AXIS2_CALL
@@ -953,8 +773,17 @@
     AXIS2_PARAM_CHECK(env->error, pattern, AXIS2_FAILURE);
     op_impl = AXIS2_INTF_TO_IMPL(op);
 
-    return AXIS2_WSDL_OP_SET_MSG_EXCHANGE_PATTERN(op_impl->wsdl_op, env,
-            pattern);
+    if (op_impl->msg_exchange_pattern)
+    {
+        AXIS2_FREE(env->allocator, op_impl->msg_exchange_pattern);
+        op_impl->msg_exchange_pattern = NULL;
+    }
+
+    if (pattern)
+    {
+        op_impl->msg_exchange_pattern = axis2_strdup(pattern, env);
+    }
+    return AXIS2_SUCCESS;
 }
 
 const axis2_char_t *AXIS2_CALL
@@ -967,7 +796,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     op_impl = AXIS2_INTF_TO_IMPL(op);
 
-    return AXIS2_WSDL_OP_GET_MSG_EXCHANGE_PATTERN(op_impl->wsdl_op, env);
+    return op_impl->msg_exchange_pattern;
 }
 
 const axis2_char_t *AXIS2_CALL
@@ -979,7 +808,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
     op_impl = AXIS2_INTF_TO_IMPL(op);
-    return AXIS2_WSDL_OP_GET_STYLE(op_impl->wsdl_op, env);
+    return op_impl->style;
 }
 
 axis2_status_t  AXIS2_CALL
@@ -994,7 +823,17 @@
     AXIS2_PARAM_CHECK(env->error, style, AXIS2_FAILURE);
     op_impl = AXIS2_INTF_TO_IMPL(op);
 
-    return AXIS2_WSDL_OP_SET_STYLE(op_impl->wsdl_op, env, style);
+    if (op_impl->style)
+    {
+        AXIS2_FREE(env->allocator, op_impl->style);
+        op_impl->style = NULL;
+    }
+
+    if (style)
+    {
+        op_impl->style = axis2_strdup(style, env);
+    }
+    return AXIS2_SUCCESS;
 }
 
 axis2_status_t AXIS2_CALL
@@ -1411,246 +1250,6 @@
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(op)->module_qnames;
-}
-
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_in_faults(
-    const axis2_op_t *op,
-    const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_GET_IN_FAULTS(op_impl->wsdl_op, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_in_faults(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_linked_list_t *in_faults)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, in_faults, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_SET_IN_FAULTS(op_impl->wsdl_op, env, in_faults);
-}
-
-struct axis2_wsdl_msg_ref *AXIS2_CALL
-            axis2_op_get_input_msg(
-                const axis2_op_t *op,
-                const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_GET_INPUT_MSG(op_impl->wsdl_op, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_input_msg(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    struct axis2_wsdl_msg_ref *input_msg)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, input_msg, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_SET_INPUT_MSG(op_impl->wsdl_op, env, input_msg);
-}
-
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_out_faults(
-    const axis2_op_t *op,
-    const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_GET_OUT_FAULTS(op_impl->wsdl_op, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_out_faults(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_linked_list_t *out_faults)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, out_faults, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_SET_OUT_FAULTS(op_impl->wsdl_op, env, out_faults);
-}
-
-struct axis2_wsdl_msg_ref *AXIS2_CALL
-            axis2_op_get_output_msg(
-                const axis2_op_t *op,
-                const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_GET_OUTPUT_MSG(op_impl->wsdl_op, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_output_msg(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    struct axis2_wsdl_msg_ref *output_msg)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, output_msg, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_SET_OUTPUT_MSG(op_impl->wsdl_op, env, output_msg);
-}
-
-const axis2_char_t *AXIS2_CALL
-axis2_op_get_target_namespace(
-    const axis2_op_t *op,
-    const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_GET_TARGET_NAMESPACE(op_impl->wsdl_op,
-            env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_in_fault(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_fault_ref_t *in_fault)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, in_fault, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_ADD_IN_FAULT(op_impl->wsdl_op, env, in_fault);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_out_fault(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_fault_ref_t *out_fault)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, out_fault, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_OP_ADD_OUT_FAULT(op_impl->wsdl_op, env, out_fault);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_feature(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_feature_t *feature)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, feature, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_EXTENSIBLE_COMPONENT_ADD_FEATURE(op_impl->wsdl_op->
-            extensible_component, env, feature);
-}
-
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_features(
-    const axis2_op_t *op,
-    const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_EXTENSIBLE_COMPONENT_GET_FEATURES(op_impl->wsdl_op->
-            extensible_component, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_add_property(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_property_t *wsdl_property)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, wsdl_property, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_EXTENSIBLE_COMPONENT_ADD_PROPERTY(op_impl->wsdl_op->
-            extensible_component, env, wsdl_property);
-}
-
-axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_all_properties(
-    const axis2_op_t *op,
-    const axis2_env_t *env)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    return AXIS2_WSDL_EXTENSIBLE_COMPONENT_GET_PROPERTIES(op_impl->wsdl_op->
-            extensible_component, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_wsdl_op(
-    axis2_op_t *op,
-    const axis2_env_t *env,
-    axis2_wsdl_op_t *wsdl_op)
-{
-    axis2_op_impl_t *op_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, wsdl_op, AXIS2_FAILURE);
-    op_impl = AXIS2_INTF_TO_IMPL(op);
-
-    if (op_impl->wsdl_op)
-    {
-        AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
-        op_impl->wsdl_op = NULL;
-    }
-
-    op_impl->wsdl_op = wsdl_op;
-    op->base.ops->free_void_arg = axis2_op_free_void_arg;
-    op->base.ops->get_qname = axis2_op_get_qname;
-    return AXIS2_SUCCESS;
 }
 
 axis2_op_ctx_t *AXIS2_CALL

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?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Thu Feb  1 18:35:32 2007
@@ -87,6 +87,9 @@
     int sc_calc_count;
 
     void *impl_class;
+    axis2_qname_t *qname;
+    axis2_char_t *style;
+    axis2_array_list_t *engaged_modules;
 };
 
 #define AXIS2_INTF_TO_IMPL(svc) ((axis2_svc_impl_t *)svc)
@@ -165,17 +168,6 @@
     const axis2_char_t *param_name);
 
 axis2_status_t AXIS2_CALL
-axis2_svc_set_wsdl_interface(
-    axis2_svc_t *svc,
-    const axis2_env_t *env,
-    axis2_wsdl_interface_t *svc_interface);
-
-axis2_wsdl_interface_t *AXIS2_CALL
-axis2_svc_get_wsdl_interface(
-    const axis2_svc_t *svc,
-    const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
 axis2_svc_engage_module(
     axis2_svc_t *svc,
     const axis2_env_t *env,
@@ -189,7 +181,7 @@
     axis2_module_desc_t *module,
     axis2_conf_t *conf);
 
-axis2_status_t AXIS2_CALL
+/*axis2_status_t AXIS2_CALL
 axis2_svc_add_to_engaged_module_list(
     axis2_svc_t *svc,
     const axis2_env_t *env,
@@ -199,12 +191,7 @@
 axis2_svc_get_all_engaged_modules(
     const axis2_svc_t *svc,
     const axis2_env_t *env);
-
-void *AXIS2_CALL
-axis2_svc_get_wsdl_op(
-    const axis2_svc_t *svc,
-    const axis2_env_t *env,
-    const axis2_qname_t *op_name);
+*/
 
 axis2_status_t AXIS2_CALL
 axis2_svc_set_style(
@@ -217,7 +204,7 @@
     const axis2_svc_t *svc,
     const axis2_env_t *env);
 
-axis2_flow_t *AXIS2_CALL
+/*axis2_flow_t *AXIS2_CALL
 axis2_svc_get_in_flow(
     const axis2_svc_t *svc,
     const axis2_env_t *env);
@@ -273,6 +260,7 @@
     const axis2_env_t *env,
     const axis2_char_t *soap_action,
     const axis2_qname_t *endpoint);
+*/
 
 const axis2_char_t *AXIS2_CALL
 axis2_svc_get_name(
@@ -317,7 +305,7 @@
     const axis2_env_t *env,
     const axis2_char_t *svc_desc);
 
-axis2_hash_t *AXIS2_CALL
+/*axis2_hash_t *AXIS2_CALL
 axis2_svc_get_all_endpoints(
     const axis2_svc_t *svc,
     const axis2_env_t *env);
@@ -327,23 +315,12 @@
     axis2_svc_t *svc,
     const axis2_env_t *env,
     axis2_hash_t *endpoints);
-
-axis2_status_t AXIS2_CALL
-axis2_svc_set_endpoint(
-    axis2_svc_t *svc,
-    const axis2_env_t *env,
-    axis2_wsdl_endpoint_t *endpoint);
-
-axis2_wsdl_endpoint_t *AXIS2_CALL
-axis2_svc_get_endpoint(
-    const axis2_svc_t *svc,
-    const axis2_env_t *env,
-    const axis2_qname_t *qname);
-
-const axis2_char_t *AXIS2_CALL
+*/
+/*const axis2_char_t *AXIS2_CALL
 axis2_svc_get_namespace(
     const axis2_svc_t *svc,
     const axis2_env_t *env);
+*/
 
 axis2_status_t AXIS2_CALL
 axis2_svc_add_mapping(
@@ -539,11 +516,6 @@
     const axis2_env_t *env)
 {
     axis2_svc_impl_t *svc_impl = NULL;
-    axis2_array_list_t *array_list_l = NULL;
-    axis2_param_container_t *param_container_l = NULL;
-    axis2_wsdl_interface_t *wsdl_interface_l = NULL;
-    axis2_status_t status = AXIS2_FAILURE;
-    axis2_property_t *property = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -562,7 +534,6 @@
     svc_impl->last_update = 0;
     svc_impl->svc.param_container = NULL;
     svc_impl->svc.flow_container = NULL;
-    svc_impl->svc.wsdl_svc = NULL;
     svc_impl->op_alias_map = NULL;
     svc_impl->op_action_map = NULL;
     svc_impl->module_list = NULL;
@@ -579,6 +550,8 @@
     svc_impl->target_ns_prefix = NULL;
     svc_impl->sc_calc_count = 0;
     svc_impl->impl_class = NULL;
+    svc_impl->qname = NULL;
+    svc_impl->style = NULL;
 
     svc_impl->svc.param_container = axis2_param_container_create(env);
     if (NULL == svc_impl->svc.param_container)
@@ -596,14 +569,6 @@
         return NULL;
     }
 
-    svc_impl->svc.wsdl_svc = axis2_wsdl_svc_create(env);
-    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->op_alias_map = axis2_hash_make(env);
     if (NULL == svc_impl->op_alias_map)
     {
@@ -637,68 +602,22 @@
         return NULL;
     }
 
-    wsdl_interface_l = axis2_wsdl_interface_create(env);
-    if (NULL == wsdl_interface_l)
-    {
-        axis2_svc_free(&(svc_impl->svc), env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-
-    status = axis2_svc_set_wsdl_interface(&(svc_impl->svc), env, wsdl_interface_l);
-    if (AXIS2_FAILURE == status)
-    {
-        axis2_svc_free(&(svc_impl->svc), env);
-        return NULL;
-    }
-
-    param_container_l = axis2_param_container_create(env);
-    if (NULL == param_container_l)
-    {
-        axis2_svc_free(&(svc_impl->svc), env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-    property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
-            axis2_param_container_free_void_arg);
-    AXIS2_PROPERTY_SET_VALUE(property, env, param_container_l);
-    status = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc_impl->svc.wsdl_svc->
-            wsdl_component, env, AXIS2_PARAMETER_KEY, property);
-    if (AXIS2_SUCCESS != status)
-    {
-        axis2_svc_free(&(svc_impl->svc), env);
-        return NULL;
-    }
-    array_list_l = axis2_array_list_create(env, 0);
-    if (NULL == array_list_l)
-    {
-        axis2_svc_free(&(svc_impl->svc), env);
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-    property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
-            axis2_array_list_free_void_arg);
-    AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_SESSION);
-    AXIS2_PROPERTY_SET_VALUE(property, env, array_list_l);
-
-    status = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc_impl->svc.wsdl_svc->
-            wsdl_component, env, AXIS2_MODULEREF_KEY, property);
-    if (AXIS2_SUCCESS != status)
+    svc_impl->schema_list = axis2_array_list_create(env,
+            AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
+    if (NULL == svc_impl->schema_list)
     {
         axis2_svc_free(&(svc_impl->svc), env);
         return NULL;
     }
 
-    svc_impl->schema_list = axis2_array_list_create(env,
+    svc_impl->engaged_modules = axis2_array_list_create(env,
             AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
-    if (NULL == svc_impl->schema_list)
+    if (NULL == svc_impl->engaged_modules)
     {
         axis2_svc_free(&(svc_impl->svc), env);
         return NULL;
     }
-
+    
     svc_impl->schema_loc_adjusted = AXIS2_FALSE;
     if (svc_impl->schema_target_ns_prefix)
     {
@@ -735,17 +654,14 @@
     svc_impl->svc.ops->get_param = axis2_svc_get_param;
     svc_impl->svc.ops->get_all_params = axis2_svc_get_all_params;
     svc_impl->svc.ops->is_param_locked = axis2_svc_is_param_locked;
-    svc_impl->svc.ops->set_wsdl_interface = axis2_svc_set_wsdl_interface;
-    svc_impl->svc.ops->get_wsdl_interface = axis2_svc_get_wsdl_interface;
     svc_impl->svc.ops->engage_module = axis2_svc_engage_module;
     svc_impl->svc.ops->add_module_ops = axis2_svc_add_module_ops;
-    svc_impl->svc.ops->add_to_engaged_module_list =
+    /*svc_impl->svc.ops->add_to_engaged_module_list =
         axis2_svc_add_to_engaged_module_list;
-    svc_impl->svc.ops->get_all_engaged_modules = axis2_svc_get_all_engaged_modules;
-    svc_impl->svc.ops->get_wsdl_op = axis2_svc_get_wsdl_op;
+    svc_impl->svc.ops->get_all_engaged_modules = axis2_svc_get_all_engaged_modules;*/
     svc_impl->svc.ops->set_style = axis2_svc_set_style;
     svc_impl->svc.ops->get_style = axis2_svc_get_style;
-    svc_impl->svc.ops->get_in_flow = axis2_svc_get_in_flow;
+    /*svc_impl->svc.ops->get_in_flow = axis2_svc_get_in_flow;
     svc_impl->svc.ops->set_in_flow = axis2_svc_set_in_flow;
     svc_impl->svc.ops->get_out_flow = axis2_svc_get_out_flow;
     svc_impl->svc.ops->set_out_flow = axis2_svc_set_out_flow;
@@ -755,7 +671,7 @@
     svc_impl->svc.ops->set_fault_out_flow = axis2_svc_set_fault_out_flow;
     svc_impl->svc.ops->get_op_by_soap_action = axis2_svc_get_op_by_soap_action;
     svc_impl->svc.ops->get_op_by_soap_action_and_endpoint =
-        axis2_svc_get_op_by_soap_action_and_endpoint;
+        axis2_svc_get_op_by_soap_action_and_endpoint;*/
     svc_impl->svc.ops->get_name = axis2_svc_get_name;
     svc_impl->svc.ops->set_name = axis2_svc_set_name;
     svc_impl->svc.ops->set_last_update = axis2_svc_set_last_update;
@@ -764,11 +680,11 @@
     svc_impl->svc.ops->set_file_name = axis2_svc_set_file_name;
     svc_impl->svc.ops->get_svc_desc = axis2_svc_get_svc_desc;
     svc_impl->svc.ops->set_svc_desc = axis2_svc_set_svc_desc;
-    svc_impl->svc.ops->get_all_endpoints = axis2_svc_get_all_endpoints;
+    /*svc_impl->svc.ops->get_all_endpoints = axis2_svc_get_all_endpoints;
     svc_impl->svc.ops->set_all_endpoints = axis2_svc_set_all_endpoints;
     svc_impl->svc.ops->set_endpoint = axis2_svc_set_endpoint;
     svc_impl->svc.ops->get_endpoint = axis2_svc_get_endpoint;
-    svc_impl->svc.ops->get_namespace = axis2_svc_get_namespace;
+    svc_impl->svc.ops->get_namespace = axis2_svc_get_namespace;*/
     svc_impl->svc.ops->add_mapping = axis2_svc_add_mapping;
     svc_impl->svc.ops->add_module_qname = axis2_svc_add_module_qname;
     svc_impl->svc.ops->get_all_module_qnames = axis2_svc_get_all_module_qnames;
@@ -841,33 +757,6 @@
     return &(svc_impl->svc);
 }
 
-
-AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
-axis2_svc_create_with_wsdl_svc(
-    const axis2_env_t *env,
-    axis2_wsdl_svc_t *wsdl_svc)
-{
-    axis2_svc_impl_t *svc_impl = NULL;
-    AXIS2_ENV_CHECK(env, NULL);
-    AXIS2_PARAM_CHECK(env->error, wsdl_svc, NULL);
-
-    svc_impl = AXIS2_INTF_TO_IMPL(axis2_svc_create(env));
-
-    if (NULL == svc_impl)
-    {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-    if (svc_impl->svc.wsdl_svc)
-    {
-        AXIS2_WSDL_SVC_FREE(svc_impl->svc.wsdl_svc, env);
-    }
-
-    svc_impl->svc.wsdl_svc = wsdl_svc;
-
-    return &(svc_impl->svc);
-}
-
 axis2_status_t AXIS2_CALL
 axis2_svc_free(
     axis2_svc_t *svc,
@@ -890,23 +779,17 @@
         svc->flow_container = NULL;
     }
 
-    if (svc->wsdl_svc)
-    {
-        AXIS2_WSDL_SVC_FREE(svc->wsdl_svc, env);
-        svc->wsdl_svc = NULL;
-    }
-
     if (svc_impl->filename)
     {
         AXIS2_FREE(env->allocator, svc_impl->filename);
         svc_impl->filename = NULL;
     }
 
-	 if (svc_impl->svc_desc)
-		{
-			 AXIS2_FREE (env->allocator, svc_impl->svc_desc);
-			 svc_impl->svc_desc = NULL;
-		}
+    if (svc_impl->svc_desc)
+    {
+        AXIS2_FREE (env->allocator, svc_impl->svc_desc);
+        svc_impl->svc_desc = NULL;
+    }
 
     svc_impl->parent = NULL;
 
@@ -936,6 +819,11 @@
         svc_impl->schema_list = NULL;
     }
 
+    if (svc_impl->engaged_modules)
+    {
+        AXIS2_ARRAY_LIST_FREE(svc_impl->engaged_modules, env);
+    }
+
     if (svc_impl->axis_svc_name)
     {
         AXIS2_FREE(env->allocator, svc_impl->axis_svc_name);
@@ -1002,6 +890,15 @@
         svc_impl->target_ns_prefix = NULL;
     }
 
+    if (svc_impl->qname)
+    {
+        axis2_qname_free(svc_impl->qname, env);
+    }
+
+    if(svc_impl->style)
+    {
+        AXIS2_FREE(env->allocator, svc_impl->style);
+    }
 
     if (svc_impl->svc.ops)
     {
@@ -1027,8 +924,8 @@
 {
     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_array_list_t *modules = NULL;
+    int i = 0, size = 0;*/
     axis2_msg_recv_t *msg_recv = NULL;
     const axis2_qname_t *qname = NULL;
     axis2_char_t *key = NULL;
@@ -1042,7 +939,7 @@
     {
         return status;
     }
-    modules = axis2_svc_get_all_engaged_modules(svc, env);
+    /*modules = axis2_svc_get_all_engaged_modules(svc, env);
     if (modules)
         size = AXIS2_ARRAY_LIST_SIZE(modules, env);
     for (i = 0; i < size; i++)
@@ -1062,8 +959,6 @@
             module_impl = AXIS2_MODULE_DESC_GET_MODULE(module_desc, env);
         if (module_impl)
         {
-            /* TODO: Notify module for service engagement */
-            /*AXIS2_MODULE_ENGAGE_NOTIFY(module_impl, env, op); */
         }
         status = AXIS2_OP_ENGAGE_MODULE(op, env, module_desc, conf);
         if (AXIS2_SUCCESS != status)
@@ -1071,7 +966,7 @@
             AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
                     "Module already engaged to operation");
         }
-    }
+    }*/
     msg_recv = AXIS2_OP_GET_MSG_RECV(op, env);
     if (msg_recv == NULL)
     {
@@ -1171,10 +1066,22 @@
     const axis2_env_t *env,
     const axis2_qname_t *qname)
 {
+    axis2_svc_impl_t *svc_impl = NULL;
+
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
+    if (svc_impl->qname)
+    {
+        axis2_qname_free(svc_impl->qname, env);
+        svc_impl->qname = NULL;
+    }
 
-    return AXIS2_WSDL_SVC_SET_QNAME(svc->wsdl_svc, env, qname);
+    if (qname)
+    {
+        svc_impl->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+    }
+    return AXIS2_SUCCESS;
 }
 
 const axis2_qname_t *AXIS2_CALL
@@ -1182,8 +1089,10 @@
     const axis2_svc_t *svc,
     const axis2_env_t *env)
 {
+    axis2_svc_impl_t *svc_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_WSDL_SVC_GET_QNAME(svc->wsdl_svc, env);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
+    return svc_impl->qname;
 }
 
 axis2_status_t AXIS2_CALL
@@ -1273,46 +1182,29 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_svc_set_wsdl_interface(
-    axis2_svc_t *svc,
-    const axis2_env_t *env,
-    axis2_wsdl_interface_t *svc_interface)
-{
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, svc_interface, AXIS2_FAILURE);
-
-    return AXIS2_WSDL_SVC_SET_SVC_INTERFACE(svc->wsdl_svc, env, svc_interface);
-}
-
-axis2_wsdl_interface_t *AXIS2_CALL
-axis2_svc_get_wsdl_interface(
-    const axis2_svc_t *svc,
-    const axis2_env_t *env)
-{
-    AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_WSDL_SVC_GET_SVC_INTERFACE(svc->wsdl_svc, env);
-}
-
-axis2_status_t AXIS2_CALL
 axis2_svc_engage_module(
     axis2_svc_t *svc,
     const axis2_env_t *env,
     axis2_module_desc_t *module_desc,
     axis2_conf_t *conf)
 {
-    axis2_module_desc_t *modu = NULL;
-    axis2_array_list_t *collection_module = NULL;
+    axis2_svc_impl_t *svc_impl = NULL;
+
+    /*axis2_module_desc_t *modu = NULL;*/
+    /*axis2_array_list_t *collection_module = NULL;*/
     axis2_phase_resolver_t *phase_resolver = NULL;
-    int i = 0;
+    /*int i = 0;*/
     axis2_status_t status = AXIS2_FAILURE;
-    int size = 0;
-    axis2_property_t *property = NULL;
+    /*int size = 0;
+    axis2_property_t *property = NULL;*/
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
+    
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
 
-    property = (axis2_property_t *)
+    /*property = (axis2_property_t *)
             AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
                     env, AXIS2_MODULEREF_KEY);
     if (property)
@@ -1334,13 +1226,12 @@
         if (AXIS2_QNAME_EQUALS(AXIS2_MODULE_DESC_GET_QNAME(modu, env), env,
                 AXIS2_MODULE_DESC_GET_QNAME(module_desc, env)))
         {
-            /* module has already been engaged on the service. */
             AXIS2_ERROR_SET(env->error,
                     AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC, AXIS2_FAILURE);
             return AXIS2_FAILURE;
         }
 
-    }
+    }*/
 
     phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
     if (!phase_resolver)
@@ -1351,7 +1242,7 @@
             module_desc);
     if (status)
     {
-        status = AXIS2_ARRAY_LIST_ADD(collection_module, env, module_desc);
+        status = AXIS2_ARRAY_LIST_ADD(svc_impl->engaged_modules, env, module_desc);
     }
     if (phase_resolver)
     {
@@ -1459,7 +1350,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL
+/*axis2_status_t AXIS2_CALL
 axis2_svc_add_to_engaged_module_list(
     axis2_svc_t *svc,
     const axis2_env_t *env,
@@ -1504,14 +1395,14 @@
 
         if (AXIS2_QNAME_EQUALS(module_d_name, env, module_d_name_l))
         {
-            /* module is already engaged, so return */
             return AXIS2_SUCCESS;
         }
     }
     return AXIS2_ARRAY_LIST_ADD(collection_module, env, module_name);
 }
+*/
 
-axis2_array_list_t *AXIS2_CALL
+/*axis2_array_list_t *AXIS2_CALL
 axis2_svc_get_all_engaged_modules(
     const axis2_svc_t *svc,
     const axis2_env_t *env)
@@ -1526,30 +1417,7 @@
     if (property)
         return (axis2_array_list_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
     return NULL;
-}
-
-void *AXIS2_CALL
-axis2_svc_get_wsdl_op(
-    const axis2_svc_t *svc,
-    const axis2_env_t *env,
-    const axis2_qname_t *op_name)
-{
-    axis2_wsdl_interface_t *svc_interface = NULL;
-    axis2_char_t *op_str = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
-    AXIS2_PARAM_CHECK(env->error, op_name, NULL);
-
-    op_str = AXIS2_QNAME_GET_LOCALPART(op_name, env);
-    svc_interface = axis2_svc_get_wsdl_interface(svc, env);
-    if (svc_interface)
-    {
-        return AXIS2_WSDL_INTERFACE_GET_OP(svc_interface, env, op_str) ;
-    }
-    else
-        return NULL;
-
-}
+}*/
 
 axis2_status_t AXIS2_CALL
 axis2_svc_set_style(
@@ -1557,24 +1425,20 @@
     const axis2_env_t *env,
     const axis2_char_t *style)
 {
-    axis2_char_t *style_l = NULL;
-    axis2_property_t *property = NULL;
+    axis2_svc_impl_t *svc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, style, AXIS2_FAILURE);
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
 
-    style_l = AXIS2_STRDUP(style, env);
-    if (!style_l)
+    if (svc_impl->style)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return AXIS2_FAILURE;
+        AXIS2_FREE(env->allocator, svc_impl->style);
+        svc_impl->style = NULL;
     }
-    property = axis2_property_create(env);
-
-    AXIS2_PROPERTY_SET_VALUE(property, env, style_l);
 
-    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
-            wsdl_component, env, AXIS2_STYLE_KEY, property);
+    svc_impl->style = AXIS2_STRDUP(style, env);
+    return AXIS2_SUCCESS;
 }
 
 const axis2_char_t *AXIS2_CALL
@@ -1582,19 +1446,14 @@
     const axis2_svc_t *svc,
     const axis2_env_t *env)
 {
-    axis2_property_t *property = NULL;
+    axis2_svc_impl_t *svc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-
-    property = (axis2_property_t *)
-            AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-                svc->wsdl_svc->wsdl_component, env, AXIS2_STYLE_KEY);
-    if (property)
-        return (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
-    return NULL;
+    svc_impl = AXIS2_INTF_TO_IMPL(svc);
+    return svc_impl->style;
 }
 
-axis2_flow_t *AXIS2_CALL
+/*axis2_flow_t *AXIS2_CALL
 axis2_svc_get_in_flow(
     const axis2_svc_t *svc,
     const axis2_env_t *env)
@@ -1854,7 +1713,7 @@
     AXIS2_QNAME_FREE(type_1, env);
     type_1 = NULL;
     return NULL;
-}
+} */
 
 const axis2_char_t *AXIS2_CALL
 axis2_svc_get_name(
@@ -1862,19 +1721,14 @@
     const axis2_env_t *env)
 {
     axis2_svc_impl_t *svc_impl = NULL;
-    const axis2_qname_t *qname = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
     svc_impl = AXIS2_INTF_TO_IMPL(svc);
 
-    if (svc_impl->axis_svc_name)
-        return svc_impl->axis_svc_name;
-
-    qname = AXIS2_WSDL_SVC_GET_QNAME(svc->wsdl_svc, env);
-    if (qname)
+    if (svc_impl->qname)
     {
-        return AXIS2_QNAME_GET_LOCALPART(qname, env);
+        return AXIS2_QNAME_GET_LOCALPART(svc_impl->qname, env);
     }
 
     return NULL;
@@ -1991,7 +1845,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+/*axis2_hash_t *AXIS2_CALL
 axis2_svc_get_all_endpoints(
     const axis2_svc_t *svc,
     const axis2_env_t *env)
@@ -2033,6 +1887,7 @@
 {
     return AXIS2_WSDL_SVC_GET_NAMESPACE(svc->wsdl_svc, env);
 }
+*/
 
 axis2_status_t AXIS2_CALL
 axis2_svc_add_mapping(

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Thu Feb  1 18:35:32 2007
@@ -108,7 +108,7 @@
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
                 "Checking for operation using SOAPAction : %s", action);
 
-        op = AXIS2_SVC_GET_OP_BY_SOAP_ACTION(svc, env, action);
+        /*op = AXIS2_SVC_GET_OP_BY_SOAP_ACTION(svc, env, action);*/
         if (!op)
         {
             const axis2_char_t * op_name = NULL;

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=502451&r1=502450&r2=502451
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Thu Feb  1 18:35:32 2007
@@ -328,7 +328,7 @@
     int size = 0;
     int status = AXIS2_FAILURE;
     axis2_flow_t *flow = NULL;
-    axis2_property_t *property = NULL;
+    /*axis2_property_t *property = NULL;*/
     axis2_phase_holder_t *phase_holder = NULL;
 
     resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
@@ -381,12 +381,12 @@
                     break;
                 }
             }
-            status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(resolver_impl->svc,
+            /*status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(resolver_impl->svc,
                     env, module_desc);
             if (AXIS2_SUCCESS != status)
             {
                 return status;
-            }
+            }*/
             status = AXIS2_OP_ADD_TO_ENGAGED_MODULE_LIST(op, env, module_desc);
             if (AXIS2_SUCCESS != status)
             {
@@ -463,7 +463,7 @@
 
     /* process handlers form service.xml */
     flow = NULL;
-    switch (type)
+    /*switch (type)
     {
 
         case AXIS2_IN_FLOW:
@@ -503,7 +503,7 @@
                 flow = (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
             break;
         }
-    }
+    }*/
 
     if (flow)
     {
@@ -1063,11 +1063,11 @@
                 return status;
             }
 
-            status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_desc);
+            /*status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_desc);
             if (AXIS2_SUCCESS != status)
             {
                 return status;
-            }
+            }*/
         }
         mod_name = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
         status = AXIS2_SVC_GRP_ADD_MODULE_QNAME(svc_grp, 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