axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r437991 - in /webservices/axis2/trunk/c: include/axis2_transport_out_desc.h modules/core/deployment/conf_builder.c modules/core/description/transport_out_desc.c modules/core/engine/conf.c modules/core/phaseresolver/phase_resolver.c
Date Tue, 29 Aug 2006 07:20:01 GMT
Author: samisa
Date: Tue Aug 29 00:20:00 2006
New Revision: 437991

URL: http://svn.apache.org/viewvc?rev=437991&view=rev
Log:
Fixed transport out description API and API docs along with those that use the API

Modified:
    webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
    webservices/axis2/trunk/c/modules/core/engine/conf.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c

Modified: webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_out_desc.h?rev=437991&r1=437990&r2=437991&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_out_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_out_desc.h Tue Aug 29 00:20:00 2006
@@ -20,13 +20,18 @@
 /** 
  * @defgroup axis2_transport_out_desc transport out description
  * @ingroup axis2_desc
- * Description.
+ * transport out description represents a transport sender configured in 
+ * Axis2 configuration. There can be multiple transport senders configured 
+ * in axis2.xml file and each of them will be represented with a transport 
+ * out description instance. deployment engine takes care of creating and 
+ * instantiating transport out descriptions.
+ * transport out description encapsulates flows related to the transport out
+ * and also holds a reference to related transport sender.
  * @{
  */
 
 /**
  * @file axis2_transport_out_desc.h
- * @brief Axis2 description transport out interface
  */
 
 #include <axis2_const.h>
@@ -46,34 +51,37 @@
 {
 #endif
 
-    struct axis2_phase;
-    struct axis2_transport_sender;
     /** Type name for struct axis2_transport_out_desc */
     typedef struct axis2_transport_out_desc axis2_transport_out_desc_t;
     /** Type name for struct axis2_transport_out_desc_ops  */
     typedef struct axis2_transport_out_desc_ops axis2_transport_out_desc_ops_t;
 
+    struct axis2_phase;
+    struct axis2_transport_sender;
+
     /**
-     * @brief Description Transport Out ops struct
-     * Encapsulator struct for ops of axis2_transport_out_desc
+     * transport out description ops struct.
+     * Encapsulator struct for ops of axis2_transport_out_desc.
      */
     struct axis2_transport_out_desc_ops
     {
         /**
-        * De-allocate memory
-        * @param transport_out_dec pointer to transport out description
-        * @param env pointer to environment struct
-        * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-        */
+         * Frees transport out description.
+         * @param transport_out_dec pointer to transport out description
+         * @param env pointer to environment struct
+         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+         */
         axis2_status_t (AXIS2_CALL *
                 free)(
                     axis2_transport_out_desc_t *transport_out_desc,
                     const axis2_env_t *env);
 
         /**
-         * De-allocate memory
-         * @param void transport_out to be freed
-         * @return status code
+         * Frees transport out description given as a void pointer.
+         * @param transport_out_dec pointer to transport out description as a 
+         * void pointer 
+         * @param env pointer to environment struct
+         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
                 free_void_arg)(
@@ -81,70 +89,89 @@
                     const axis2_env_t *env);
 
         /**
-        * @param transport_out pointer to transport_out
-        * @param env pointer to environment struct
+         * Gets QName.
+         * @param transport_out pointer to transport_out
+         * @param env pointer to environment struct
+         * @return pointer to QName, returns a reference, not a cloned copy
          */
-        axis2_qname_t *(AXIS2_CALL *
+        const axis2_qname_t *(AXIS2_CALL *
                 get_qname)(
                     const axis2_transport_out_desc_t *transport_out,
                     const axis2_env_t *env);
 
         /**
-        * @param transport_out pointer to transport_out
-        * @param env pointer to environment struct
-        * @param qname pointer to qname
+         * Sets QName.
+         * @param transport_out pointer to transport_out
+         * @param env pointer to environment struct
+         * @param qname pointer to QName, this method creates a clone of QName
+         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
                 set_qname)(
                     struct axis2_transport_out_desc *transport_out,
                     const axis2_env_t *env,
-                    axis2_qname_t *qname);
+                    const axis2_qname_t *qname);
 
         /**
+         * Gets out flow. Out flow represents the list of phases invoked 
+         * along the sender path.
          * @param transport_out pointer to transport_out
          * @param env pointer to environment struct
+         * @return pointer to flow representing out flow, returns a reference,
+         * not a cloned copy
          */
         struct axis2_flow *(AXIS2_CALL *
-                get_outflow)(
+                get_out_flow)(
                     const axis2_transport_out_desc_t *transport_out,
                     const axis2_env_t *env);
 
         /**
+         * Sets out flow. Out flow represents the list of phases invoked 
+         * along the sender path.
          * @param transport_out pointer to transport_out
          * @param env pointer to environment struct
-         * @param outflow pointer to out flow
+         * @param out_flow pointer to out flow, transport out description 
+         * assumes ownership of flow
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
-                set_outflow)(
+                set_out_flow)(
                     struct axis2_transport_out_desc *transport_out,
                     const axis2_env_t *env,
-                    struct axis2_flow *outflow);
+                    struct axis2_flow *out_flow);
 
         /**
+         * Gets fault out flow. Fault out flow represents the list of phases 
+         * invoked along the sender path if a fault happens.         
          * @param transport_out pointer to transport_out
          * @param env pointer to environment struct
+         * @return pointer to flow representing fault out flow
          */
         struct axis2_flow *(AXIS2_CALL *
-                get_faultflow)(
+                get_fault_out_flow)(
                     const axis2_transport_out_desc_t *transport_out,
                     const axis2_env_t *env);
 
         /**
+         * Sets fault out flow. Fault out flow represents the list of phases 
+         * invoked along the sender path if a fault happens.         
          * @param transport_out pointer to transport_out
          * @param env pointer to environment struct
-         * @param faultflow pointer to faultflow
+         * @param fault_out_flow pointer to fault_out_flow
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
-                set_faultflow)(
+                set_fault_out_flow)(
                     struct axis2_transport_out_desc *transport_out,
                     const axis2_env_t *env,
-                    struct axis2_flow *faultflow);
+                    struct axis2_flow *fault_out_flow);
 
         /**
-        * @param transport_out pointer to transport_out
-        * @param env pointer to environment struct
+         * Gets transport sender.
+         * @param transport_out pointer to transport_out
+         * @param env pointer to environment struct
+         * @return pointer to transport sender associated wit the transport out
+         * description, returns a reference, not a cloned copy
          */
         axis2_transport_sender_t *(AXIS2_CALL *
                 get_sender)(
@@ -152,10 +179,12 @@
                     const axis2_env_t *env);
 
         /**
-        * @param transport_out pointer to transport_out
-        * @param env pointer to environment struct
-        * @param sender pointer to sender
-        * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+         * Sets transport sender.
+         * @param transport_out pointer to transport_out
+         * @param env pointer to environment struct
+         * @param sender pointer to transport sender, transport description
+         * assumes ownership of sender 
+         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
                 set_sender)(
@@ -164,18 +193,23 @@
                     axis2_transport_sender_t *sender);
 
         /**
-        * @param transport_out pointer to transport_out
-        * @param env pointer to environment struct
-        */
+         * Gets transport out phase.
+         * @param transport_out pointer to transport_out
+         * @param env pointer to environment struct
+         * @return pointer to phase representing transport out phase, returns a 
+         * reference, not a cloned copy
+         */
         struct axis2_phase * (AXIS2_CALL *
                 get_out_phase)(
                     const axis2_transport_out_desc_t *transport_out,
                     const axis2_env_t *env);
 
         /**
+         * Sets transport out phase.
          * @param transport_out pointer to transport_out 
          * @param env pointer to environment struct
-         * @param out_phase pointer to out phase
+         * @param out_phase pointer to phase representing transport out phase,
+         * transport out description assumes ownership of phase
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
@@ -185,30 +219,37 @@
                     struct axis2_phase *out_phase);
 
         /**
+         * Gets fault phase.
          * @param transport_out  pointer to transport_out
          * @param env pointer to environment struct
+         * @return pointer to phase representing fault phase, returns a 
+         * reference, not a cloned copy
          */
         struct axis2_phase *(AXIS2_CALL *
-                get_faultphase)(
+                get_fault_phase)(
                     const axis2_transport_out_desc_t *transport_out,
                     const axis2_env_t *env);
 
         /**
+         * Sets fault phase.
          * @param transport_out pointer to transport_out
          * @param env pointer to environment struct
-         * @param faultphase pointer to fault phase
+         * @param fault_phase pointer to phase representing fault phase, 
+         * transport description assumes ownership of phase
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
-                set_faultphase)(
+                set_fault_phase)(
                     struct axis2_transport_out_desc *transport_out,
                     const axis2_env_t *env,
-                    struct axis2_phase *faultphase);
+                    struct axis2_phase *fault_phase);
 
         /**
-         * @param transport_out_desc pointer to tarnsport out description
+         * Adds parameter.
+         * @param transport_out_desc pointer to tarn sport out description
          * @param env pointer to environment struct
-         * @param param pointer to param
+         * @param param pointer to parameter, transport out description assumes
+         * ownership of parameter
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *
@@ -218,17 +259,19 @@
                     axis2_param_t *param);
 
         /**
+         * Gets named parameter. 
          * @param transport_out_desc pointer to transport out description
          * @param env pointer to environment struct
-         * @param param_name pointer to parameter name
+         * @param param_name parameter name string
          */
         axis2_param_t *(AXIS2_CALL *
                 get_param)(
                     const axis2_transport_out_desc_t *transport_out_desc,
                     const axis2_env_t *env,
-                    axis2_char_t *param_name);
+                    const axis2_char_t *param_name);
 
         /**
+         * Checks if the named parameter is locked.
          * @param transport_out_desc pointer to transport out description
          * @param env pointer to environment struct
          * @param param_name pointer to parameter name
@@ -237,120 +280,124 @@
                 is_param_locked)(
                     axis2_transport_out_desc_t *transport_out_desc,
                     const axis2_env_t *env,
-                    axis2_char_t *param_name);
+                    const axis2_char_t *param_name);
 
     };
 
     /**
-     * transport out description struct  
+     * transport out description struct.
      */
     struct axis2_transport_out_desc
     {
-        /** operatoins of transport out description struct  */
+        /** operations of transport out description struct */
         axis2_transport_out_desc_ops_t *ops;
+        /** parameter container that holds parameter */
         axis2_param_container_t *param_container;
     };
 
     /**
-     * Creates transport out struct
+     * Creates transport out description with given QName.
      * @param env pointer to environment struct
-     * @param qname pointer to qname
+     * @param qname pointer to QName, newly created transport out description
+     * creates a clone of this
      * @return pointer to newly created transport out
      */
     AXIS2_EXTERN axis2_transport_out_desc_t * AXIS2_CALL
     axis2_transport_out_desc_create_with_qname (
         const axis2_env_t *env,
-        axis2_qname_t *qname);
-
+        const axis2_qname_t *qname);
 
+    /**
+     * Frees transport out description given as a void pointer.
+     * @param transport_out_dec pointer to transport out description as a 
+     * void pointer 
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
     axis2_status_t AXIS2_CALL
     axis2_transport_out_desc_free_void_arg(
         void *transport_out,
         const axis2_env_t *env);
 
-/*************************** Function macros **********************************/
-
-/** Frees the transport out description.
+/** Frees transport out description.
     @sa axis2_transport_out_desc_ops#free */
 #define AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out_desc, env) \
       ((transport_out_desc)->ops->free (transport_out_desc, env))
 
-/** Gets the qname.
+/** Gets QName.
     @sa axis2_transport_out_desc_ops#get_qname */
 #define AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(transport_out_desc, env) \
       ((transport_out_desc)->ops->get_qname (transport_out_desc, env))
 
-/** Sets the qname.
+/** Sets QName.
     @sa axis2_transport_out_desc_ops#set_qname */
 #define AXIS2_TRANSPORT_OUT_DESC_SET_QNAME(transport_out_desc, env, qname) \
       ((transport_out_desc)->ops->set_qname (transport_out_desc, env, qname))
 
-/** Gets the out flow.
-    @sa axis2_transport_out_desc_ops#get_outflow */
+/** Gets out flow.
+    @sa axis2_transport_out_desc_ops#get_out_flow */
 #define AXIS2_TRANSPORT_OUT_DESC_GET_OUT_FLOW(transport_out_desc, env) \
-      ((transport_out_desc)->ops->get_outflow (transport_out_desc, env))
+      ((transport_out_desc)->ops->get_out_flow (transport_out_desc, env))
 
-/** Sets the out flow.
-    @sa axis2_transport_out_desc_ops#set_outflow */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_OUT_FLOW(transport_out_desc, env, outflow) \
-      ((transport_out_desc)->ops->set_outflow (transport_out_desc, env, outflow))
-
-/** Get faultflow.
-    @sa axis2_transport_out_desc_ops#get_faultflow */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_FAULTFLOW(transport_out_desc, env) \
-      ((transport_out_desc)->ops->get_faultflow (transport_out_desc, env))
-
-/** Set faultflow.
-    @sa axis2_transport_out_desc_ops#set_faultflow */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_FAULTFLOW(transport_out_desc, env, faultflow) \
-      ((transport_out_desc)->ops->set_faultflow (transport_out_desc, env, faultflow))
+/** Sets out flow.
+    @sa axis2_transport_out_desc_ops#set_out_flow */
+#define AXIS2_TRANSPORT_OUT_DESC_SET_OUT_FLOW(transport_out_desc, env, out_flow) \
+      ((transport_out_desc)->ops->set_out_flow (transport_out_desc, env, out_flow))
+
+/** Gets fault out flow.
+    @sa axis2_transport_out_desc_ops#get_fault_out_flow */
+#define AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_OUT_FLOW(transport_out_desc, env) \
+      ((transport_out_desc)->ops->get_fault_out_flow (transport_out_desc, env))
+
+/** Sets fault out flow.
+    @sa axis2_transport_out_desc_ops#set_fault_out_flow */
+#define AXIS2_TRANSPORT_OUT_DESC_SET_FAULT_OUT_FLOW(transport_out_desc, env, fault_out_flow)
\
+      ((transport_out_desc)->ops->set_fault_out_flow (transport_out_desc, env, fault_out_flow))
 
-/** Get sender.
+/** Gets transport sender.
     @sa axis2_transport_out_desc_ops#get_sender */
 #define AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out_desc, env) \
       ((transport_out_desc)->ops->get_sender (transport_out_desc, env))
 
-/** Set sender.
+/** Sets transport sender.
     @sa axis2_transport_out_desc_ops#set_sender */
 #define AXIS2_TRANSPORT_OUT_DESC_SET_SENDER(transport_out_desc, env, sender) \
       ((transport_out_desc)->ops->set_sender (transport_out_desc, env, sender))
 
-/** Get out phase.
+/** Gets out phase.
     @sa axis2_transport_out_desc_ops#get_out_phase */
 #define AXIS2_TRANSPORT_OUT_DESC_GET_OUT_PHASE(transport_out_desc, env) \
       ((transport_out_desc)->ops->get_out_phase (transport_out_desc, env))
 
-/** Set out phase.
+/** Sets out phase.
     @sa axis2_transport_out_desc_ops#set_out_phase */
 #define AXIS2_TRANSPORT_OUT_DESC_SET_OUT_PHASE(transport_out_desc, env, out_phase) \
       ((transport_out_desc)->ops->set_out_phase (transport_out_desc, env, out_phase))
 
-/** Get faultphase.
-    @sa axis2_transport_out_desc_ops#get_faultphase */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_FAULTPHASE(transport_out_desc, env) \
-      ((transport_out_desc)->ops->get_faultphase (transport_out_desc, env))
-
-/** Set faultphase.
-    @sa axis2_transport_out_desc_ops#set_faultphase */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_FAULTPHASE(transport_out_desc, env, faultphase) \
-      ((transport_out_desc)->ops->set_faultphase (transport_out_desc, env, faultphase))
+/** Gets fault phase.
+    @sa axis2_transport_out_desc_ops#get_fault_phase */
+#define AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_PHASE(transport_out_desc, env) \
+      ((transport_out_desc)->ops->get_fault_phase (transport_out_desc, env))
+
+/** Sets fault phase.
+    @sa axis2_transport_out_desc_ops#set_fault_phase */
+#define AXIS2_TRANSPORT_OUT_DESC_SET_FAULT_PHASE(transport_out_desc, env, fault_phase) \
+      ((transport_out_desc)->ops->set_fault_phase (transport_out_desc, env, fault_phase))
 
-/** Adds the parameter.
+/** Adds given parameter.
     @sa axis2_transport_out_desc_ops#add_param */
 #define AXIS2_TRANSPORT_OUT_DESC_ADD_PARAM(transport_out_desc, env, param) \
       ((transport_out_desc)->ops->add_param (transport_out_desc, env, param))
 
-/** Get param.
+/** Gets named parameter.
     @sa axis2_transport_out_desc_ops#get_param */
 #define AXIS2_TRANSPORT_OUT_DESC_GET_PARAM(transport_out_desc, env, param_name) \
       ((transport_out_desc)->ops->get_param (transport_out_desc, env, param_name))
 
-/** Is param locked.
+/** Checks if the named parameter locked.
     @sa axis2_transport_out_desc_ops#is_param_locked */
 #define AXIS2_TRANSPORT_OUT_DESC_IS_PARAM_LOCKED(transport_out_desc, env, param_name) \
       ((transport_out_desc)->ops->is_param_locked (transport_out_desc, env, param_name))
-
-/*************************** End of function macros ***************************/
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=437991&r1=437990&r2=437991&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Tue Aug 29 00:20:00 2006
@@ -860,7 +860,7 @@
                 flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
                     env, out_fault_flow_element, builder_impl->conf->param_container,
                         out_fault_flow_node);
