You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/01/10 03:11:16 UTC
svn commit: r494687 [1/4] - in /webservices/axis2/trunk/c: include/
modules/core/context/ modules/core/engine/
Author: samisa
Date: Tue Jan 9 18:11:15 2007
New Revision: 494687
URL: http://svn.apache.org/viewvc?view=rev&rev=494687
Log:
Dropping ops from context. Also fixed formatting
Modified:
webservices/axis2/trunk/c/include/axis2_conf_ctx.h
webservices/axis2/trunk/c/include/axis2_ctx.h
webservices/axis2/trunk/c/include/axis2_msg_ctx.h
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
webservices/axis2/trunk/c/modules/core/context/ctx.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
Modified: webservices/axis2/trunk/c/include/axis2_conf_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf_ctx.h?view=diff&rev=494687&r1=494686&r2=494687
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf_ctx.h Tue Jan 9 18:11:15 2007
@@ -45,255 +45,11 @@
#endif
- /** Type name for struct axis2_conf_ctx_ops */
- typedef struct axis2_conf_ctx_ops axis2_conf_ctx_ops_t;
/** Type name for struct axis2_conf_ctx */
typedef struct axis2_conf_ctx axis2_conf_ctx_t;
struct axis2_conf;
/**
- * configuration context ops struct.
- * Encapsulator struct for ops of axis2_conf_ctx.
- */
- struct axis2_conf_ctx_ops
- {
- /**
- * Sets the configuration associated with the engine instance.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param conf pointer to configuration
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_conf)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- struct axis2_conf *conf);
- /**
- * Gets the base struct, which is of type context
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return pointer to context struct, returns a reference not a cloned
- * copy
- */
- axis2_ctx_t *(AXIS2_CALL *
- get_base)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * Gets the configuration of the engine.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return pointer to configuration struct, returns a reference not a
- * cloned copy
- */
- axis2_conf_t *(AXIS2_CALL *
- get_conf)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * Gets the hash map of operation context instances.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return pointer to hash map containing all operation contexts
- */
- axis2_hash_t *(AXIS2_CALL *
- get_op_ctx_map)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * Gets the hash map of service context instances.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return pointer to hash map containing all service contexts
- */
- axis2_hash_t *(AXIS2_CALL *
- get_svc_ctx_map)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * Gets the hash map of service group context instances.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return pointer to hash map containing all service group contexts
- */
- axis2_hash_t *(AXIS2_CALL *
- get_svc_grp_ctx_map)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * Registers an operation context with the given message ID.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param message_id message id related to the operation context
- * @param op_ctx pointer to operation context, conf context assumes
- * ownership of the operation context
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- register_op_ctx)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *message_id,
- axis2_op_ctx_t *op_ctx);
-
- /**
- * Gets operation context corresponding to the given message ID.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param message_id message ID related to the operation to be retrieved
- * @return pointer to operation context related to the given message ID
- */
- axis2_op_ctx_t *(AXIS2_CALL *
- get_op_ctx)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *message_id);
-
- /**
- * Registers a service context with the given service ID.
- * @param conf_ctx pointer t configuration context
- * @param env pointer to environment struct
- * @param svc_id ID of the service to be added
- * @param svc_ctx pointer to service context
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- register_svc_ctx)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *svc_id,
- axis2_svc_ctx_t *svc_ctx);
-
- /**
- * Gets service context with the given service ID
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param svc_id service ID
- * @return pointer to service context with the given service ID
- */
- struct axis2_svc_ctx *(AXIS2_CALL *
- get_svc_ctx)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *svc_id);
-
- /**
- * Registers a service group context with the given service group ID.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param svc_grp_id service group id
- * @param svc_grp_ctx pointer to service group context
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- register_svc_grp_ctx)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *svc_grp_id,
- axis2_svc_grp_ctx_t *svc_grp_ctx);
-
- /**
- * Gets service group with the given service group ID.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param svc_grp_id service group id
- * @return pointer to service group context with the given ID
- */
- axis2_svc_grp_ctx_t *(AXIS2_CALL *
- get_svc_grp_ctx)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *svc_grp_id);
-
- /**
- * Gets the root working directory. It is in this directory that the
- * axis2.xml configuration file is located. The services and modules
- * sub folders too are located in this directory.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return pointer to string containing the root folder name
- */
- const axis2_char_t *(AXIS2_CALL *
- get_root_dir)(
- const axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * Sets the root working directory. It is in this directory that the
- * axis2.xml configuration file is located. The services and modules
- * sub folders too are located in this directory.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param path string containing the path of root directory
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_root_dir)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- const axis2_char_t *path);
-
- /**
- * Initializes the configuration context. Within this function, it would
- * initialize all the service group context, service context and
- * operation context instances stored within configuration context.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param conf pointer to configuration struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- init)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- axis2_conf_t *conf);
-
- /**
- * Frees configuration context struct.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env);
-
- /**
- * This method fills the context hierarchy (service group, service and
- * operation contexts that is) for the service and operation found in
- * the given message context. If the context hierarchy is not already
- * built it will create the contexts and build the context hierarchy.
- * @param conf_ctx pointer to configuration context
- * @param env pointer to environment struct
- * @param msg_ctx pointer to message context with service and operation
- * for which the context hierarchy is to be built set
- * @return pointer to the service group context, which is the root of
- * the context hierarchy for given service and operation
- */
- axis2_svc_grp_ctx_t *(AXIS2_CALL *
- fill_ctxs)(
- axis2_conf_ctx_t *conf_ctx,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
- };
-
- /**
- * configuration context struct.
- */
- struct axis2_conf_ctx
- {
- /** operations configuration context struct */
- axis2_conf_ctx_ops_t *ops;
- };
-
- /**
* Creates a configuration context struct instance.
* @param env pointer to environment struct
* @param conf pointer to configuration, configuration context assumes
@@ -301,95 +57,287 @@
* @return pointer to newly created configuration context
*/
AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL
- axis2_conf_ctx_create(
- const axis2_env_t *env,
+ axis2_conf_ctx_create(const axis2_env_t *env,
struct axis2_conf *conf);
-/** Sets the configuration.
- @sa axis2_conf_ctx_ops#set_conf */
+ /**
+ * Sets the configuration associated with the engine instance.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param conf pointer to configuration
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_set_conf(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ struct axis2_conf *conf);
+ /**
+ * Gets the base struct, which is of type context
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return pointer to context struct, returns a reference not a cloned
+ * copy
+ */
+ AXIS2_EXTERN axis2_ctx_t * AXIS2_CALL
+ axis2_conf_ctx_get_base(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Gets the configuration of the engine.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return pointer to configuration struct, returns a reference not a
+ * cloned copy
+ */
+ AXIS2_EXTERN axis2_conf_t * AXIS2_CALL
+ axis2_conf_ctx_get_conf(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Gets the hash map of operation context instances.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return pointer to hash map containing all operation contexts
+ */
+ AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+ axis2_conf_ctx_get_op_ctx_map(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Gets the hash map of service context instances.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return pointer to hash map containing all service contexts
+ */
+ AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+ axis2_conf_ctx_get_svc_ctx_map(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Gets the hash map of service group context instances.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return pointer to hash map containing all service group contexts
+ */
+ AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+ axis2_conf_ctx_get_svc_grp_ctx_map(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Registers an operation context with the given message ID.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param message_id message id related to the operation context
+ * @param op_ctx pointer to operation context, conf context assumes
+ * ownership of the operation context
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_register_op_ctx(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *message_id,
+ axis2_op_ctx_t *op_ctx);
+
+ /**
+ * Gets operation context corresponding to the given message ID.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param message_id message ID related to the operation to be retrieved
+ * @return pointer to operation context related to the given message ID
+ */
+ AXIS2_EXTERN axis2_op_ctx_t * AXIS2_CALL
+ axis2_conf_ctx_get_op_ctx(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *message_id);
+
+ /**
+ * Registers a service context with the given service ID.
+ * @param conf_ctx pointer t configuration context
+ * @param env pointer to environment struct
+ * @param svc_id ID of the service to be added
+ * @param svc_ctx pointer to service context
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_register_svc_ctx(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *svc_id,
+ axis2_svc_ctx_t *svc_ctx);
+
+ /**
+ * Gets service context with the given service ID
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param svc_id service ID
+ * @return pointer to service context with the given service ID
+ */
+ AXIS2_EXTERN struct axis2_svc_ctx * AXIS2_CALL
+ axis2_conf_ctx_get_svc_ctx(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *svc_id);
+
+ /**
+ * Registers a service group context with the given service group ID.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param svc_grp_id service group id
+ * @param svc_grp_ctx pointer to service group context
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_register_svc_grp_ctx(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *svc_grp_id,
+ axis2_svc_grp_ctx_t *svc_grp_ctx);
+
+ /**
+ * Gets service group with the given service group ID.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param svc_grp_id service group id
+ * @return pointer to service group context with the given ID
+ */
+ AXIS2_EXTERN axis2_svc_grp_ctx_t * AXIS2_CALL
+ axis2_conf_ctx_get_svc_grp_ctx(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *svc_grp_id);
+
+ /**
+ * Gets the root working directory. It is in this directory that the
+ * axis2.xml configuration file is located. The services and modules
+ * sub folders too are located in this directory.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return pointer to string containing the root folder name
+ */
+ AXIS2_EXTERN const axis2_char_t * AXIS2_CALL
+ axis2_conf_ctx_get_root_dir(const axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Sets the root working directory. It is in this directory that the
+ * axis2.xml configuration file is located. The services and modules
+ * sub folders too are located in this directory.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param path string containing the path of root directory
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_set_root_dir(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *path);
+
+ /**
+ * Initializes the configuration context. Within this function, it would
+ * initialize all the service group context, service context and
+ * operation context instances stored within configuration context.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param conf pointer to configuration struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_init(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ axis2_conf_t *conf);
+
+ /**
+ * Frees configuration context struct.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_ctx_free(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env);
+
+ /**
+ * This method fills the context hierarchy (service group, service and
+ * operation contexts that is) for the service and operation found in
+ * the given message context. If the context hierarchy is not already
+ * built it will create the contexts and build the context hierarchy.
+ * @param conf_ctx pointer to configuration context
+ * @param env pointer to environment struct
+ * @param msg_ctx pointer to message context with service and operation
+ * for which the context hierarchy is to be built set
+ * @return pointer to the service group context, which is the root of
+ * the context hierarchy for given service and operation
+ */
+ AXIS2_EXTERN axis2_svc_grp_ctx_t * AXIS2_CALL
+ axis2_conf_ctx_fill_ctxs(axis2_conf_ctx_t *conf_ctx,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
+
+
+/** Sets the configuration. */
#define AXIS2_CONF_CTX_SET_CONF(conf_ctx, env, conf) \
- ((conf_ctx)->ops->set_conf(conf_ctx, env, conf))
+ axis2_conf_ctx_set_conf(conf_ctx, env, conf)
-/** Gets base which is of type context.
- @sa axis2_conf_ctx_ops#get_base */
+/** Gets base which is of type context. */
#define AXIS2_CONF_CTX_GET_BASE(conf_ctx, env) \
- ((conf_ctx)->ops->get_base(conf_ctx, env))
+ axis2_conf_ctx_get_base(conf_ctx, env)
-/** Gets the configuration.
- @sa axis2_conf_ctx_ops#get_conf */
+/** Gets the configuration. */
#define AXIS2_CONF_CTX_GET_CONF(conf_ctx, env) \
- ((conf_ctx)->ops->get_conf(conf_ctx, env))
+ axis2_conf_ctx_get_conf(conf_ctx, env)
-/** Gets the operation context map.
- @sa axis2_conf_ctx_ops#get_op_ctx_map */
+/** Gets the operation context map. */
#define AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env) \
- ((conf_ctx)->ops->get_op_ctx_map(conf_ctx, env))
+ axis2_conf_ctx_get_op_ctx_map(conf_ctx, env)
-/** Gets the service context map.
- @sa axis2_conf_ctx_ops#get_svc_ctx_map */
+/** Gets the service context map. */
#define AXIS2_CONF_CTX_GET_SVC_CTX_MAP(conf_ctx, env) \
- ((conf_ctx)->ops->get_svc_ctx_map(conf_ctx, env))
+ axis2_conf_ctx_get_svc_ctx_map(conf_ctx, env)
-/** Gets the service group context map.
- @sa axis2_conf_ctx_ops#get_svc_grp_ctx_map */
+/** Gets the service group context map. */
#define AXIS2_CONF_CTX_GET_SVC_GRP_CTX_MAP(conf_ctx, env) \
- ((conf_ctx)->ops->get_svc_grp_ctx_map(conf_ctx, env))
+ axis2_conf_ctx_get_svc_grp_ctx_map(conf_ctx, env)
-/** Registers the operation context with given message ID.
- @sa axis2_conf_ctx_ops#register_op_ctx */
+/** Registers the operation context with given message ID. */
#define AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, message_id, op_ctx) \
- ((conf_ctx)->ops->register_op_ctx(conf_ctx, env, message_id, op_ctx))
+ axis2_conf_ctx_register_op_ctx(conf_ctx, env, message_id, op_ctx)
-/** Gets the operation context with given message ID.
- @sa axis2_conf_ctx_ops#get_op_ctx */
+/** Gets the operation context with given message ID. */
#define AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, message_id) \
- ((conf_ctx)->ops->get_op_ctx(conf_ctx, env, message_id))
+ axis2_conf_ctx_get_op_ctx(conf_ctx, env, message_id)
-/** Registers the service context with given service ID.
- @sa axis2_conf_ctx_ops#register_svc_ctx */
+/** Registers the service context with given service ID. */
#define AXIS2_CONF_CTX_REGISTER_SVC_CTX(conf_ctx, env, svc_id, svc_ctx) \
- ((conf_ctx)->ops->register_svc_ctx(conf_ctx, env, svc_id, svc_ctx))
+ axis2_conf_ctx_register_svc_ctx(conf_ctx, env, svc_id, svc_ctx)
-/** Gets the service context with given service ID.
- @sa axis2_conf_ctx_ops#get_svc_ctx */
+/** Gets the service context with given service ID. */
#define AXIS2_CONF_CTX_GET_SVC_CTX(conf_ctx, env, svc_id) \
- ((conf_ctx)->ops->get_svc_ctx(conf_ctx, env, svc_id))
+ axis2_conf_ctx_get_svc_ctx(conf_ctx, env, svc_id)
-/** Registers the service group context with given service group ID.
- @sa axis2_conf_ctx_ops#register_svc_grp_ctx */
+/** Registers the service group context with given service group ID. */
#define AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(conf_ctx, env, svc_grp_id, svc_grp_ctx) \
- ((conf_ctx)->ops->register_svc_grp_ctx(conf_ctx, env, svc_grp_id, svc_grp_ctx))
+ axis2_conf_ctx_register_svc_grp_ctx(conf_ctx, env, svc_grp_id, svc_grp_ctx)
-/** Gets the service group context with given service group ID.
- @sa axis2_conf_ctx_ops#get_svc_grp_ctx */
+/** Gets the service group context with given service group ID. */
#define AXIS2_CONF_CTX_GET_SVC_GRP_CTX(conf_ctx, env, svc_grp_id) \
- ((conf_ctx)->ops->get_svc_grp_ctx(conf_ctx, env, svc_grp_id))
+ axis2_conf_ctx_get_svc_grp_ctx(conf_ctx, env, svc_grp_id)
-/** Gets the root directory.
- @sa axis2_conf_ctx_ops#get_root_dir */
+/** Gets the root directory. */
#define AXIS2_CONF_CTX_GET_ROOT_DIR(conf_ctx, env) \
- ((conf_ctx)->ops->get_root_dir(conf_ctx, env))
+ axis2_conf_ctx_get_root_dir(conf_ctx, env)
-/** Sets the root directory.
- @sa axis2_conf_ctx_ops#set_root_dir */
+/** Sets the root directory. */
#define AXIS2_CONF_CTX_SET_ROOT_DIR(conf_ctx, env, path) \
- ((conf_ctx)->ops->set_root_dir(conf_ctx, env, path))
+ axis2_conf_ctx_set_root_dir(conf_ctx, env, path)
-/** Initializes the configuration context.
- @sa axis2_conf_ctx_ops#init */
+/** Initializes the configuration context. */
#define AXIS2_CONF_CTX_INIT(conf_ctx, env, conf) \
- ((conf_ctx)->ops->init(conf_ctx, env, conf))
+ axis2_conf_ctx_init(conf_ctx, env, conf)
-/** Frees the configuration context.
- @sa axis2_conf_ctx_ops#free */
+/** Frees the configuration context. */
#define AXIS2_CONF_CTX_FREE(conf_ctx, env) \
- ((conf_ctx)->ops->free(conf_ctx, env))
+ axis2_conf_ctx_free(conf_ctx, env)
/** Fill context hierarchy related to the service and operation set in message
- context.
- @sa axis2_conf_ctx_ops#fill_ctxs */
+ context. */
#define AXIS2_CONF_CTX_FILL_CTXS(conf_ctx, env, msg_ctx) \
- ((conf_ctx)->ops->fill_ctxs(conf_ctx, env, msg_ctx))
+ axis2_conf_ctx_fill_ctxs(conf_ctx, env, msg_ctx)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_ctx.h?view=diff&rev=494687&r1=494686&r2=494687
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_ctx.h Tue Jan 9 18:11:15 2007
@@ -49,187 +49,159 @@
{
#endif
-
- /** Type name for struct axis2_ctx_ops */
- typedef struct axis2_ctx_ops axis2_ctx_ops_t;
/** Type name for struct axis2_ctx */
typedef struct axis2_ctx axis2_ctx_t;
+ /**
+ * Creates a context struct.
+ * @param env pointer to environment struct
+ * @return pointer to newly created context
+ */
+ AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL
+ axis2_ctx_create(const axis2_env_t *env);
/**
- * context ops struct.
- * Encapsulator struct for ops of axis2_ctx
+ * Sets a property with the given key.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @param key key string to store the property with
+ * @param value pointer to property to be stored, context assumes the
+ * ownership of the property
+ * @param persistent persist ency status, AXIS2_TRUE if the value is to
+ * be stored in the resistant store, AXIS2_FALSE if it is to be stored
+ * in the non-persistent store
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_ctx_ops
- {
- /**
- * Sets a property with the given key.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @param key key string to store the property with
- * @param value pointer to property to be stored, context assumes the
- * ownership of the property
- * @param persistent persist ency status, AXIS2_TRUE if the value is to
- * be stored in the resistant store, AXIS2_FALSE if it is to be stored
- * in the non-persistent store
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_property)(
- struct axis2_ctx *ctx,
- const axis2_env_t *env,
- const axis2_char_t *key,
- axis2_property_t *value,
- const axis2_bool_t persistent);
-
- /**
- * Gets the property with the given key.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @param key key string
- * @param persistent persistence status, AXIS2_TRUE if the value is to
- * be retrieved from the persistent store, AXIS2_FALSE if it is to be
- * retrieved from the non-persistent store
- * @return pointer to property struct corresponding to the given key
- */
- axis2_property_t *(AXIS2_CALL *
- get_property)(
- const axis2_ctx_t *ctx,
- const axis2_env_t *env,
- const axis2_char_t *key,
- const axis2_bool_t persistent);
-
- /**
- * Gets the non-persistent map of properties.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @return pointer to the hash map which stores the non-persistent
- * properties
- */
- axis2_hash_t *(AXIS2_CALL *
- get_non_persistent_map)(
- const axis2_ctx_t *ctx,
- const axis2_env_t *env);
-
- /**
- * Gets the persistent map of properties.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @return pointer to the hash map which stores the persistent
- * properties
- */
- axis2_hash_t *(AXIS2_CALL *
- get_persistent_map)(
- const axis2_ctx_t *ctx,
- const axis2_env_t *env);
-
- /**
- * Gets all properties stored within context.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @return pointer to hash table containing all properties
- */
- axis2_hash_t *(AXIS2_CALL *
- get_all_properties)(
- const axis2_ctx_t *ctx,
- const axis2_env_t *env);
-
-
- /**
- * Frees context struct.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_ctx_t *ctx,
- const axis2_env_t *env);
-
- /**
- * Sets non-persistent map of properties.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @param map pointer to hash map, context assumes ownership of the map
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_non_persistent_map)(
- struct axis2_ctx *ctx,
- const axis2_env_t *env,
- axis2_hash_t *map);
-
- /**
- * Sets persistent map of properties.
- * @param ctx pointer to context struct
- * @param env pointer to environment struct
- * @param map pointer to hash map, context assumes ownership of the map
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_persistent_map)(
- struct axis2_ctx *ctx,
- const axis2_env_t *env,
- axis2_hash_t *map);
- };
-
- /**
- * context struct.
- */
- struct axis2_ctx
- {
- /** operations of context struct */
- axis2_ctx_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ctx_set_property(struct axis2_ctx *ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *key,
+ axis2_property_t *value,
+ const axis2_bool_t persistent);
/**
- * Creates a context struct.
+ * Gets the property with the given key.
+ * @param ctx pointer to context struct
* @param env pointer to environment struct
- * @return pointer to newly created context
+ * @param key key string
+ * @param persistent persistence status, AXIS2_TRUE if the value is to
+ * be retrieved from the persistent store, AXIS2_FALSE if it is to be
+ * retrieved from the non-persistent store
+ * @return pointer to property struct corresponding to the given key
*/
- AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL
- axis2_ctx_create(
+ AXIS2_EXTERN axis2_property_t * AXIS2_CALL
+ axis2_ctx_get_property(const axis2_ctx_t *ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *key,
+ const axis2_bool_t persistent);
+
+ /**
+ * Gets the non-persistent map of properties.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @return pointer to the hash map which stores the non-persistent
+ * properties
+ */
+ AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+ axis2_ctx_get_non_persistent_map(const axis2_ctx_t *ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Gets the persistent map of properties.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @return pointer to the hash map which stores the persistent
+ * properties
+ */
+ AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+ axis2_ctx_get_persistent_map(const axis2_ctx_t *ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Gets all properties stored within context.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @return pointer to hash table containing all properties
+ */
+ AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+ axis2_ctx_get_all_properties(const axis2_ctx_t *ctx,
const axis2_env_t *env);
+
+ /**
+ * Frees context struct.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ctx_free(axis2_ctx_t *ctx,
+ const axis2_env_t *env);
+
+ /**
+ * Sets non-persistent map of properties.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @param map pointer to hash map, context assumes ownership of the map
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ctx_set_non_persistent_map(struct axis2_ctx *ctx,
+ const axis2_env_t *env,
+ axis2_hash_t *map);
+
+ /**
+ * Sets persistent map of properties.
+ * @param ctx pointer to context struct
+ * @param env pointer to environment struct
+ * @param map pointer to hash map, context assumes ownership of the map
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ctx_set_persistent_map(struct axis2_ctx *ctx,
+ const axis2_env_t *env,
+ axis2_hash_t *map);
+
+
/** Sets property with given key.
@sa axis2_ctx_ops#set_property */
#define AXIS2_CTX_SET_PROPERTY(ctx, env, key, value, persistent) \
- ((ctx)->ops->set_property(ctx, env, key, value, persistent))
+ axis2_ctx_set_property(ctx, env, key, value, persistent)
/** Gets property with given key.
@sa axis2_ctx_ops#get_property */
#define AXIS2_CTX_GET_PROPERTY(ctx, env, key, persistent) \
- ((ctx)->ops->get_property(ctx, env, key, persistent))
+ axis2_ctx_get_property(ctx, env, key, persistent)
/** Gets non persistent map of properties.
@sa axis2_ctx_ops#get_non_persistent_map */
#define AXIS2_CTX_GET_NON_PERSISTANT_MAP(ctx, env) \
- ((ctx)->ops->get_non_persistent_map(ctx, env))
+ axis2_ctx_get_non_persistent_map(ctx, env)
/** Gets all properties.
@sa axis2_ctx_ops#get_all_properties */
#define AXIS2_CTX_GET_ALL_PROPERTIES(ctx, env) \
- ((ctx)->ops->get_all_properties(ctx, env))
+ axis2_ctx_get_all_properties(ctx, env)
/** Gets persistent map of properties.
@sa axis2_ctx_ops#get_persistent_map */
#define AXIS2_CTX_GET_PERSISTANT_MAP(ctx, env) \
- ((ctx)->ops->get_persistent_map(ctx, env))
+ axis2_ctx_get_persistent_map(ctx, env)
/** Sets non persistent map of properties.
@sa axis2_ctx_ops#set_non_persistent_map */
#define AXIS2_CTX_SET_NON_PERSISTANT_MAP(ctx, env, map) \
- ((ctx)->ops->set_non_persistent_map(ctx, env, map))
+ axis2_ctx_set_non_persistent_map(ctx, env, map)
/** Sets persistent map of properties.
@sa axis2_ctx_ops#set_persistent_map */
#define AXIS2_CTX_SET_PERSISTANT_MAP(ctx, env, map) \
- ((ctx)->ops->set_persistent_map(ctx, env, map))
+ axis2_ctx_set_persistent_map(ctx, env, map)
/** Frees the context.
@sa axis2_ctx_ops#free */
#define AXIS2_CTX_FREE(ctx, env) \
- ((ctx)->ops->free (ctx, env))
+ axis2_ctx_free (ctx, env)
/** @} */
#ifdef __cplusplus
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org