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 da...@apache.org on 2005/12/12 04:16:33 UTC
svn commit: r356126 - /webservices/axis2/trunk/c/include/
Author: damitha
Date: Sun Dec 11 19:16:03 2005
New Revision: 356126
URL: http://svn.apache.org/viewcvs?rev=356126&view=rev
Log:
refactoring completed
Modified:
webservices/axis2/trunk/c/include/axis2.h
webservices/axis2/trunk/c/include/axis2_engine_config.h
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_module_desc.h
webservices/axis2/trunk/c/include/axis2_operation.h
webservices/axis2/trunk/c/include/axis2_phase_resolver.h
webservices/axis2/trunk/c/include/axis2_svc.h
webservices/axis2/trunk/c/include/axis2_wsdl_binding.h
webservices/axis2/trunk/c/include/axis2_wsdl_binding_fault.h
webservices/axis2/trunk/c/include/axis2_wsdl_binding_msg_ref.h
webservices/axis2/trunk/c/include/axis2_wsdl_binding_operation.h
webservices/axis2/trunk/c/include/axis2_wsdl_component.h
webservices/axis2/trunk/c/include/axis2_wsdl_endpoint.h
webservices/axis2/trunk/c/include/axis2_wsdl_extensible_component.h
webservices/axis2/trunk/c/include/axis2_wsdl_fault_ref.h
webservices/axis2/trunk/c/include/axis2_wsdl_feature.h
webservices/axis2/trunk/c/include/axis2_wsdl_interface.h
webservices/axis2/trunk/c/include/axis2_wsdl_msg_ref.h
webservices/axis2/trunk/c/include/axis2_wsdl_operation.h
webservices/axis2/trunk/c/include/axis2_wsdl_property.h
webservices/axis2/trunk/c/include/axis2_wsdl_svc.h
Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Sun Dec 11 19:16:03 2005
@@ -95,6 +95,24 @@
* @{
*/
+typedef enum axis2_operation_type
+{
+ /** axis2_wsdl_operation */
+ AXIS2_WSDL_OPERATION = 0,
+ /** axis2_operation */
+ AXIS2_OPERATION
+
+}axis2_operation_type_t;
+
+typedef enum axis2_svc_type
+{
+ /** axis2_wsdl_svc */
+ AXIS2_WSDL_SVC = 0,
+ /** axis2_svc */
+ AXIS2_SVC
+
+}axis2_svc_type_t;
+
/******************************************************************************/
/********************Axis2 specific constants**********************************/
/******************************************************************************/
Modified: webservices/axis2/trunk/c/include/axis2_engine_config.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine_config.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_config.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_config.h Sun Dec 11 19:16:03 2005
@@ -31,6 +31,7 @@
#include <axis2_qname.h>
#include <axis2_hash.h>
#include <axis2_phases_info.h>
+#include <axis2_msg_recv.h>
#ifdef __cplusplus
extern "C"
@@ -41,6 +42,7 @@
* @{
*/
+struct axis2_msg_recv;
struct axis2_phases_info;
struct axis2_transport_in_desc *transports_in;
struct axis2_transport_out_desc *transports_out;
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Sun Dec 11 19:16:03 2005
@@ -169,6 +169,8 @@
AXIS2_ERROR_INVALID_STATE_SVC_GRP,
/** Wsdl operation accessed has invalid state */
AXIS2_ERROR_INVALID_STATE_WSDL_OPERATION,
+ /** Module description accessed has invalid state */
+ AXIS2_ERROR_INVALID_STATE_MODULE_DESC,
/** Array list index out of bounds */
AXIS2_ERROR_INDEX_OUT_OF_BOUNDS,
/** Both before and after handlers cannot be the same */
Modified: webservices/axis2/trunk/c/include/axis2_module_desc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_module_desc.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module_desc.h Sun Dec 11 19:16:03 2005
@@ -187,7 +187,7 @@
axis2_param_t * (AXIS2_CALL *
get_param) (axis2_module_desc_t *module_desc,
axis2_env_t **env,
- const axis2_char_t *name);
+ axis2_char_t *name);
axis2_array_list_t * (AXIS2_CALL *
get_params) (axis2_module_desc_t *module_desc,
@@ -201,7 +201,7 @@
axis2_bool_t (AXIS2_CALL *
is_param_locked ) (axis2_module_desc_t *module_desc,
axis2_env_t **env,
- const axis2_char_t *param_name);
+ axis2_char_t *param_name);
};
Modified: webservices/axis2/trunk/c/include/axis2_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_operation.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_operation.h Sun Dec 11 19:16:03 2005
@@ -49,7 +49,10 @@
struct axis2_msg_recv;
struct axis2_param_container;
struct axis2_module_desc;
-struct axis2_operation;
+struct axis2_operation;
+struct axis2_wsdl_feature;
+struct axis2_wsdl_property;
+struct axis2_wsdl_fault_ref;
typedef struct axis2_operation_ops axis2_operation_ops_t;
typedef struct axis2_operation axis2_operation_t;
@@ -84,7 +87,7 @@
axis2_param_t *(AXIS2_CALL *
get_param)(axis2_operation_t *operation,
axis2_env_t **env,
- const axis2_char_t *name);
+ axis2_char_t *name);
axis2_array_list_t *(AXIS2_CALL *
@@ -97,7 +100,7 @@
axis2_bool_t (AXIS2_CALL *
is_param_locked) (axis2_operation_t *operation,
axis2_env_t **env,
- const axis2_char_t *param_name);
+ axis2_char_t *param_name);
axis2_status_t (AXIS2_CALL *
set_parent) (axis2_operation_t *operation,
@@ -290,17 +293,17 @@
axis2_status_t (AXIS2_CALL *
add_infault) (axis2_operation_t *operation,
axis2_env_t **env,
- axis2_wsdl_fault_ref_t *infault);
+ struct axis2_wsdl_fault_ref *infault);
axis2_status_t (AXIS2_CALL *
add_outfault) (axis2_operation_t *operation,
axis2_env_t **env,
- axis2_wsdl_fault_ref_t *outfault);
+ struct axis2_wsdl_fault_ref *outfault);
axis2_status_t (AXIS2_CALL *
add_feature) (axis2_operation_t *operation,
axis2_env_t **env,
- axis2_wsdl_feature_t *feature);
+ struct axis2_wsdl_feature *feature);
axis2_linked_list_t *(AXIS2_CALL *
get_features) (axis2_operation_t *operation,
@@ -309,7 +312,7 @@
axis2_status_t (AXIS2_CALL *
add_property) (axis2_operation_t *operation,
axis2_env_t **env,
- axis2_wsdl_property_t *wsdl_property);
+ struct axis2_wsdl_property *wsdl_property);
axis2_linked_list_t *(AXIS2_CALL *
get_Properties) (axis2_operation_t *operation,
Modified: webservices/axis2/trunk/c/include/axis2_phase_resolver.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_phase_resolver.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase_resolver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase_resolver.h Sun Dec 11 19:16:03 2005
@@ -47,8 +47,13 @@
struct axis2_phase;
struct axis2_handler_desc;
+struct axis2_module_desc;
struct axis2_handler;
struct axis2_phase_rule;
+struct axis2_svc;
+struct axis2_engine_config;
+struct axis2_operation;
+struct axis2_phase_holder;
typedef struct axis2_phase_resolver axis2_phase_resolver_t;
typedef struct axis2_phase_resolver_ops axis2_phase_resolver_ops_t;
@@ -195,8 +200,8 @@
#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_SVC(phase_resolver, env, svc, module_desc) \
((phase_resolver->ops)->engage_module_to_svc (phase_resolver, env, svc, module_desc))
-#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OPERATION(phase_resolver, env, axis_operation) \
- ((phase_resolver->ops)->engage_module_to_operation (phase_resolver, env, axis_operation))
+#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OPERATION(phase_resolver, env, axis_operation, module_desc) \
+ ((phase_resolver->ops)->engage_module_to_operation (phase_resolver, env, axis_operation, module_desc))
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Sun Dec 11 19:16:03 2005
@@ -36,6 +36,8 @@
#include <axis2_module_desc.h>
#include <axis2_engine_config.h>
#include <axis2_wsdl_soap_operation.h>
+#include <axis2_string.h>
+#include <axis2_wsdl_endpoint.h>
#ifdef __cplusplus
extern "C"
@@ -47,6 +49,7 @@
* @{
*/
+struct axis2_wsdl_endpoint;
struct axis2_svc_grp;
struct axis2_operation;
struct axis2_flow_container;
@@ -123,7 +126,7 @@
axis2_bool_t (AXIS2_CALL *
is_param_locked) (axis2_svc_t *svc,
axis2_env_t **env,
- const axis2_char_t *param_name);
+ axis2_char_t *param_name);
axis2_status_t (AXIS2_CALL *
set_svc_interface) (axis2_svc_t *svc,
@@ -391,7 +394,15 @@
axis2_env_t **env,
axis2_char_t * mapping_key ,
struct axis2_operation * axis2_operation);
-
+
+ axis2_status_t (AXIS2_CALL *
+ add_module_ref) (axis2_svc_t *svc,
+ axis2_env_t **env,
+ axis2_qname_t *moduleref);
+
+ axis2_array_list_t *(AXIS2_CALL *
+ get_modules) (axis2_svc_t *svc,
+ axis2_env_t **env);
};
/**
@@ -564,6 +575,11 @@
#define AXIS2_SVC_ADD_MAPPING(svc, env, mapping_key, axis2_opt) \
(svc->ops->add_mapping(svc, env, mapping_key, axis2_opt))
+#define AXIS2_SVC_ADD_MODULE_REF(svc, env, moduleref) \
+ (svc->ops->add_module_ref(svc, env, moduleref))
+
+#define AXIS2_SVC_GET_MODULES(svc, env) \
+ (svc->ops->get_modules(svc, env))
/**************************** End of function macros **************************/
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_binding.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_binding.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_binding.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_binding.h Sun Dec 11 19:16:03 2005
@@ -39,7 +39,9 @@
#endif
struct axis2_wsdl_interface;
-struct axis2_wsdl_binding_operation;
+struct axis2_wsdl_binding_operation;
+struct axis2_wsdl_binding_fault;
+struct axis2_wsdl_extensible_component;
typedef struct axis2_wsdl_binding axis2_wsdl_binding_t;
typedef struct axis2_wsdl_binding_ops axis2_wsdl_binding_ops_t;
@@ -176,7 +178,7 @@
axis2_status_t (AXIS2_CALL *
add_binding_fault) (axis2_wsdl_binding_t *binding,
axis2_env_t **env,
- axis2_wsdl_binding_fault_t *binding_fault);
+ struct axis2_wsdl_binding_fault *binding_fault);
/**
* Method getBindingFault
@@ -184,7 +186,7 @@
* @param ref
* @return WSDLBindingFault
*/
- axis2_wsdl_binding_fault_t * (AXIS2_CALL *
+ struct axis2_wsdl_binding_fault * (AXIS2_CALL *
get_binding_fault) (axis2_wsdl_binding_t *binding,
axis2_env_t **env,
axis2_qname_t *ref);
@@ -197,7 +199,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_binding
{
axis2_wsdl_binding_ops_t *ops;
- axis2_wsdl_extensible_component_t *extensible_component;
+ struct axis2_wsdl_extensible_component *extensible_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_binding_fault.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_binding_fault.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_binding_fault.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_binding_fault.h Sun Dec 11 19:16:03 2005
@@ -35,6 +35,7 @@
{
#endif
+struct axis2_wsdl_extensible_component;
typedef struct axis2_wsdl_binding_fault axis2_wsdl_binding_fault_t;
typedef struct axis2_wsdl_binding_fault_ops axis2_wsdl_binding_fault_ops_t;
@@ -82,7 +83,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_binding_fault
{
axis2_wsdl_binding_fault_ops_t *ops;
- axis2_wsdl_extensible_component_t *extensible_component;
+ struct axis2_wsdl_extensible_component *extensible_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_binding_msg_ref.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_binding_msg_ref.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_binding_msg_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_binding_msg_ref.h Sun Dec 11 19:16:03 2005
@@ -35,6 +35,7 @@
{
#endif
+struct axis2_wsdl_extensible_component;
typedef struct axis2_wsdl_binding_msg_ref axis2_wsdl_binding_msg_ref_t;
typedef struct axis2_wsdl_binding_msg_ref_ops axis2_wsdl_binding_msg_ref_ops_t;
@@ -101,7 +102,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_binding_msg_ref
{
axis2_wsdl_binding_msg_ref_ops_t *ops;
- axis2_wsdl_extensible_component_t *extensible_component;
+ struct axis2_wsdl_extensible_component *extensible_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_binding_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_binding_operation.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_binding_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_binding_operation.h Sun Dec 11 19:16:03 2005
@@ -24,7 +24,9 @@
{
#endif
-struct axis2_wsdl_binding_msg_ref;
+struct axis2_wsdl_binding_msg_ref;
+struct axis2_wsdl_binding_fault;
+struct axis2_wsdl_extensible_component;
typedef struct axis2_wsdl_binding_operation_ops axis2_wsdl_binding_operation_ops_t;
typedef struct axis2_wsdl_binding_operation axis2_wsdl_binding_operation_t;
@@ -131,7 +133,7 @@
axis2_status_t (AXIS2_CALL *
add_infault) (axis2_wsdl_binding_operation_t *binding_operation,
axis2_env_t **env,
- axis2_wsdl_binding_fault_t *infault);
+ struct axis2_wsdl_binding_fault *infault);
/**
* Add the OutFault to the Component OutFaults
@@ -141,7 +143,7 @@
axis2_status_t (AXIS2_CALL *
add_outfault) (axis2_wsdl_binding_operation_t *binding_operation,
axis2_env_t **env,
- axis2_wsdl_binding_fault_t *outfault);
+ struct axis2_wsdl_binding_fault *outfault);
axis2_linked_list_t * (AXIS2_CALL *
get_infaults) (axis2_wsdl_binding_operation_t *binding_operation,
@@ -170,7 +172,7 @@
struct axis2_wsdl_binding_operation
{
axis2_wsdl_binding_operation_ops_t *ops;
- axis2_wsdl_extensible_component_t *extensible_component;
+ struct axis2_wsdl_extensible_component *extensible_component;
};
/** create Wsdl Binding Operation struct
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_component.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_component.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_component.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_component.h Sun Dec 11 19:16:03 2005
@@ -13,14 +13,21 @@
#include <axis2_string.h>
#include <axis2_hash.h>
#include <axis2_linked_list.h>
+#include <axis2_array_list.h>
#include <axis2_wsdl_extensible_element.h>
+#include <axis2_param_container.h>
+#include <axis2_description.h>
+#include <axis2_module_desc.h>
+
#ifdef __cplusplus
extern "C"
{
#endif
-struct axis2_wsdl_extensible_element;
+struct axis2_wsdl_extensible_element;
+struct axis2_param_container;
+struct axis2_module_desc;
typedef struct axis2_wsdl_component_ops axis2_wsdl_component_ops_t;
typedef struct axis2_wsdl_component axis2_wsdl_component_t;
@@ -38,26 +45,27 @@
/** Deallocate memory
* @return status code
*/
- axis2_status_t (AXIS2_CALL *free) (axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env);
+ axis2_status_t (AXIS2_CALL *
+ free) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
/**
* Sets the properties of the Component if any
* @param axis2_hash_t properties
* @return status code
*/
- axis2_status_t (AXIS2_CALL *set_component_properties)
- (axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env,
- axis2_hash_t *properties);
+ axis2_status_t (AXIS2_CALL *
+ set_component_properties) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ axis2_hash_t *properties);
/**
* Returns the properties that are specific to this WSDL Component
* @return axis2_hash_t component properties
*/
- axis2_hash_t *(AXIS2_CALL *get_component_properties)
- (axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env);
+ axis2_hash_t *(AXIS2_CALL *
+ get_component_properties) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
/**
* Will set the property keyed with the relavent key
@@ -65,42 +73,42 @@
* @param void value to be put
* @return status code
*/
- axis2_status_t (AXIS2_CALL *set_component_property) (
- axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env,
- const void *key,
- void *value);
+ axis2_status_t (AXIS2_CALL *
+ set_component_property) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ void *key,
+ void *value);
/**
* Gets the component property
* @param void key for the map search.
* @return void value for the key
*/
- void *(AXIS2_CALL *get_component_property)
- (axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env,
- const void *key);
+ void *(AXIS2_CALL *
+ get_component_property) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ void *key);
-/**
- * Adds the <code>Element</code> to this Component.
- *
- * @param element
- */
-axis2_status_t (AXIS2_CALL *
-add_extensibility_element) (axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env,
- void *element);
-
-/**
- * Returns the Extensibility Elements of this component;
- *
- * @return List of <code>Element</code> s
- */
-axis2_linked_list_t *(AXIS2_CALL *
-get_extensibility_elements) (axis2_wsdl_component_t *wsdl_component,
- axis2_env_t **env);
+ /**
+ * Adds the <code>Element</code> to this Component.
+ *
+ * @param element
+ */
+ axis2_status_t (AXIS2_CALL *
+ add_extensibility_element) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ void *element);
+
+ /**
+ * Returns the Extensibility Elements of this component;
+ *
+ * @return List of <code>Element</code> s
+ */
+ axis2_linked_list_t *(AXIS2_CALL *
+ get_extensibility_elements) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
};
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_endpoint.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_endpoint.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_endpoint.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_endpoint.h Sun Dec 11 19:16:03 2005
@@ -36,6 +36,7 @@
{
#endif
+struct axis2_wsdl_component;
struct axis2_wsdl_binding;
typedef struct axis2_wsdl_endpoint axis2_wsdl_endpoint_t;
typedef struct axis2_wsdl_endpoint_ops axis2_wsdl_endpoint_ops_t;
@@ -105,7 +106,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_endpoint
{
axis2_wsdl_endpoint_ops_t *ops;
- axis2_wsdl_component_t *wsdl_component;
+ struct axis2_wsdl_component *wsdl_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_extensible_component.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_extensible_component.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_extensible_component.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_extensible_component.h Sun Dec 11 19:16:03 2005
@@ -37,6 +37,9 @@
{
#endif
+struct axis2_wsdl_component;
+struct axis2_wsdl_feature;
+struct axis2_wsdl_property;
typedef struct axis2_wsdl_extensible_component axis2_wsdl_extensible_component_t;
typedef struct axis2_wsdl_extensible_component_ops axis2_wsdl_extensible_component_ops_t;
@@ -68,7 +71,7 @@
axis2_status_t (AXIS2_CALL *
add_feature) (axis2_wsdl_extensible_component_t *extensible_component,
axis2_env_t **env,
- axis2_wsdl_feature_t *wsdl_feature);
+ struct axis2_wsdl_feature *wsdl_feature);
/**
* Will return the <code>WSDLFeature</code>s. If there aren't
@@ -89,7 +92,7 @@
axis2_status_t (AXIS2_CALL *
add_property) (axis2_wsdl_extensible_component_t *extensible_component,
axis2_env_t **env,
- axis2_wsdl_property_t *wsdl_property);
+ struct axis2_wsdl_property *wsdl_property);
/**
* Returns the Component Properties. If none exist an empty list will be returned.
@@ -108,7 +111,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_extensible_component
{
axis2_wsdl_extensible_component_ops_t *ops;
- axis2_wsdl_component_t *wsdl_component;
+ struct axis2_wsdl_component *wsdl_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_fault_ref.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_fault_ref.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_fault_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_fault_ref.h Sun Dec 11 19:16:03 2005
@@ -35,6 +35,7 @@
{
#endif
+struct axis2_wsdl_component;
typedef struct axis2_wsdl_fault_ref axis2_wsdl_fault_ref_t;
typedef struct axis2_wsdl_fault_ref_ops axis2_wsdl_fault_ref_ops_t;
@@ -120,7 +121,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_fault_ref
{
axis2_wsdl_fault_ref_ops_t *ops;
- axis2_wsdl_component_t *wsdl_component;
+ struct axis2_wsdl_component *wsdl_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_feature.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_feature.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_feature.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_feature.h Sun Dec 11 19:16:03 2005
@@ -34,6 +34,7 @@
{
#endif
+struct axis2_wsdl_component;
typedef struct axis2_wsdl_feature axis2_wsdl_feature_t;
typedef struct axis2_wsdl_feature_ops axis2_wsdl_feature_ops_t;
@@ -51,8 +52,9 @@
/** De-allocate memory
* @return status code
*/
- axis2_status_t (AXIS2_CALL *free)(axis2_wsdl_feature_t *wsdl_feature,
- axis2_env_t **env);
+ axis2_status_t (AXIS2_CALL *
+ free)(axis2_wsdl_feature_t *wsdl_feature,
+ axis2_env_t **env);
/**
* Method getName
@@ -103,7 +105,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_feature
{
axis2_wsdl_feature_ops_t *ops;
- axis2_wsdl_component_t *wsdl_component;
+ struct axis2_wsdl_component *wsdl_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_interface.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_interface.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_interface.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_interface.h Sun Dec 11 19:16:03 2005
@@ -37,7 +37,7 @@
extern "C"
{
#endif
-
+
struct axis2_wsdl_operation;
struct axis2_operation;
struct axis2_wsdl_extensible_component;
@@ -49,6 +49,7 @@
* @{
*/
+
/**
* @brief Wsdl Interface operations struct
* Encapsulator struct for operations of axis2_wsdl_interface
@@ -165,7 +166,8 @@
axis2_status_t (AXIS2_CALL *
set_operation) (axis2_wsdl_interface_t *wsdl_interface,
axis2_env_t **env,
- void *operation);
+ void *operation,
+ axis2_operation_type_t opt_type);
/**
* @param list
@@ -216,6 +218,7 @@
{
axis2_wsdl_interface_ops_t *ops;
struct axis2_wsdl_extensible_component *extensible_component;
+ axis2_operation_type_t optr_type; /*0-wsdl_operation, 1-axis2_operation */
};
/**
@@ -262,8 +265,8 @@
#define AXIS2_WSDL_INTERFACE_SET_OPERATIONS(wsdl_interface, env, list) \
((wsdl_interface->ops)->set_operations (wsdl_interface, env, list))
-#define AXIS2_WSDL_INTERFACE_SET_OPERATION(wsdl_interface, env, operation) \
- ((wsdl_interface->ops)->set_operation (wsdl_interface, env, operation))
+#define AXIS2_WSDL_INTERFACE_SET_OPERATION(wsdl_interface, env, operation, optr_type) \
+ ((wsdl_interface->ops)->set_operation (wsdl_interface, env, operation, optr_type))
#define AXIS2_WSDL_INTERFACE_SET_SUPER_INTERFACES(wsdl_interface, env, list) \
((wsdl_interface->ops)->set_super_interfaces (wsdl_interface, env, list))
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_msg_ref.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_msg_ref.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_msg_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_msg_ref.h Sun Dec 11 19:16:03 2005
@@ -35,6 +35,7 @@
{
#endif
+struct axis2_wsdl_extensible_component;
typedef struct axis2_wsdl_msg_ref axis2_wsdl_msg_ref_t;
typedef struct axis2_wsdl_msg_ref_ops axis2_wsdl_msg_ref_ops_t;
@@ -121,7 +122,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_msg_ref
{
axis2_wsdl_msg_ref_ops_t *ops;
- axis2_wsdl_extensible_component_t *extensible_component;
+ struct axis2_wsdl_extensible_component *extensible_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_operation.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_operation.h Sun Dec 11 19:16:03 2005
@@ -41,7 +41,8 @@
extern "C"
{
#endif
-
+struct axis2_wsdl_extensible_component;
+struct axis2_wsdl_fault_ref;
typedef struct axis2_wsdl_operation_ops axis2_wsdl_operation_ops_t;
typedef struct axis2_wsdl_operation axis2_wsdl_operation_t;
@@ -68,7 +69,7 @@
axis2_status_t (AXIS2_CALL *
set_msg_exchange_pattern) (axis2_wsdl_operation_t *wsdl_operation,
axis2_env_t **env,
- const axis2_char_t *msg_exchange_pattern);
+ axis2_char_t *msg_exchange_pattern);
/**
* get the message exchange pattern
@@ -122,7 +123,7 @@
*/
axis2_linked_list_t * (AXIS2_CALL *
get_infaults) (axis2_wsdl_operation_t *wsdl_operation,
- axis2_env_t **env);
+ axis2_env_t **env);
/**
* Method setInfaults
@@ -131,15 +132,15 @@
*/
axis2_status_t (AXIS2_CALL *
set_infaults) (axis2_wsdl_operation_t *wsdl_operation,
- axis2_env_t **env,
- axis2_linked_list_t *infaults);
+ axis2_env_t **env,
+ axis2_linked_list_t *infaults);
/**
* Method getInputMessage
*
* @return
*/
- axis2_wsdl_msg_ref_t *(AXIS2_CALL *
+ struct axis2_wsdl_msg_ref *(AXIS2_CALL *
get_input_msg) (axis2_wsdl_operation_t *wsdl_operation,
axis2_env_t **env);
@@ -150,8 +151,8 @@
*/
axis2_status_t (AXIS2_CALL *
set_input_msg) (axis2_wsdl_operation_t *wsdl_operation,
- axis2_env_t **env,
- axis2_wsdl_msg_ref_t *input_msg);
+ axis2_env_t **env,
+ struct axis2_wsdl_msg_ref *input_msg);
/**
* Method getOutfaults
@@ -177,7 +178,7 @@
*
* @return
*/
- axis2_wsdl_msg_ref_t *(AXIS2_CALL *
+ struct axis2_wsdl_msg_ref *(AXIS2_CALL *
get_output_msg) (axis2_wsdl_operation_t *wsdl_operation,
axis2_env_t **env);
@@ -189,7 +190,7 @@
axis2_status_t (AXIS2_CALL *
set_output_msg) (axis2_wsdl_operation_t *wsdl_operation,
axis2_env_t **env,
- axis2_wsdl_msg_ref_t *output_msg);
+ struct axis2_wsdl_msg_ref *output_msg);
/**
* Method isSafe
@@ -227,7 +228,7 @@
axis2_status_t (AXIS2_CALL *
add_infault) (axis2_wsdl_operation_t *wsdl_operation,
axis2_env_t **env,
- axis2_wsdl_fault_ref_t *infault);
+ struct axis2_wsdl_fault_ref *infault);
/**
* Add the OutFault to the Component OutFaults
@@ -237,13 +238,13 @@
axis2_status_t (AXIS2_CALL *
add_outfault) (axis2_wsdl_operation_t *wsdl_operation,
axis2_env_t **env,
- axis2_wsdl_fault_ref_t *outfault);
+ struct axis2_wsdl_fault_ref *outfault);
};
struct axis2_wsdl_operation
{
axis2_wsdl_operation_ops_t *ops;
- axis2_wsdl_extensible_component_t *extensible_component;
+ struct axis2_wsdl_extensible_component *extensible_component;
};
AXIS2_DECLARE(axis2_wsdl_operation_t *) axis2_wsdl_operation_create (
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_property.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_property.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_property.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_property.h Sun Dec 11 19:16:03 2005
@@ -34,6 +34,7 @@
{
#endif
+struct axis2_wsdl_component;
typedef struct axis2_wsdl_property axis2_wsdl_property_t;
typedef struct axis2_wsdl_property_ops axis2_wsdl_property_ops_t;
@@ -123,7 +124,7 @@
AXIS2_DECLARE_DATA struct axis2_wsdl_property
{
axis2_wsdl_property_ops_t *ops;
- axis2_wsdl_component_t *wsdl_component;
+ struct axis2_wsdl_component *wsdl_component;
};
/**
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_svc.h?rev=356126&r1=356125&r2=356126&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_svc.h Sun Dec 11 19:16:03 2005
@@ -45,7 +45,8 @@
*/
struct axis2_wsdl_endpoint;
-struct axis2_wsdl_interface;
+struct axis2_wsdl_interface;
+struct axis2_wsdl_component;
typedef struct axis2_wsdl_svc_ops axis2_wsdl_svc_ops_t;
typedef struct axis2_wsdl_svc axis2_wsdl_svc_t;
@@ -157,7 +158,7 @@
struct axis2_wsdl_svc
{
axis2_wsdl_svc_ops_t *ops;
- axis2_wsdl_component_t * wsdl_component;
+ struct axis2_wsdl_component *wsdl_component;
};
/** create Wsdl Service struct