-                status = AXIS2_TRANSPORT_OUT_DESC_SET_FAULTFLOW(transport_out, env, flow);
+                status = AXIS2_TRANSPORT_OUT_DESC_SET_FAULT_OUT_FLOW(transport_out, env,
flow);
                 if(AXIS2_SUCCESS != status)
                 {
                     AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);

Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=437991&r1=437990&r2=437991&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Tue Aug 29 00:20:00
2006
@@ -16,58 +16,25 @@
 
 #include <axis2_transport_out_desc.h>
 
-/**
- * @brief Description transport out struct impl
- * Transport out
- * Represents a incoming transport deployed in AXis2
- */
 typedef struct axis2_transport_out_desc_impl
 {
     axis2_transport_out_desc_t transport_out;
-
-    /**
-     * Field flowInclude
-     * This will have a shallow copy and will not be freed by the descructor
-     */
-    axis2_flow_t *outflow;
-
-    /**
-     * Field flowInclude
-     * This will have a shallow copy and will not be freed by the descructor
-     */
-    axis2_flow_t *faultflow;
-
-    /**
-     * Field name
-     * This will have a shallow copy and will not be freed by the descructor
-     */
+    axis2_flow_t *out_flow;
+    axis2_flow_t *fault_out_flow;
     axis2_qname_t *qname;
-
-    /**
-     * This will have a shallow copy, but will be freed by the descructor
-     */
     axis2_transport_sender_t *sender;
-
-    /** to store handler in inFlow */
     axis2_phase_t *out_phase;
-
-    /** to store handler Fault in inFlow */
-    axis2_phase_t *faultphase;
-
-
-}
-axis2_transport_out_desc_impl_t;
+    axis2_phase_t *fault_phase;
+} axis2_transport_out_desc_impl_t;
 
 #define AXIS2_INTF_TO_IMPL(transport_out) ((axis2_transport_out_desc_impl_t *)transport_out)
 
