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/11/04 07:05:42 UTC
svn commit: r330721 - in /webservices/axis2/trunk/c: ides/anjuta/ include/
modules/core/description/src/ modules/util/src/
Author: damitha
Date: Thu Nov 3 22:05:02 2005
New Revision: 330721
URL: http://svn.apache.org/viewcvs?rev=330721&view=rev
Log:
More name changes. changes to axis2_parameter_container and axis2_parameter
Added:
webservices/axis2/trunk/c/modules/util/src/allocator.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c
webservices/axis2/trunk/c/modules/util/src/environment.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
webservices/axis2/trunk/c/modules/util/src/error.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_error.c
webservices/axis2/trunk/c/modules/util/src/file_diff.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c
webservices/axis2/trunk/c/modules/util/src/hash.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_hash.c
webservices/axis2/trunk/c/modules/util/src/log.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_log.c
webservices/axis2/trunk/c/modules/util/src/qname.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
webservices/axis2/trunk/c/modules/util/src/stream.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
webservices/axis2/trunk/c/modules/util/src/string.c
- copied unchanged from r330715, webservices/axis2/trunk/c/modules/util/src/axis2_string.c
Removed:
webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c
webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
webservices/axis2/trunk/c/modules/util/src/axis2_error.c
webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c
webservices/axis2/trunk/c/modules/util/src/axis2_hash.c
webservices/axis2/trunk/c/modules/util/src/axis2_log.c
webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
webservices/axis2/trunk/c/modules/util/src/axis2_string.c
Modified:
webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
webservices/axis2/trunk/c/include/axis2_core.h
webservices/axis2/trunk/c/include/axis2_engine_configuration.h
webservices/axis2/trunk/c/include/axis2_message_receiver.h
webservices/axis2/trunk/c/include/axis2_operation.h
webservices/axis2/trunk/c/include/axis2_parameter.h
webservices/axis2/trunk/c/include/axis2_parameter_container.h
webservices/axis2/trunk/c/include/axis2_service.h
webservices/axis2/trunk/c/include/axis2_service_group.h
webservices/axis2/trunk/c/modules/core/description/src/parameter.c
webservices/axis2/trunk/c/modules/core/description/src/parameter_container.c
webservices/axis2/trunk/c/modules/util/src/Makefile.am
webservices/axis2/trunk/c/modules/util/src/Makefile.in
Modified: webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/ides/anjuta/axis2c.prj?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/anjuta/axis2c.prj (original)
+++ webservices/axis2/trunk/c/ides/anjuta/axis2c.prj Thu Nov 3 22:05:02 2005
@@ -59,7 +59,7 @@
preferences.indent.opening=0
preferences.autoformat.disable=1
preferences.indent.automatic=1
-preferences.use.tabs=0
+preferences.use.tabs=1
preferences.indent.size=4
preferences.tabsize=4
preferences.indent.closing=0
@@ -122,9 +122,7 @@
include/axis2_parameter_container.h\
include/axis2_service.h\
include/axis2_service_group.h\
- include/axis2_wsdl_component.h\
- include/axis2_handler_desc.h\
- include/axis2_phase_rule.h
+ include/axis2_wsdl_component.h
module.source.name=.
module.source.type=
@@ -145,13 +143,6 @@
modules/xml/om/src/axis2_om_text.c\
modules/xml/om/src/axis2_om_stax_builder.c\
modules/xml/om/src/axis2_om_node.c\
- modules/util/src/axis2_allocator.c\
- modules/util/src/axis2_environment.c\
- modules/util/src/axis2_error.c\
- modules/util/src/axis2_hash.c\
- modules/util/src/axis2_log.c\
- modules/util/src/axis2_stream.c\
- modules/util/src/axis2_string.c\
modules/util/test/main.c\
modules/util/test/util_error_test.c\
modules/util/test/util_hash_test.c\
@@ -163,8 +154,6 @@
modules/test/common/test_common.c\
modules/test/om/src/test_om.c\
modules/xml/om/src/axis2_om_output.c\
- modules/util/src/axis2_qname.c\
- modules/util/src/axis2_file_diff.c\
modules/core/context/src/context_message.c\
modules/core/description/src/module.c\
modules/core/description/src/operation.c\
@@ -178,7 +167,15 @@
modules/wsdl/src/wsdl_component.c\
modules/wsdl/src/wsdl_operation.c\
modules/wsdl/src/wsdl_service.c\
- modules/core/description/src/phase_rule.c
+ modules/util/src/allocator.c\
+ modules/util/src/environment.c\
+ modules/util/src/error.c\
+ modules/util/src/file_diff.c\
+ modules/util/src/hash.c\
+ modules/util/src/log.c\
+ modules/util/src/qname.c\
+ modules/util/src/stream.c\
+ modules/util/src/string.c
module.pixmap.name=.
module.pixmap.type=
Modified: webservices/axis2/trunk/c/include/axis2_core.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_core.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_core.h (original)
+++ webservices/axis2/trunk/c/include/axis2_core.h Thu Nov 3 22:05:02 2005
@@ -63,29 +63,27 @@
#define SERVICE_NAME_SPLIT_CHAR ":"
/** @cond */
-struct axis2_description_param_ops_s;
-struct axis2_description_param_s;
+struct axis2_param_ops_s;
+struct axis2_param_s;
/** @endcond */
-typedef struct axis2_description_param_ops_s axis2_description_param_ops_t;
-typedef struct axis2_description_param_s axis2_description_param_t;
+typedef struct axis2_param_ops_s axis2_param_ops_t;
+typedef struct axis2_param_s axis2_param_t;
/** @cond */
-struct axis2_description_param_include_ops_s;
-struct axis2_description_param_include_s;
+struct axis2_param_container_ops_s;
+struct axis2_param_container_s;
/** @endcond */
-typedef struct axis2_description_param_include_ops_s
- axis2_description_param_include_ops_t;
-typedef struct axis2_description_param_include_s
- axis2_description_param_include_t;
+typedef struct axis2_param_container_ops_s axis2_param_container_ops_t;
+typedef struct axis2_param_container_s axis2_param_container_t;
/** @cond */
-struct axis2_description_operation_s;
+struct axis2_operation_s;
struct axis2_description_operation_ops_s;
/** @endcond */
-typedef struct axis2_description_operation_s axis2_description_operation_t;
+typedef struct axis2_operation_s axis2_description_operation_t;
typedef struct axis2_description_operation_ops_s
axis2_description_operation_ops_t;
Modified: webservices/axis2/trunk/c/include/axis2_engine_configuration.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine_configuration.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_configuration.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_configuration.h Thu Nov 3 22:05:02 2005
@@ -18,13 +18,13 @@
#define AXIS2_ENGINE_CONFIG_H
/**
- * @file axis2_engine_config.h
+ * @file axis2_engine_configuration.h
* @brief Global states of all the Axis can
* can be accessed here
*/
#include <axis2_core.h>
-#include <axis2_description_param_include.h>
+#include <axis2_parameter_container.h>
#include <axis2_description_servicegroup.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_message_receiver.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_message_receiver.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_message_receiver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_message_receiver.h Thu Nov 3 22:05:02 2005
@@ -19,7 +19,7 @@
/**
- * @file axis2_engine_msg_receiver.h
+ * @file axis2_message_receiver.h
* @brief axis2 ENGINE CORE msg_receiver
*/
Modified: webservices/axis2/trunk/c/include/axis2_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_operation.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_operation.h Thu Nov 3 22:05:02 2005
@@ -18,14 +18,14 @@
#define AXIS2_DESCRIPTION_OPERATION_H
/**
- * @file axis2_description_operation.h
+ * @file axis2_operation.h
* @brief axis2 DESCRIPTION CORE operation
*/
#include <axis2_core.h>
-#include <axis2_description_param_include.h>
-#include <axis2_description_service.h>
-#include <axis2_engine_msg_receiver.h>
+#include <axis2_parameter_container.h>
+#include <axis2_service.h>
+#include <axis2_message_receiver.h>
#ifdef __cplusplus
extern "C"
@@ -67,7 +67,7 @@
, param_name) (axis2_description_operation_get_ops(operation_desc \
, env)->is_param_locked(operation_desc, env, param_name));
-#define axis2_description_operation_set_parent(operation_desc, env, \
+#define axis2_operation_set_parent(operation_desc, env, \
service_desc) (axis2_description_operation_get_ops(operation_desc \
, env)->set_parent (operation_desc, env, service_desc));
@@ -79,7 +79,7 @@
(axis2_description_operation_get_ops(operation_desc, env)->get_name \
(operation_desc, env));
-#define axis2_description_operation_set_msg_exchange_pattern(operation_desc \
+#define axis2_operation_set_msg_exchange_pattern(operation_desc \
, env, msg_exchange_pattern) \
(axis2_description_operation_get_ops(operation_desc \
, env)->set_msg_exchange_pattern (operation_desc \
@@ -89,7 +89,7 @@
(axis2_description_operation_get_ops(operation_desc \
, env)->get_msg_exchange_pattern (operation_desc, env));
-#define axis2_description_operation_set_msg_receiver(operation_desc \
+#define axis2_operation_set_msg_receiver(operation_desc \
, env, msg_receiver) (axis2_description_operation_get_ops(operation_desc \
, env)->set_msg_receiver (operation_desc, env, msg_receiver));
@@ -106,9 +106,9 @@
typedef axis2_status_t (*axis2_description_operation_add_param_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env
- , axis2_description_param_t *param);
+ , axis2_param_t *param);
-typedef axis2_description_param_t *(*axis2_description_operation_get_param_t)
+typedef axis2_param_t *(*axis2_description_operation_get_param_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *name);
@@ -120,7 +120,7 @@
, const axis2_char_t *param_name);
-typedef axis2_status_t (*axis2_description_operation_set_parent_t)
+typedef axis2_status_t (*axis2_operation_set_parent_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_service_t *service_desc);
@@ -130,14 +130,14 @@
typedef axis2_qname_t *(*axis2_description_operation_get_name_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env);
-typedef axis2_status_t (*axis2_description_operation_set_msg_exchange_pattern_t)
+typedef axis2_status_t (*axis2_operation_set_msg_exchange_pattern_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_char_t *pattern);
typedef axis2_char_t *(*axis2_description_operation_get_msg_exchange_pattern_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env);
-typedef axis2_status_t (*axis2_description_operation_set_msg_receiver_t)
+typedef axis2_status_t (*axis2_operation_set_msg_receiver_t)
(axis2_description_operation_t *operation_desc, axis2_env_t *env,
axis2_engine_msg_receiver_t *msg_receiver);
@@ -158,19 +158,19 @@
axis2_description_operation_is_param_locked_t is_param_locked;
- axis2_description_operation_set_parent_t set_parent;
+ axis2_operation_set_parent_t set_parent;
axis2_description_operation_get_parent_t get_parent;
axis2_description_operation_get_name_t get_name;
- axis2_description_operation_set_msg_exchange_pattern_t
+ axis2_operation_set_msg_exchange_pattern_t
set_msg_exchange_pattern;
axis2_description_operation_get_msg_exchange_pattern_t
get_msg_exchange_pattern;
- axis2_description_operation_set_msg_receiver_t set_msg_receiver;
+ axis2_operation_set_msg_receiver_t set_msg_receiver;
axis2_description_operation_get_msg_receiver_t get_msg_receiver;
};
Modified: webservices/axis2/trunk/c/include/axis2_parameter.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_parameter.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_parameter.h (original)
+++ webservices/axis2/trunk/c/include/axis2_parameter.h Thu Nov 3 22:05:02 2005
@@ -25,15 +25,13 @@
#include <axis2_defines.h>
#include <axis2_environment.h>
#include <axis2_om_node.h>
+#include <axis2_core.h>
#ifdef __cplusplus
extern "C"
{
#endif
- struct axis2_parameter;
- struct axis2_parameter_ops;
-
/**
* @defgroup axis2_parameter Handlers
* @ingroup axis2_core_description
@@ -54,90 +52,139 @@
/**
* \brief parameter operations struct
*/
-AXIS2_DECLARE_DATA typedef struct axis2_parameter_ops
+AXIS2_DECLARE_DATA struct axis2_param_ops_s
{
/**
* Parameter name accessor
* @return name of the parameter
*/
- axis2_char_t* (AXIS2_CALL *get_name)(struct axis2_parameter *parameter, axis2_env_t **env);
+ axis2_char_t* (AXIS2_CALL *get_name)(axis2_param_t *parameter,
+ axis2_env_t **env);
/**
* Parameter value accessor
* @return Object
*/
- void* (AXIS2_CALL *get_value)(struct axis2_parameter *parameter, axis2_env_t **env);
+ void* (AXIS2_CALL *get_value)(axis2_param_t *parameter,
+ axis2_env_t **env);
/**
* parameter name mutator
* @param name
*/
- axis2_status_t (AXIS2_CALL *set_name)(struct axis2_parameter *parameter, axis2_env_t **env, axis2_char_t *name);
+ axis2_status_t (AXIS2_CALL *set_name)(axis2_param_t *parameter,
+ axis2_env_t **env,
+ axis2_char_t *name);
/**
* Method setValue
*
* @param value
*/
- axis2_status_t (AXIS2_CALL *set_value)(struct axis2_parameter *parameter, axis2_env_t **env, void *value);
+ axis2_status_t (AXIS2_CALL *set_value)(axis2_param_t *parameter,
+ axis2_env_t **env,
+ void *value);
/**
* Method isLocked
*
* @return boolean
*/
- axis2_bool_t (AXIS2_CALL *is_locked)(struct axis2_parameter *parameter, axis2_env_t **env);
+ axis2_bool_t (AXIS2_CALL *is_locked)(axis2_param_t *parameter,
+ axis2_env_t **env);
/**
* Method setLocked
*
* @param value
*/
- axis2_status_t (AXIS2_CALL *set_locked)(struct axis2_parameter *parameter, axis2_env_t **env, axis2_bool_t value);
+ axis2_status_t (AXIS2_CALL *set_locked)(axis2_param_t *parameter,
+ axis2_env_t **env,
+ axis2_bool_t value);
/**
* Method getParameterType
*
* @return int
*/
- int (AXIS2_CALL *get_parameter_type)(struct axis2_parameter *parameter, axis2_env_t **env);
+ int (AXIS2_CALL *get_parameter_type)(axis2_param_t *parameter,
+ axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *set_parameter_type)(struct axis2_parameter *parameter, axis2_env_t **env, int type);
+ axis2_status_t (AXIS2_CALL *set_parameter_type)(axis2_param_t *parameter,
+ axis2_env_t **env,
+ int type);
/**
- * Paramter can be any thing it can be XML element with number of child elements , so if some
- * one wants to access the XML elemet we need to store that , at the deployment time , to store
- * the XMLelment of the parameter can use this method it will store whole
- * <parameter name="ServiceClass1" locked="false">org.apache.axis2.sample.echo.EchoImpl</parameter>
- * element
+ * Paramter can be any thing it can be XML element with number of child
+ * elements , so if someone wants to access the XML elemet we need to store
+ * that , at the deployment time , to store the XMLelment of the parameter
+ * can use this method it will store whole
+ * <parameter name="ServiceClass1" locked="false">org.apache.axis2.sample.
+ * echo.EchoImpl</parameter> element
* @param element <code>OMElement<code>
*/
- axis2_status_t (AXIS2_CALL *set_parameter_element)(struct axis2_parameter *parameter, axis2_env_t **env, axis2_om_node_t *element);
+ axis2_status_t (AXIS2_CALL *set_parameter_element)(axis2_param_t *parameter,
+ axis2_env_t **env,
+ axis2_om_node_t *element);
/**
* To get the whole paramter element
* @return <code>OMElement<code>
*/
- axis2_om_node_t* (AXIS2_CALL *get_parameter_element)(struct axis2_parameter *parameter, axis2_env_t **env);
+ axis2_om_node_t* (AXIS2_CALL *get_parameter_element)
+ (axis2_param_t *parameter,
+ axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *free)(struct axis2_parameter *parameter, axis2_env_t **env);
-} axis2_parameter_ops_t;
+ axis2_status_t (AXIS2_CALL *free)(axis2_param_t *parameter,
+ axis2_env_t **env);
+};
/**
* \brief Parameter struct
*/
- typedef struct axis2_parameter
- {
- /** Parameter related operations */
- axis2_parameter_ops_t *ops;
- } axis2_parameter_t;
+struct axis2_param_s
+{
+ /** Parameter related operations */
+ axis2_param_ops_t *ops;
+};
/**
* creates parameter struct
*/
-AXIS2_DECLARE(axis2_parameter_t*) axis2_parameter_create(axis2_env_t **env, axis2_char_t *name, void *value);
+AXIS2_DECLARE(axis2_param_t*)
+axis2_parameter_create(axis2_env_t **env,
+ axis2_char_t *name,
+ void *value);
+
+#define AXIS2_PARAMETER_FREE(param, env) \
+ ((param->ops)->free (param, env))
+
+#define AXIS2_PARAMETER_SET_NAME(param, env, name) \
+ ((param->ops)->set_name (param, env, name))
+
+#define AXIS2_PARAMETER_GET_NAME(param, env) \
+ ((param->ops)->get_name (param, env))
+
+#define AXIS2_PARAMETER_SET_VALUE(param, env, value) \
+ (((param->ops)->set_value (param , env, value))
+
+#define AXIS2_PARAMETER_GET_VALUE(param, env) \
+ ((param->ops)->get_value (param, env))
+
+#define AXIS2_PARAMETER_IS_LOCKED(param, env) \
+ ((param->ops)->is_locked (param, env))
+
+#define AXIS2_PARAMETER_SET_LOCKED(param, env, locked) \
+ ((param->ops)->set_locked (param, env, locked))
+
+#define AXIS2_PARAMETER_SET_ELEMENT(param, env, element) \
+ (((param->ops)->set_parameter_element (param , env, element))
+
+#define AXIS2_PARAMETER_GET_ELEMENT(param, env) \
+ ((param->ops)->get_parameter_element (param, env))
+
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_parameter_container.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_parameter_container.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_parameter_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2_parameter_container.h Thu Nov 3 22:05:02 2005
@@ -18,7 +18,7 @@
#define AXIS2_DESCRIPTION_PARAM_INCLUDE_H
/**
- * @file axis2_description_param_include.h
+ * @file axis2_parameter_container.h
* @brief Parameter handling
*/
@@ -32,7 +32,7 @@
/*#include <axis2_om_element.h>*/
#include <axis2_qname.h>
-#include <axis2_description_parameter.h>
+#include <axis2_parameter.h>
#ifdef __cplusplus
extern "C"
@@ -52,103 +52,93 @@
* @{
*/
-/*************************** Function macros **********************************/
-
-#define axis2_description_param_include_free(param_include, env) \
- (axis2_description_param_include_get_ops(param_include, env)->free (env, \
- param_include))
-
-#define axis2_description_param_include_add_param(param_include, env, \
- param) (axis2_description_param_include_get_ops(param_include, \
- env)->add_param (param_include, env, param))
-
-#define axis2_description_param_include_get_param(param_include, env) \
- (axis2_description_param_include_get_ops(param_include, \
- env)->get_param (param_include, env))
-
-#define axis2_description_param_include_get_params(param_include, env) \
- (axis2_description_param_include_get_ops(param_include, \
- env)->get_params (param_include, env))
-
-#define axis2_description_param_include_is_param_locked(param_include, env, \
- param_name) (axis2_description_param_include_get_ops(param_include, \
- env)->is_param_locked (param_include, env, param_name))
-
-/*************************** End of function macros ***************************/
-
-/***************************** Function pointers ******************************/
-
-/** Deallocate memory
- * @return status code
- */
-typedef axis2_status_t (*axis2_description_param_include_free_t)
- (axis2_env_t * env,
- axis2_description_param_include_t * param_include);
-
-/** Add a parameter
- * @param parameters
- * @return status code
- */
-typedef axis2_status_t (*axis2_description_param_include_add_param_t)
- (axis2_description_param_include_t *param_include, axis2_env_t *env,
- const axis2_description_param_t * param);
-
-/** To get a parameter in a given description
- * @param parameter name
- * @return parameter
- */
-typedef axis2_description_param_t
- *(*axis2_description_param_include_get_param_t)
- (axis2_description_param_include_t *param_include, axis2_env_t *env,
- const axis2_char_t *name);
-
-/** To get all the parameters in a given description
- * @return all the parameters contained
- */
-typedef axis2_hash_t *(*axis2_description_param_include_get_params_t)
- (axis2_description_param_include_t *param_include, axis2_env_t *env);
-
-/** To check whether the paramter is locked at any level
- * @param parameter name
- * @return whether parameter is locked
- */
-typedef axis2_bool_t (*axis2_description_param_include_is_param_locked_t)
- (axis2_description_param_include_t *param_include, axis2_env_t *env,
- const axis2_char_t *param_name);
-
-/****************************** End of function pointers **********************/
/**
* Paramter can be any thing it can be XML element with number of child
* elements
*/
-struct axis2_description_param_include_ops_s
+struct axis2_param_container_ops_s
{
- axis2_description_param_include_free_t free;
+ /** Deallocate memory
+ * @return status code
+ */
+ axis2_status_t (AXIS2_CALL *free)(axis2_param_container_t *param_container,
+ axis2_env_t **env);
+
+ /** Add a parameter
+ * @param parameters
+ * @return status code
+ */
+ axis2_status_t (AXIS2_CALL *add_param)
+ (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ axis2_param_t *param);
+
+ /** To get a parameter in a given description
+ * @param parameter name
+ * @return parameter
+ */
+ axis2_param_t *(AXIS2_CALL *get_param)
+ (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ const axis2_char_t *name);
+
+
+ /** To get all the parameters in a given description
+ * @return all the parameters contained
+ */
+ axis2_hash_t *(AXIS2_CALL *get_params)
+ (axis2_param_container_t *param_container,
+ axis2_env_t **env);
+
+ /** To check whether the paramter is locked at any level
+ * @param parameter name
+ * @return whether parameter is locked
+ */
+ axis2_bool_t (AXIS2_CALL *is_param_locked)
+ (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ const axis2_char_t *param_name) ;
- axis2_description_param_include_add_param_t add_param;
+};
- axis2_description_param_include_get_param_t get_param;
+/** @struct axis2_description_param_include
+ * @brief DESCRIPTION param_include struct
+ * Holder for parameters
+ *
+*/
+struct axis2_param_container_s
+{
+ axis2_param_container_ops_t *ops;
+};
- axis2_description_param_include_get_params_t get_params;
+/**
+ * Create axis2_param_container_t
+ * @return axis2_param_container_t
+ */
+axis2_param_container_t
+*axis2_param_container_create (axis2_env_t **env);
- axis2_description_param_include_is_param_locked_t is_param_locked;
+/*************************** Function macros **********************************/
-};
+#define AXIS2_PARAMETER_CONTAINER_FREE(param_container, env) \
+ ((param_container->ops)->free (env, param_container))
-/** This will return the operations struct of the
- * axis2_description_param_include_t struct
- * @return operations for axis2_description_param_include_t
- */
-axis2_description_param_include_ops_t *axis2_description_param_include_get_ops
- (axis2_description_param_include_t *param_include, axis2_env_t *env);
+#define AXIS2_PARAMETER_CONTAINER_ADD_PARAMETER(param_container, env, param) \
+ ((param_container->ops)->add_param (param_container, env, param))
-/**
- * Create axis2_description_param_include_t
- * @return axis2_description_param_include_t
- */
-axis2_description_param_include_t *axis2_description_param_include_create
- (axis2_env_t * env);
+#define AXIS2_PARAMETER_CONTAINER_GET_PARAMETER(param_container, env) \
+ ((param_container->ops)->get_param (param_container, env))
+
+#define AXIS2_PARAMETER_CONTAINER_GET_PARAMETERS(param_container, env) \
+ ((param_container->ops)->get_params (param_container, env))
+
+#define AXIS2_PARAMETER_CONTAINER_IS_PARAMETER_LOCKED(param_container, env, \
+ param_name) \
+ ((param_container->ops)->is_param_locked (param_container, env, \
+ param_name))
+
+/*************************** End of function macros ***************************/
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_service.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_service.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_service.h Thu Nov 3 22:05:02 2005
@@ -18,13 +18,13 @@
#define AXIS2_DESCRIPTION_SERVICE_H
/**
- * @file axis2_description_service.h
+ * @file axis2_service.h
* @brief axis2 DESCRIPTION CORE service
*/
#include <axis2_core.h>
-#include <axis2_description_param_include.h>
-#include <axis2_description_operation.h>
+#include <axis2_parameter_container.h>
+#include <axis2_operation.h>
#include <axis2_description_servicegroup.h>
#include <axis2_qname.h>
@@ -138,9 +138,9 @@
typedef axis2_status_t (*axis2_description_service_add_param_t)
(axis2_description_service_t *srv_desc, axis2_env_t *env
- , axis2_description_param_t *param);
+ , axis2_param_t *param);
-typedef axis2_description_param_t *(*axis2_description_service_get_param_t)
+typedef axis2_param_t *(*axis2_description_service_get_param_t)
(axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *name);
Modified: webservices/axis2/trunk/c/include/axis2_service_group.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_service_group.h?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_service_group.h (original)
+++ webservices/axis2/trunk/c/include/axis2_service_group.h Thu Nov 3 22:05:02 2005
@@ -23,8 +23,8 @@
*/
#include <axis2_core.h>
-#include <axis2_description_param_include.h>
-#include <axis2_description_service.h>
+#include <axis2_parameter_container.h>
+#include <axis2_service.h>
#ifdef __cplusplus
extern "C"
@@ -135,10 +135,10 @@
typedef axis2_status_t (*axis2_description_servicegroup_add_param_t)
(axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
- , axis2_description_param_t *param);
+ , axis2_param_t *param);
-typedef axis2_description_param_t *(*axis2_description_servicegroup_get_param_t)(
+typedef axis2_param_t *(*axis2_description_servicegroup_get_param_t)(
axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_char_t *name);
Modified: webservices/axis2/trunk/c/modules/core/description/src/parameter.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/parameter.c?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/parameter.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/parameter.c Thu Nov 3 22:05:02 2005
@@ -17,10 +17,10 @@
#include <axis2_parameter.h>
#include <axis2.h>
-typedef struct axis2_parameter_impl
+typedef struct axis2_param_impl_s
{
/** Parameter struct */
- axis2_parameter_t parameter;
+ axis2_param_t parameter;
/** Parameter name */
axis2_char_t *name;
/** Parameter value */
@@ -35,29 +35,66 @@
* org.apache.axis2.sample.echo.EchoImpl</parameter>
*/
axis2_om_node_t *parameter_element ;
-} axis2_parameter_impl_t;
+} axis2_param_impl_t;
-#define AXIS2_INTF_TO_IMPL(parameter) ((axis2_parameter_impl_t *)parameter)
+#define AXIS2_INTF_TO_IMPL(parameter) ((axis2_param_impl_t *)parameter)
-axis2_char_t* AXIS2_CALL axis2_parameter_get_name(struct axis2_parameter *parameter, axis2_env_t **env);
-void* AXIS2_CALL axis2_parameter_get_value(struct axis2_parameter *parameter, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_parameter_set_name(struct axis2_parameter *parameter, axis2_env_t **env, axis2_char_t *name);
-axis2_status_t AXIS2_CALL axis2_parameter_set_value(struct axis2_parameter *parameter, axis2_env_t **env, void *value);
-axis2_bool_t AXIS2_CALL axis2_parameter_is_locked(struct axis2_parameter *parameter, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_parameter_set_locked(struct axis2_parameter *parameter, axis2_env_t **env, axis2_bool_t value);
-int AXIS2_CALL axis2_parameter_get_parameter_type(struct axis2_parameter *parameter, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_parameter_set_parameter_type(struct axis2_parameter *parameter, axis2_env_t **env, int type);
-axis2_status_t AXIS2_CALL axis2_parameter_set_parameter_element(struct axis2_parameter *parameter, axis2_env_t **env, axis2_om_node_t *element);
-axis2_om_node_t* AXIS2_CALL axis2_parameter_get_parameter_element(struct axis2_parameter *parameter, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_parameter_free(struct axis2_parameter *parameter, axis2_env_t **env);
-
-axis2_parameter_t* AXIS2_CALL axis2_parameter_create(axis2_env_t **env, axis2_char_t *name, void *value)
+axis2_char_t* AXIS2_CALL
+axis2_parameter_get_name(axis2_param_t *parameter,
+ axis2_env_t **env);
+
+void* AXIS2_CALL
+axis2_parameter_get_value(axis2_param_t *parameter,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_parameter_set_name(axis2_param_t *parameter,
+ axis2_env_t **env,
+ axis2_char_t *name);
+
+axis2_status_t AXIS2_CALL
+axis2_parameter_set_value(axis2_param_t *parameter,
+ axis2_env_t **env,
+ void *value);
+
+axis2_bool_t AXIS2_CALL
+axis2_parameter_is_locked(axis2_param_t *parameter,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_parameter_set_locked(axis2_param_t *parameter,
+ axis2_env_t **env,
+ axis2_bool_t value);
+
+int AXIS2_CALL
+axis2_parameter_get_parameter_type(axis2_param_t *parameter,
+ axis2_env_t **env);
+axis2_status_t AXIS2_CALL
+axis2_parameter_set_parameter_type(axis2_param_t *parameter,
+ axis2_env_t **env,
+ int type);
+
+axis2_status_t AXIS2_CALL
+axis2_parameter_set_parameter_element(axis2_param_t *parameter,
+ axis2_env_t **env,
+ axis2_om_node_t *element);
+
+axis2_om_node_t* AXIS2_CALL
+axis2_parameter_get_parameter_element(axis2_param_t *parameter,
+ axis2_env_t **env);
+axis2_status_t AXIS2_CALL
+axis2_parameter_free(axis2_param_t *parameter,
+ axis2_env_t **env);
+
+axis2_param_t* AXIS2_CALL
+axis2_parameter_create(axis2_env_t **env,
+ axis2_char_t *name, void *value)
{
- axis2_parameter_impl_t *parameter_impl = NULL;
+ axis2_param_impl_t *parameter_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- parameter_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_parameter_t) );
+ parameter_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_param_impl_t) );
if (!parameter_impl)
{
AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
@@ -78,30 +115,34 @@
parameter_impl->parameter.ops->set_value = axis2_parameter_set_value;
parameter_impl->parameter.ops->is_locked = axis2_parameter_is_locked;
parameter_impl->parameter.ops->set_locked = axis2_parameter_set_locked;
- parameter_impl->parameter.ops->get_parameter_type = axis2_parameter_get_parameter_type;
- parameter_impl->parameter.ops->set_parameter_type = axis2_parameter_set_parameter_type;
- parameter_impl->parameter.ops->set_parameter_element = axis2_parameter_set_parameter_element;
- parameter_impl->parameter.ops->get_parameter_element = axis2_parameter_get_parameter_element;
+ parameter_impl->parameter.ops->get_parameter_type =
+ axis2_parameter_get_parameter_type;
+ parameter_impl->parameter.ops->set_parameter_type =
+ axis2_parameter_set_parameter_type;
+ parameter_impl->parameter.ops->set_parameter_element =
+ axis2_parameter_set_parameter_element;
+ parameter_impl->parameter.ops->get_parameter_element =
+ axis2_parameter_get_parameter_element;
parameter_impl->parameter.ops->free = axis2_parameter_free;
return &(parameter_impl->parameter);
}
-axis2_char_t* AXIS2_CALL axis2_parameter_get_name(struct axis2_parameter *parameter, axis2_env_t **env)
+axis2_char_t* AXIS2_CALL axis2_parameter_get_name(axis2_param_t *parameter, axis2_env_t **env)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, NULL);
return AXIS2_INTF_TO_IMPL(parameter)->name;
}
-void* AXIS2_CALL axis2_parameter_get_value(struct axis2_parameter *parameter, axis2_env_t **env)
+void* AXIS2_CALL axis2_parameter_get_value(axis2_param_t *parameter, axis2_env_t **env)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, NULL);
return AXIS2_INTF_TO_IMPL(parameter)->value;
}
-axis2_status_t AXIS2_CALL axis2_parameter_set_name(struct axis2_parameter *parameter, axis2_env_t **env, axis2_char_t *name)
+axis2_status_t AXIS2_CALL axis2_parameter_set_name(axis2_param_t *parameter, axis2_env_t **env, axis2_char_t *name)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
@@ -109,7 +150,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_parameter_set_value(struct axis2_parameter *parameter, axis2_env_t **env, void *value)
+axis2_status_t AXIS2_CALL axis2_parameter_set_value(axis2_param_t *parameter, axis2_env_t **env, void *value)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
@@ -117,14 +158,14 @@
return AXIS2_SUCCESS;
}
-axis2_bool_t AXIS2_CALL axis2_parameter_is_locked(struct axis2_parameter *parameter, axis2_env_t **env)
+axis2_bool_t AXIS2_CALL axis2_parameter_is_locked(axis2_param_t *parameter, axis2_env_t **env)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(parameter)->locked;
}
-axis2_status_t AXIS2_CALL axis2_parameter_set_locked(struct axis2_parameter *parameter, axis2_env_t **env, axis2_bool_t value)
+axis2_status_t AXIS2_CALL axis2_parameter_set_locked(axis2_param_t *parameter, axis2_env_t **env, axis2_bool_t value)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
@@ -132,14 +173,14 @@
return AXIS2_SUCCESS;
}
-int AXIS2_CALL axis2_parameter_get_parameter_type(struct axis2_parameter *parameter, axis2_env_t **env)
+int AXIS2_CALL axis2_parameter_get_parameter_type(axis2_param_t *parameter, axis2_env_t **env)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(parameter)->type;
}
-axis2_status_t AXIS2_CALL axis2_parameter_set_parameter_type(struct axis2_parameter *parameter, axis2_env_t **env, int type)
+axis2_status_t AXIS2_CALL axis2_parameter_set_parameter_type(axis2_param_t *parameter, axis2_env_t **env, int type)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
@@ -148,7 +189,7 @@
}
-axis2_status_t AXIS2_CALL axis2_parameter_set_parameter_element(struct axis2_parameter *parameter, axis2_env_t **env, axis2_om_node_t *element)
+axis2_status_t AXIS2_CALL axis2_parameter_set_parameter_element(axis2_param_t *parameter, axis2_env_t **env, axis2_om_node_t *element)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
@@ -157,17 +198,18 @@
}
-axis2_om_node_t* AXIS2_CALL axis2_parameter_get_parameter_element(struct axis2_parameter *parameter, axis2_env_t **env)
+axis2_om_node_t* AXIS2_CALL axis2_parameter_get_parameter_element(axis2_param_t *parameter, axis2_env_t **env)
{
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(parameter)->parameter_element;
}
-axis2_status_t AXIS2_CALL axis2_parameter_free(struct axis2_parameter *parameter, axis2_env_t **env)
+axis2_status_t AXIS2_CALL axis2_parameter_free(axis2_param_t *parameter, axis2_env_t **env)
{
- /* no need to free members here as we do not make deep copies in create */
AXIS2_FUNC_PARAMETER_CHECK(parameter, env, AXIS2_FAILURE);
+ if(NULL != parameter->ops)
+ AXIS2_FREE((*env)->allocator, parameter->ops);
AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(parameter));
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/parameter_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/parameter_container.c?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/parameter_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/parameter_container.c Thu Nov 3 22:05:02 2005
@@ -14,155 +14,176 @@
* limitations under the License.
*/
-#include <axis2_description_param_include.h>
+#include <axis2_parameter_container.h>
-/** @struct axis2_description_param_include
- * @brief DESCRIPTION param_include struct
- * Holder for parameters
+/** @struct axis2_param_container_impl
+ * @brief DESCRIPTION axis2_param_container_impl struct
+ * Container of parameters.
*
*/
-struct axis2_description_param_include_s
+typedef struct axis2_param_container_impl_s
{
- axis2_description_param_include_ops_t *ops;
+ axis2_param_container_t param_container;
axis2_hash_t *params;
axis2_bool_t is_locked;
-};
+} axis2_param_container_impl_t;
-/************************* Function prototypes ********************************/
+#define AXIS2_INTF_TO_IMPL(param_container) \
+ ((axis2_param_container_impl_t *)param_container)
-axis2_status_t axis2_description_param_include_ops_free
- (axis2_description_param_include_t *param_include);
+/************************* Function prototypes ********************************/
-axis2_status_t axis2_description_param_include_ops_add_param
- (axis2_description_param_include_t *param_include, axis2_env_t *env
- , const axis2_description_param_t *param);
+axis2_status_t AXIS2_CALL
+ axis2_parameter_container_free (axis2_param_container_t *param_container,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_param_container_add_parameter (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ axis2_param_t *param);
-axis2_description_param_t *axis2_description_param_include_ops_get_param
- (axis2_description_param_include_t *param_include, axis2_env_t *env
- , const axis2_char_t *name);
-
-axis2_hash_t *axis2_description_param_include_ops_get_params
- (axis2_description_param_include_t *param_include, axis2_env_t *env);
-
-axis2_status_t axis2_description_param_include_ops_is_param_locked
- (axis2_description_param_include_t *param_include, axis2_env_t *env
- , const axis2_char_t *param_name);
+axis2_param_t * AXIS2_CALL
+axis2_param_container_get_parameter (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ const axis2_char_t *name);
+
+axis2_hash_t * AXIS2_CALL
+axis2_param_container_get_parameters (axis2_param_container_t *param_container,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_param_container_is_parameter_locked (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ const axis2_char_t *param_name);
/************************** End of function prototypes ************************/
-axis2_description_param_include_ops_t *axis2_description_param_include_get_ops
- (axis2_description_param_include_t *param_include, axis2_env_t *env)
-{
- if(!param_include)
- {
- env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return NULL;
- }
- return param_include->ops;
-}
-
-axis2_description_param_include_t *axis2_description_param_include_create (
- axis2_env_t *env)
+axis2_param_container_t * AXIS2_CALL
+axis2_param_container_create (axis2_env_t **env)
{
- axis2_description_param_include_t *param_include =
- (axis2_description_param_include_t *)
- malloc(sizeof(axis2_description_param_include_t));
- if(!param_include)
+ AXIS2_ENV_CHECK(env, NULL);
+
+ axis2_param_container_impl_t *param_container_impl =
+ (axis2_param_container_impl_t *) AXIS2_MALLOC((*env)->allocator,
+ sizeof(axis2_param_container_impl_t));
+
+
+ if(NULL == param_container_impl)
{
- env->error->error_number = AXIS2_ERROR_NO_MEMORY;
+ AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
return NULL;
}
- axis2_description_param_include_ops_t *ops =
- malloc(sizeof(axis2_description_param_include_ops_t));
- if(!ops)
+
+ axis2_param_container_ops_t *ops =
+ AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_param_container_ops_t));
+ if(NULL == ops)
{
- env->error->error_number = AXIS2_ERROR_NO_MEMORY;
+ AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
return NULL;
}
- ops->free = (axis2_description_param_include_free_t)
- axis2_description_param_include_ops_free;
- ops->add_param = (axis2_description_param_include_add_param_t)
- axis2_description_param_include_ops_add_param;
- ops->get_param = (axis2_description_param_include_get_param_t)
- axis2_description_param_include_ops_get_param;
- ops->get_params = (axis2_description_param_include_get_params_t)
- axis2_description_param_include_ops_get_params;
- ops->is_param_locked = (axis2_description_param_include_is_param_locked_t)
- axis2_description_param_include_ops_is_param_locked;
- param_include->ops = ops;
+ ops->free = axis2_parameter_container_free;
+ ops->add_param = axis2_param_container_add_parameter;
+ ops->get_param = axis2_param_container_get_parameter;
+ ops->get_params = axis2_param_container_get_parameters;
+ ops->is_param_locked = axis2_param_container_is_parameter_locked;
+
+ param_container_impl->param_container.ops = ops;
- param_include->params = axis2_hash_make (env);
- if(!param_include->params)
+ param_container_impl->params = axis2_hash_make (env);
+
+ if(NULL == param_container_impl->params)
{
- env->error->error_number = AXIS2_ERROR_NO_MEMORY;
+ AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
return NULL;
}
- param_include->is_locked = AXIS2_FALSE;
- return param_include;
+ param_container_impl->is_locked = AXIS2_FALSE;
+ return &(param_container_impl->param_container);
}
/*************************** Start of operation impls *************************/
-axis2_status_t axis2_description_param_include_ops_free
- (axis2_description_param_include_t *param_include)
-{
- if(param_include)
- free(param_include);
- return AXIS2_SUCCESS;
+axis2_status_t AXIS2_CALL
+axis2_parameter_container_free (axis2_param_container_t *param_container,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAMETER_CHECK(param_container, env, AXIS2_FAILURE);
+ if(NULL != param_container->ops)
+ AXIS2_FREE((*env)->allocator, param_container->ops);
+
+ if(NULL != AXIS2_INTF_TO_IMPL(param_container)->params)
+ AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(param_container)->params);
+
+ AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(param_container));
+ return AXIS2_SUCCESS;
}
-axis2_status_t axis2_description_param_include_ops_add_param
- (axis2_description_param_include_t *param_include, axis2_env_t **env
- , const axis2_description_param_t *param)
+axis2_status_t AXIS2_CALL
+axis2_param_container_add_parameter (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ axis2_param_t *param)
{
- AXIS2_FUNC_PARAMETER_CHECK(param_include, env, NULL)
+ AXIS2_FUNC_PARAMETER_CHECK(param_container, env, AXIS2_FAILURE);
if(NULL == param)
{
+ AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error
+ , AXIS2_ERROR_INVALID_NULL_PARAMETER);
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- if (NULL == (param_include->params))
+ if (NULL == (AXIS2_INTF_TO_IMPL(param_container)->params))
{
- param_include->params = axis2_hash_make (*env);
+ AXIS2_INTF_TO_IMPL(param_container)->params = axis2_hash_make (env);
}
- axis2_hash_set (param_include->params
- , axis2_description_param_get_name(param, *env)
+ axis2_hash_set (AXIS2_INTF_TO_IMPL(param_container)->params
+ , AXIS2_PARAMETER_GET_NAME(param, env)
, AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
}
-axis2_description_param_t *axis2_description_param_include_ops_get_param
- (axis2_description_param_include_t *param_include, axis2_env_t *env
- , const axis2_char_t *name)
-{
- AXIS2_FUNC_PARAMETER_CHECK(param_include, env, NULL)
- return (axis2_description_param_t *)(axis2_hash_get
- (param_include->params, axis2_strdup(name)
- , AXIS2_HASH_KEY_STRING));
+axis2_param_t * AXIS2_CALL
+axis2_param_container_get_parameter (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ const axis2_char_t *name)
+{
+ AXIS2_FUNC_PARAMETER_CHECK(param_container, env, NULL);
+
+ return (axis2_param_t *)(axis2_hash_get (AXIS2_INTF_TO_IMPL(param_container)->
+ params, axis2_strdup(name), AXIS2_HASH_KEY_STRING));
}
-axis2_hash_t *axis2_description_param_include_ops_get_params
- (axis2_description_param_include_t *param_include, axis2_env_t *env)
+axis2_hash_t * AXIS2_CALL
+axis2_param_container_get_parameters (axis2_param_container_t *param_container,
+ axis2_env_t **env)
{
- if(!param_include)
- {
- env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return NULL;
- }
- return param_include->params;
+ AXIS2_FUNC_PARAMETER_CHECK(param_container, env, NULL);
+
+ return AXIS2_INTF_TO_IMPL(param_container)->params;
}
-axis2_status_t axis2_description_param_include_ops_is_param_locked
- (axis2_description_param_include_t *param_include, axis2_env_t *env
- , const axis2_char_t *param_name)
-{
- axis2_description_param_t *param = (axis2_description_param_t *)
- (axis2_hash_get (param_include->params
- , axis2_strdup(param_name)
- , AXIS2_HASH_KEY_STRING));
+axis2_status_t AXIS2_CALL
+axis2_param_container_is_parameter_locked (axis2_param_container_t *param_container,
+ axis2_env_t **env,
+ const axis2_char_t *param_name)
+{
+ AXIS2_FUNC_PARAMETER_CHECK(param_container, env, AXIS2_FAILURE);
- if(!param)
+ axis2_param_t *param = (axis2_param_t *)
+ (axis2_hash_get (AXIS2_INTF_TO_IMPL(param_container)->params
+ , axis2_strdup(param_name), AXIS2_HASH_KEY_STRING));
+
+ if(NULL == param)
+ {
+ AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error
+ , AXIS2_ERROR_INVALID_NULL_PARAMETER);
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return axis2_description_param_is_locked(param, env);
+ }
+
+ return AXIS2_PARAMETER_IS_LOCKED(param, env);
}
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.am?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.am Thu Nov 3 22:05:02 2005
@@ -1,14 +1,14 @@
lib_LTLIBRARIES = libaxis2_util.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_util_la_SOURCES = axis2_hash.c \
- axis2_allocator.c \
- axis2_environment.c \
- axis2_error.c \
- axis2_stream.c \
- axis2_log.c \
- axis2_string.c \
- axis2_file_diff.c \
- axis2_qname.c
+libaxis2_util_la_SOURCES = hash.c \
+ allocator.c \
+ environment.c \
+ error.c \
+ stream.c \
+ log.c \
+ string.c \
+ file_diff.c \
+ qname.c
libaxis2_util_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include \
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.in?rev=330721&r1=330720&r2=330721&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.in Thu Nov 3 22:05:02 2005
@@ -63,9 +63,8 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libaxis2_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libaxis2_util_la_OBJECTS = axis2_hash.lo axis2_allocator.lo \
- axis2_environment.lo axis2_error.lo axis2_stream.lo \
- axis2_log.lo axis2_string.lo axis2_file_diff.lo axis2_qname.lo
+am_libaxis2_util_la_OBJECTS = hash.lo allocator.lo environment.lo \
+ error.lo stream.lo log.lo string.lo file_diff.lo qname.lo
libaxis2_util_la_OBJECTS = $(am_libaxis2_util_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -193,15 +192,15 @@
target_vendor = @target_vendor@
lib_LTLIBRARIES = libaxis2_util.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_util_la_SOURCES = axis2_hash.c \
- axis2_allocator.c \
- axis2_environment.c \
- axis2_error.c \
- axis2_stream.c \
- axis2_log.c \
- axis2_string.c \
- axis2_file_diff.c \
- axis2_qname.c
+libaxis2_util_la_SOURCES = hash.c \
+ allocator.c \
+ environment.c \
+ error.c \
+ stream.c \
+ log.c \
+ string.c \
+ file_diff.c \
+ qname.c
libaxis2_util_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include \
@@ -276,15 +275,15 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_allocator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_environment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_file_diff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_qname.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_string.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_diff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qname.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \