You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/08/24 09:28:19 UTC
svn commit: r434329 [1/2] - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engine/ modules/core/phaseresolver/
modules/core/receivers/ modules/wsdl/ ...
Author: samisa
Date: Thu Aug 24 00:28:17 2006
New Revision: 434329
URL: http://svn.apache.org/viewvc?rev=434329&view=rev
Log:
Fixed operation API, and related implementation
Modified:
webservices/axis2/trunk/c/include/axis2_op.h
webservices/axis2/trunk/c/include/axis2_wsdl_op.h
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/wsdl/builder/wsdl_pump.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/test/core/description/test_description.c
webservices/axis2/trunk/c/test/unit/core/description/test_op.c
webservices/axis2/trunk/c/test/unit/core/description/test_svc.c
webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op.h?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Thu Aug 24 00:28:17 2006
@@ -20,11 +20,23 @@
/**
* @defgroup axis2_op operation
* @ingroup axis2_desc
+ * operation represents the static structure of an operation in a service.
+ * In Axis2 description hierarchy, operation lives inside configuration,
+ * but is logically associated with the service to which it belongs.
+ * operations are configured in services.xml files located in the respective
+ * service group folders of the services folder in the repository.
+ * In services.xml file, operations are declared in association with a given
+ * service. The deployment engine would create operation instances to represent
+ * those configured operations and would associate them with the respective
+ * service in the configuration.
+ * operation encapsulates data on message exchange pattern (MEP), the
+ * execution flows, engaged module information, and the message receiver
+ * associated with the operation.
* @{
*/
+
/**
* @file axis2_op.h
- * @brief axis2 op interface
*/
#include <axis2_param_container.h>
@@ -46,6 +58,10 @@
{
#endif
+ /** Type name for struct axis2_op_ops */
+ typedef struct axis2_op_ops axis2_op_ops_t;
+ /** Type name for struct axis2_op */
+ typedef struct axis2_op axis2_op_t;
struct axis2_wsdl_op;
struct axis2_svc;
@@ -62,23 +78,21 @@
struct axis2_msg_ctx;
struct axis2_msg;
struct axis2_conf;
- /** Type name for struct axis2_op_ops */
- typedef struct axis2_op_ops axis2_op_ops_t;
- /** Type name for struct axis2_op */
- typedef struct axis2_op axis2_op_t;
+/** SOAP action string constant */
#define AXIS2_SOAP_ACTION "soapAction"
/**
- * Operation ops struct
- * Encapsulator struct for ops of axis2_op
+ * operation ops struct.
+ * Encapsulator struct for ops of axis2_op.
*/
AXIS2_DECLARE_DATA struct axis2_op_ops
{
/**
- * De-allocate memory
+ * Frees operation.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
free)(
@@ -86,8 +100,10 @@
const axis2_env_t *env);
/**
- * @param op pointer to operation
+ * Frees operation given as a void pointer.
+ * @param op pointer to operation 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)(
@@ -96,10 +112,12 @@
/**
- * Method addParameter
+ * Adds a parameter to method.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param param Parameter that will be added
+ * @param param pointer parameter to be added, operation assumes
+ * ownership of parameter
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
add_param)(
@@ -108,31 +126,37 @@
axis2_param_t *param);
/**
- * Method getParameter
+ * Gets named parameter.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param name Name of the parameter
+ * @param name name of parameter to be retrived as a string
+ * @return pointer to named parameter if exists, else NULL. Returns a
+ * reference, not a cloned copy
*/
axis2_param_t *(AXIS2_CALL *
get_param)(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env,
const axis2_char_t *name);
/**
+ * Gets all parameters.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing all parameters, returns
+ * a reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_params)(
- axis2_op_t *op,
+ get_all_params)(
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
- * To check whether a given paramter is locked
+ * Checks if the named paramter is locked.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param param_name pointer to param name
+ * @param param_name name of the parameter to be checked
+ * @return AXIS2_TRUE if named parameter is locked, else AXIS2_FALSE
*/
axis2_bool_t (AXIS2_CALL *
is_param_locked)(
@@ -141,49 +165,63 @@
const axis2_char_t *param_name);
/**
+ * Sets parent. Parent of an operation is of type service.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param service_desc pointer to service description
+ * @param svc pointer to parent service, operation does not assume
+ * ownership of service
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_parent)(
axis2_op_t *op,
const axis2_env_t *env,
- struct axis2_svc *service_desc);
+ struct axis2_svc *svc);
/**
+ * Gets parent. Parent of an operation is of type service.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to parent service, returns a reference, not a cloned
+ * copy
*/
struct axis2_svc *(AXIS2_CALL *
get_parent)(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
- * @param op pointer to operation
- * @param env pointer to environment struct
- * @param qname pointer to qname
+ * Sets operation QName.
+ * @param op pointer to operation as a void pointer, as this would be
+ * assigined to get_qname() method of base WSDL operation
+ * @param env pointer to environment struct
+ * @param qname pointer to QName, this method creates a clone of the
+ * QName
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_qname)(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_qname_t *qname);
+ const axis2_qname_t *qname);
/**
+ * Gets operation QName.
* @param op pointer to operation
* @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)(
void *op,
const axis2_env_t *env);
/**
+ * Sets operation message exchange pattern (MEP).
* @param op pointer to operation
* @param env pointer to environment struct
- * @param pattern pointer to pattern
+ * @param pattern message exchange pattern string
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_msg_exchange_pattern)(
@@ -192,18 +230,24 @@
const axis2_char_t *pattern);
/**
+ * Gets operation message exchange pattern (MEP).
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return MEP string
*/
- axis2_char_t *(AXIS2_CALL *
+ const axis2_char_t *(AXIS2_CALL *
get_msg_exchange_pattern)(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Sets message receiver. message receiver is responsible for invoking
+ * the business logic associated with the operation.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param msg_recv pointer to message receiver
+ * @param msg_recv pointer to message receiver, operation assumes
+ * ownership of message receiver
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_msg_recv)(
@@ -212,192 +256,255 @@
struct axis2_msg_recv *msg_recv);
/**
+ * Gets message receiver. message receiver is responsible for invoking
+ * the business logic associated with the operation.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to message receiver, returns a reference, not a
+ * cloned copy
*/
struct axis2_msg_recv *(AXIS2_CALL *
get_msg_recv)(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Gets style of operation. Style is that mentioned in WSDL, either
+ * RPC or document literal.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return string representing style
*/
- axis2_char_t *(AXIS2_CALL *
+ const axis2_char_t *(AXIS2_CALL *
get_style)(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Sets style of operation. Style is that mentioned in WSDL, either
+ * RPC or document literal.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param style pointer to style
+ * @param style string representing style
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_style)(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_char_t *style);
+ const axis2_char_t *style);
/**
- * To ebgage a module it is reuired to use this method
+ * Engages given module to operation.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param moduleref pointer to module ref
- * @param conf pointer to configuration
+ * @param module_desc pointer to module description, operation does not
+ * assume ownership of struct
+ * @param conf pointer to configuration, operation does not assume
+ * ownership of configuration
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
engage_module)(
axis2_op_t *op,
const axis2_env_t *env,
- struct axis2_module_desc *moduleref,
+ struct axis2_module_desc *module_desc,
struct axis2_conf *conf);
/**
+ * Adds module description to engaged module list.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param module_name pointer to module name
+ * @param module_dec pointer to module description, operation does not
+ * assume ownership of struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- add_to_engage_module_list)(
+ add_to_engaged_module_list)(
axis2_op_t *op,
const axis2_env_t *env,
- struct axis2_module_desc *module_name);
+ struct axis2_module_desc *module_dec);
/**
- * Method getEngadgedModules
+ * Gets all modules associated to operation.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing module descriptions
*/
axis2_array_list_t *(AXIS2_CALL *
- get_modules)(
- axis2_op_t *op,
+ get_all_modules)(
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
- * This method will simply map the String URI of the Message exchange
- * pattern to a integer. Further in the first lookup it will cash the looked
- * up value so that the subsequent method calls will be extremely efficient.
- *
+ * Gets Axis specific MEP constant. This method simply maps the string
+ * URI of the MEP to an integer.
+ * @param op pointer to operation
+ * @param env pointer to environment struct
+ * @return integer representing MEP
*/
int (AXIS2_CALL *
get_axis_specific_mep_const)(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Gets fault in flow. Fault in flow is the list of phases invoked
+ * when a fault happens along in path.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing phases, returns a reference,
+ * not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_phases_in_fault_flow)(
- axis2_op_t *op,
+ get_fault_in_flow)(
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Gets fault out flow. Fault out flow is the list of phases invoked
+ * when a fault happens along out path.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing phases, returns a reference,
+ * not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_phases_out_fault_flow)(
- axis2_op_t *op,
+ get_fault_out_flow)(
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Gets out flow. Out flow is the list of phases invoked
+ * along out path.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing phases, returns a reference,
+ * not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_phases_outflow)(
- axis2_op_t *op,
+ get_out_flow)(
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Gets in flow. In flow is the list of phases
+ * invoked along in path.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing phases, returns a reference,
+ * not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_remaining_phases_inflow)(
- axis2_op_t *op,
+ get_in_flow)(
+ const axis2_op_t *op,
const axis2_env_t *env);
/**
+ * Sets fault in flow. Fault in flow is the list of phases invoked
+ * when a fault happens along in path.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @param list pointer to array list containing phases, operation takes
+ * over the ownership of list
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_phases_in_fault_flow)(
+ set_fault_in_flow)(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
/**
+ * Sets fault out flow. Fault out flow is the list of phases invoked
+ * when a fault happens along out path.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param list pointer to list
+ * @param list pointer to array list containing phases, operation takes
+ * over the ownership of list
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_phases_out_fault_flow)(
+ set_fault_out_flow)(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
/**
+ * Sets out flow. Out flow is the list of phases invoked
+ * along out path.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param list pointer to list
+ * @param list pointer to array list containing phases, operation takes
+ * over the ownership of list
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_phases_outflow)(
+ set_out_flow)(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
/**
+ * Sets in flow. In flow is the list of phases
+ * invoked along in path.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param list pointer to list
+ * @param list pointer to array list containing phases, operation takes
+ * over the ownership of list
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_remaining_phases_inflow)(
+ set_in_flow)(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
/**
+ * Adds given QName to module QName list.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param module_name pointer to module name
+ * @param module_name pointer to module QName, QName would be cloned by
+ * this method
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- add_module)(
+ add_module_qname)(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_qname_t *module_name);
+ const axis2_qname_t *module_qname);
/**
+ * Gets all module QNames as a list.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to array list containing module QNames,
+ * returns a reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_module_refs)(
- axis2_op_t *op,
+ get_all_module_qnames)(
+ const axis2_op_t *op,
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_in_faults)(
- axis2_op_t *op,
+ 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 in faults
+ * @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)(
@@ -406,18 +513,24 @@
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)(
- axis2_op_t *op,
+ 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 input message
+ * @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)(
@@ -426,18 +539,24 @@
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_out_faults)(
- axis2_op_t *op,
+ 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 out faults
+ * @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)(
@@ -446,18 +565,24 @@
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)(
- axis2_op_t *op,
+ 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 output message
+ * @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)(
@@ -466,38 +591,23 @@
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
*/
- axis2_bool_t (AXIS2_CALL *
- is_safe)(
- axis2_op_t *op,
- const axis2_env_t *env);
-
- /**
- * @param op pointer to operation
- * @param env pointer to environment struct
- * @param safe safe
- */
- axis2_status_t (AXIS2_CALL *
- set_safety)(
- axis2_op_t *op,
- const axis2_env_t *env,
- axis2_bool_t safe);
-
- /**
- * @param op pointer to operation
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
+ const axis2_char_t *(AXIS2_CALL *
get_target_namespace)(
- axis2_op_t *op,
+ 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 in fault
+ * @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)(
@@ -506,9 +616,12 @@
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 out fault
+ * @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)(
@@ -517,9 +630,12 @@
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 feature
+ * @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)(
@@ -528,18 +644,23 @@
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_features)(
- axis2_op_t *op,
+ 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
+ * @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)(
@@ -548,18 +669,24 @@
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_Properties)(
- axis2_op_t *op,
+ 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 op
+ * @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)(
@@ -568,27 +695,15 @@
struct axis2_wsdl_op *wsdl_op);
/**
- * This method is responsible for finding a MEPContext for an incomming
- * messages. An incomming message can be of two states.
- * <p/>
- * 1)This is a new incomming message of a given MEP. 2)This message is a
- * part of an MEP which has already begun.
- * <p/>
- * The method is special cased for the two MEPs
- * <p/>
- * #IN_ONLY #IN_OUT
- * <p/>
- * for two reasons. First reason is the wide usage and the second being that
- * the need for the MEPContext to be saved for further incomming messages.
- * <p/>
- * In the event that MEP of this op is different from the two MEPs
- * deafulted above the decession of creating a new or this message relates
- * to a MEP which already in business is decided by looking at the WSA
- * Relates TO of the incomming message.
+ * 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.
* @param op pointer to operation
* @param env pointer to environment struct
* @param msg_ctx pointer to message context
* @param svc_ctx pointer to service context
+ * @return pointer to operation context, returns
+ * a reference, not a cloned copy
*/
struct axis2_op_ctx *(AXIS2_CALL *
find_op_ctx)(
@@ -598,20 +713,32 @@
struct axis2_svc_ctx *svc_ctx);
/**
- * This will not create a new op context if there is no one already.
+ * Finds operation context related to this operation using given message
+ * context. This method will not create a new operation context if
+ * an associated operation context could not be found.
* @param op pointer to operation
* @param env pointer to environment struct
* @param msg_ctx pointer to message context
+ * @return pointer to operation context if found, else NULL. Returns
+ * a reference, not a cloned copy
+
*/
struct axis2_op_ctx *(AXIS2_CALL *
- find_for_existing_op_ctx)(
+ find_existing_op_ctx)(
axis2_op_t *op,
const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx);
/**
+ * Registes given operation context against this operation. Regisration
+ * happens within the given message context, as it is the message context
+ * that captures the state information of a given invocation.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @param msg_ctx pointer to message context
+ * @param op_ctx pointer to operation context, operation does not assume
+ * ownership of operation context
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
register_op_ctx)(
@@ -621,8 +748,11 @@
struct axis2_op_ctx *op_ctx);
/**
+ * Gets message with given label.
* @param op pointer to operation
* @param env pointer to environment struct
+ * @return pointer to message corresponding to given label, returns
+ * a reference, not a cloned copy
*/
struct axis2_msg *(AXIS2_CALL *
get_msg)(
@@ -631,14 +761,16 @@
const axis2_char_t *label);
/**
+ * Adds given message with the given label.
* @param op pointer to operation
* @param env pointer to environment struct
- * @param label pointer to label
+ * @param label label string
* @param msg pointer to message
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
add_msg)(
- const axis2_op_t *op,
+ axis2_op_t *op,
const axis2_env_t *env,
const axis2_char_t *label,
const struct axis2_msg *msg);
@@ -646,317 +778,313 @@
};
/**
- * Operaton struct
+ * operaton struct.
*/
AXIS2_DECLARE_DATA struct axis2_op
{
+ /** base WSDL operation */
axis2_wsdl_op_t base;
+ /** operations of operation struct */
axis2_op_ops_t *ops;
+ /** parameter container */
struct axis2_param_container *param_container;
};
/**
- * Creates op struct
+ * Creates operation struct.
* @param env pointer to environment struct
- * @return pointer to newly created op
+ * @return pointer to newly created operation
*/
AXIS2_EXTERN axis2_op_t *AXIS2_CALL
axis2_op_create(
const axis2_env_t *env);
/**
- * Creates op struct with name
+ * Creates operation struct with given QName.
* @param env pointer to environment struct
- * @param name pointer to name
- * @return pointer to newly created op
+ * @param name pointer to QName
+ * @return pointer to newly created operation
*/
AXIS2_EXTERN axis2_op_t *AXIS2_CALL
axis2_op_create_with_qname(
const axis2_env_t *env,
- axis2_qname_t *name);
+ const axis2_qname_t *name);
/**
- * Creates op struct with wsdl op
- * @param wsdl_op wsdl op
- * @return pointer to newly created op
+ * 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
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_free_void_arg(
void *op,
const axis2_env_t *env);
-/************************** Start of function macros **************************/
-
-/** Frees the operation.
+/** Frees operation.
@sa axis2_op_ops#free */
#define AXIS2_OP_FREE(op, env) \
((op)->ops->free (op, env))
-/** Adds the param.
+/** Adds parameter.
@sa axis2_op_ops#add_param */
#define AXIS2_OP_ADD_PARAM(op, env, param) \
((op)->ops->add_param (op, env, param))
-/** Gets the param.
+/** Gets named parameter.
@sa axis2_op_ops#get_param */
#define AXIS2_OP_GET_PARAM(op, env, key) \
((op)->ops->get_param (op, env, key))
-/** Gets the params.
- @sa axis2_op_ops#get_params */
-#define AXIS2_OP_GET_PARAMS(op, env) \
- ((op)->ops->get_params (op, env))
+/** Gets all the parameters as a list.
+ @sa axis2_op_ops#get_all_params */
+#define AXIS2_OP_GET_ALL_PARAMS(op, env) \
+ ((op)->ops->get_all_params (op, env))
-/** Is param locked.
+/** Checks if the named parameter is locked.
@sa axis2_op_ops#is_param_locked */
#define AXIS2_OP_IS_PARAM_LOCKED(op, env, param_name) \
((op)->ops->is_param_locked(op, env, param_name))
-/** Set parent.
+/** Sets parent service.
@sa axis2_op_ops#set_parent */
#define AXIS2_OP_SET_PARENT(op, env, service_desc) \
((op)->ops->set_parent (op, env, service_desc))
-/** Get parent.
+/** Gets parent service.
@sa axis2_op_ops#get_parent */
#define AXIS2_OP_GET_PARENT(op, env) \
((op)->ops->get_parent (op, env))
-/** Sets the message receiver.
+/** Sets message receiver.
@sa axis2_op_ops#set_msg_recv */
#define AXIS2_OP_SET_MSG_RECV(op, env, msg_recv) \
((op)->ops->set_msg_recv (op, env, msg_recv))
-/** Gets the message receiver.
+/** Gets message receiver.
@sa axis2_op_ops#get_msg_recv */
#define AXIS2_OP_GET_MSG_RECV(op, env) \
((op)->ops->get_msg_recv (op, env))
-/** Sets the qname.
+/** Sets QName.
@sa axis2_op_ops#set_qname */
#define AXIS2_OP_SET_QNAME(op, env, qname) \
((op)->ops->set_qname (op, env, qname))
-/** Gets the qname.
+/** Gets QName.
@sa axis2_op_ops#get_qname */
#define AXIS2_OP_GET_QNAME(op, env) \
(((axis2_op_t *) op)->ops->get_qname (op, env))
-/** Sets the message exchange pattern.
+/** Sets message exchange pattern.
@sa axis2_op_ops#set_msg_exchange_pattern */
#define AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op , env, \
msg_exchange_pattern) \
((op)->ops->set_msg_exchange_pattern (op, env, \
msg_exchange_pattern))
-/** Gets the message exchange pattern.
+/** Gets message exchange pattern.
@sa axis2_op_ops#get_msg_exchange_pattern */
#define AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env) \
((op)->ops->get_msg_exchange_pattern (op, env))
-/** Gets the style.
+/** Gets style of operation.
@sa axis2_op_ops#get_style */
#define AXIS2_OP_GET_STYLE(op, env) \
((op)->ops->get_style (op, env))
-/** Sets the style.
+/** Sets style of operation.
@sa axis2_op_ops#set_style */
#define AXIS2_OP_SET_STYLE(op, env, style) \
((op)->ops->set_style (op, env, style))
-/** Engages the module.
+/** Engages the given module.
@sa axis2_op_ops#engage_module */
#define AXIS2_OP_ENGAGE_MODULE(op, env, moduleref, conf) \
((op)->ops->engage_module (op, env, moduleref, conf))
-/** Add to engage module list.
- @sa axis2_op_ops#add_to_engage_module_list */
-#define AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op, env, module_name) \
- ((op)->ops->add_to_engage_module_list (op, env, module_name))
-
-/** Get modules.
- @sa axis2_op_ops#get_modules */
-#define AXIS2_OP_GET_MODULES(op, env) \
- ((op)->ops->get_modules (op, env))
+/** Adds the named module to engaged module list.
+ @sa axis2_op_ops#add_to_engaged_module_list */
+#define AXIS2_OP_ADD_TO_ENGAGED_MODULE_LIST(op, env, module_name) \
+ ((op)->ops->add_to_engaged_module_list (op, env, module_name))
+
+/** Gets all modules.
+ @sa axis2_op_ops#get_all_modules */
+#define AXIS2_OP_GET_ALL_MODULES(op, env) \
+ ((op)->ops->get_all_modules (op, env))
-/** Gets the axis specific mep const
+/** Gets Axis specific MEP constant.
@sa axis2_op_ops#get_axis_specific_mep_const */
#define AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op, env) \
((op)->ops->get_axis_specific_mep_const (op, env))
-/** Gets the in fault flow.
- @sa axis2_op_ops#get_phases_in_fault_flow */
-#define AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(op, env) \
- ((op)->ops->get_phases_in_fault_flow (op, env))
-
-/** Gets the phases out flow.
- @sa axis2_op_ops#get_phases_out_fault_flow */
-#define AXIS2_OP_GET_PHASES_OUT_FAULT_FLOW(op, env) \
- ((op)->ops->get_phases_out_fault_flow (op, env))
-
-/** Gets the phases outflow.
- @sa axis2_op_ops#get_phases_outflow */
-#define AXIS2_OP_GET_PHASES_OUT_FLOW(op, env) \
- ((op)->ops->get_phases_outflow (op, env))
-
-/** Gets the remaining phases in flow.
- @sa axis2_op_ops#get_ramaining_phases_inflow */
-#define AXIS2_OP_GET_REMAINING_PHASES_IN_FLOW(op, env) \
- ((op)->ops->get_remaining_phases_inflow (op, env))
-
-/** Sets the phases in fault flow.
- @sa axis2_op_ops#set_phases_in_fault_flow */
-#define AXIS2_OP_SET_PHASES_IN_FAULT_FLOW(op, env, list) \
- ((op)->ops->set_phases_in_fault_flow (op, env, list))
-
-/** Sets the phases out fault flow.
- @sa axis2_op_ops#set_phases_out_fault_flow */
-#define AXIS2_OP_SET_PHASES_OUT_FAULT_FLOW(op, env, list) \
- ((op)->ops->set_phases_out_fault_flow (op, env, list))
-
-/** Sets the phases out flow.
- @sa axis2_op_ops#set_phases_outflow */
-#define AXIS2_OP_SET_PHASES_OUT_FLOW(op, env, list) \
- ((op)->ops->set_phases_outflow (op, env, list))
-
-/** Sets the remaining phases in flow.
- @sa axis2_op_ops#set_remaining_phases_inflow */
-#define AXIS2_OP_SET_REMAINING_PHASES_IN_FLOW(op, env, list) \
- ((op)->ops->set_remaining_phases_inflow (op, env, list))
-
-/** Adds the module.
- @sa axis2_op_ops#add_module */
-#define AXIS2_OP_ADD_MODULE(op, env, module_name) \
- ((op)->ops->add_module (op, env, module_name))
-
-/** Gets the module refs.
- @sa axis2_op_ops#get_module_refs */
-#define AXIS2_OP_GET_MODULE_REFS(op, env) \
- ((op)->ops->get_module_refs (op, env))
-
-/** Gets the in faults.
- @sa axis2_op_ops#get_in_faults */
-#define AXIS2_OP_GET_IN_FAULTS(op, env) \
- ((op)->ops->get_in_faults (op, env))
+/** Gets fault in flow.
+ @sa axis2_op_ops#get_fault_in_flow */
+#define AXIS2_OP_GET_FAULT_IN_FLOW(op, env) \
+ ((op)->ops->get_fault_in_flow (op, env))
+
+/** Gets fault out flow.
+ @sa axis2_op_ops#get_fault_out_flow */
+#define AXIS2_OP_GET_FAULT_OUT_FLOW(op, env) \
+ ((op)->ops->get_fault_out_flow (op, env))
+
+/** Gets out flow.
+ @sa axis2_op_ops#get_out_flow */
+#define AXIS2_OP_GET_OUT_FLOW(op, env) \
+ ((op)->ops->get_out_flow (op, env))
+
+/** Gets in flow.
+ @sa axis2_op_ops#get_in_flow */
+#define AXIS2_OP_GET_IN_FLOW(op, env) \
+ ((op)->ops->get_in_flow (op, env))
+
+/** Sets fault in flow.
+ @sa axis2_op_ops#set_fault_in_flow */
+#define AXIS2_OP_SET_FAULT_IN_FLOW(op, env, list) \
+ ((op)->ops->set_fault_in_flow (op, env, list))
+
+/** Sets fault out flow.
+ @sa axis2_op_ops#set_fault_out_flow */
+#define AXIS2_OP_SET_FAULT_OUT_FLOW(op, env, list) \
+ ((op)->ops->set_fault_out_flow (op, env, list))
+
+/** Sets out flow.
+ @sa axis2_op_ops#set_out_flow */
+#define AXIS2_OP_SET_OUT_FLOW(op, env, list) \
+ ((op)->ops->set_out_flow (op, env, list))
+
+/** Sets in flow.
+ @sa axis2_op_ops#set_in_flow */
+#define AXIS2_OP_SET_IN_FLOW(op, env, list) \
+ ((op)->ops->set_in_flow (op, env, list))
+
+/** Adds given module QName to module qname list.
+ @sa axis2_op_ops#add_module_qname */
+#define AXIS2_OP_ADD_MODULE_QNAME(op, env, module_name) \
+ ((op)->ops->add_module_qname (op, env, module_name))
+
+/** Gets all module descriptions.
+ @sa axis2_op_ops#get_all_module_qnames */
+#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 the in faults.
+/** 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))
-/** Sets the input message.
+/** 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 the input message.
+/** 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))
-/** Sets the out faults.
- @sa axis2_op_ops#get_out_faults */
-#define AXIS2_OP_GET_OUT_FAULTS(op, env) \
- ((op)->ops->get_out_faults (op, env))
+/** 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 the out faults.
+/** 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 the output message.
+/** 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 the output message.
+/** 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))
-/** Is safe.
- @sa axis2_op_ops#is_safe */
-#define AXIS2_OP_IS_SAFE(op, env) \
- ((op)->ops->is_safe (op, env))
-
-/** Set safety.
- @sa axis2_op_ops#set_safety */
-#define AXIS2_OP_SET_SAFETY(op, env, safe) \
- ((op)->ops->set_safety (op, env, safe))
-
-/** Gets the target namespace.
+/** 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 the in fault.
+/** Adds in fault.
@sa axis2_op_ops#add_in_fault */
#define AXIS2_OP_ADD_IN_FAULT(op, env, in_fault) \
((op)->ops->add_in_fault (op, env, in_fault))
-/** Adds the out fault.
+/** Adds out fault.
@sa axis2_op_ops#add_out_fault */
#define AXIS2_OP_ADD_OUT_FAULT(op, env, out_fault) \
((op)->ops->add_out_fault (op, env, out_fault))
-/** Adds the feature.
+/** Adds feature.
@sa axis2_op_ops#add_feature */
#define AXIS2_OP_ADD_FEATURE(op, env, feature) \
((op)->ops->add_feature (op, env, feature))
-/** Gets the features.
- @sa axis2_op_ops#get_features */
-#define AXIS2_OP_GET_FEATURES(op, env) \
- ((op)->ops->get_features(op, env))
+/** 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 the property.
+/** 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 the properties.
- @sa axis2_op_ops#get_properties */
-#define AXIS2_OP_GET_PROPERTIES(op, env) \
- ((op)->ops->get_properties (op, env, properties))
+/** 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 the wsdl operation.
+/** 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 the operation context.
+/** 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 for existing operation context.
- @sa axis2_op_ops#find_for_existing_op_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) \
- ((op)->ops->find_for_existing_op_ctx (op, env, wsdl_op))
+ ((op)->ops->find_existing_op_ctx (op, env, wsdl_op))
-/** Registers the operation conetxt.
+/** Registers given operation conetxt against this operation.
@sa axis2_op_ops#_register_op_ctx */
#define AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, wsdl_op) \
((op)->ops->register_op_ctx (op, env, msg_ctx, wsdl_op))
-/** Gets the message.
+/** Gets message corresponding to given label.
@sa axis2_op_ops#get_msg */
#define AXIS2_OP_GET_MSG(op, env, label) \
((op)->ops->get_msg(op, env, label))
-/** Adds the message.
+/** Adds message with given label.
@sa axis2_op_ops#add_msg */
#define AXIS2_OP_ADD_MSG(op, env, label, msg) \
((op)->ops->add_msg(op, env, label, msg))
-
-
-/************************** End of function macros ****************************/
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_wsdl_op.h?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_op.h Thu Aug 24 00:28:17 2006
@@ -96,13 +96,13 @@
axis2_status_t (AXIS2_CALL *
set_qname) (axis2_wsdl_op_t *wsdl_op,
const axis2_env_t *env,
- axis2_qname_t *name);
+ const axis2_qname_t *name);
/**
* Get the name of wsdl op
* @return axis2_qname_t wsdl op name
*/
- axis2_qname_t *(AXIS2_CALL *
+ const axis2_qname_t *(AXIS2_CALL *
get_qname) (void *wsdl_op,
const axis2_env_t *env);
@@ -115,7 +115,7 @@
axis2_status_t (AXIS2_CALL *
set_style) (axis2_wsdl_op_t *wsdl_op,
const axis2_env_t *env,
- axis2_char_t *style);
+ const axis2_char_t *style);
/**
* Get style
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Thu Aug 24 00:28:17 2006
@@ -233,7 +233,7 @@
if (svc)
{
axis2_op_t *temp_op = NULL;
- axis2_qname_t *op_qname = AXIS2_OP_GET_QNAME(op, env);
+ const axis2_qname_t *op_qname = AXIS2_OP_GET_QNAME(op, env);
temp_op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
if (!temp_op)
{
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?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Thu Aug 24 00:28:17 2006
@@ -140,7 +140,7 @@
axis2_options_t *options)
{
axis2_op_client_impl_t *op_client_impl = NULL;
- axis2_char_t *mep_uri = NULL;
+ const axis2_char_t *mep_uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, op, NULL);
@@ -468,7 +468,7 @@
response_mc = axis2_mep_client_two_way_send(env, msg_ctx);
if (!response_mc)
{
- axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Thu Aug 24 00:28:17 2006
@@ -2283,7 +2283,7 @@
if (op)
{
AXIS2_INTF_TO_IMPL(msg_ctx)->op = op;
- AXIS2_INTF_TO_IMPL(msg_ctx)->op_qname = AXIS2_OP_GET_QNAME(op, env);
+ AXIS2_INTF_TO_IMPL(msg_ctx)->op_qname = (axis2_qname_t *)AXIS2_OP_GET_QNAME(op, env);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Thu Aug 24 00:28:17 2006
@@ -182,7 +182,7 @@
if (op_ctx_impl->op)
{
- op_ctx_impl->op_qname = AXIS2_OP_GET_QNAME(op_ctx_impl->op, env);
+ op_ctx_impl->op_qname = (axis2_qname_t *)AXIS2_OP_GET_QNAME(op_ctx_impl->op, env);
op_ctx_impl->op_mep = AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op_ctx_impl->op, env);
}
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?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Aug 24 00:28:17 2006
@@ -1164,7 +1164,7 @@
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *)v;
- modules = AXIS2_OP_GET_MODULE_REFS(op_desc, env);
+ modules = AXIS2_OP_GET_ALL_MODULE_QNAMES(op_desc, env);
if(modules)
sizek = AXIS2_ARRAY_LIST_SIZE(modules, env);
for (k = 0; k < sizek; k++)
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Thu Aug 24 00:28:17 2006
@@ -895,7 +895,7 @@
}
else
{
- status = AXIS2_OP_ADD_MODULE(op, env, ref_qname);
+ status = AXIS2_OP_ADD_MODULE_QNAME(op, env, ref_qname);
AXIS2_QNAME_FREE(ref_qname, env);
if(AXIS2_SUCCESS != status)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Thu Aug 24 00:28:17 2006
@@ -710,11 +710,11 @@
op_out_faultphases = axis2_phases_info_get_op_out_faultphases(phases_info,
env);
- status = AXIS2_OP_SET_REMAINING_PHASES_IN_FLOW(op_desc, env, op_in_phases);
- status = AXIS2_OP_SET_PHASES_OUT_FLOW(op_desc, env, op_out_phases);
+ status = AXIS2_OP_SET_IN_FLOW(op_desc, env, op_in_phases);
+ status = AXIS2_OP_SET_OUT_FLOW(op_desc, env, op_out_phases);
if(op_in_faultphases)
{
- status = AXIS2_OP_SET_PHASES_IN_FAULT_FLOW(op_desc, env,
+ status = AXIS2_OP_SET_FAULT_IN_FLOW(op_desc, env,
op_in_faultphases);
}
else
@@ -728,7 +728,7 @@
if(op_out_faultphases)
{
- status = AXIS2_OP_SET_PHASES_OUT_FAULT_FLOW(op_desc, env,
+ status = AXIS2_OP_SET_FAULT_OUT_FLOW(op_desc, env,
op_out_faultphases);
}
else
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Aug 24 00:28:17 2006
@@ -492,7 +492,7 @@
int sizej = 0;
op_desc = (axis2_op_t *) AXIS2_ARRAY_LIST_GET(ops, env, i);
- params = AXIS2_OP_GET_PARAMS(op_desc, env);
+ params = AXIS2_OP_GET_ALL_PARAMS(op_desc, env);
/* Adding wsa-mapping into service */
sizej = AXIS2_ARRAY_LIST_SIZE(params, env);
for(j = 0; j < sizej; j++)
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Thu Aug 24 00:28:17 2006
@@ -476,7 +476,7 @@
axis2_op_t *op)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
- axis2_qname_t *op_qname = NULL;
+ const axis2_qname_t *op_qname = NULL;
axis2_char_t *op_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Thu Aug 24 00:28:17 2006
@@ -36,10 +36,9 @@
int mep;
/*To store deploytime module refs */
- axis2_array_list_t *modulerefs;
+ axis2_array_list_t *module_qnames;
-}
-axis2_op_impl_t;
+} axis2_op_impl_t;
#define AXIS2_INTF_TO_IMPL(op) ((axis2_op_impl_t *)op)
@@ -58,13 +57,13 @@
axis2_param_t *AXIS2_CALL
axis2_op_get_param(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env,
const axis2_char_t *name);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_params(
- axis2_op_t *op,
+axis2_op_get_all_params(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
@@ -81,7 +80,7 @@
axis2_svc_t *AXIS2_CALL
axis2_op_get_parent(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -92,16 +91,16 @@
struct axis2_msg_recv *AXIS2_CALL
axis2_op_get_msg_recv(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_op_set_qname(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_qname_t *qname);
+ const axis2_qname_t *qname);
-axis2_qname_t *AXIS2_CALL
+const axis2_qname_t *AXIS2_CALL
axis2_op_get_qname(
void *op,
const axis2_env_t *env);
@@ -112,21 +111,21 @@
const axis2_env_t *env,
const axis2_char_t *pattern);
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_op_get_msg_exchange_pattern(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_op_get_style(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_op_set_style(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_char_t *style);
+ const axis2_char_t *style);
axis2_status_t AXIS2_CALL
axis2_op_engage_module(
@@ -136,79 +135,79 @@
axis2_conf_t *conf);
axis2_status_t AXIS2_CALL
-axis2_op_add_to_engage_module_list(
+axis2_op_add_to_engaged_module_list(
axis2_op_t *op,
const axis2_env_t *env,
axis2_module_desc_t *module_name);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_modules(
- axis2_op_t *op,
+axis2_op_get_all_modules(
+ const axis2_op_t *op,
const axis2_env_t *env);
int AXIS2_CALL
axis2_op_get_axis_specific_mep_const(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_phases_in_fault_flow(
- axis2_op_t *op,
+axis2_op_get_fault_in_flow(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_phases_out_fault_flow(
- axis2_op_t *op,
+axis2_op_get_fault_out_flow(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_phases_outflow(
- axis2_op_t *op,
+axis2_op_get_out_flow(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_remaining_phases_inflow(
- axis2_op_t *op,
+axis2_op_get_in_flow(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_op_set_phases_in_fault_flow(
+axis2_op_set_fault_in_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
axis2_status_t AXIS2_CALL
-axis2_op_set_phases_out_fault_flow(
+axis2_op_set_fault_out_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
axis2_status_t AXIS2_CALL
-axis2_op_set_phases_outflow(
+axis2_op_set_out_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
axis2_status_t AXIS2_CALL
-axis2_op_set_remaining_phases_inflow(
+axis2_op_set_in_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list);
axis2_status_t AXIS2_CALL
-axis2_op_add_module(
+axis2_op_add_module_qname(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_qname_t *module_name);
+ const axis2_qname_t *module_qname);
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_module_refs(
- axis2_op_t *op,
+axis2_op_get_all_module_qnames(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_in_faults(
- axis2_op_t *op,
+axis2_op_get_all_in_faults(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -219,7 +218,7 @@
struct axis2_wsdl_msg_ref *AXIS2_CALL
axis2_op_get_input_msg(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -230,8 +229,8 @@
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_out_faults(
- axis2_op_t *op,
+axis2_op_get_all_out_faults(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -242,7 +241,7 @@
struct axis2_wsdl_msg_ref *AXIS2_CALL
axis2_op_get_output_msg(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -251,20 +250,9 @@
const axis2_env_t *env,
struct axis2_wsdl_msg_ref *output_msg);
-axis2_bool_t AXIS2_CALL
-axis2_op_is_safe(
- axis2_op_t *op,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_safety(
- axis2_op_t *op,
- const axis2_env_t *env,
- axis2_bool_t safe);
-
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_op_get_target_namespace(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -286,8 +274,8 @@
axis2_wsdl_feature_t *feature);
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_features(
- axis2_op_t *op,
+axis2_op_get_all_features(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -297,8 +285,8 @@
axis2_wsdl_property_t *wsdl_property);
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_Properties(
- axis2_op_t *op,
+axis2_op_get_all_properties(
+ const axis2_op_t *op,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
@@ -341,7 +329,7 @@
* @return
*/
axis2_op_ctx_t *AXIS2_CALL
-axis2_op_find_for_existing_op_ctx(
+axis2_op_find_existing_op_ctx(
axis2_op_t *op,
const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx);
@@ -389,7 +377,7 @@
axis2_status_t AXIS2_CALL
axis2_op_add_msg(
- const axis2_op_t *op,
+ axis2_op_t *op,
const axis2_env_t *env,
const axis2_char_t *label,
const axis2_msg_t *msg);
@@ -427,7 +415,7 @@
op_impl->mep = AXIS2_MEP_CONSTANT_INVALID;
op_impl->op.param_container = NULL;
op_impl->wsdl_op = NULL;
- op_impl->modulerefs = NULL;
+ op_impl->module_qnames = NULL;
op_impl->op.ops = NULL;
op_impl->op.param_container = (axis2_param_container_t *)
@@ -610,7 +598,7 @@
op_impl->op.ops->free_void_arg = axis2_op_free_void_arg;
op_impl->op.ops->add_param = axis2_op_add_param;
op_impl->op.ops->get_param = axis2_op_get_param;
- op_impl->op.ops->get_params = axis2_op_get_params;
+ op_impl->op.ops->get_all_params = axis2_op_get_all_params;
op_impl->op.ops->set_parent = axis2_op_set_parent;
op_impl->op.ops->get_parent = axis2_op_get_parent;
op_impl->op.ops->set_msg_recv = axis2_op_set_msg_recv;
@@ -624,39 +612,37 @@
op_impl->op.ops->set_style = axis2_op_set_style;
op_impl->op.ops->get_style = axis2_op_get_style;
op_impl->op.ops->engage_module = axis2_op_engage_module;
- op_impl->op.ops->add_to_engage_module_list = axis2_op_add_to_engage_module_list;
- op_impl->op.ops->get_modules = axis2_op_get_modules;
+ op_impl->op.ops->add_to_engaged_module_list = axis2_op_add_to_engaged_module_list;
+ op_impl->op.ops->get_all_module_qnames = axis2_op_get_all_module_qnames;
op_impl->op.ops->get_axis_specific_mep_const = axis2_op_get_axis_specific_mep_const;
- op_impl->op.ops->get_phases_in_fault_flow = axis2_op_get_phases_in_fault_flow;
- op_impl->op.ops->get_phases_out_fault_flow = axis2_op_get_phases_out_fault_flow;
- op_impl->op.ops->get_phases_outflow = axis2_op_get_phases_outflow;
- op_impl->op.ops->get_remaining_phases_inflow = axis2_op_get_remaining_phases_inflow;
- op_impl->op.ops->set_phases_in_fault_flow = axis2_op_set_phases_in_fault_flow;
- op_impl->op.ops->set_phases_out_fault_flow = axis2_op_set_phases_out_fault_flow;
- op_impl->op.ops->set_phases_outflow = axis2_op_set_phases_outflow;
- op_impl->op.ops->set_remaining_phases_inflow = axis2_op_set_remaining_phases_inflow;
- op_impl->op.ops->add_module = axis2_op_add_module;
- op_impl->op.ops->get_module_refs = axis2_op_get_module_refs;
- op_impl->op.ops->get_in_faults = axis2_op_get_in_faults;
+ op_impl->op.ops->get_fault_in_flow = axis2_op_get_fault_in_flow;
+ op_impl->op.ops->get_fault_out_flow = axis2_op_get_fault_out_flow;
+ op_impl->op.ops->get_out_flow = axis2_op_get_out_flow;
+ op_impl->op.ops->get_in_flow = axis2_op_get_in_flow;
+ op_impl->op.ops->set_fault_in_flow = axis2_op_set_fault_in_flow;
+ op_impl->op.ops->set_fault_out_flow = axis2_op_set_fault_out_flow;
+ op_impl->op.ops->set_out_flow = axis2_op_set_out_flow;
+ 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_out_faults = axis2_op_get_out_faults;
+ 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->is_safe = axis2_op_is_safe;
- op_impl->op.ops->set_safety = axis2_op_set_safety;
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_features = axis2_op_get_features;
+ 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_Properties = axis2_op_get_Properties;
+ 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_for_existing_op_ctx = axis2_op_find_for_existing_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;
op_impl->op.ops->get_msg = axis2_op_get_msg;
op_impl->op.ops->add_msg = axis2_op_add_msg;
@@ -667,7 +653,7 @@
axis2_op_t *AXIS2_CALL
axis2_op_create_with_qname(
const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_qname_t *qname)
{
axis2_op_impl_t *op_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -761,13 +747,13 @@
op_impl->msg_recv = NULL;
}
- if(NULL != op_impl->modulerefs)
+ if(NULL != op_impl->module_qnames)
{
int i = 0;
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->modulerefs, env); i++)
+ for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->module_qnames, env); i++)
{
axis2_qname_t *module_ref = NULL;
- module_ref = AXIS2_ARRAY_LIST_GET(op_impl->modulerefs, env, i);
+ module_ref = AXIS2_ARRAY_LIST_GET(op_impl->module_qnames, env, i);
if (module_ref)
{
@@ -775,13 +761,13 @@
module_ref = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(op_impl->modulerefs, env);
- op_impl->modulerefs = NULL;
+ AXIS2_ARRAY_LIST_FREE(op_impl->module_qnames, env);
+ op_impl->module_qnames = NULL;
}
if(NULL != op_impl->wsdl_op)
{
- AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
+ AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
op_impl->wsdl_op = NULL;
}
@@ -851,7 +837,7 @@
axis2_param_t *AXIS2_CALL
axis2_op_get_param(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env,
const axis2_char_t *param_name)
{
@@ -869,8 +855,8 @@
}
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_params(
- axis2_op_t *op,
+axis2_op_get_all_params(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -931,7 +917,7 @@
axis2_svc_t *AXIS2_CALL
axis2_op_get_parent(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -964,7 +950,7 @@
struct axis2_msg_recv *AXIS2_CALL
axis2_op_get_msg_recv(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -975,7 +961,7 @@
axis2_op_set_qname(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_qname_t *qname)
{
axis2_op_impl_t *op_impl = NULL;
@@ -985,7 +971,7 @@
return AXIS2_WSDL_OP_SET_QNAME(op_impl->wsdl_op, env, qname);
}
-axis2_qname_t *AXIS2_CALL
+const axis2_qname_t *AXIS2_CALL
axis2_op_get_qname(
void *op,
const axis2_env_t *env)
@@ -1015,9 +1001,9 @@
pattern);
}
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_op_get_msg_exchange_pattern(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1028,9 +1014,9 @@
return AXIS2_WSDL_OP_GET_MSG_EXCHANGE_PATTERN(op_impl->wsdl_op, env);
}
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_op_get_style(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1044,7 +1030,7 @@
axis2_op_set_style(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_char_t *style)
+ const axis2_char_t *style)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1141,7 +1127,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_add_to_engage_module_list(
+axis2_op_add_to_engaged_module_list(
axis2_op_t *op,
const axis2_env_t *env,
axis2_module_desc_t *module_desc)
@@ -1190,8 +1176,8 @@
}
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_modules(
- axis2_op_t *op,
+axis2_op_get_all_modules(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1210,7 +1196,7 @@
int AXIS2_CALL
axis2_op_get_axis_specific_mep_const(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1280,8 +1266,8 @@
}
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_phases_in_fault_flow(
- axis2_op_t *op,
+axis2_op_get_fault_in_flow(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1301,8 +1287,8 @@
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_phases_out_fault_flow(
- axis2_op_t *op,
+axis2_op_get_fault_out_flow(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1322,8 +1308,8 @@
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_phases_outflow(
- axis2_op_t *op,
+axis2_op_get_out_flow(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1343,8 +1329,8 @@
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_remaining_phases_inflow(
- axis2_op_t *op,
+axis2_op_get_in_flow(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1363,7 +1349,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_set_phases_in_fault_flow(
+axis2_op_set_fault_in_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list)
@@ -1388,7 +1374,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_set_phases_out_fault_flow(
+axis2_op_set_fault_out_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list)
@@ -1412,7 +1398,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_set_phases_outflow(
+axis2_op_set_out_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list)
@@ -1437,7 +1423,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_set_remaining_phases_inflow(
+axis2_op_set_in_flow(
axis2_op_t *op,
const axis2_env_t *env,
axis2_array_list_t *list)
@@ -1461,10 +1447,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_add_module(
+axis2_op_add_module_qname(
axis2_op_t *op,
const axis2_env_t *env,
- axis2_qname_t *module_qname)
+ const axis2_qname_t *module_qname)
{
axis2_op_impl_t *op_impl = NULL;
axis2_qname_t *module_qname_l = NULL;
@@ -1475,21 +1461,21 @@
module_qname_l = AXIS2_QNAME_CLONE(module_qname, env);
- return AXIS2_ARRAY_LIST_ADD(op_impl->modulerefs, env, module_qname_l);
+ return AXIS2_ARRAY_LIST_ADD(op_impl->module_qnames, env, module_qname_l);
}
axis2_array_list_t *AXIS2_CALL
-axis2_op_get_module_refs(
- axis2_op_t *op,
+axis2_op_get_all_module_qnames(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(op)->modulerefs;
+ return AXIS2_INTF_TO_IMPL(op)->module_qnames;
}
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_in_faults(
- axis2_op_t *op,
+axis2_op_get_all_in_faults(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1517,7 +1503,7 @@
struct axis2_wsdl_msg_ref *AXIS2_CALL
axis2_op_get_input_msg(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1544,8 +1530,8 @@
}
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_out_faults(
- axis2_op_t *op,
+axis2_op_get_all_out_faults(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1573,7 +1559,7 @@
struct axis2_wsdl_msg_ref *AXIS2_CALL
axis2_op_get_output_msg(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1599,36 +1585,9 @@
return AXIS2_WSDL_OP_SET_OUTPUT_MSG(op_impl->wsdl_op, env, output_msg);
}
-axis2_bool_t AXIS2_CALL
-axis2_op_is_safe(
- axis2_op_t *op,
- const axis2_env_t *env)
-{
- axis2_op_impl_t *op_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- op_impl = AXIS2_INTF_TO_IMPL(op);
-
- return AXIS2_WSDL_OP_IS_SAFE(op_impl->wsdl_op, env);
-}
-
-axis2_status_t AXIS2_CALL
-axis2_op_set_safety(
- axis2_op_t *op,
- const axis2_env_t *env,
- axis2_bool_t safe)
-{
- axis2_op_impl_t *op_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- op_impl = AXIS2_INTF_TO_IMPL(op);
-
- return AXIS2_WSDL_OP_SET_SAFETY(op_impl->wsdl_op, env, safe);
-}
-
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_op_get_target_namespace(
- axis2_op_t *op,
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1687,8 +1646,8 @@
}
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_features(
- axis2_op_t *op,
+axis2_op_get_all_features(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1717,8 +1676,8 @@
}
axis2_linked_list_t *AXIS2_CALL
-axis2_op_get_Properties(
- axis2_op_t *op,
+axis2_op_get_all_properties(
+ const axis2_op_t *op,
const axis2_env_t *env)
{
axis2_op_impl_t *op_impl = NULL;
@@ -1812,7 +1771,7 @@
}
axis2_op_ctx_t *AXIS2_CALL
-axis2_op_find_for_existing_op_ctx(
+axis2_op_find_existing_op_ctx(
axis2_op_t *op,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
@@ -2057,7 +2016,7 @@
axis2_status_t AXIS2_CALL
axis2_op_add_msg(
- const axis2_op_t *op,
+ axis2_op_t *op,
const axis2_env_t *env,
const axis2_char_t *label,
const axis2_msg_t *msg)
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Thu Aug 24 00:28:17 2006
@@ -927,7 +927,7 @@
axis2_array_list_t *modules = NULL;
int i = 0, size = 0;
axis2_msg_recv_t *msg_recv = NULL;
- axis2_qname_t *qname = NULL;
+ const axis2_qname_t *qname = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1294,7 +1294,7 @@
void *v = NULL;
axis2_hash_this (index, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
- params = AXIS2_OP_GET_PARAMS(op_desc, env);
+ params = AXIS2_OP_GET_ALL_PARAMS(op_desc, env);
/* Adding wsa-maping into service */
size = AXIS2_ARRAY_LIST_SIZE(params, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=434329&r1=434328&r2=434329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Thu Aug 24 00:28:17 2006
@@ -261,7 +261,7 @@
axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
{
- phases = AXIS2_OP_GET_PHASES_OUT_FLOW(op, env);
+ phases = AXIS2_OP_GET_OUT_FLOW(op, env);
}
}
@@ -378,7 +378,7 @@
if (op_ctx)
{
op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- op_specific_phases = AXIS2_OP_GET_REMAINING_PHASES_IN_FLOW(op, env);
+ op_specific_phases = AXIS2_OP_GET_IN_FLOW(op, env);
axis2_engine_resume_invocation_phases(engine, env, op_specific_phases, msg_ctx);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
@@ -405,7 +405,7 @@
if (op_ctx)
{
op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- op_specific_phases = AXIS2_OP_GET_REMAINING_PHASES_IN_FLOW(op, env);
+ op_specific_phases = AXIS2_OP_GET_IN_FLOW(op, env);
status = axis2_engine_invoke_phases(engine, env, op_specific_phases, msg_ctx);
if (status != AXIS2_SUCCESS)
{
@@ -535,7 +535,7 @@
if (op_ctx)
{
axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
- axis2_array_list_t *phases = AXIS2_OP_GET_PHASES_IN_FAULT_FLOW(op, env);
+ axis2_array_list_t *phases = AXIS2_OP_GET_FAULT_IN_FLOW(op, env);
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
@@ -1007,7 +1007,7 @@
axis2_op_t *op = AXIS2_OP_CTX_GET_OP(op_ctx, env);
if (op)
{
- phases = AXIS2_OP_GET_PHASES_OUT_FLOW(op, env);
+ phases = AXIS2_OP_GET_OUT_FLOW(op, env);
}
}
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org