-/************************* Function prototypes ********************************/
-
 axis2_status_t AXIS2_CALL
 axis2_transport_out_desc_free(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env);
 
-axis2_qname_t *AXIS2_CALL
+const axis2_qname_t *AXIS2_CALL
 axis2_transport_out_desc_get_qname(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env);
@@ -76,29 +43,29 @@
 axis2_transport_out_desc_set_qname(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_qname_t *qname);
+    const axis2_qname_t *qname);
 
 axis2_flow_t *AXIS2_CALL
-axis2_transport_out_desc_get_outflow(
+axis2_transport_out_desc_get_out_flow(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_outflow(
+axis2_transport_out_desc_set_out_flow(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_flow_t *outflow);
+    axis2_flow_t *out_flow);
 
 axis2_flow_t *AXIS2_CALL
-axis2_transport_out_desc_get_faultflow(
+axis2_transport_out_desc_get_fault_out_flow(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultflow(
+axis2_transport_out_desc_set_fault_out_flow(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_flow_t *faultflow);
+    axis2_flow_t *fault_out_flow);
 
 axis2_transport_sender_t *AXIS2_CALL
 axis2_transport_out_desc_get_sender(
@@ -123,15 +90,15 @@
     axis2_phase_t *out_phase);
 
 axis2_phase_t *AXIS2_CALL
-axis2_transport_out_desc_get_faultphase(
+axis2_transport_out_desc_get_fault_phase(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultphase(
+axis2_transport_out_desc_set_fault_phase(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_phase_t *faultphase);
+    axis2_phase_t *fault_phase);
 
 axis2_status_t AXIS2_CALL
 axis2_transport_out_desc_add_param(
@@ -143,21 +110,19 @@
 axis2_transport_out_desc_get_param(
     const axis2_transport_out_desc_t *transport_out_desc,
     const axis2_env_t *env,
-    axis2_char_t *param_name);
+    const axis2_char_t *param_name);
 
 axis2_bool_t AXIS2_CALL
 axis2_transport_out_desc_is_param_locked(
     axis2_transport_out_desc_t *
     transport_out_desc,
     const axis2_env_t *env,
-    axis2_char_t *param_name);
-
-/************************** End of function prototypes ************************/
+    const axis2_char_t *param_name);
 
 AXIS2_EXTERN axis2_transport_out_desc_t *AXIS2_CALL
 axis2_transport_out_desc_create_with_qname(
     const axis2_env_t *env,
-    axis2_qname_t *qname)
+    const axis2_qname_t *qname)
 {
     axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
 
@@ -175,9 +140,9 @@
 
     transport_out_impl->qname = NULL;
     transport_out_impl->out_phase = NULL;
-    transport_out_impl->faultphase = NULL;
-    transport_out_impl->outflow = NULL;
-    transport_out_impl->faultflow = NULL;
+    transport_out_impl->fault_phase = NULL;
+    transport_out_impl->out_flow = NULL;
+    transport_out_impl->fault_out_flow = NULL;
     transport_out_impl->sender = NULL;
     transport_out_impl->transport_out.ops = NULL;
     transport_out_impl->transport_out.param_container = NULL;
@@ -209,14 +174,14 @@
         axis2_transport_out_desc_get_qname;
     transport_out_impl->transport_out.ops->set_qname =
         axis2_transport_out_desc_set_qname;
-    transport_out_impl->transport_out.ops->get_outflow =
-        axis2_transport_out_desc_get_outflow;
-    transport_out_impl->transport_out.ops->set_outflow =
-        axis2_transport_out_desc_set_outflow;
-    transport_out_impl->transport_out.ops->get_faultflow =
-        axis2_transport_out_desc_get_faultflow;
-    transport_out_impl->transport_out.ops->set_faultflow =
-        axis2_transport_out_desc_set_faultflow;
+    transport_out_impl->transport_out.ops->get_out_flow =
+        axis2_transport_out_desc_get_out_flow;
+    transport_out_impl->transport_out.ops->set_out_flow =
+        axis2_transport_out_desc_set_out_flow;
+    transport_out_impl->transport_out.ops->get_fault_out_flow =
+        axis2_transport_out_desc_get_fault_out_flow;
+    transport_out_impl->transport_out.ops->set_fault_out_flow =
+        axis2_transport_out_desc_set_fault_out_flow;
     transport_out_impl->transport_out.ops->get_sender =
         axis2_transport_out_desc_get_sender;
     transport_out_impl->transport_out.ops->set_sender =
@@ -225,10 +190,10 @@
         axis2_transport_out_desc_get_out_phase;
     transport_out_impl->transport_out.ops->set_out_phase =
         axis2_transport_out_desc_set_out_phase;
-    transport_out_impl->transport_out.ops->get_faultphase =
-        axis2_transport_out_desc_get_faultphase;
-    transport_out_impl->transport_out.ops->set_faultphase =
-        axis2_transport_out_desc_set_faultphase;
+    transport_out_impl->transport_out.ops->get_fault_phase =
+        axis2_transport_out_desc_get_fault_phase;
+    transport_out_impl->transport_out.ops->set_fault_phase =
+        axis2_transport_out_desc_set_fault_phase;
     transport_out_impl->transport_out.ops->add_param =
         axis2_transport_out_desc_add_param;
     transport_out_impl->transport_out.ops->get_param =
@@ -239,8 +204,6 @@
     return &(transport_out_impl->transport_out);
 }
 
-/***************************Function implementation****************************/
-
 axis2_status_t AXIS2_CALL
 axis2_transport_out_desc_free(
     axis2_transport_out_desc_t *transport_out,
@@ -276,16 +239,16 @@
         transport_out_impl->qname = NULL;
     }
 
-    if (transport_out_impl->outflow)
+    if (transport_out_impl->out_flow)
     {
-        AXIS2_FLOW_FREE(transport_out_impl->outflow, env);
-        transport_out_impl->outflow = NULL;
+        AXIS2_FLOW_FREE(transport_out_impl->out_flow, env);
+        transport_out_impl->out_flow = NULL;
     }
 
-    if (transport_out_impl->faultflow)
+    if (transport_out_impl->fault_out_flow)
     {
-        AXIS2_FLOW_FREE(transport_out_impl->faultflow, env);
-        transport_out_impl->faultflow = NULL;
+        AXIS2_FLOW_FREE(transport_out_impl->fault_out_flow, env);
+        transport_out_impl->fault_out_flow = NULL;
     }
 
     if (transport_out_impl->out_phase)
@@ -294,10 +257,10 @@
         transport_out_impl->out_phase = NULL;
     }
 
-    if (transport_out_impl->faultphase)
+    if (transport_out_impl->fault_phase)
     {
-        AXIS2_FLOW_FREE(transport_out_impl->faultphase, env);
-        transport_out_impl->faultphase = NULL;
+        AXIS2_FLOW_FREE(transport_out_impl->fault_phase, env);
+        transport_out_impl->fault_phase = NULL;
     }
 
     AXIS2_FREE(env->allocator, transport_out_impl);
@@ -318,7 +281,7 @@
     return axis2_transport_out_desc_free(transport_out_l, env);
 }
 
-axis2_qname_t *AXIS2_CALL
+const axis2_qname_t *AXIS2_CALL
 axis2_transport_out_desc_get_qname(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env)
@@ -331,7 +294,7 @@
 axis2_transport_out_desc_set_qname(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_qname_t *qname)
+    const axis2_qname_t *qname)
 {
     axis2_transport_out_desc_impl_t *transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -347,59 +310,59 @@
 }
 
 axis2_flow_t *AXIS2_CALL
-axis2_transport_out_desc_get_outflow(
+axis2_transport_out_desc_get_out_flow(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_INTF_TO_IMPL(transport_out)->outflow;
+    return AXIS2_INTF_TO_IMPL(transport_out)->out_flow;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_outflow(
+axis2_transport_out_desc_set_out_flow(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_flow_t *outflow)
+    axis2_flow_t *out_flow)
 {
     axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, outflow, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, out_flow, AXIS2_FAILURE);
 
     transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
-    if (transport_out_impl->outflow)
+    if (transport_out_impl->out_flow)
     {
-        AXIS2_FLOW_FREE(transport_out_impl->outflow, env);
-        transport_out_impl->outflow = NULL;
+        AXIS2_FLOW_FREE(transport_out_impl->out_flow, env);
+        transport_out_impl->out_flow = NULL;
     }
-    transport_out_impl->outflow = outflow;
+    transport_out_impl->out_flow = out_flow;
     return AXIS2_SUCCESS;
 }
 
 axis2_flow_t *AXIS2_CALL
-axis2_transport_out_desc_get_faultflow(
+axis2_transport_out_desc_get_fault_out_flow(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env)
 {
-    return AXIS2_INTF_TO_IMPL(transport_out)->faultflow;
+    return AXIS2_INTF_TO_IMPL(transport_out)->fault_out_flow;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultflow(
+axis2_transport_out_desc_set_fault_out_flow(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_flow_t *faultflow)
+    axis2_flow_t *fault_out_flow)
 {
     axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, faultflow, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, fault_out_flow, AXIS2_FAILURE);
 
     transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
-    if (transport_out_impl->faultflow)
+    if (transport_out_impl->fault_out_flow)
     {
-        AXIS2_FLOW_FREE(transport_out_impl->faultflow, env);
-        transport_out_impl->faultflow = NULL;
+        AXIS2_FLOW_FREE(transport_out_impl->fault_out_flow, env);
+        transport_out_impl->fault_out_flow = NULL;
     }
-    transport_out_impl->faultflow = faultflow;
+    transport_out_impl->fault_out_flow = fault_out_flow;
     return AXIS2_SUCCESS;
 }
 
@@ -466,33 +429,33 @@
 }
 
 axis2_phase_t *AXIS2_CALL
-axis2_transport_out_desc_get_faultphase(
+axis2_transport_out_desc_get_fault_phase(
     const axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
-    return AXIS2_INTF_TO_IMPL(transport_out)->faultphase;
+    return AXIS2_INTF_TO_IMPL(transport_out)->fault_phase;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultphase(
+axis2_transport_out_desc_set_fault_phase(
     axis2_transport_out_desc_t *transport_out,
     const axis2_env_t *env,
-    axis2_phase_t *faultphase)
+    axis2_phase_t *fault_phase)
 {
     axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, faultphase, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, fault_phase, AXIS2_FAILURE);
 
     transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
-    if (transport_out_impl->faultphase)
+    if (transport_out_impl->fault_phase)
     {
-        AXIS2_FLOW_FREE(transport_out_impl->faultphase, env);
-        transport_out_impl->faultphase = NULL;
+        AXIS2_FLOW_FREE(transport_out_impl->fault_phase, env);
+        transport_out_impl->fault_phase = NULL;
     }
-    transport_out_impl->faultphase = faultphase;
+    transport_out_impl->fault_phase = fault_phase;
     return AXIS2_SUCCESS;
 
 }
@@ -514,7 +477,7 @@
 axis2_transport_out_desc_get_param(
     const axis2_transport_out_desc_t *transport_out_desc,
     const axis2_env_t *env,
-    axis2_char_t *param_name)
+    const axis2_char_t *param_name)
 {
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, param_name, NULL);
@@ -528,7 +491,7 @@
     axis2_transport_out_desc_t *
     transport_out_desc,
     const axis2_env_t *env,
-    axis2_char_t *param_name)
+    const axis2_char_t *param_name)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);

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=437991&r1=437990&r2=437991&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Tue Aug 29 00:20:00 2006
@@ -1278,7 +1278,7 @@
     axis2_transport_out_desc_t *transport)
 {
     axis2_conf_impl_t *config_impl = NULL;
-    axis2_qname_t *qname = NULL;
+    const axis2_qname_t *qname = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, transport, AXIS2_FAILURE);

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?rev=437991&r1=437990&r2=437991&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Aug 29 00:20:00
2006
@@ -969,8 +969,8 @@
         }
         case AXIS2_FAULT_OUT_FLOW:
         {
-            flow = AXIS2_TRANSPORT_OUT_DESC_GET_FAULTFLOW(transport, env);
-            phase = AXIS2_TRANSPORT_OUT_DESC_GET_FAULTPHASE(transport, env);
+            flow = AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_OUT_FLOW(transport, env);
+            phase = AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_PHASE(transport, env);
             break;
         }
         }



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