You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/08/11 07:53:26 UTC
svn commit: r430686 - in /webservices/axis2/trunk/c: include/axis2_conf.h
include/axis2_disp_checker.h modules/core/deployment/conf_builder.c
modules/core/engine/conf.c modules/core/engine/disp_checker.c
Author: samisa
Date: Thu Aug 10 22:53:25 2006
New Revision: 430686
URL: http://svn.apache.org/viewvc?rev=430686&view=rev
Log:
More doc comment improvements and API fixes
Modified:
webservices/axis2/trunk/c/include/axis2_conf.h
webservices/axis2/trunk/c/include/axis2_disp_checker.h
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?rev=430686&r1=430685&r2=430686&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Thu Aug 10 22:53:25 2006
@@ -47,7 +47,6 @@
#include <axis2_hash.h>
#include <axis2_phases_info.h>
#include <axis2_msg_recv.h>
-#include <axis2_disp.h>
#include <axis2_disp_checker.h>
#ifdef __cplusplus
@@ -66,6 +65,7 @@
struct axis2_svc;
struct axis2_op;
struct axis2_dep_engine;
+ struct axis2_desp;
/**
* configuration ops struct.
Modified: webservices/axis2/trunk/c/include/axis2_disp_checker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp_checker.h?rev=430686&r1=430685&r2=430686&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp_checker.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp_checker.h Thu Aug 10 22:53:25 2006
@@ -20,13 +20,12 @@
/**
* @defgroup axis2_disp_checker dispatcher checker
* @ingroup axis2_engine
- * Description.
+ * dispatcher checker is responsible of checking the status of the dispatchers.
* @{
*/
/**
* @file axis2_disp_checker.h
- * @brief Axis2 Dispatcher interface
*/
#include <axis2_defines.h>
@@ -44,14 +43,16 @@
typedef struct axis2_disp_checker axis2_disp_checker_t;
/**
- * dispatcher checker ops struct
- * Encapsulator struct for operations of axis2_disp_checker
+ * dispatcher checker ops struct.
+ * Encapsulator struct for operations of axis2_disp_checker.
*/
AXIS2_DECLARE_DATA struct axis2_disp_checker_ops
{
/**
+ * Gets the base handler.
* @param disp_checker pointer to dispatcher checker
* @param env pointer to environment struct
+ * @return pointer to base handler, returns a reference not a cloned copy
*/
axis2_handler_t *(AXIS2_CALL *
get_base)(
@@ -60,38 +61,45 @@
/**
+ * Gets QName.
* @param disp_checker pointer to dispatcher checker
* @param env pointer to environment struct
+ * @return returns a pointer to the QName, returns a reference not a
+ * cloned copy
*/
axis2_qname_t *(AXIS2_CALL *
get_qname)(
- const axis2_disp_checker_t *disp_checker,
+ const axis2_disp_checker_t *disp_checker,
const axis2_env_t *env);
/**
+ * Sets QName.
* @param disp_checker pointer to dispatcher checker
* @param env pointer to environment struct
- * @param qname pointer to qname
+ * @param qname pointer to QName. A clone would be created within the method
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_qname)(
- struct axis2_disp_checker *disp_checker,
+ axis2_disp_checker_t *disp_checker,
const axis2_env_t *env,
- axis2_qname_t *qname);
+ const axis2_qname_t *qname);
/**
+ * Frees dispatcher checker.
* @param disp_checker pointer to dispatcher checker
* @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
free)(
- struct axis2_disp_checker *disp_checker,
+ axis2_disp_checker_t *disp_checker,
const axis2_env_t *env);
};
/**
- * dispatcher checker struct
+ * dispatcher checker struct.
*/
struct axis2_disp_checker
{
@@ -101,21 +109,21 @@
/**
- * Creates a dispatcher checker struct
+ * Creates a dispatcher checker struct instance.
* @param env pointer to environment struct
- * @param qname pointer to qname, it can be NULL
+ * @return pointer to newly created dispatcher checker struct
*/
AXIS2_EXTERN axis2_disp_checker_t *AXIS2_CALL
axis2_disp_checker_create(
- const axis2_env_t *env,
- axis2_qname_t *qname);
+ const axis2_env_t *env);
+
-/** Gets the base.
+/** Gets base handler.
@sa axis2_disp_checker_ops#get_base */
#define AXIS2_DISP_CHECKER_GET_BASE(disp_checker, env) \
((disp_checker)->ops->get_base(disp_checker, env))
-/** Gets the qname.
+/** Gets QName.
@sa axis2_disp_checker_ops#get_qname */
#define AXIS2_DISP_CHECKER_GET_QNAME(disp_checker, env) \
((disp_checker)->ops->get_qname(disp_checker, env))
@@ -125,7 +133,7 @@
#define AXIS2_DISP_CHECKER_SET_QNAME(disp_checker, env, name) \
((disp_checker)->ops->set_qname(disp_checker, env, name))
-/** Frees the dispatcher checker.
+/** Frees dispatcher checker.
@sa axis2_disp_checker_ops#free */
#define AXIS2_DISP_CHECKER_FREE(disp_checker, env) \
((disp_checker)->ops->free(disp_checker, env))
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=430686&r1=430685&r2=430686&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Thu Aug 10 22:53:25 2006
@@ -15,6 +15,7 @@
*/
#include <axis2_conf_builder.h>
+#include <axis2_disp.h>
#include <axis2_conf.h>
#include <axis2_class_loader.h>
#include <axis2_transport_in_desc.h>
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=430686&r1=430685&r2=430686&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Thu Aug 10 22:53:25 2006
@@ -15,6 +15,7 @@
*/
#include <string.h>
+#include <axis2_disp.h>
#include <axis2_conf.h>
#include <axis2_dir_handler.h>
#include <axis2_dep_engine.h>
@@ -1786,7 +1787,7 @@
return AXIS2_FAILURE;
}
- disp_checker = axis2_disp_checker_create(env, NULL);
+ disp_checker = axis2_disp_checker_create(env);
handler = AXIS2_DISP_CHECKER_GET_BASE(disp_checker, env);
AXIS2_DISP_CHECKER_FREE(disp_checker, env);
AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 0, handler);
@@ -1838,7 +1839,7 @@
return AXIS2_FAILURE;
}
- disp_checker = axis2_disp_checker_create(env, NULL);
+ disp_checker = axis2_disp_checker_create(env);
handler = AXIS2_DISP_CHECKER_GET_BASE(disp_checker, env);
AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 0, handler);
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?rev=430686&r1=430685&r2=430686&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Thu Aug 10 22:53:25 2006
@@ -56,19 +56,18 @@
axis2_status_t AXIS2_CALL
axis2_disp_checker_set_qname(
- struct axis2_disp_checker *disp_checker,
+ axis2_disp_checker_t *disp_checker,
const axis2_env_t *env,
- axis2_qname_t *qname);
+ const axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_disp_checker_free(
- struct axis2_disp_checker *disp_checker,
+ axis2_disp_checker_t *disp_checker,
const axis2_env_t *env);
axis2_disp_checker_t *AXIS2_CALL
axis2_disp_checker_create(
- const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_env_t *env)
{
axis2_disp_checker_impl_t *disp_checker_impl = NULL;
axis2_handler_desc_t *handler_desc = NULL;
@@ -154,9 +153,9 @@
axis2_status_t AXIS2_CALL
axis2_disp_checker_set_qname(
- struct axis2_disp_checker *disp_checker,
+ axis2_disp_checker_t *disp_checker,
const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_qname_t *qname)
{
axis2_disp_checker_impl_t *disp_checker_impl = NULL;
@@ -182,7 +181,7 @@
axis2_status_t AXIS2_CALL
axis2_disp_checker_free(
- struct axis2_disp_checker *disp_checker,
+ axis2_disp_checker_t *disp_checker,
const axis2_env_t *env)
{
axis2_disp_checker_impl_t *disp_checker_impl = NULL;
@@ -194,16 +193,7 @@
AXIS2_QNAME_FREE(disp_checker_impl->qname, env);
disp_checker_impl->qname = NULL;
}
- /* Hi Samisa !. Do I think we should not free handler_desc here. So I
- * commented this
- */
- /*if (disp_checker_impl->base)
- {
- axis2_handler_desc_t *handler_desc = AXIS2_HANDLER_GET_HANDLER_DESC(disp_checker_impl->base, env);
- AXIS2_HANDLER_DESC_FREE(handler_desc, env); // freeing handler desc frees handler
- disp_checker_impl->base = NULL;
- }*/
-
+
if (disp_checker_impl->disp_checker.ops)
{
AXIS2_FREE(env->allocator, disp_checker_impl->disp_checker.ops);
@@ -216,13 +206,6 @@
return AXIS2_SUCCESS;
}
-
-/**
- * Method invoke.
- *
- * @param msgctx
- * @throws AxisFault
- */
axis2_status_t AXIS2_CALL
axis2_disp_checker_invoke(
axis2_handler_t *handler,
@@ -288,4 +271,3 @@
}
return AXIS2_SUCCESS;
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org