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/02 04:44:20 UTC
svn commit: r330178 - in /webservices/axis2/trunk/c: include/
modules/core/description/src/ modules/core/engine/src/
Author: damitha
Date: Tue Nov 1 19:44:08 2005
New Revision: 330178
URL: http://svn.apache.org/viewcvs?rev=330178&view=rev
Log:
Changes to the code
Modified:
webservices/axis2/trunk/c/include/axis2_description_service.h
webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
webservices/axis2/trunk/c/include/axis2_engine_config.h
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c
Modified: webservices/axis2/trunk/c/include/axis2_description_service.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_service.h?rev=330178&r1=330177&r2=330178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_service.h Tue Nov 1 19:44:08 2005
@@ -69,7 +69,7 @@
(srv_desc, env));
#define axis2_description_service_set_parent(srv_desc, env \
- , servicegroup_desc) (axis2_description_service_get_ops(service_desc \
+ , servicegroup_desc) (axis2_description_service_get_ops(srv_desc \
, env)->set_parent (srv_desc, env, servicegroup_desc));
#define axis2_description_service_get_parent(srv_desc, env) \
@@ -77,28 +77,28 @@
(srv_desc, env));
#define axis2_description_service_get_name(srv_desc, env) \
- (axis2_description_service_get_ops(srv_desc, env)->get_name(service_desc \
+ (axis2_description_service_get_ops(srv_desc, env)->get_name(srv_desc \
, env));
#define axis2_description_service_add_param(srv_desc, env, param) \
- (axis2_description_service_get_ops(srv_desc, env)->add_param(service_desc \
+ (axis2_description_service_get_ops(srv_desc, env)->add_param(srv_desc \
, env, param));
#define axis2_description_service_get_param(srv_desc, env, name) \
- (axis2_description_service_get_ops(srv_desc, env)->get_param(env \
- , service_desc, name));
+ (axis2_description_service_get_ops(srv_desc, env)->get_param(srv_desc \
+ , env, name));
#define axis2_description_service_get_params(srv_desc, env) \
- (axis2_description_service_get_ops(srv_desc, env)->get_params(env \
- , service_desc));
+ (axis2_description_service_get_ops(srv_desc, env)->get_params(srv_desc \
+ , env));
#define axis2_description_service_is_param_locked(srv_desc, env, \
param_name) (axis2_description_service_get_ops(env \
- , service_desc)->is_parameter_locked(srv_desc, env, param_name));
+ , srv_desc)->is_parameter_locked(srv_desc, env, param_name));
/**************************** End of function macros **************************/
Modified: webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_servicegroup.h?rev=330178&r1=330177&r2=330178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_servicegroup.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_servicegroup.h Tue Nov 1 19:44:08 2005
@@ -66,9 +66,9 @@
, service_desc) (axis2_description_servicegroup_get_ops(srvgrp_desc \
, env)->get_service(srvgrp_desc, env, service_desc));
-#define axis2_description_servicegroup_remove_service(srvgrp_desc, env) \
+#define axis2_description_servicegroup_remove_service(srvgrp_desc, env, srvc_name) \
(axis2_description_servicegroup_get_ops(srvgrp_desc \
- , env)->remove_service(srvgrp_desc, env, service_name));
+ , env)->remove_service(srvgrp_desc, env, srvc_name));
#define axis2_description_servicegroup_add_param(srvgrp_desc, env, param) \
(axis2_description_servicegroup_get_ops(srvgrp_desc \
@@ -118,7 +118,7 @@
*/
typedef axis2_status_t (*axis2_description_servicegroup_add_service_t)
(axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
- , axis2_description_service_t * service_desc);
+ , axis2_description_service_t *service_desc);
/** Get the service from service group_member
* @param service_name
@@ -131,7 +131,7 @@
typedef axis2_status_t (*axis2_description_servicegroup_remove_service_t)
(axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
- , const axis2_qname_t* service_name);
+ , const axis2_qname_t *service_name);
typedef axis2_status_t (*axis2_description_servicegroup_add_param_t)
(axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
@@ -166,8 +166,7 @@
};
axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
- (axis2_env_t *env
- , axis2_description_servicegroup_t *srvgrp_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
axis2_description_servicegroup_t *axis2_description_servicegroup_create
(axis2_env_t *env);
Modified: webservices/axis2/trunk/c/include/axis2_engine_config.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine_config.h?rev=330178&r1=330177&r2=330178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_config.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_config.h Tue Nov 1 19:44:08 2005
@@ -46,37 +46,37 @@
/************************* Start of function macros ***************************/
-#define axis2_engine_config_free(env, engine_config) (axis2_engine_get_ops(env, \
- engine_config)->free(env, engine_config);
+#define axis2_engine_config_free(engine_config, env) (axis2_engine_get_ops \
+ (engine_config, env)->free(engine_config, env);
-#define axis2_engine_config_add_service_group(env, engine_config, \
+#define axis2_engine_config_add_service_group(engine_config, env, \
service_group_desc) (axis2_engine_config_get_ops(env, \
- engine_config)->add_service_group (env, engine_config, service_group_desc));
+ engine_config)->add_service_group (engine_config, env, service_group_desc));
-#define axis2_engine_config_get_service(env, engine_config, service_name) \
- (axis2_engine_config_get_ops(env, engine_config)->get_service(env, \
- engine_config, service_name));
+#define axis2_engine_config_get_service(engine_config, env, service_name) \
+ (axis2_engine_config_get_ops(engine_config, env)->get_service \
+ (engine_config, env, service_name));
-#define axis2_engine_config_remove_service(env, engine_config, service_name) \
- (axis2_engine_config_get_ops(env, engine_config)->remove_service(env, \
- engine_config, service_name));
+#define axis2_engine_config_remove_service(engine_config, env, service_name) \
+ (axis2_engine_config_get_ops(engine_config, env)->remove_service \
+ (engine_config, env, service_name));
/************************* End of function macros *****************************/
/************************* Start of function pointers *************************/
-typedef axis2_status_t (*axis2_engine_config_free_t)(axis2_env_t *env,
- axis2_engine_config_t *engine_config);
+typedef axis2_status_t (*axis2_engine_config_free_t)
+ (axis2_engine_config_t *engine_config, axis2_env_t *env);
typedef axis2_status_t (*axis2_engine_config_add_service_group_t)
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, axis2_description_servicegroup_t *service_group_desc);
typedef axis2_description_service_t *(*axis2_engine_config_get_service_t)
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t* service_name);
typedef axis2_status_t (*axis2_engine_config_remove_service_t)
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t *name);
/************************* End of function pointers ***************************/
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c?rev=330178&r1=330177&r2=330178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c Tue Nov 1 19:44:08 2005
@@ -94,9 +94,6 @@
}
ops->free = axis2_description_service_ops_free;
ops->add_operation = axis2_description_service_ops_add_operation;
- ops->add_param = axis2_description_service_ops_add_param;
- ops->get_param = axis2_description_service_ops_get_param;
- ops->get_params = axis2_description_service_ops_get_params;
ops->get_operation_with_qname =
axis2_description_service_ops_get_operation_with_qname;
ops->get_operation_with_name =
@@ -104,6 +101,10 @@
ops->get_operations = axis2_description_service_ops_get_operations;
ops->set_parent = axis2_description_service_ops_set_parent;
ops->get_parent = axis2_description_service_ops_get_parent;
+ ops->get_name = axis2_description_service_ops_get_name;
+ ops->add_param = axis2_description_service_ops_add_param;
+ ops->get_param = axis2_description_service_ops_get_param;
+ ops->get_params = axis2_description_service_ops_get_params;
srv_desc->ops = ops;
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c?rev=330178&r1=330177&r2=330178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c Tue Nov 1 19:44:08 2005
@@ -63,8 +63,7 @@
, const axis2_char_t *name);
axis2_hash_t *axis2_description_servicegroup_ops_get_params
- (axis2_env_t *env
- , axis2_description_servicegroup_t *srvgrp_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
@@ -73,8 +72,7 @@
/***************************** End of function headers ************************/
axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
- (axis2_env_t *env
- , axis2_description_servicegroup_t *srvgrp_desc)
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env)
{
if(!env || !srvgrp_desc)
{
@@ -108,6 +106,11 @@
ops->get_name = axis2_description_servicegroup_ops_get_name;
ops->add_service = axis2_description_servicegroup_ops_add_service;
ops->get_service = axis2_description_servicegroup_ops_get_service;
+ ops->remove_service = axis2_description_servicegroup_ops_remove_service;
+ ops->add_param = axis2_description_servicegroup_ops_add_param;
+ ops->get_param = axis2_description_servicegroup_ops_get_param;
+ ops->get_params = axis2_description_servicegroup_ops_get_params;
+ ops->is_param_locked = axis2_description_servicegroup_ops_is_param_locked;
srvgrp_desc->ops = ops;
@@ -248,8 +251,7 @@
}
axis2_hash_t *axis2_description_servicegroup_ops_get_params
- (axis2_env_t *env
- , axis2_description_servicegroup_t *srvgrp_desc)
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env)
{
if(!env || !srvgrp_desc)
{
Modified: webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c?rev=330178&r1=330177&r2=330178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c Tue Nov 1 19:44:08 2005
@@ -33,31 +33,31 @@
/***************************** Function prototypes ****************************/
-axis2_status_t axis2_engine_config_ops_free (axis2_env_t *env
- ,axis2_engine_config_t * engine_config);
+axis2_status_t axis2_engine_config_ops_free(axis2_engine_config_t *engine_config
+ ,axis2_env_t *env);
axis2_status_t axis2_engine_config_ops_add_service_group
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, axis2_description_servicegroup_t *service_group_desc);
-axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup(
- axis2_env_t *env, axis2_engine_config_t *engine_config
+axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t* servicegroup_name);
-axis2_status_t axis2_engine_config_ops_add_service(
- axis2_env_t *env, axis2_engine_config_t *engine_config
+axis2_status_t axis2_engine_config_ops_add_service
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_description_service_t* service_desc);
-axis2_description_service_t *axis2_engine_config_ops_get_service(
- axis2_env_t *env, axis2_engine_config_t *engine_config
+axis2_description_service_t *axis2_engine_config_ops_get_service
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t* service_name);
axis2_status_t axis2_engine_config_ops_remove_service
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t *name);
-axis2_status_t split_service_name(axis2_env_t *env
- , axis2_char_t *service_name, axis2_char_t **service_name_st);
+axis2_status_t split_service_name(axis2_env_t *env, axis2_char_t *service_name
+ , axis2_char_t **service_name_st);
/************************** End of function prototypes ************************/
@@ -121,8 +121,8 @@
/**********************Start of operation impls********************************/
-axis2_status_t axis2_engine_config_ops_free (axis2_env_t *env
- ,axis2_engine_config_t * engine_config)
+axis2_status_t axis2_engine_config_ops_free (axis2_engine_config_t *engine_config
+ , axis2_env_t *env)
{
if(engine_config)
{
@@ -132,7 +132,7 @@
}
axis2_status_t axis2_engine_config_ops_add_service_group
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, axis2_description_servicegroup_t *servicegroup_desc)
{
if(!engine_config || !servicegroup_desc)
@@ -140,16 +140,16 @@
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- axis2_char_t *tempname = axis2_description_servicegroup_get_name(env
- , servicegroup_desc);
+ axis2_char_t *tempname = axis2_description_servicegroup_get_name
+ (servicegroup_desc, env);
axis2_hash_set (engine_config->service_groups
, tempname
, AXIS2_HASH_KEY_STRING, servicegroup_desc);
return AXIS2_SUCCESS;
}
-axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup(
- axis2_env_t *env, axis2_engine_config_t *engine_config
+axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t* servicegroup_name)
{
if(!engine_config)
@@ -168,8 +168,8 @@
, AXIS2_HASH_KEY_STRING));
}
-axis2_status_t axis2_engine_config_ops_add_service(
- axis2_env_t *env, axis2_engine_config_t *engine_config
+axis2_status_t axis2_engine_config_ops_add_service
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_description_service_t *service_desc)
{
if(!engine_config || !service_desc)
@@ -182,21 +182,21 @@
return AXIS2_ERROR_NO_MEMORY;
axis2_qname_t *servicegroup_qname = axis2_description_service_get_name
- (env, service_desc);
+ (service_desc, env);
axis2_char_t *servicegroup_name = servicegroup_qname->localpart;
- axis2_description_servicegroup_set_name(env, servicegroup_desc
+ axis2_description_servicegroup_set_name(servicegroup_desc, env
, servicegroup_name);
- axis2_description_servicegroup_add_service(env, servicegroup_desc
+ axis2_description_servicegroup_add_service(servicegroup_desc, env
, service_desc);
return AXIS2_SUCCESS;
}
-axis2_description_service_t *axis2_engine_config_ops_get_service(
- axis2_env_t *env, axis2_engine_config_t *engine_config
+axis2_description_service_t *axis2_engine_config_ops_get_service
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t* service_name)
{
if(!env || !engine_config)
@@ -221,7 +221,7 @@
if(AXIS2_SUCCESS == split_service_name(env, service_name, service_st))
{
axis2_char_t *grp_name = *(service_st + 2);
- sg = axis2_engine_config_ops_get_servicegroup(env, engine_config
+ sg = axis2_engine_config_ops_get_servicegroup(engine_config, env
, grp_name);
if(!sg)
return NULL;
@@ -229,13 +229,13 @@
axis2_char_t *srv_name = *(service_st + 1);
axis2_qname_t *qname = (axis2_qname_t*) axis2_qname_create(env, srv_name, NULL, NULL);
- return axis2_description_servicegroup_get_service(env, sg, qname);
+ return axis2_description_servicegroup_get_service(sg, env, qname);
return NULL;
}
axis2_status_t axis2_engine_config_ops_remove_service
- (axis2_env_t *env, axis2_engine_config_t *engine_config
+ (axis2_engine_config_t *engine_config, axis2_env_t *env
, const axis2_char_t *service_name)
{
if(!env || !engine_config)
@@ -255,16 +255,16 @@
if(AXIS2_SUCCESS == split_service_name(env, service_name, service_st))
{
axis2_char_t *grp_name = *(service_st + 2);
- sg = axis2_engine_config_ops_get_servicegroup(env, engine_config
+ sg = axis2_engine_config_ops_get_servicegroup(engine_config, env
, grp_name);
if(!sg)
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
axis2_char_t *srv_name = *(service_st + 1);
- axis2_qname_t *qname = (axis2_qname_t*) axis2_qname_create(env, srv_name
+ axis2_qname_t *qname = (axis2_qname_t*) axis2_qname_create(srv_name, env
, NULL, NULL);
- axis2_description_servicegroup_remove_service(env, sg, qname);
+ axis2_description_servicegroup_remove_service(sg, env, qname);
return AXIS2_SUCCESS;
}
@@ -278,8 +278,8 @@
* @param service_name
* @return service name and group name
*/
-axis2_status_t split_service_name(axis2_env_t *env
- , axis2_char_t *service_name, axis2_char_t **service_name_st)
+axis2_status_t split_service_name
+ (axis2_env_t *env, axis2_char_t *service_name, axis2_char_t **service_name_st)
{
if(!service_name_st)
{