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 da...@apache.org on 2005/11/01 06:29:24 UTC

svn commit: r329981 [2/3] - in /webservices/axis2/trunk/c: include/ modules/core/context/src/ modules/core/description/src/ modules/core/engine/src/ modules/test/om/src/ modules/test/util/ modules/util/src/ modules/util/test/ modules/wsdl/src/ modules/...

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c Mon Oct 31 21:27:27 2005
@@ -34,44 +34,44 @@
 
 /***************************** Function prototypes ****************************/
 
-axis2_status_t axis2_description_param_ops_free (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_free (axis2_env_t *env
 	, axis2_description_param_t * param);
 
-axis2_status_t axis2_description_param_ops_set_name (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_name (axis2_env_t *env
 	, axis2_description_param_t * param, const axis2_char_t *name);
 
-axis2_char_t *axis2_description_param_ops_get_name (axis2_environment_t *env
+axis2_char_t *axis2_description_param_ops_get_name (axis2_env_t *env
 	, axis2_description_param_t * param);
 
-axis2_status_t axis2_description_param_ops_set_value (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_value (axis2_env_t *env
 	, axis2_description_param_t * param, void *value);
 
-void *axis2_description_param_ops_get_value (axis2_environment_t *env
+void *axis2_description_param_ops_get_value (axis2_env_t *env
 	, axis2_description_param_t * param);
 
-axis2_bool_t axis2_description_param_ops_is_locked (axis2_environment_t *env
+axis2_bool_t axis2_description_param_ops_is_locked (axis2_env_t *env
 	, axis2_description_param_t * param);
 
-axis2_status_t axis2_description_param_ops_set_locked (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_locked (axis2_env_t *env
 	, axis2_description_param_t * param, const axis2_bool_t locked);
 
-/*void axis2_description_param_ops_set_param_element (axis2_environment_t *env
+/*void axis2_description_param_ops_set_param_element (axis2_env_t *env
 	, axis2_description_param_t * param, const axis2_om_element_t * om_element);
 */										 
 
 /*axis2_description_param_t *axis2_description_param_ops_get_param_element 
-	(axis2_environment_t *env, axis2_description_param_t *param);*/
+	(axis2_env_t *env, axis2_description_param_t *param);*/
 
-axis2_status_t axis2_description_param_ops_set_type (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_type (axis2_env_t *env
 	, axis2_description_param_t * param, const int type);
 
-int axis2_description_param_ops_get_type (axis2_environment_t *env
+int axis2_description_param_ops_get_type (axis2_env_t *env
 		, axis2_description_param_t * param);
 
 /************************** End of function prototypes ************************/
 
 axis2_description_param_ops_t *axis2_description_param_get_ops
-	(axis2_environment_t *env, axis2_description_param_t *param)
+	(axis2_env_t *env, axis2_description_param_t *param)
 {
 	if(!param)
 	{
@@ -84,7 +84,7 @@
 
 
 axis2_description_param_t *axis2_description_param_create 
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_description_param_t *param 
 	= (axis2_description_param_t *) axis2_malloc (env->allocator
@@ -127,7 +127,7 @@
 
 
 axis2_description_param_t *axis2_description_param_create_with_name_value 
-		(axis2_environment_t *env, const axis2_char_t *name
+		(axis2_env_t *env, const axis2_char_t *name
 		, const axis2_char_t *value)
 {
 	
@@ -160,7 +160,7 @@
 
 /**********************Start of operation impls********************************/
 
-axis2_status_t axis2_description_param_ops_free (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_free (axis2_env_t *env
 		,axis2_description_param_t * param)
 {
 	if(param)
@@ -171,7 +171,7 @@
 	return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED;
 }
 
-axis2_status_t axis2_description_param_ops_set_name (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_name (axis2_env_t *env
 		, axis2_description_param_t * param, const axis2_char_t *name)
 {
 	if(!param)
@@ -183,7 +183,7 @@
 	return AXIS2_SUCCESS;	
 }
 
-axis2_char_t *axis2_description_param_ops_get_name (axis2_environment_t *env
+axis2_char_t *axis2_description_param_ops_get_name (axis2_env_t *env
 		, axis2_description_param_t *param)
 {
 	if(!param)
@@ -195,7 +195,7 @@
 	return param->name;
 }
 
-axis2_status_t axis2_description_param_ops_set_value (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_value (axis2_env_t *env
 		, axis2_description_param_t * param, void *value)
 {
 	if(!param)
@@ -206,7 +206,7 @@
 	return AXIS2_SUCCESS;
 }	
 
-void *axis2_description_param_ops_get_value (axis2_environment_t *env
+void *axis2_description_param_ops_get_value (axis2_env_t *env
 		, axis2_description_param_t * param)
 {
 	if(!param)
@@ -218,7 +218,7 @@
 	return param->value;
 }
 
-axis2_bool_t axis2_description_param_ops_is_locked (axis2_environment_t *env
+axis2_bool_t axis2_description_param_ops_is_locked (axis2_env_t *env
 		, axis2_description_param_t * param)
 {
 	if(!param)
@@ -229,7 +229,7 @@
 	return param->is_locked;
 }
 
-axis2_status_t axis2_description_param_ops_set_locked (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_locked (axis2_env_t *env
 		, axis2_description_param_t * param, const axis2_bool_t is_locked)
 {
 	if(!param)
@@ -241,7 +241,7 @@
 }
 
 /*axis2_status_t axis2_description_param_ops_set_param_element 
-		(axis2_environment_t *env, axis2_description_param_t * param
+		(axis2_env_t *env, axis2_description_param_t * param
         , const axis2_om_element_t * om_element)
 {
 	if(!param)
@@ -254,7 +254,7 @@
 }
 
 axis2_description_param_t *axis2_description_param_get_param_element 
-		(axis2_environment_t *env, axis2_description_param_t *param)
+		(axis2_env_t *env, axis2_description_param_t *param)
 {
 	if(!param)
 	{
@@ -264,7 +264,7 @@
 	return (axis2_description_param_t *) param->param_element;
 }*/
 
-axis2_status_t axis2_description_param_ops_set_type (axis2_environment_t *env
+axis2_status_t axis2_description_param_ops_set_type (axis2_env_t *env
 		, axis2_description_param_t * param, const int type)
 {
 	if(!param)
@@ -275,7 +275,7 @@
 	return AXIS2_SUCCESS;
 }
 
-int axis2_description_param_ops_get_type (axis2_environment_t *env
+int axis2_description_param_ops_get_type (axis2_env_t *env
 		, axis2_description_param_t * param)
 {
 	if(!param)

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=329981&r1=329980&r2=329981&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 Mon Oct 31 21:27:27 2005
@@ -17,55 +17,55 @@
 
 /*************************** Function headers ********************************/
 
-axis2_status_t axis2_description_service_ops_free (axis2_environment_t *env
+axis2_status_t axis2_description_service_ops_free (axis2_env_t *env
 		, axis2_description_service_t *service_desc);
 
 axis2_status_t axis2_description_service_ops_add_operation
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		, axis2_description_operation_t *operation_desc);
 
 axis2_description_operation_t *
 		axis2_description_service_ops_get_operation_with_qname(
-		axis2_environment_t *env, axis2_description_service_t *service_desc
+		axis2_env_t *env, axis2_description_service_t *service_desc
 		, axis2_qname_t *operation_name);
 		
 axis2_description_operation_t *
 		axis2_description_service_ops_get_operation_with_name
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		, const axis2_char_t* operation_name);
 
 axis2_hash_t *axis2_description_service_ops_get_operations(
-		axis2_environment_t *env, axis2_description_service_t *service_desc);
+		axis2_env_t *env, axis2_description_service_t *service_desc);
 		
-axis2_status_t axis2_description_service_ops_set_parent(axis2_environment_t *env
+axis2_status_t axis2_description_service_ops_set_parent(axis2_env_t *env
 		, axis2_description_service_t *service_desc
 		,axis2_description_servicegroup_t *servicegroup_desc);
 
 axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
-		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+		(axis2_env_t *env, axis2_description_service_t *service_desc);
 		
 axis2_qname_t *axis2_description_service_ops_get_name
-		(axis2_environment_t *env, axis2_description_service_t *service_desc);	
+		(axis2_env_t *env, axis2_description_service_t *service_desc);	
 
-axis2_status_t axis2_description_service_ops_add_param(axis2_environment_t *env
+axis2_status_t axis2_description_service_ops_add_param(axis2_env_t *env
 		, axis2_description_service_t *service_desc
 		, axis2_description_param_t *param);
 
 axis2_description_param_t *axis2_description_service_ops_get_param
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		, const axis2_char_t *name);
 
 axis2_hash_t *axis2_description_service_ops_get_params
-		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+		(axis2_env_t *env, axis2_description_service_t *service_desc);
 
 axis2_bool_t axis2_description_service_ops_is_param_locked(
-		axis2_environment_t *env, axis2_description_service_t *service_desc
+		axis2_env_t *env, axis2_description_service_t *service_desc
 		, const axis2_char_t *param_name);
 		
 /************************* End of function headers ***************************/
 
 axis2_description_service_ops_t * axis2_description_service_get_ops
-		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+		(axis2_env_t *env, axis2_description_service_t *service_desc)
 {
 	if(!service_desc)
 	{
@@ -76,7 +76,7 @@
 }
 
 axis2_description_service_t *axis2_description_service_create
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_description_service_t *service_desc = (axis2_description_service_t *)
 		axis2_malloc (env->allocator, sizeof(axis2_description_service_t));
@@ -132,7 +132,7 @@
 }
 
 axis2_description_service_t *axis2_description_service_create_with_qname
-		(axis2_environment_t *env, axis2_qname_t *qname)
+		(axis2_env_t *env, axis2_qname_t *qname)
 {
 	axis2_description_service_t *service_desc = 
 		axis2_description_service_create(env);
@@ -149,7 +149,7 @@
 /********************** Start of function implementations ********************/
 
 axis2_status_t axis2_description_service_ops_free
-		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+		(axis2_env_t *env, axis2_description_service_t *service_desc)
 {
 	if(!env)
 		return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -163,7 +163,7 @@
 
 
 axis2_status_t axis2_description_service_ops_add_operation
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		, axis2_description_operation_t *operation_desc)
 {
 	if(!service_desc || !operation_desc)
@@ -196,7 +196,7 @@
 
 axis2_description_operation_t 
 		*axis2_description_service_ops_get_operation_with_qname
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		, axis2_qname_t *operation_name)
 {
 	if(!service_desc || !service_desc->wasaction_opeartionmap)
@@ -212,7 +212,7 @@
 
 axis2_description_operation_t 
 		*axis2_description_service_ops_get_operation_with_name
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		, const axis2_char_t* name)
 {
 	if(!service_desc || !service_desc->wasaction_opeartionmap)
@@ -226,7 +226,7 @@
 }
 
 axis2_hash_t *axis2_description_service_ops_get_operations
-		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+		(axis2_env_t *env, axis2_description_service_t *service_desc)
 {
 	if(!service_desc)
 	{
@@ -237,7 +237,7 @@
 }
 	
 axis2_status_t axis2_description_service_ops_set_parent
-		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		(axis2_env_t *env, axis2_description_service_t *service_desc
 		,axis2_description_servicegroup_t *servicegroup_desc)
 {
 	if(!service_desc || !servicegroup_desc)
@@ -249,7 +249,7 @@
 }
 
 axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
-		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+		(axis2_env_t *env, axis2_description_service_t *service_desc)
 {
 	if(!service_desc || !service_desc->parent)
 	{
@@ -260,7 +260,7 @@
 }
 
 axis2_qname_t *axis2_description_service_ops_get_name
-		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+		(axis2_env_t *env, axis2_description_service_t *service_desc)
 {
 	if(!env || !service_desc)
 	{
@@ -270,7 +270,7 @@
 	return service_desc->name;
 }
 
-axis2_status_t axis2_description_service_ops_add_param(axis2_environment_t *env
+axis2_status_t axis2_description_service_ops_add_param(axis2_env_t *env
 		, axis2_description_service_t *service_desc
 		, axis2_description_param_t *param)
 {
@@ -286,7 +286,7 @@
 }
 
 axis2_description_param_t *axis2_description_service_ops_get_param(
-		axis2_environment_t *env, axis2_description_service_t *service_desc
+		axis2_env_t *env, axis2_description_service_t *service_desc
 		, const axis2_char_t *name)
 {
 	if(!env || !service_desc || !service_desc->param_include)
@@ -308,7 +308,7 @@
 }
 
 axis2_hash_t *axis2_description_service_ops_get_params
-		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+		(axis2_env_t *env, axis2_description_service_t *service_desc)
 {
 	if(!env || !service_desc)
 	{
@@ -321,7 +321,7 @@
 }
 
 axis2_bool_t axis2_description_service_ops_is_param_locked(
-		axis2_environment_t *env, axis2_description_service_t *service_desc
+		axis2_env_t *env, axis2_description_service_t *service_desc
 		, const axis2_char_t *param_name)
 {
 	if(!env || !service_desc || !service_desc->param_include)

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=329981&r1=329980&r2=329981&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 Mon Oct 31 21:27:27 2005
@@ -31,55 +31,55 @@
 
 /***************************** Function headers *******************************/
 
-axis2_status_t axis2_description_servicegroup_ops_free(axis2_environment_t *env
+axis2_status_t axis2_description_servicegroup_ops_free(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 
 axis2_status_t axis2_description_servicegroup_ops_set_name
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_char_t *name);
 
 axis2_char_t *axis2_description_servicegroup_ops_get_name
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 
 axis2_status_t axis2_description_servicegroup_ops_add_service
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t* servicegroup_desc
 		, axis2_description_service_t *service_desc);
 
 axis2_description_service_t *axis2_description_servicegroup_ops_get_service
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_qname_t* service_name);
 		
 axis2_status_t axis2_description_servicegroup_ops_remove_service
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_qname_t* service_name);
 		
 axis2_status_t axis2_description_servicegroup_ops_add_param
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_description_param_t *param);
 		
 
 axis2_description_param_t *axis2_description_servicegroup_ops_get_param(
-		axis2_environment_t *env, axis2_description_servicegroup_t *servicegroup_desc
+		axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_char_t *name);
 		
 axis2_hash_t *axis2_description_servicegroup_ops_get_params
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 		
 axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
-		axis2_environment_t *env, axis2_description_servicegroup_t *servicegroup_desc
+		axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_char_t *param_name);
 
 /***************************** End of function headers ************************/
 
 axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc)
 {
 	if(!env || !servicegroup_desc)
@@ -91,7 +91,7 @@
 }
 
 axis2_description_servicegroup_t *axis2_description_servicegroup_create
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_description_servicegroup_t *servicegroup_desc 
 		= (axis2_description_servicegroup_t *)
@@ -143,7 +143,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_description_servicegroup_ops_free(axis2_environment_t *env
+axis2_status_t axis2_description_servicegroup_ops_free(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc)
 {
 	if(!env || !servicegroup_desc)
@@ -153,7 +153,7 @@
 }
 
 axis2_status_t axis2_description_servicegroup_ops_set_name
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_char_t *name)
 {
@@ -166,7 +166,7 @@
 }
 
 axis2_char_t *axis2_description_servicegroup_ops_get_name
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc)
 {
 	if(!env || !servicegroup_desc)
@@ -178,7 +178,7 @@
 }
 
 axis2_status_t axis2_description_servicegroup_ops_add_service
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_description_service_t *service_desc)
 {
@@ -192,7 +192,7 @@
 }
 
 axis2_description_service_t *axis2_description_servicegroup_ops_get_service
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_qname_t* service_name)
 {
@@ -207,7 +207,7 @@
 }
 
 axis2_status_t axis2_description_servicegroup_ops_remove_service
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_qname_t* service_name)
 {
@@ -222,7 +222,7 @@
 }
 
 axis2_status_t axis2_description_servicegroup_ops_add_param
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_description_param_t *param)
 {
@@ -238,7 +238,7 @@
 }
 
 axis2_description_param_t *axis2_description_servicegroup_ops_get_param(
-		axis2_environment_t *env, axis2_description_servicegroup_t *servicegroup_desc
+		axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_char_t *name)
 {
 	if(!env || !servicegroup_desc || !servicegroup_desc->param_include)
@@ -260,7 +260,7 @@
 }
 
 axis2_hash_t *axis2_description_servicegroup_ops_get_params
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc)
 {
 	if(!env || !servicegroup_desc)
@@ -274,7 +274,7 @@
 }
 
 axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
-		axis2_environment_t *env, axis2_description_servicegroup_t *servicegroup_desc
+		axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_char_t *param_name)
 {
 	if(!env || !servicegroup_desc || !servicegroup_desc->param_include)

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=329981&r1=329980&r2=329981&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 Mon Oct 31 21:27:27 2005
@@ -33,37 +33,37 @@
 	
 /***************************** Function prototypes ****************************/
 
-axis2_status_t axis2_engine_config_ops_free (axis2_environment_t *env
+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_add_service_group
-		(axis2_environment_t *env, axis2_engine_config_t *engine_config
+		(axis2_env_t *env, axis2_engine_config_t *engine_config
     	, axis2_description_servicegroup_t *service_group_desc);
 
 axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup(
-		axis2_environment_t *env, axis2_engine_config_t *engine_config
+		axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_char_t* servicegroup_name);
 
 axis2_status_t axis2_engine_config_ops_add_service(
-		axis2_environment_t *env, axis2_engine_config_t *engine_config
+		axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_description_service_t* service_desc);
 
 axis2_description_service_t *axis2_engine_config_ops_get_service(
-		axis2_environment_t *env, axis2_engine_config_t *engine_config
+		axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_char_t* service_name);
 
 axis2_status_t axis2_engine_config_ops_remove_service
-		(axis2_environment_t *env, axis2_engine_config_t *engine_config
+		(axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_char_t *name);
 		
-axis2_status_t split_service_name(axis2_environment_t *env
+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 ************************/
 
 axis2_engine_config_ops_t *axis2_engine_config_get_ops
-	(axis2_environment_t *env, axis2_engine_config_t *engine_config)
+	(axis2_env_t *env, axis2_engine_config_t *engine_config)
 {
 	if(!engine_config)
 	{
@@ -76,7 +76,7 @@
 
 
 axis2_engine_config_t *axis2_engine_config_create 
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_engine_config_t *engine_config
 	= (axis2_engine_config_t *) axis2_malloc (env->allocator
@@ -121,7 +121,7 @@
 
 /**********************Start of operation impls********************************/
 
-axis2_status_t axis2_engine_config_ops_free (axis2_environment_t *env
+axis2_status_t axis2_engine_config_ops_free (axis2_env_t *env
 		,axis2_engine_config_t * engine_config)
 {
 	if(engine_config)
@@ -132,7 +132,7 @@
 }
 
 axis2_status_t axis2_engine_config_ops_add_service_group
-		(axis2_environment_t *env, axis2_engine_config_t *engine_config
+		(axis2_env_t *env, axis2_engine_config_t *engine_config
     	, axis2_description_servicegroup_t *servicegroup_desc)
 {
 	if(!engine_config || !servicegroup_desc)
@@ -149,7 +149,7 @@
 }
 
 axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup(
-		axis2_environment_t *env, axis2_engine_config_t *engine_config
+		axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_char_t* servicegroup_name)
 {
 	if(!engine_config)
@@ -169,7 +169,7 @@
 }
 
 axis2_status_t axis2_engine_config_ops_add_service(
-		axis2_environment_t *env, axis2_engine_config_t *engine_config
+		axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_description_service_t *service_desc)
 {
 	if(!engine_config || !service_desc) 
@@ -196,7 +196,7 @@
 }
 
 axis2_description_service_t *axis2_engine_config_ops_get_service(
-		axis2_environment_t *env, axis2_engine_config_t *engine_config
+		axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_char_t* service_name)
 {
 	if(!env || !engine_config)
@@ -235,7 +235,7 @@
 }
 
 axis2_status_t axis2_engine_config_ops_remove_service
-		(axis2_environment_t *env, axis2_engine_config_t *engine_config
+		(axis2_env_t *env, axis2_engine_config_t *engine_config
 		, const axis2_char_t *service_name)
 {
 	if(!env || !engine_config)
@@ -278,7 +278,7 @@
  * @param service_name
  * @return service name and group name 
  */
-axis2_status_t split_service_name(axis2_environment_t *env
+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)

Modified: webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c Mon Oct 31 21:27:27 2005
@@ -28,17 +28,17 @@
 	
 /*************************** Function headers *********************************/
 
-axis2_status_t axis2_engine_msg_receiver_ops_free (axis2_environment_t *env
+axis2_status_t axis2_engine_msg_receiver_ops_free (axis2_env_t *env
 		, axis2_engine_msg_receiver_t *msg_receiver);	
 
-axis2_status_t axis2_engine_msg_receiver_ops_receive (axis2_environment_t *env
+axis2_status_t axis2_engine_msg_receiver_ops_receive (axis2_env_t *env
 		, axis2_engine_msg_receiver_t *msg_receiver
 		, axis2_context_msg_ctx_t *msg_ctx);
 		
 /************************* End of function headers ****************************/	
 
 axis2_engine_msg_receiver_t *axis2_engine_msg_receiver_get_ops
-		(axis2_environment_t *env, axis2_engine_msg_receiver_t *msg_receiver)
+		(axis2_env_t *env, axis2_engine_msg_receiver_t *msg_receiver)
 {
 	if(!msg_receiver)
 	{
@@ -49,7 +49,7 @@
 }
 
 axis2_engine_msg_receiver_t *axis2_engine_msg_receiver_create 
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_engine_msg_receiver_ops_t *ops = NULL;
 	axis2_engine_msg_receiver_t *msg_receiver = 
@@ -76,7 +76,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_engine_msg_receiver_ops_free (axis2_environment_t *env
+axis2_status_t axis2_engine_msg_receiver_ops_free (axis2_env_t *env
 		, axis2_engine_msg_receiver_t *msg_receiver)
 {
 	if(msg_receiver){
@@ -86,7 +86,7 @@
 	return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED;
 }
 
-axis2_status_t axis2_engine_msg_receive(axis2_environment_t *env
+axis2_status_t axis2_engine_msg_receive(axis2_env_t *env
 		, axis2_engine_msg_receiver_t *msg_receiver
 		, axis2_context_msg_ctx_t *msg_ctx)
 {

Modified: webservices/axis2/trunk/c/modules/test/om/src/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/test_om.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/test_om.c (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/test_om.c Mon Oct 31 21:27:27 2005
@@ -9,7 +9,7 @@
 
 axis2_allocator_t *allocator = NULL;
 axis2_string_t *string = NULL;
-axis2_environment_t *environment = NULL;
+axis2_env_t *environment = NULL;
 
 guththila_environment_t *my_guththila_environment = NULL;
 guththila_allocator_t *my_guththila_allocator = NULL;

Modified: webservices/axis2/trunk/c/modules/test/util/test_util.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/util/test_util.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/modules/test/util/test_util.c Mon Oct 31 21:27:27 2005
@@ -24,15 +24,15 @@
     axis2_char_t *value;
 } a;
 
-axis2_environment_t *test_init()
+axis2_env_t *test_init()
 {
 	axis2_allocator_t *allocator = axis2_allocator_init (NULL);
-    axis2_environment_t *env =
+    axis2_env_t *env =
     	axis2_environment_create (allocator, NULL, NULL, NULL, NULL);
 	return env;
 }
 
-int test_hash_get (axis2_environment_t *environment)
+int test_hash_get (axis2_env_t *environment)
 {
     axis2_hash_t *ht;
     a *a1, *a2, *a3, *a4;
@@ -90,7 +90,7 @@
   * This test is intended to test whether given two files are equal or not.
   * Spaces and new lines are ignored in comparing
   */
-int test_file_diff(axis2_environment_t *env)
+int test_file_diff(axis2_env_t *env)
 {
 	axis2_char_t *expected_file_name = axis2_strdup(env->string, "expected");
     axis2_char_t *actual_file_name = axis2_strdup(env->string, "actual");	
@@ -99,7 +99,7 @@
 
 int main(void)
 {
-	axis2_environment_t *env = test_init();
+	axis2_env_t *env = test_init();
 	test_file_diff(env);
 	test_hash_get(env); 
 }

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_environment.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_environment.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_environment.c Mon Oct 31 21:27:27 2005
@@ -22,7 +22,7 @@
 
 
 AXIS2_DECLARE(axis2_status_t )
-axis2_environment_free (axis2_environment_t *env)
+axis2_environment_free (axis2_env_t *env)
 {
     if(NULL != env && NULL != env->allocator)
         free (env->allocator);
@@ -42,18 +42,18 @@
 	return 0;  
 }
 
-AXIS2_DECLARE(axis2_environment_t *)
+AXIS2_DECLARE(axis2_env_t *)
 axis2_environment_create (axis2_allocator_t * allocator,
                           axis2_error_t * error, axis2_stream_t * stream,
                           axis2_log_t * log)
 {
-    axis2_environment_t *environment;
+    axis2_env_t *environment;
     if (!allocator)
         return NULL;
 
     environment =
-        (axis2_environment_t *) AXIS2_MALLOC (allocator,
-                                              sizeof (axis2_environment_t));
+        (axis2_env_t *) AXIS2_MALLOC (allocator,
+                                              sizeof (axis2_env_t));
 
     if (!environment)
         return NULL;

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c Mon Oct 31 21:27:27 2005
@@ -19,19 +19,19 @@
 void *expected_file, *actual_file; /* File pointers */
 
 /* private function header */
-axis2_status_t axis2_file_diff_clean(axis2_environment_t *env);
+axis2_status_t axis2_file_diff_clean(axis2_env_t *env);
 
-axis2_status_t axis2_file_diff(axis2_environment_t *env
+axis2_status_t axis2_file_diff(axis2_env_t *env
 		, axis2_char_t* expected_file_name, axis2_char_t* actual_file_name)
 {
     int ch1, ch2;
     int j = 0, k = 0;
    	axis2_char_t *buffer1, *buffer2;
    	int flag1 = 0, flag2 = 0;
-	expected_file = axis2_stream_file_open (env->stream
+	expected_file = AXIS2_STREAM_FILE_OPEN (env->stream
 		, expected_file_name, "rt");
 	 
-	actual_file = axis2_stream_file_open (env->stream, actual_file_name
+	actual_file = AXIS2_STREAM_FILE_OPEN (env->stream, actual_file_name
 		, "rt");
 	
 	if( expected_file == NULL || actual_file == NULL ) {
@@ -43,10 +43,10 @@
 	
    	
    
-   	buffer1 = (axis2_char_t*) axis2_malloc(env->allocator, 8096 * sizeof(axis2_char_t));
-   	buffer2 = (axis2_char_t*) axis2_malloc(env->allocator, 8096 * sizeof(axis2_char_t));
-   	ch1 = axis2_stream_file_get_char (env->stream, expected_file);
-   	ch2 = axis2_stream_file_get_char (env->stream, actual_file);
+   	buffer1 = (axis2_char_t*) AXIS2_MALLOC(env->allocator, 8096 * sizeof(axis2_char_t));
+   	buffer2 = (axis2_char_t*) AXIS2_MALLOC(env->allocator, 8096 * sizeof(axis2_char_t));
+   	ch1 = AXIS2_STREAM_FILE_GET_CHAR (env->stream, expected_file);
+   	ch2 = AXIS2_STREAM_FILE_GET_CHAR (env->stream, actual_file);
 	
    	
    	while(1)
@@ -68,13 +68,13 @@
             
         if(flag1 == 1 && flag2 == 0)
         {
-            axis2_stream_file_unget_char(env->stream, ch2, actual_file);
+            AXIS2_STREAM_FILE_UNGET_CHAR(env->stream, ch2, actual_file);
             j++;
             buffer1[j] = ch1;
         }
         if(flag1 == 0 && flag2 == 1)
         {
-            axis2_stream_file_unget_char(env->stream, ch1, expected_file);
+            AXIS2_STREAM_FILE_UNGET_CHAR(env->stream, ch1, expected_file);
             k++;
             buffer2[k] = ch2;
         }
@@ -82,25 +82,25 @@
         {
             if(ch1 != ch2)
             {
-				axis2_stream_write(env->stream
+				AXIS2_STREAM_WRITE(env->stream
 					, "\n****************************** TEST FAILED *********" \
 					"**************************\n", 80);
                 
                 *buffer1 = '\n';
                 *buffer2 = '\n';
-				axis2_stream_write(env->stream
+				AXIS2_STREAM_WRITE(env->stream
 					, "\n---------------------- Expected file read upto: ----" \
 					"--------------------------\n", 80);
                 
                  /*printf("%s\n", buffer1); */
-				axis2_stream_write(env->stream, buffer1, j);
-				axis2_stream_write(env->stream
+				AXIS2_STREAM_WRITE(env->stream, buffer1, j);
+				AXIS2_STREAM_WRITE(env->stream
 					, "\n---------------------- Actual file read upto: ------" \
 					"--------------------------\n", 80);
                 
                 /* printf("%s\n", buffer2); */
-				axis2_stream_write(env->stream, buffer2, k);
-				axis2_stream_write(env->stream, "\n", 1);
+				AXIS2_STREAM_WRITE(env->stream, buffer2, k);
+				AXIS2_STREAM_WRITE(env->stream, "\n", 1);
 
                 axis2_file_diff_clean(env);
             }
@@ -120,22 +120,22 @@
         
         if(ch1 == env->stream->axis2_eof || ch2 == env->stream->axis2_eof)
             break;
-        ch1 = axis2_stream_file_get_char(env->stream, expected_file );
-		ch2 = axis2_stream_file_get_char(env->stream, actual_file);
+        ch1 = AXIS2_STREAM_FILE_GET_CHAR(env->stream, expected_file );
+		ch2 = AXIS2_STREAM_FILE_GET_CHAR(env->stream, actual_file);
    	}
    	
-   	axis2_stream_write(env->stream
+   	AXIS2_STREAM_WRITE(env->stream
 		, "\n************************* TEST PASSED **************************" \
 		"**************\n", 80);
 	
    	return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_file_diff_clean (axis2_environment_t *env)
+axis2_status_t axis2_file_diff_clean (axis2_env_t *env)
 {
 	if(expected_file != NULL )
-    	axis2_stream_file_close(env->stream, expected_file);
+    	AXIS2_STREAM_FILE_CLOSE(env->stream, expected_file);
    	if(actual_file != NULL )
-    	axis2_stream_file_close(env->stream, actual_file);
+    	AXIS2_STREAM_FILE_CLOSE(env->stream, actual_file);
 	return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_hash.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_hash.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_hash.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_hash.c Mon Oct 31 21:27:27 2005
@@ -63,7 +63,7 @@
  */
 struct axis2_hash_t
 {
-    axis2_environment_t *environment;
+    axis2_env_t *environment;
     axis2_hash_entry_t **array;
     axis2_hash_index_t iterator;    /* For axis2_hash_first(NULL, ...) */
     unsigned int count, max;
@@ -87,7 +87,7 @@
 }
 
 AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_make (axis2_environment_t * environment)
+axis2_hash_make (axis2_env_t * environment)
 {
     axis2_hash_t *ht;
     ht = AXIS2_MALLOC (environment->allocator, sizeof (axis2_hash_t));
@@ -101,7 +101,7 @@
 }
 
 AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_make_custom (axis2_environment_t * environment,
+axis2_hash_make_custom (axis2_env_t * environment,
                         axis2_hashfunc_t hash_func)
 {
     axis2_hash_t *ht = axis2_hash_make (environment);
@@ -115,7 +115,7 @@
  */
 
 AXIS2_DECLARE(axis2_hash_index_t*)
-axis2_hash_next (axis2_environment_t * environment, axis2_hash_index_t * hi)
+axis2_hash_next (axis2_env_t * environment, axis2_hash_index_t * hi)
 {
     hi->this = hi->next;
     while (!hi->this)
@@ -133,7 +133,7 @@
 }
 
 AXIS2_DECLARE(axis2_hash_index_t*)
-axis2_hash_first (axis2_environment_t * environment, axis2_hash_t * ht)
+axis2_hash_first (axis2_env_t * environment, axis2_hash_t * ht)
 {
     axis2_hash_index_t *hi;
     if (environment)
@@ -296,7 +296,7 @@
 }
 
 AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_copy (axis2_environment_t * environment, const axis2_hash_t * orig)
+axis2_hash_copy (axis2_env_t * environment, const axis2_hash_t * orig)
 {
     axis2_hash_t *ht;
     axis2_hash_entry_t *new_vals;
@@ -383,17 +383,17 @@
 }
 
 AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_overlay (axis2_environment_t * environment,
+axis2_hash_overlay (axis2_env_t * environment,
                     const axis2_hash_t * overlay, const axis2_hash_t * base)
 {
     return axis2_hash_merge (environment, overlay, base, NULL, NULL);
 }
 
 AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_merge (axis2_environment_t * environment,
+axis2_hash_merge (axis2_env_t * environment,
                   const axis2_hash_t * overlay,
                   const axis2_hash_t * base,
-                  void *(*merger) (axis2_environment_t * environment,
+                  void *(*merger) (axis2_env_t * environment,
                                    const void *key,
                                    axis2_ssize_t klen,
                                    const void *h1_val,
@@ -499,7 +499,7 @@
 }
 
 static void
-axis2_hash_entry_free (axis2_environment_t * environment,
+axis2_hash_entry_free (axis2_env_t * environment,
                        axis2_hash_entry_t * hash_entry)
 {
     printf ("hash entry called ");
@@ -517,7 +517,7 @@
 }
 
 AXIS2_DECLARE(axis2_status_t)
-axis2_hash_free (axis2_environment_t * environment, axis2_hash_t * ht)
+axis2_hash_free (axis2_env_t * environment, axis2_hash_t * ht)
 {
     if (ht)
     {

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_qname.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_qname.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_qname.c Mon Oct 31 21:27:27 2005
@@ -19,19 +19,19 @@
 #include <axis2_defines.h>
 
 
-axis2_status_t AXIS2_CALL  axis2_qname_impl_free (axis2_environment_t * environment,
+axis2_status_t AXIS2_CALL  axis2_qname_impl_free (axis2_env_t * environment,
                                       axis2_qname_t * qname);
-axis2_bool_t AXIS2_CALL  axis2_qname_impl_equals (axis2_environment_t * environment,
+axis2_bool_t AXIS2_CALL  axis2_qname_impl_equals (axis2_env_t * environment,
                                       axis2_qname_t * qn1,
                                       axis2_qname_t * qn2);
-/*AXIS2_DECLARE(axis2_qname_t*) axis2_qname_create (axis2_environment_t * environment,
+/*AXIS2_DECLARE(axis2_qname_t*) axis2_qname_create (axis2_env_t * environment,
                                    const axis2_char_t * localpart,
                                    const axis2_char_t * namespace_uri,
                                    const axis2_char_t * prefix);
 */
 
 axis2_status_t AXIS2_CALL
-axis2_qname_impl_free (axis2_environment_t * environment,
+axis2_qname_impl_free (axis2_env_t * environment,
                        axis2_qname_t * qname)
 {
     if (!qname)
@@ -41,27 +41,27 @@
     }
     if (qname->localpart)
     {
-        axis2_free (environment->allocator, qname->localpart);
+        AXIS2_FREE (environment->allocator, qname->localpart);
     }
     if (qname->namespace_uri)
     {
-        axis2_free (environment->allocator, qname->namespace_uri);
+        AXIS2_FREE (environment->allocator, qname->namespace_uri);
     }
     if (qname->prefix)
     {
-        axis2_free (environment->allocator, qname->prefix);
+        AXIS2_FREE (environment->allocator, qname->prefix);
     }
     if (qname->ops)
     {
-        axis2_free (environment->allocator, qname->ops);
+        AXIS2_FREE (environment->allocator, qname->ops);
     }
-    axis2_free (environment->allocator, qname);
+    AXIS2_FREE (environment->allocator, qname);
     return AXIS2_SUCCESS;
 
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_qname_impl_equals (axis2_environment_t * environment,
+axis2_qname_impl_equals (axis2_env_t * environment,
                          axis2_qname_t * qn1, axis2_qname_t * qn2)
 {
 
@@ -101,7 +101,7 @@
 
 
 AXIS2_DECLARE(axis2_qname_t *)
-axis2_qname_create (axis2_environment_t * environment,
+axis2_qname_create (axis2_env_t * environment,
                     const axis2_char_t * localpart,
                     const axis2_char_t * namespace_uri,
                     const axis2_char_t * prefix)
@@ -115,7 +115,7 @@
         return NULL;
     }
 
-    qn = (axis2_qname_t *) axis2_malloc (environment->allocator,
+    qn = (axis2_qname_t *) AXIS2_MALLOC (environment->allocator,
                                          sizeof (axis2_qname_t));
     if (!qn)
     {
@@ -127,7 +127,7 @@
     qn->localpart = axis2_strdup (localpart);
     if (!(qn->localpart))
     {
-        axis2_free (environment->allocator, qn);
+        AXIS2_FREE (environment->allocator, qn);
         environment->error->error_number = AXIS2_ERROR_NO_MEMORY;
         return NULL;
     }
@@ -142,8 +142,8 @@
     }
     if (!(qn->prefix))
     {
-        axis2_free (environment->allocator, qn->localpart);
-        axis2_free (environment->allocator, qn);
+        AXIS2_FREE (environment->allocator, qn->localpart);
+        AXIS2_FREE (environment->allocator, qn);
         environment->error->error_number = AXIS2_ERROR_NO_MEMORY;
         return NULL;
     }
@@ -157,9 +157,9 @@
     }
     if (!(qn->namespace_uri))
     {
-        axis2_free (environment->allocator, qn->localpart);
-        axis2_free (environment->allocator, qn->prefix);
-        axis2_free (environment->allocator, qn);
+        AXIS2_FREE (environment->allocator, qn->localpart);
+        AXIS2_FREE (environment->allocator, qn->prefix);
+        AXIS2_FREE (environment->allocator, qn);
         environment->error->error_number = AXIS2_ERROR_NO_MEMORY;
         return NULL;
     }
@@ -167,15 +167,15 @@
 
     qn->ops = NULL;
     qn->ops =
-        axis2_malloc (environment->allocator, sizeof (axis2_qname_ops_t));
+        AXIS2_MALLOC (environment->allocator, sizeof (axis2_qname_ops_t));
     /* operations */
     if (!qn->ops)
     {
-        axis2_free (environment->allocator, qn->localpart);
+        AXIS2_FREE (environment->allocator, qn->localpart);
         if (qn->namespace_uri)
-            axis2_free (environment->allocator, qn->namespace_uri);
-        axis2_free (environment->allocator, qn->prefix);
-        axis2_free (environment->allocator, qn);
+            AXIS2_FREE (environment->allocator, qn->namespace_uri);
+        AXIS2_FREE (environment->allocator, qn->prefix);
+        AXIS2_FREE (environment->allocator, qn);
         environment->error->error_number = AXIS2_ERROR_NO_MEMORY;
         return NULL;
     }

Modified: webservices/axis2/trunk/c/modules/util/test/util_hash_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/test/util_hash_test.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/test/util_hash_test.c (original)
+++ webservices/axis2/trunk/c/modules/util/test/util_hash_test.c Mon Oct 31 21:27:27 2005
@@ -8,7 +8,7 @@
 void Testaxis2_hash_ops_get(CuTest *tc)
 {
     axis2_allocator_t *allocator = axis2_allocator_init (NULL);
-    axis2_environment_t *environment =
+    axis2_env_t *environment =
         axis2_environment_create (allocator, NULL, NULL, NULL, NULL);
 
     axis2_hash_t *ht;

Modified: webservices/axis2/trunk/c/modules/util/test/util_log_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/test/util_log_test.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/test/util_log_test.c (original)
+++ webservices/axis2/trunk/c/modules/util/test/util_log_test.c Mon Oct 31 21:27:27 2005
@@ -5,7 +5,7 @@
 
     char actual[10];
     axis2_allocator_t *allocator = axis2_allocator_init(NULL);
-    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL, NULL);
+    axis2_env_t *env = axis2_environment_create(allocator, NULL, NULL, NULL, NULL);
     char *expected = strdup("aaaaaaaaa");
     axis2_stream_read(env->stream, actual, 10);
     axis2_log_write(env->log, actual, 10);

Modified: webservices/axis2/trunk/c/modules/util/test/util_stream_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/test/util_stream_test.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/test/util_stream_test.c (original)
+++ webservices/axis2/trunk/c/modules/util/test/util_stream_test.c Mon Oct 31 21:27:27 2005
@@ -4,7 +4,7 @@
 
     char actual[10];
     axis2_allocator_t *allocator = axis2_allocator_init(NULL);
-    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL, NULL);
+    axis2_env_t *env = axis2_environment_create(allocator, NULL, NULL, NULL, NULL);
     char *expected = strdup("aaaaaaaaa");
     axis2_stream_read(env->stream, actual, 10);
     CuAssertStrEquals(tc, expected, actual);
@@ -14,7 +14,7 @@
 
     char actual[10];
     axis2_allocator_t *allocator = axis2_allocator_init(NULL);
-    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL, NULL);
+    axis2_env_t *env = axis2_environment_create(allocator, NULL, NULL, NULL, NULL);
     char *expected = strdup("aaaaaaaaa");
     axis2_stream_read(env->stream, actual, 10);
     axis2_stream_write(env->stream, actual, 10);

Modified: webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_component.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_component.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_component.c Mon Oct 31 21:27:27 2005
@@ -16,21 +16,21 @@
 
 /***************************** Function headers *******************************/
 
-axis2_status_t axis2_wsdl_component_free (axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_free (axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component);
 
 /**
  * Sets the properties of the Component if any
  * @param axis2_hash_t* properties
  */
-axis2_status_t axis2_wsdl_component_set_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_set_component_properties(axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component, axis2_hash_t *properties);
 
 /**
  * Returns the properties that are specific to this WSDL Component
  * @return axis2_hash_t** component properties
  */
-axis2_status_t axis2_wsdl_component_get_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_get_component_properties(axis2_env_t *env
 		,axis2_wsdl_component_t *wsdl_component, axis2_hash_t **properties);
 
 /**
@@ -38,7 +38,7 @@
  * @param void* Key in the map
  * @param void* value to be put
  */
-axis2_status_t axis2_wsdl_component_set_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_set_component_property(axis2_env_t *env
 	, axis2_wsdl_component_t *wsdl_component, const void *key, void *value);
 	
 
@@ -48,12 +48,12 @@
  * @param void* key for the map search.
  * @return void* value for the key
  */
-axis2_status_t axis2_wsdl_component_get_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_get_component_property(axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component, const void *key, void **value) ;
 		
 /***************************** End of function headers ************************/
 
-axis2_status_t axis2_wsdl_component_create (axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_create (axis2_env_t *env
 		, axis2_wsdl_component_t **wsdl_component)
 {
 	axis2_wsdl_impl_component_t *wsdl_impl_component 
@@ -94,7 +94,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_wsdl_component_free (axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_free (axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component)
 {
 	if(NULL != wsdl_component)
@@ -106,7 +106,7 @@
  * Returns the properties that are specific to this WSDL Component
  * @return axis2_hash_t** component properties
  */
-axis2_status_t axis2_wsdl_component_get_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_get_component_properties(axis2_env_t *env
 		,axis2_wsdl_component_t *wsdl_component, axis2_hash_t **properties)
 {
 	if(NULL == wsdl_component) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -120,7 +120,7 @@
  * Sets the properties of the Component if any
  * @param axis2_hash_t* properties
  */
-axis2_status_t axis2_wsdl_component_set_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_set_component_properties(axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component, axis2_hash_t *properties) 
 {
 	if(NULL == wsdl_component || NULL == properties) 
@@ -140,7 +140,7 @@
  * @param void* Key in the map
  * @param void* value to be put
  */
-axis2_status_t axis2_wsdl_component_set_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_set_component_property(axis2_env_t *env
 	, axis2_wsdl_component_t *wsdl_component, const void *key, void *value) 
 {
 	if(NULL ==wsdl_component || NULL == key || NULL == value) 
@@ -159,7 +159,7 @@
  * @param void* key for the map search.
  * @return void* value for the key
  */
-axis2_status_t axis2_wsdl_component_get_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_component_get_component_property(axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component,const void *key, void **value) 
 {
 	if(NULL == wsdl_component || NULL == key) 

Modified: webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_operation.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_operation.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_operation.c Mon Oct 31 21:27:27 2005
@@ -35,7 +35,7 @@
 
 /***************************** Function headers *******************************/
 
-axis2_status_t axis2_wsdl_operation_free (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_free (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt);
 
 /**
@@ -43,7 +43,7 @@
  * @return axis2_char_t* msg_exchange_pattern
  */
 axis2_status_t axis2_wsdl_operation_get_msg_exchange_pattern 
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, axis2_char_t **pattern);
 
 /**
@@ -53,14 +53,14 @@
  * @return status code
  */
 axis2_status_t axis2_wsdl_operation_set_msg_exchange_pattern
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, const axis2_char_t *msg_exchange_pattern);
 
 /**
  * get name
  * @return axis2_qname_t** operation name
  */
-axis2_status_t axis2_wsdl_operation_get_name (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_name (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_qname_t **name);
 
 /**
@@ -68,14 +68,14 @@
  *
  * @param axis2_qname_t* operation name
  */
-axis2_status_t axis2_wsdl_operation_set_name (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_name (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const axis2_qname_t *name);
 
 /**
  * get style
  * return axis2_char_t** style
  */
-axis2_status_t axis2_wsdl_operation_get_style (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_style (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_char_t **style);
 
 /**
@@ -83,7 +83,7 @@
  * @param axis2_char_t* style
  * @return status code
  */
-axis2_status_t axis2_wsdl_operation_set_style (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_style (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const axis2_char_t *style);
 		
 
@@ -91,14 +91,14 @@
  * Sets the properties of the operation if any
  * @param axis2_hash_t* properties
  */
-axis2_status_t axis2_wsdl_operation_set_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_component_properties(axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_hash_t *properties);
 
 /**
  * Returns the properties that are specific to this WSDL operation
  * @return axis2_hash_t** component properties
  */
-axis2_status_t axis2_wsdl_operation_get_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_component_properties(axis2_env_t *env
 		,axis2_wsdl_operation_t *wsdl_opt, axis2_hash_t **properties);
 
 /**
@@ -106,7 +106,7 @@
  * @param void* Key in the map
  * @param void* value to be put
  */
-axis2_status_t axis2_wsdl_operation_set_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_component_property(axis2_env_t *env
 	, axis2_wsdl_operation_t *wsdl_opt, const void *key, void *value);
 	
 
@@ -116,14 +116,14 @@
  * @param void* key for the map search.
  * @return void* value for the key
  */
-axis2_status_t axis2_wsdl_operation_get_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_component_property(axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const void *key, void **value) ;
 
 
 /***************************** End of function headers ************************/
 
 axis2_status_t axis2_wsdl_operation_create
-		(axis2_environment_t *env, axis2_wsdl_operation_t **wsdl_opt)
+		(axis2_env_t *env, axis2_wsdl_operation_t **wsdl_opt)
 {
 	axis2_wsdl_impl_operation_t *wsdl_impl_opt 
 		= (axis2_wsdl_impl_operation_t *)
@@ -164,7 +164,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_wsdl_operation_free(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_free(axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt)
 {
 	if(!env || !wsdl_opt)
@@ -174,7 +174,7 @@
 }
 
 axis2_status_t axis2_wsdl_operation_get_msg_exchange_pattern 
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, axis2_char_t **pattern)
 {
 	if(NULL == wsdl_opt)
@@ -184,7 +184,7 @@
 }
 
 axis2_status_t axis2_wsdl_operation_set_msg_exchange_pattern
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, const axis2_char_t *msg_exchange_pattern)
 {
 	if(NULL == wsdl_opt || NULL == msg_exchange_pattern) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -195,7 +195,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_wsdl_operation_get_name (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_name (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_qname_t **name)
 {
 	if(NULL == wsdl_opt)
@@ -204,7 +204,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_wsdl_operation_set_name (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_name (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const axis2_qname_t *name)
 {
 	if(NULL == wsdl_opt || NULL == name) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -214,7 +214,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_wsdl_operation_get_style (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_style (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_char_t **style)
 {
 	if(NULL == wsdl_opt) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -223,7 +223,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_wsdl_operation_set_style (axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_style (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const axis2_char_t *style)
 {
 	if(NULL == wsdl_opt || NULL == style) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -238,7 +238,7 @@
  * Sets the properties of the operation if any
  * @param axis2_hash_t* properties
  */
-axis2_status_t axis2_wsdl_operation_set_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_component_properties(axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_hash_t *properties)
 {
 	axis2_wsdl_impl_operation_t *wsdl_impl_opt = (axis2_wsdl_impl_operation_t *)
@@ -258,7 +258,7 @@
  * Returns the properties that are specific to this WSDL operation
  * @return axis2_hash_t** component properties
  */
-axis2_status_t axis2_wsdl_operation_get_component_properties(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_component_properties(axis2_env_t *env
 		,axis2_wsdl_operation_t *wsdl_opt, axis2_hash_t **properties)
 {
 	axis2_wsdl_impl_operation_t *wsdl_impl_opt = (axis2_wsdl_impl_operation_t *)
@@ -278,7 +278,7 @@
  * @param void* Key in the map
  * @param void* value to be put
  */
-axis2_status_t axis2_wsdl_operation_set_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_set_component_property(axis2_env_t *env
 	, axis2_wsdl_operation_t *wsdl_opt, const void *key, void *value)
 {
 	axis2_wsdl_impl_operation_t *wsdl_impl_opt = (axis2_wsdl_impl_operation_t *)
@@ -301,7 +301,7 @@
  * @param void* key for the map search.
  * @return void* value for the key
  */
-axis2_status_t axis2_wsdl_operation_get_component_property(axis2_environment_t *env
+axis2_status_t axis2_wsdl_operation_get_component_property(axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const void *key, void **value)
 {
 	axis2_wsdl_impl_operation_t *wsdl_impl_opt = (axis2_wsdl_impl_operation_t *)

Modified: webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_service.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_service.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_service.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_service.c Mon Oct 31 21:27:27 2005
@@ -31,14 +31,14 @@
 
 /***************************** Function headers *******************************/
 
-axis2_status_t axis2_wsdl_service_free(axis2_environment_t *env
+axis2_status_t axis2_wsdl_service_free(axis2_env_t *env
 		, axis2_wsdl_service_t *wsdl_srv);
 
 
 /***************************** End of function headers ************************/
 
 axis2_status_t axis2_wsdl_service_create
-		(axis2_environment_t *env, axis2_wsdl_service_t **wsdl_srv)
+		(axis2_env_t *env, axis2_wsdl_service_t **wsdl_srv)
 {
 	axis2_wsdl_impl_service_t *wsdl_impl_srv 
 		= (axis2_wsdl_impl_service_t *)
@@ -73,7 +73,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_wsdl_service_free(axis2_environment_t *env
+axis2_status_t axis2_wsdl_service_free(axis2_env_t *env
 		, axis2_wsdl_service_t *wsdl_srv)
 {
 	if(!env || !wsdl_srv)

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c Mon Oct 31 21:27:27 2005
@@ -18,17 +18,17 @@
 #include <string.h>
 #include <axis2_defines.h>
 
-axis2_status_t AXIS2_CALL axis2_om_attribute_impl_free (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_attribute_impl_free (axis2_env_t *
                                              environment,
                                              axis2_om_attribute_t *
                                              attribute);
 
-axis2_qname_t * AXIS2_CALL axis2_om_attribute_impl_get_qname (axis2_environment_t *
+axis2_qname_t * AXIS2_CALL axis2_om_attribute_impl_get_qname (axis2_env_t *
                                                   environment,
                                                   axis2_om_attribute_t *
                                                   attribute);
 
-axis2_status_t AXIS2_CALL axis2_om_attribute_impl_serialize (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_attribute_impl_serialize (axis2_env_t *
                                                   environment,
                                                   axis2_om_attribute_t *
                                                   attribute,
@@ -37,7 +37,7 @@
 
 
 AXIS2_DECLARE(axis2_om_attribute_t*)
- axis2_om_attribute_create (axis2_environment_t * environment,
+ axis2_om_attribute_create (axis2_env_t * environment,
                            const axis2_char_t * localname,
                            const axis2_char_t * value,
                            axis2_om_namespace_t * ns)
@@ -98,7 +98,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_attribute_impl_free (axis2_environment_t * environment,
+axis2_om_attribute_impl_free (axis2_env_t * environment,
                               axis2_om_attribute_t * attribute)
 {
     if (attribute)
@@ -118,7 +118,7 @@
 }
 
 axis2_qname_t* AXIS2_CALL
-axis2_om_attribute_impl_get_qname (axis2_environment_t * environment,
+axis2_om_attribute_impl_get_qname (axis2_env_t * environment,
                                    axis2_om_attribute_t * attribute)
 {
     axis2_qname_t *qname = NULL;
@@ -141,7 +141,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_attribute_impl_serialize (axis2_environment_t * environment,
+axis2_om_attribute_impl_serialize (axis2_env_t * environment,
                                    axis2_om_attribute_t * attribute,
                                    axis2_om_output_t * om_output)
 {

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Mon Oct 31 21:27:27 2005
@@ -17,11 +17,11 @@
 #include <axis2_om_comment.h>
 #include <string.h>
 
-axis2_status_t AXIS2_CALL axis2_om_comment_impl_free (axis2_environment_t * environment,
+axis2_status_t AXIS2_CALL axis2_om_comment_impl_free (axis2_env_t * environment,
                                            axis2_om_comment_t * comment);
 
 AXIS2_DECLARE(axis2_om_comment_t*)
- axis2_om_comment_create (axis2_environment_t * environment,
+ axis2_om_comment_create (axis2_env_t * environment,
                          const axis2_char_t * value, axis2_om_node_t ** node)
 {
     axis2_om_comment_t *comment = NULL;
@@ -89,7 +89,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_comment_impl_free (axis2_environment_t * environment,
+axis2_om_comment_impl_free (axis2_env_t * environment,
                             axis2_om_comment_t * comment)
 {
     if (comment)

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Mon Oct 31 21:27:27 2005
@@ -16,11 +16,11 @@
 
 #include <axis2_om_doctype.h>
 
-axis2_status_t AXIS2_CALL axis2_om_doctype_impl_free (axis2_environment_t * environment,
+axis2_status_t AXIS2_CALL axis2_om_doctype_impl_free (axis2_env_t * environment,
                                            axis2_om_doctype_t * doctype);
 
 AXIS2_DECLARE(axis2_om_doctype_t *)
- axis2_om_doctype_create (axis2_environment_t * environment,
+ axis2_om_doctype_create (axis2_env_t * environment,
                          axis2_om_node_t * parent, const axis2_char_t * value,
                          axis2_om_node_t ** node)
 {
@@ -94,7 +94,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_doctype_impl_free (axis2_environment_t * environment,
+axis2_om_doctype_impl_free (axis2_env_t * environment,
                             axis2_om_doctype_t * doctype)
 {
     if (doctype)

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c Mon Oct 31 21:27:27 2005
@@ -18,36 +18,36 @@
 #include <axis2_om_document.h>
 #include <axis2_om_stax_builder.h>
 
-axis2_status_t AXIS2_CALL axis2_om_document_impl_free (axis2_environment_t * environment,
+axis2_status_t AXIS2_CALL axis2_om_document_impl_free (axis2_env_t * environment,
                                             axis2_om_document_t * document);
-axis2_status_t AXIS2_CALL axis2_om_document_impl_add_child (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_document_impl_add_child (axis2_env_t *
                                                  environment,
                                                  axis2_om_document_t *
                                                  document,
                                                  axis2_om_node_t * child);
-axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_build_next (axis2_environment_t *
+axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_build_next (axis2_env_t *
                                                     environment,
                                                     axis2_om_document_t *
                                                     document);
-axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_root_element (axis2_environment_t
+axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_root_element (axis2_env_t
                                                           * environment,
                                                           axis2_om_document_t
                                                           * document);
-axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_next_sibling (axis2_environment_t
+axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_next_sibling (axis2_env_t
                                                           * environment,
                                                           axis2_om_document_t
                                                           * document);
-axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_first_child (axis2_environment_t *
+axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_first_child (axis2_env_t *
                                                          environment,
                                                          axis2_om_document_t *
                                                          document);
-axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_next_child (axis2_environment_t *
+axis2_om_node_t * AXIS2_CALL axis2_om_document_impl_get_next_child (axis2_env_t *
                                                         environment,
                                                         axis2_om_document_t *
                                                         document);
 
 AXIS2_DECLARE(axis2_om_document_t *)
-axis2_om_document_create (axis2_environment_t * environment,
+axis2_om_document_create (axis2_env_t * environment,
                           axis2_om_node_t * root,
                           axis2_om_stax_builder_t * builder)
 {
@@ -130,7 +130,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_document_impl_free (axis2_environment_t * environment,
+axis2_om_document_impl_free (axis2_env_t * environment,
                              axis2_om_document_t * document)
 {
     if (document)
@@ -151,7 +151,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_document_impl_add_child (axis2_environment_t * environment,
+axis2_om_document_impl_add_child (axis2_env_t * environment,
                                   axis2_om_document_t * document,
                                   axis2_om_node_t * child)
 {
@@ -179,7 +179,7 @@
 }
 
 axis2_om_node_t* AXIS2_CALL
-axis2_om_document_impl_build_next (axis2_environment_t * environment,
+axis2_om_document_impl_build_next (axis2_env_t * environment,
                                    axis2_om_document_t * document)
 {
     if (!document)
@@ -200,7 +200,7 @@
 
 
 axis2_om_node_t * AXIS2_CALL
-axis2_om_document_impl_get_root_element (axis2_environment_t * environment,
+axis2_om_document_impl_get_root_element (axis2_env_t * environment,
                                          axis2_om_document_t * document)
 {
     axis2_status_t status = AXIS2_SUCCESS;
@@ -226,7 +226,7 @@
 }
 
 axis2_om_node_t * AXIS2_CALL
-axis2_om_document_impl_get_next_sibling (axis2_environment_t * environment,
+axis2_om_document_impl_get_next_sibling (axis2_env_t * environment,
                                          axis2_om_document_t * document)
 {
     axis2_om_node_t *lastchild = NULL;
@@ -246,7 +246,7 @@
 }
 
 axis2_om_node_t* AXIS2_CALL
-axis2_om_document_impl_get_first_child (axis2_environment_t * environment,
+axis2_om_document_impl_get_first_child (axis2_env_t * environment,
                                         axis2_om_document_t * document)
 {
     axis2_om_node_t *current_child = NULL;
@@ -273,7 +273,7 @@
 }
 
 axis2_om_node_t* AXIS2_CALL
-axis2_om_document_impl_get_next_child (axis2_environment_t * environment,
+axis2_om_document_impl_get_next_child (axis2_env_t * environment,
                                        axis2_om_document_t * document)
 {
     axis2_om_node_t *current_child = NULL;

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c Mon Oct 31 21:27:27 2005
@@ -20,24 +20,24 @@
 
 
 axis2_om_namespace_t *AXIS2_CALL
-axis2_om_element_impl_find_namespace (axis2_environment_t * environment,
+axis2_om_element_impl_find_namespace (axis2_env_t * environment,
                                       axis2_om_node_t * node,
                                       const axis2_char_t * uri,
                                       const axis2_char_t * prefix);
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_declare_namespace (axis2_environment_t * environment,
+axis2_om_element_impl_declare_namespace (axis2_env_t * environment,
                                          axis2_om_node_t * node,
                                          axis2_om_namespace_t * ns);
 
 axis2_om_namespace_t *AXIS2_CALL
-axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *
+axis2_om_element_impl_find_namespace_with_qname (axis2_env_t *
                                                  environment,
                                                  axis2_om_node_t * element,
                                                  axis2_qname_t * qname);
 /*
 axis2_om_namespace_t *
-    AXIS2_CALL axis2_om_element_impl_find_declared_namespace (axis2_environment_t *
+    AXIS2_CALL axis2_om_element_impl_find_declared_namespace (axis2_env_t *
                                                     environment,
                                                     struct axis2_om_element
                                                     *element,
@@ -47,33 +47,33 @@
 */
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_add_attribute (axis2_environment_t * environment,
+axis2_om_element_impl_add_attribute (axis2_env_t * environment,
                                      struct axis2_om_element *element,
                                      axis2_om_attribute_t * attribute);
 
 axis2_om_attribute_t *AXIS2_CALL
-axis2_om_element_impl_get_attribute (axis2_environment_t * environment,
+axis2_om_element_impl_get_attribute (axis2_env_t * environment,
                                      struct axis2_om_element *element,
                                      axis2_qname_t * qname);
 
-axis2_status_t AXIS2_CALL axis2_om_element_impl_free (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_element_impl_free (axis2_env_t *
                                                       environment,
                                                       struct axis2_om_element
                                                       *element);
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_serialize_start_part (axis2_environment_t * environment,
+axis2_om_element_impl_serialize_start_part (axis2_env_t * environment,
                                             axis2_om_element_t * element,
                                             axis2_om_output_t * om_output);
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_serialize_end_part (axis2_environment_t * environment,
+axis2_om_element_impl_serialize_end_part (axis2_env_t * environment,
                                           axis2_om_element_t * element,
                                           axis2_om_output_t * om_output);
 
 
 AXIS2_DECLARE(axis2_om_element_t *)
-axis2_om_element_create (axis2_environment_t * environment,
+axis2_om_element_create (axis2_env_t * environment,
                          axis2_om_node_t * parent,
                          const axis2_char_t * localname,
                          axis2_om_namespace_t * ns, axis2_om_node_t ** node)
@@ -179,7 +179,7 @@
 }
 
 AXIS2_DECLARE(axis2_om_element_t *)
-axis2_om_element_create_with_qname (axis2_environment_t * environment,
+axis2_om_element_create_with_qname (axis2_env_t * environment,
                                     axis2_om_node_t * parent,
                                     axis2_qname_t * qname,
                                     axis2_om_node_t ** node)
@@ -218,7 +218,7 @@
 }
 
 axis2_om_namespace_t * AXIS2_CALL
-axis2_om_element_impl_find_namespace (axis2_environment_t * environment,
+axis2_om_element_impl_find_namespace (axis2_env_t * environment,
                                       axis2_om_node_t * node,
                                       const axis2_char_t * uri,
                                       const axis2_char_t * prefix)
@@ -276,7 +276,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_declare_namespace (axis2_environment_t * environment,
+axis2_om_element_impl_declare_namespace (axis2_env_t * environment,
                                          axis2_om_node_t * node,
                                          axis2_om_namespace_t * ns)
 {
@@ -325,7 +325,7 @@
 
 /*
 axis2_om_namespace_t *
-axis2_om_element_impl_find_declared_namespace (axis2_environment_t *
+axis2_om_element_impl_find_declared_namespace (axis2_env_t *
                                                environment,
                                                struct axis2_om_element *
                                                element,
@@ -363,7 +363,7 @@
 */
 
 axis2_om_namespace_t * AXIS2_CALL
-axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *
+axis2_om_element_impl_find_namespace_with_qname (axis2_env_t *
                                                  environment,
                                                  axis2_om_node_t * element,
                                                  axis2_qname_t * qname)
@@ -387,7 +387,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_add_attribute (axis2_environment_t * environment,
+axis2_om_element_impl_add_attribute (axis2_env_t * environment,
                                      struct axis2_om_element * element,
                                      axis2_om_attribute_t * attribute)
 {
@@ -415,7 +415,7 @@
 }
 
 axis2_om_attribute_t * AXIS2_CALL
-axis2_om_element_impl_get_attribute (axis2_environment_t * environment,
+axis2_om_element_impl_get_attribute (axis2_env_t * environment,
                                      struct axis2_om_element * element,
                                      axis2_qname_t * qname)
 {
@@ -431,7 +431,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_free (axis2_environment_t * environment,
+axis2_om_element_impl_free (axis2_env_t * environment,
                             struct axis2_om_element *element)
 {
     axis2_status_t status = AXIS2_SUCCESS;
@@ -488,7 +488,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_serialize_start_part (axis2_environment_t * environment,
+axis2_om_element_impl_serialize_start_part (axis2_env_t * environment,
                                             axis2_om_element_t * element,
                                             axis2_om_output_t * om_output)
 {
@@ -562,7 +562,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_element_impl_serialize_end_part (axis2_environment_t * environment,
+axis2_om_element_impl_serialize_end_part (axis2_env_t * environment,
                                           axis2_om_element_t * element,
                                           axis2_om_output_t * om_output)
 {

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c Mon Oct 31 21:27:27 2005
@@ -16,17 +16,17 @@
 
 #include <axis2_om_namespace.h>
 
-axis2_status_t AXIS2_CALL axis2_om_namespace_impl_free (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_namespace_impl_free (axis2_env_t *
                                              environment,
                                              axis2_om_namespace_t *
                                              om_namespace);
 
-axis2_bool_t AXIS2_CALL axis2_om_namespace_impl_equals (axis2_environment_t *
+axis2_bool_t AXIS2_CALL axis2_om_namespace_impl_equals (axis2_env_t *
                                              environment,
                                              axis2_om_namespace_t * ns1,
                                              axis2_om_namespace_t * ns2);
 
-axis2_status_t AXIS2_CALL axis2_om_namespace_impl_serialize (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_namespace_impl_serialize (axis2_env_t *
                                                   environment,
                                                   axis2_om_namespace_t *
                                                   om_namespace,
@@ -34,7 +34,7 @@
                                                   om_output);
 
 AXIS2_DECLARE(axis2_om_namespace_t *)
- axis2_om_namespace_create (axis2_environment_t * environment,
+ axis2_om_namespace_create (axis2_env_t * environment,
                            const axis2_char_t * uri,
                            const axis2_char_t * prefix)
 {
@@ -105,7 +105,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_namespace_impl_free (axis2_environment_t * environment,
+axis2_om_namespace_impl_free (axis2_env_t * environment,
                               struct axis2_om_namespace * om_namespace)
 {
     if (om_namespace)
@@ -134,7 +134,7 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_om_namespace_impl_equals (axis2_environment_t * environment,
+axis2_om_namespace_impl_equals (axis2_env_t * environment,
                                 axis2_om_namespace_t * ns1,
                                 axis2_om_namespace_t * ns2)
 {
@@ -159,7 +159,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_namespace_impl_serialize (axis2_environment_t * environment,
+axis2_om_namespace_impl_serialize (axis2_env_t * environment,
                                    axis2_om_namespace_t * om_namespace,
                                    axis2_om_output_t * om_output)
 {

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c Mon Oct 31 21:27:27 2005
@@ -18,46 +18,46 @@
 #include <axis2_om_element.h>
 #include <axis2_om_text.h>
 
-axis2_status_t AXIS2_CALL axis2_om_node_impl_free (axis2_environment_t * environment,
+axis2_status_t AXIS2_CALL axis2_om_node_impl_free (axis2_env_t * environment,
                                         axis2_om_node_t * node);
-axis2_status_t AXIS2_CALL axis2_om_node_impl_add_child (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_node_impl_add_child (axis2_env_t *
                                              environment,
                                              axis2_om_node_t * parent,
                                              axis2_om_node_t * child);
-axis2_om_node_t * AXIS2_CALL axis2_om_node_impl_detach (axis2_environment_t * environment,
+axis2_om_node_t * AXIS2_CALL axis2_om_node_impl_detach (axis2_env_t * environment,
                                             axis2_om_node_t * node_to_detach);
-axis2_status_t AXIS2_CALL axis2_om_node_impl_set_parent (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_node_impl_set_parent (axis2_env_t *
                                               environment,
                                               axis2_om_node_t * node,
                                               axis2_om_node_t * parent);
-axis2_status_t AXIS2_CALL axis2_om_node_impl_insert_sibling_after (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_node_impl_insert_sibling_after (axis2_env_t *
                                                         environment,
                                                         axis2_om_node_t *
                                                         node,
                                                         axis2_om_node_t *
                                                         node_to_insert);
-axis2_status_t AXIS2_CALL axis2_om_node_impl_insert_sibling_before (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_node_impl_insert_sibling_before (axis2_env_t *
                                                          environment,
                                                          axis2_om_node_t *
                                                          node,
                                                          axis2_om_node_t *
                                                          node_to_insert);
-axis2_om_node_t * AXIS2_CALL axis2_om_node_impl_get_first_child (axis2_environment_t *
+axis2_om_node_t * AXIS2_CALL axis2_om_node_impl_get_first_child (axis2_env_t *
                                                      environment,
                                                      axis2_om_node_t *
                                                      parent_node);
-axis2_om_node_t * AXIS2_CALL axis2_om_node_impl_get_next_child (axis2_environment_t *
+axis2_om_node_t * AXIS2_CALL axis2_om_node_impl_get_next_child (axis2_env_t *
                                                     environment,
                                                     axis2_om_node_t *
                                                     parent_node);
-axis2_status_t AXIS2_CALL axis2_om_node_impl_serialize (axis2_environment_t *
+axis2_status_t AXIS2_CALL axis2_om_node_impl_serialize (axis2_env_t *
                                              environment,
                                              axis2_om_node_t * om_node,
                                              axis2_om_output_t * om_output);
 
 
 AXIS2_DECLARE(axis2_om_node_t *)
-axis2_om_node_create (axis2_environment_t * environment)
+axis2_om_node_create (axis2_env_t * environment)
 {
     axis2_om_node_t *node =
         (axis2_om_node_t *) axis2_malloc (environment->allocator,
@@ -108,7 +108,7 @@
  *  before calling this function first free 
  */
 axis2_status_t AXIS2_CALL
-axis2_om_node_impl_free (axis2_environment_t * environment,
+axis2_om_node_impl_free (axis2_env_t * environment,
                          axis2_om_node_t * node)
 {
 
@@ -155,7 +155,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_node_impl_add_child (axis2_environment_t * environment,
+axis2_om_node_impl_add_child (axis2_env_t * environment,
                               axis2_om_node_t * parent,
                               axis2_om_node_t * child)
 {
@@ -182,7 +182,7 @@
 
 
 axis2_om_node_t * AXIS2_CALL
-axis2_om_node_impl_detach (axis2_environment_t * environment,
+axis2_om_node_impl_detach (axis2_env_t * environment,
                            axis2_om_node_t * node_to_detach)
 {
     axis2_om_node_t *parent = NULL;
@@ -216,7 +216,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_node_impl_set_parent (axis2_environment_t * environment,
+axis2_om_node_impl_set_parent (axis2_env_t * environment,
                                axis2_om_node_t * node,
                                axis2_om_node_t * parent)
 {
@@ -249,7 +249,7 @@
  */
 
 axis2_status_t AXIS2_CALL
-axis2_om_node_impl_insert_sibling_after (axis2_environment_t * environment,
+axis2_om_node_impl_insert_sibling_after (axis2_env_t * environment,
                                          axis2_om_node_t * node,
                                          axis2_om_node_t * node_to_insert)
 {
@@ -272,7 +272,7 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_om_node_impl_insert_sibling_before (axis2_environment_t * environment,
+axis2_om_node_impl_insert_sibling_before (axis2_env_t * environment,
                                           axis2_om_node_t * node,
                                           axis2_om_node_t * node_to_insert)
 {
@@ -300,7 +300,7 @@
 }
 
 axis2_om_node_t* AXIS2_CALL
-axis2_om_node_impl_get_first_child (axis2_environment_t * environment,
+axis2_om_node_impl_get_first_child (axis2_env_t * environment,
                                     axis2_om_node_t * parent_node)
 {
     /**  */
@@ -319,7 +319,7 @@
 }
 
 axis2_om_node_t* AXIS2_CALL
-axis2_om_node_impl_get_next_child (axis2_environment_t * environment,
+axis2_om_node_impl_get_next_child (axis2_env_t * environment,
                                    axis2_om_node_t * parent_node)
 {
     axis2_om_node_t *node = NULL;
@@ -345,7 +345,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_om_node_impl_serialize (axis2_environment_t * environment,
+axis2_om_node_impl_serialize (axis2_env_t * environment,
                               axis2_om_node_t * om_node,
                               axis2_om_output_t * om_output)
 {