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 [1/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/...

Author: damitha
Date: Mon Oct 31 21:27:27 2005
New Revision: 329981

URL: http://svn.apache.org/viewcvs?rev=329981&view=rev
Log:
changed axis2_environment_t to axis2_env_t.

Added:
    webservices/axis2/trunk/c/modules/util/src/axis2_string.h
      - copied unchanged from r329972, webservices/axis2/trunk/c/include/axis2_string.h
Removed:
    webservices/axis2/trunk/c/include/axis2_string.h
Modified:
    webservices/axis2/trunk/c/include/axis2_context_msg_context.h
    webservices/axis2/trunk/c/include/axis2_description_operation.h
    webservices/axis2/trunk/c/include/axis2_description_param_include.h
    webservices/axis2/trunk/c/include/axis2_description_parameter.h
    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/include/axis2_engine_msg_receiver.h
    webservices/axis2/trunk/c/include/axis2_environment.h
    webservices/axis2/trunk/c/include/axis2_file_diff.h
    webservices/axis2/trunk/c/include/axis2_hash.h
    webservices/axis2/trunk/c/include/axis2_om_attribute.h
    webservices/axis2/trunk/c/include/axis2_om_comment.h
    webservices/axis2/trunk/c/include/axis2_om_doctype.h
    webservices/axis2/trunk/c/include/axis2_om_document.h
    webservices/axis2/trunk/c/include/axis2_om_element.h
    webservices/axis2/trunk/c/include/axis2_om_namespace.h
    webservices/axis2/trunk/c/include/axis2_om_node.h
    webservices/axis2/trunk/c/include/axis2_om_output.h
    webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
    webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
    webservices/axis2/trunk/c/include/axis2_om_text.h
    webservices/axis2/trunk/c/include/axis2_qname.h
    webservices/axis2/trunk/c/include/axis2_stream.h
    webservices/axis2/trunk/c/include/axis2_wsdl_component.h
    webservices/axis2/trunk/c/include/axis2_wsdl_operation.h
    webservices/axis2/trunk/c/include/axis2_wsdl_service.h
    webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c
    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
    webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c
    webservices/axis2/trunk/c/modules/test/om/src/test_om.c
    webservices/axis2/trunk/c/modules/test/util/test_util.c
    webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
    webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c
    webservices/axis2/trunk/c/modules/util/src/axis2_hash.c
    webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
    webservices/axis2/trunk/c/modules/util/test/util_hash_test.c
    webservices/axis2/trunk/c/modules/util/test/util_log_test.c
    webservices/axis2/trunk/c/modules/util/test/util_stream_test.c
    webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_component.c
    webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_operation.c
    webservices/axis2/trunk/c/modules/wsdl/src/axis2_wsdl_service.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
    webservices/axis2/trunk/c/xdocs/axis2_developer_guide.html

Modified: webservices/axis2/trunk/c/include/axis2_context_msg_context.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_context_msg_context.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_context_msg_context.h (original)
+++ webservices/axis2/trunk/c/include/axis2_context_msg_context.h Mon Oct 31 21:27:27 2005
@@ -55,7 +55,7 @@
 /************************** Start of function pointers ************************/
 
     typedef axis2_status_t (*axis2_context_msg_ctx_free_t)
-        (axis2_environment_t * env, axis2_context_msg_ctx_t * msg_ctx);
+        (axis2_env_t * env, axis2_context_msg_ctx_t * msg_ctx);
 
 /**************************** End of function pointers ************************/
 
@@ -65,10 +65,10 @@
     };
 
     axis2_context_msg_ctx_t *axis2_context_msg_ctx_get_ops
-        (axis2_environment_t * env, axis2_context_msg_ctx_t * msg_ctx);
+        (axis2_env_t * env, axis2_context_msg_ctx_t * msg_ctx);
 
       axis2_context_msg_ctx_t
-        * axis2_context_msg_ctx_create (axis2_environment_t * env);
+        * axis2_context_msg_ctx_create (axis2_env_t * env);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_description_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_operation.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_operation.h Mon Oct 31 21:27:27 2005
@@ -102,49 +102,49 @@
 /************************** Start of function pointers ************************/
 
 typedef axis2_status_t (*axis2_description_operation_free_t)
-        (axis2_environment_t * env,
+        (axis2_env_t * env,
          axis2_description_operation_t * operation_desc);
 
 typedef axis2_status_t (*axis2_description_operation_add_param_t)
-        (axis2_environment_t *env, axis2_description_operation_t *operation_desc
+        (axis2_env_t *env, axis2_description_operation_t *operation_desc
         , axis2_description_param_t *param);
 
 typedef axis2_description_param_t *(*axis2_description_operation_get_param_t) 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
         , const axis2_char_t *name);
 
 typedef axis2_hash_t *(*axis2_description_operation_get_params_t)
-        (axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+        (axis2_env_t *env, axis2_description_operation_t *operation_desc);
 		 
 typedef axis2_bool_t (*axis2_description_operation_is_param_locked_t)
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *param_name);
 		 
 
 typedef axis2_status_t (*axis2_description_operation_set_parent_t)
-        (axis2_environment_t *env, axis2_description_operation_t *operation_desc
+        (axis2_env_t *env, axis2_description_operation_t *operation_desc
          , axis2_description_service_t *service_desc);
 
 typedef axis2_description_service_t *(*axis2_description_operation_get_parent_t) 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc);
 
 typedef axis2_qname_t *(*axis2_description_operation_get_name_t)
-        (axis2_environment_t * env, axis2_description_operation_t * operation_desc);
+        (axis2_env_t * env, axis2_description_operation_t * operation_desc);
 
 typedef axis2_status_t (*axis2_description_operation_set_msg_exchange_pattern_t)
-        (axis2_environment_t *env, axis2_description_operation_t *operation_desc
+        (axis2_env_t *env, axis2_description_operation_t *operation_desc
          , axis2_char_t *pattern);
 
 typedef axis2_char_t *(*axis2_description_operation_get_msg_exchange_pattern_t)
-        (axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+        (axis2_env_t *env, axis2_description_operation_t *operation_desc);
 
 typedef axis2_status_t (*axis2_description_operation_set_msg_receiver_t)
-        (axis2_environment_t * env,
+        (axis2_env_t * env,
          axis2_description_operation_t * operation_desc,
          axis2_engine_msg_receiver_t * msg_receiver);
 
 typedef axis2_engine_msg_receiver_t *(*axis2_description_operation_get_msg_receiver_t)
-        (axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+        (axis2_env_t *env, axis2_description_operation_t *operation_desc);
 
 /**************************** End of function pointers ************************/
 
@@ -178,13 +178,13 @@
 };
 
 axis2_description_operation_ops_t *axis2_description_operation_get_ops
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc);
 
 axis2_description_operation_t *axis2_description_operation_create 
-		(axis2_environment_t *env);
+		(axis2_env_t *env);
 
 axis2_description_operation_t *axis2_description_operation_create_with_name 
-		(axis2_environment_t *env, axis2_qname_t *name);
+		(axis2_env_t *env, axis2_qname_t *name);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_description_param_include.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_param_include.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_param_include.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_param_include.h Mon Oct 31 21:27:27 2005
@@ -82,7 +82,7 @@
   * @return status code
   */
 typedef axis2_status_t (*axis2_description_param_include_free_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 		 axis2_description_param_include_t * param_include);
 
 /** Add a parameter
@@ -90,7 +90,7 @@
   * @return status code
   */
 typedef axis2_status_t (*axis2_description_param_include_add_param_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 		 axis2_description_param_include_t * param_include,
 		 const axis2_description_param_t * param);
 
@@ -100,14 +100,14 @@
   */
 typedef axis2_description_param_t
 		*(*axis2_description_param_include_get_param_t) 
-		(axis2_environment_t *env, axis2_description_param_include_t *param_include,
+		(axis2_env_t *env, axis2_description_param_include_t *param_include,
 		const axis2_char_t *name);
 
 /** To get all the parameters in a given description
   * @return all the parameters contained
   */
 typedef axis2_hash_t *(*axis2_description_param_include_get_params_t)
-        (axis2_environment_t * env,
+        (axis2_env_t * env,
          axis2_description_param_include_t * param_include);
 
 /** To check whether the paramter is locked at any level
@@ -115,7 +115,7 @@
   * @return whether parameter is locked
   */
 typedef axis2_bool_t (*axis2_description_param_include_is_param_locked_t)
-		(axis2_environment_t *env,
+		(axis2_env_t *env,
 		axis2_description_param_include_t *param_include,
 		const axis2_char_t *param_name);
 
@@ -144,14 +144,14 @@
   * @return operations for axis2_description_param_include_t
   */
 axis2_description_param_include_ops_t*axis2_description_param_include_get_ops 
-		(axis2_environment_t *env, axis2_description_param_include_t *param_include);
+		(axis2_env_t *env, axis2_description_param_include_t *param_include);
 
 /**
   *	Create axis2_description_param_include_t
   * @return axis2_description_param_include_t
   */
 axis2_description_param_include_t *axis2_description_param_include_create
-        (axis2_environment_t * env);
+        (axis2_env_t * env);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_description_parameter.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_parameter.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_parameter.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_parameter.h Mon Oct 31 21:27:27 2005
@@ -78,7 +78,7 @@
   * @return Status code
   */
     typedef axis2_status_t (*axis2_description_param_free_t)
-        (axis2_environment_t * env, axis2_description_param_t * param);
+        (axis2_env_t * env, axis2_description_param_t * param);
 
 /**
   * parameter name set operation
@@ -86,7 +86,7 @@
   * @return Status code
   */
     typedef axis2_status_t (*axis2_description_param_set_name_t)
-        (axis2_environment_t * env, axis2_description_param_t * param,
+        (axis2_env_t * env, axis2_description_param_t * param,
          const axis2_char_t * name);
 
 /**
@@ -94,7 +94,7 @@
   * @return parameter name
   */
     typedef axis2_char_t *(*axis2_description_param_get_name_t)
-        (axis2_environment_t * env, axis2_description_param_t * param);
+        (axis2_env_t * env, axis2_description_param_t * param);
 
 /**
   * parameter value set operation
@@ -102,7 +102,7 @@
   * @return Status code
   */
     typedef axis2_status_t (*axis2_description_param_set_value_t)
-        (axis2_environment_t * env, axis2_description_param_t * param,
+        (axis2_env_t * env, axis2_description_param_t * param,
          void *value);
 
 /**
@@ -110,14 +110,14 @@
   * @return parameter value
   */
     typedef void *(*axis2_description_param_get_value_t)
-        (axis2_environment_t * env, axis2_description_param_t * param);
+        (axis2_env_t * env, axis2_description_param_t * param);
 
 /**
   * parameter lock check operation
   * @return whether parameter is locked or not
   */
     typedef axis2_bool_t (*axis2_description_param_is_locked_t)
-        (axis2_environment_t * env, axis2_description_param_t * param);
+        (axis2_env_t * env, axis2_description_param_t * param);
 
 /**
   * parameter lock set operation
@@ -125,7 +125,7 @@
   * @return Status code
   */
     typedef axis2_status_t (*axis2_description_param_set_locked_t)
-        (axis2_environment_t * env, axis2_description_param_t * param,
+        (axis2_env_t * env, axis2_description_param_t * param,
          const axis2_bool_t locked);
 
 /**
@@ -139,7 +139,7 @@
   * @return Status code
   */
 /*typedef axis2_status_t (*axis2_description_param_set_param_element_t) 
-	(axis2_environment_t *env, axis2_description_param_t *param
+	(axis2_env_t *env, axis2_description_param_t *param
 	, axis2_om_element_t * om_element);
 */
 
@@ -149,7 +149,7 @@
   */
     typedef axis2_description_param_t
         *
-        (*axis2_description_param_get_param_element_t) (axis2_environment_t *
+        (*axis2_description_param_get_param_element_t) (axis2_env_t *
                                                         env,
                                                         axis2_description_param_t
                                                         * param);
@@ -160,7 +160,7 @@
   * @return Status code
   */
     typedef axis2_status_t (*axis2_description_param_set_type_t)
-        (axis2_environment_t * env, axis2_description_param_t * param,
+        (axis2_env_t * env, axis2_description_param_t * param,
          const int type);
 
 /**
@@ -168,7 +168,7 @@
   * @return parameter type
   */
     typedef int (*axis2_description_param_get_type_t)
-        (axis2_environment_t * env, axis2_description_param_t * param);
+        (axis2_env_t * env, axis2_description_param_t * param);
 
 /************************ End of function pointers ****************************/
 
@@ -205,14 +205,14 @@
   * @return operations for axis2_description_param_t
   */
     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);
 
 /**
   *	Create axis2_description_param_t
   * @return axis2_description_param_t
   */
     axis2_description_param_t *axis2_description_param_create
-        (axis2_environment_t * env);
+        (axis2_env_t * env);
 
 /**
  * Create parameter with name and value
@@ -221,7 +221,7 @@
  * @return axis2_description_param_t
  */
     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);
 
 /** @} */

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=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_service.h Mon Oct 31 21:27:27 2005
@@ -106,57 +106,57 @@
 
 
 typedef axis2_status_t (*axis2_description_service_free_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc);
 
 typedef axis2_status_t (*axis2_description_service_add_operation_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc,
 	 	axis2_description_operation_t * operation_desc);
 
 typedef axis2_description_operation_t
 		*(*axis2_description_service_get_operation_with_qname_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc,
 	 	axis2_qname_t * operation_name);
 
 typedef axis2_description_operation_t
 		* (*axis2_description_service_get_operation_with_name_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc,
 	 	const axis2_char_t * operation_name);
 
 typedef axis2_hash_t *(*axis2_description_service_get_operations_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc);
 
 typedef axis2_status_t (*axis2_description_service_set_parent_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc,
 	 	axis2_description_servicegroup_t * servicegroup_desc);
 
 typedef axis2_description_servicegroup_t
 		* (*axis2_description_service_get_parent_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_service_t * service_desc);
 		 
 typedef axis2_qname_t *(*axis2_description_service_get_name_t)
-		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+		(axis2_env_t *env, axis2_description_service_t *service_desc);
 		
 typedef axis2_status_t (*axis2_description_service_add_param_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_service_t *service_desc
 		, axis2_description_param_t *param);
 
 typedef axis2_description_param_t *(*axis2_description_service_get_param_t)
-		(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);
 
 typedef axis2_hash_t *(*axis2_description_service_get_params_t)
-		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+		(axis2_env_t *env, axis2_description_service_t *service_desc);
 
 typedef axis2_bool_t (*axis2_description_service_is_param_locked_t)
-		(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 function pointers *******************************/
@@ -199,14 +199,14 @@
   * @return operation struct for service
   */
 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);
 
 /** Create a service with qualified name
   * @param qualified name
   * @return service struct
   */
 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);
 
 /** @} */
 #ifdef __cplusplus

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=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_servicegroup.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_servicegroup.h Mon Oct 31 21:27:27 2005
@@ -96,7 +96,7 @@
   * @return status code
   */
 typedef axis2_status_t (*axis2_description_servicegroup_free_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 
 /** Set name of the service group_member
@@ -104,7 +104,7 @@
   * @return status_code
   */
 typedef axis2_status_t (*axis2_description_servicegroup_set_name_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_char_t *servicegroup_name);
 		
@@ -112,7 +112,7 @@
   * @return service group name
   */
 typedef axis2_char_t *(*axis2_description_servicegroup_get_name_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 
 /** Add a service to the serivce group
@@ -120,7 +120,7 @@
   * @return status code
   */
 typedef axis2_status_t (*axis2_description_servicegroup_add_service_t)
-		(axis2_environment_t * env,
+		(axis2_env_t * env,
 	 	axis2_description_servicegroup_t * servicegroup_desc,
 	 	axis2_description_service_t * service_desc);
 
@@ -130,31 +130,31 @@
   */
 typedef axis2_description_service_t 
 		*(*axis2_description_servicegroup_get_service_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_qname_t* service_name);
 
 typedef axis2_status_t (*axis2_description_servicegroup_remove_service_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, const axis2_qname_t* service_name);
 		
 typedef axis2_status_t (*axis2_description_servicegroup_add_param_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc
 		, axis2_description_param_t *param);
 		
 
 typedef axis2_description_param_t *(*axis2_description_servicegroup_get_param_t)(
-		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);
 		
 typedef axis2_hash_t *(*axis2_description_servicegroup_get_params_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 		
 typedef axis2_bool_t (*axis2_description_servicegroup_is_param_locked_t)
-		(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 pointers *************************/
@@ -174,11 +174,11 @@
 };
 
 axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops 
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_servicegroup_t *servicegroup_desc);
 
 axis2_description_servicegroup_t *axis2_description_servicegroup_create
-		(axis2_environment_t *env);
+		(axis2_env_t *env);
 
 /** @} */
 #ifdef __cplusplus

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=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_config.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_config.h Mon Oct 31 21:27:27 2005
@@ -64,19 +64,19 @@
 /************************* End of function macros *****************************/
 /************************* Start of function pointers *************************/
 
-typedef axis2_status_t (*axis2_engine_config_free_t)(axis2_environment_t *env,
+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_add_service_group_t)
-		(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);
 
 typedef axis2_description_service_t *(*axis2_engine_config_get_service_t)
-		(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);
 
 typedef axis2_status_t (*axis2_engine_config_remove_service_t)
-		(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);	
 		
 /************************* End of function pointers ***************************/
@@ -104,13 +104,13 @@
 /** function to get the operations consturct for axis2_engine_config_create
  * @return operation struct
  */
-axis2_engine_config_ops_t *axis2_engine_config_get_ops(axis2_environment_t *env,
+axis2_engine_config_ops_t *axis2_engine_config_get_ops(axis2_env_t *env,
 		axis2_engine_config_t *config);
 
 /** create axis_engine_config struct
  * @return axis_engine_config struct
  */
-axis2_engine_config_t *axis2_engine_config_create(axis2_environment_t *env);
+axis2_engine_config_t *axis2_engine_config_create(axis2_env_t *env);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_engine_msg_receiver.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine_msg_receiver.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_msg_receiver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_msg_receiver.h Mon Oct 31 21:27:27 2005
@@ -58,11 +58,11 @@
 /************************** Start of function pointers ************************/
 
     typedef axis2_status_t (*axis2_engine_msg_receiver_free_t)
-        (axis2_environment_t * env,
+        (axis2_env_t * env,
          axis2_engine_msg_receiver_t * msg_receiver);
 
     typedef axis2_status_t (*axis2_engine_msg_receiver_receive_t)
-        (axis2_environment_t * env,
+        (axis2_env_t * env,
          axis2_engine_msg_receiver_t * msg_receiver,
          axis2_context_msg_ctx_t * msg_ctx);
 
@@ -76,11 +76,11 @@
     };
 
     axis2_engine_msg_receiver_t *axis2_engine_msg_receiver_get_ops
-        (axis2_environment_t * env,
+        (axis2_env_t * env,
          axis2_engine_msg_receiver_t * msg_receiver);
 
       axis2_engine_msg_receiver_t
-        * axis2_engine_msg_receiver_create (axis2_environment_t * env);
+        * axis2_engine_msg_receiver_create (axis2_env_t * env);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_environment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_environment.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_environment.h (original)
+++ webservices/axis2/trunk/c/include/axis2_environment.h Mon Oct 31 21:27:27 2005
@@ -63,7 +63,7 @@
         axis2_stream_t *stream;
         /** Logging routines */
         axis2_log_t *log;
-    } axis2_environment_t;
+    } axis2_env_t;
 
   /**
     * Creates an environment struct
@@ -74,7 +74,7 @@
     * @param string pointer to an instance of string struct. Optional, can be NULL. If NULL default string handler would be used.
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_environment_t *) axis2_environment_create (axis2_allocator_t *
+    AXIS2_DECLARE(axis2_env_t *) axis2_environment_create (axis2_allocator_t *
                                                    allocator,
                                                    axis2_error_t * error,
                                                    axis2_stream_t * stream,
@@ -89,7 +89,7 @@
     * @param string pointer to an instance of string struct. Optional, can be NULL. If NULL default string handler would be used.
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_status_t) axis2_environment_free (axis2_environment_t *env);
+    AXIS2_DECLARE(axis2_status_t) axis2_environment_free (axis2_env_t *env);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_file_diff.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_file_diff.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_file_diff.h (original)
+++ webservices/axis2/trunk/c/include/axis2_file_diff.h Mon Oct 31 21:27:27 2005
@@ -38,7 +38,7 @@
   * @param file name
   * @return status code
   */
-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);
 
 #endif /* AXIS2_FILE_DIFF_H */

Modified: webservices/axis2/trunk/c/include/axis2_hash.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_hash.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/include/axis2_hash.h Mon Oct 31 21:27:27 2005
@@ -78,7 +78,7 @@
  * @param environment The environment to allocate the hash table out of
  * @return The hash table just created
   */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make (axis2_environment_t * environment);
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make (axis2_env_t * environment);
 
 /**
  * Create a hash table with a custom hash function
@@ -86,7 +86,7 @@
  * @param hash_func A custom hash function.
  * @return The hash table just created
   */
-   AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make_custom (axis2_environment_t * environment,
+   AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make_custom (axis2_env_t * environment,
                                           axis2_hashfunc_t hash_func);
 
 /**
@@ -96,7 +96,7 @@
  * @return The hash table just created
  * @remark Makes a shallow copy
  */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_copy (axis2_environment_t * environment,
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_copy (axis2_env_t * environment,
                                    const axis2_hash_t * h);
 
 /**
@@ -135,7 +135,7 @@
 /**
  * <PRE>
  * 
- * int sum_values(axis2_environment_t *environment, axis2_hash_t *ht)
+ * int sum_values(axis2_env_t *environment, axis2_hash_t *ht)
  * {
  *     axis2_hash_index_t *hi;
  *     void *val;
@@ -148,7 +148,7 @@
  * }
  * </PRE>
  */
- AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_first (axis2_environment_t * environment,
+ AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_first (axis2_env_t * environment,
                                           axis2_hash_t * ht);
 
 /**
@@ -157,7 +157,7 @@
  * @return a pointer to the updated iteration state.  NULL if there are no more  
  *         entries.
  */
- AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_next (axis2_environment_t * environment, axis2_hash_index_t * hi);
+ AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_next (axis2_env_t * environment, axis2_hash_index_t * hi);
 
 /**
  * Get the current entry's details from the iteration state.
@@ -187,7 +187,7 @@
  * @param base The table that represents the initial values of the new table
  * @return A new hash table containing all of the data from the two passed in
  */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_overlay (axis2_environment_t * environment,
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_overlay (axis2_env_t * environment,
                                       const axis2_hash_t * overlay,
                                       const axis2_hash_t * base);
 
@@ -205,10 +205,10 @@
  * @param data Client data to pass to the merger function
  * @return A new hash table containing all of the data from the two passed in
  */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_merge (axis2_environment_t * environment,
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_merge (axis2_env_t * environment,
                                     const axis2_hash_t * h1,
                                     const axis2_hash_t * h2,
-                                    void *(*merger) (axis2_environment_t *
+                                    void *(*merger) (axis2_env_t *
                                                      environment,
                                                      const void *key,
                                                      axis2_ssize_t klen,
@@ -225,7 +225,7 @@
  *
  */
 									
-AXIS2_DECLARE(axis2_status_t) axis2_hash_free(axis2_environment_t *environment,
+AXIS2_DECLARE(axis2_status_t) axis2_hash_free(axis2_env_t *environment,
 									axis2_hash_t *ht);
 									
 

Modified: webservices/axis2/trunk/c/include/axis2_om_attribute.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_attribute.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_attribute.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_attribute.h Mon Oct 31 21:27:27 2005
@@ -53,7 +53,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
 
-         axis2_status_t (AXIS2_CALL *axis2_om_attribute_ops_free) (axis2_environment_t *
+         axis2_status_t (AXIS2_CALL *axis2_om_attribute_ops_free) (axis2_env_t *
                                                        environment,
                                                        struct
                                                        axis2_om_attribute *
@@ -67,7 +67,7 @@
         */
 
          axis2_qname_t
-            *(AXIS2_CALL *axis2_om_attribute_ops_get_qname) (axis2_environment_t *
+            *(AXIS2_CALL *axis2_om_attribute_ops_get_qname) (axis2_env_t *
                                                   environment,
                                                   struct axis2_om_attribute *
                                                   om_attribute);
@@ -80,7 +80,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
 
-         int (AXIS2_CALL *axis2_om_attribute_ops_serialize) (axis2_environment_t *
+         int (AXIS2_CALL *axis2_om_attribute_ops_serialize) (axis2_env_t *
                                                  environment,
                                                  struct axis2_om_attribute *
                                                  om_attribute,
@@ -113,7 +113,7 @@
     * @param ns namespace, if any, of the attribute. Optional, can be NULL
     * @return a pointer to newly created attribute struct 
     */
-    AXIS2_DECLARE(axis2_om_attribute_t *) axis2_om_attribute_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_attribute_t *) axis2_om_attribute_create (axis2_env_t *
                                                      environment,
                                                      const axis2_char_t *
                                                      localname,

Modified: webservices/axis2/trunk/c/include/axis2_om_comment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_comment.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_comment.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_comment.h Mon Oct 31 21:27:27 2005
@@ -51,7 +51,7 @@
         * @param comment pointer to axis2_commnet struct to be freed
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
-         axis2_status_t (AXIS2_CALL *axis2_om_comment_ops_free) (axis2_environment_t *
+         axis2_status_t (AXIS2_CALL *axis2_om_comment_ops_free) (axis2_env_t *
                                                      environment,
                                                      struct axis2_om_comment *
                                                      comment);
@@ -79,7 +79,7 @@
     *                       Node type will be set to AXIS2_OM_COMMENT
     * @return a pointer to the newly created comment struct
     */
-    AXIS2_DECLARE(axis2_om_comment_t *) axis2_om_comment_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_comment_t *) axis2_om_comment_create (axis2_env_t *
                                                  environment,
                                                  const axis2_char_t * value,
                                                  axis2_om_node_t **

Modified: webservices/axis2/trunk/c/include/axis2_om_doctype.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_doctype.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_doctype.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_doctype.h Mon Oct 31 21:27:27 2005
@@ -50,7 +50,7 @@
         * @param om_doctype pointer to doctype struct to be freed
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-         axis2_status_t (AXIS2_CALL *axis2_om_doctype_ops_free) (axis2_environment_t *
+         axis2_status_t (AXIS2_CALL *axis2_om_doctype_ops_free) (axis2_env_t *
                                                      environment,
                                                      struct axis2_om_doctype *
                                                      om_doctype);
@@ -78,7 +78,7 @@
     *                       Node type will be set to AXIS2_OM_DOCTYPE
     * @return pointer to newly created doctype struct 
     */
-    AXIS2_DECLARE(axis2_om_doctype_t *) axis2_om_doctype_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_doctype_t *) axis2_om_doctype_create (axis2_env_t *
                                                  environment,
                                                  axis2_om_node_t * parent,
                                                  const axis2_char_t * value,

Modified: webservices/axis2/trunk/c/include/axis2_om_document.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_document.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_document.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_document.h Mon Oct 31 21:27:27 2005
@@ -58,7 +58,7 @@
         * @param document pointer to document struct to be freed
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_document_ops_free) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_document_ops_free) (axis2_env_t *
                                                       environment,
                                                       struct axis2_om_document
                                                       * document);
@@ -70,7 +70,7 @@
         * @return pointer to the next node. NULL on error.
         */
         axis2_om_node_t
-            *(AXIS2_CALL *axis2_om_document_ops_build_next) (axis2_environment_t *
+            *(AXIS2_CALL *axis2_om_document_ops_build_next) (axis2_env_t *
                                                   environment,
                                                   struct axis2_om_document *
                                                   document);
@@ -83,7 +83,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
         axis2_status_t (AXIS2_CALL *axis2_om_document_ops_add_child)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_document * document, axis2_om_node_t * child);
 
       /**
@@ -94,7 +94,7 @@
         *             build the root. Returns NULL on error. 
         */
         axis2_om_node_t
-            * (AXIS2_CALL *axis2_om_document_ops_get_root_element) (axis2_environment_t *
+            * (AXIS2_CALL *axis2_om_document_ops_get_root_element) (axis2_env_t *
                                                          environment,
                                                          struct
                                                          axis2_om_document *
@@ -109,7 +109,7 @@
         *           On error, returns NULL and set the error. 
         */
         axis2_om_node_t
-            * (AXIS2_CALL *axis2_om_document_ops_get_next_sibling) (axis2_environment_t *
+            * (AXIS2_CALL *axis2_om_document_ops_get_next_sibling) (axis2_env_t *
                                                          environment,
                                                          struct
                                                          axis2_om_document *
@@ -125,7 +125,7 @@
         *           On error, returns NULL and sets the error. 
         */
         axis2_om_node_t
-            * (AXIS2_CALL *axis2_om_document_ops_get_first_child) (axis2_environment_t *
+            * (AXIS2_CALL *axis2_om_document_ops_get_first_child) (axis2_env_t *
                                                         environment,
                                                         struct
                                                         axis2_om_document *
@@ -141,7 +141,7 @@
         *           On error, returns NULL and sets the error. 
         */
         axis2_om_node_t
-            * (AXIS2_CALL *axis2_om_document_ops_get_next_child) (axis2_environment_t *
+            * (AXIS2_CALL *axis2_om_document_ops_get_next_child) (axis2_env_t *
                                                        environment,
                                                        struct
                                                        axis2_om_document *
@@ -179,7 +179,7 @@
     * @param builder pointer to xml builder 
     * @return pointer to the newly created document.
     */
-    AXIS2_DECLARE(axis2_om_document_t *) axis2_om_document_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_document_t *) axis2_om_document_create (axis2_env_t *
                                                        environment,
                                                        axis2_om_node_t * root,
                                                        struct

Modified: webservices/axis2/trunk/c/include/axis2_om_element.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_element.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_element.h Mon Oct 31 21:27:27 2005
@@ -55,7 +55,7 @@
         *           NULL and sets the errorno in environment.
         */
         axis2_om_namespace_t *
-            (AXIS2_CALL *axis2_om_element_ops_find_namespace) (axis2_environment_t *
+            (AXIS2_CALL *axis2_om_element_ops_find_namespace) (axis2_env_t *
                                                      environment,
                                                      axis2_om_node_t * node,
                                                      const axis2_char_t * uri,
@@ -70,7 +70,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
         axis2_status_t (AXIS2_CALL *axis2_om_element_ops_declare_namespace)
-            (axis2_environment_t * environment, axis2_om_node_t *node,
+            (axis2_env_t * environment, axis2_om_node_t *node,
              axis2_om_namespace_t * ns);
 
       /**
@@ -82,7 +82,7 @@
         */
         /*   AXIS2_DECLARE_DATA axis2_om_namespace_t
             *(AXIS2_CALL *axis2_om_element_ops_find_declared_namespace)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_element * element, const axis2_char_t * uri,
              const axis2_char_t * prefix);
              */
@@ -98,7 +98,7 @@
         */
          axis2_om_namespace_t *
             (AXIS2_CALL *axis2_om_element_ops_find_namespace_with_qname)
-            (axis2_environment_t *environment, axis2_om_node_t *node,
+            (axis2_env_t *environment, axis2_om_node_t *node,
              axis2_qname_t *qname);
 
       /**
@@ -109,7 +109,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
          axis2_status_t (AXIS2_CALL *axis2_om_element_ops_add_attribute)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_element * element,
              axis2_om_attribute_t * attribute);
 
@@ -122,7 +122,7 @@
         *           On error, returns NULL and sets the error.
         */
          axis2_om_attribute_t *
-            (AXIS2_CALL *axis2_om_element_ops_get_attribute) (axis2_environment_t *
+            (AXIS2_CALL *axis2_om_element_ops_get_attribute) (axis2_env_t *
                                                     environment,
                                                     struct axis2_om_element *
                                                     element,
@@ -134,7 +134,7 @@
         * @param element OM element to be freed.
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
-         axis2_status_t (AXIS2_CALL *axis2_om_element_ops_free) (axis2_environment_t *
+         axis2_status_t (AXIS2_CALL *axis2_om_element_ops_free) (axis2_env_t *
                                                        environment,
                                                        struct axis2_om_element
                                                        * element);
@@ -147,7 +147,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *axis2_om_element_ops_serialize_start_part)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_element * element,
              axis2_om_output_t * om_output);
 
@@ -160,7 +160,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *axis2_om_element_ops_serialize_end_part)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_element * element,
              axis2_om_output_t * om_output);
 
@@ -196,7 +196,7 @@
     *                       Node type will be set to AXIS2_OM_ELEMENT
     * @return a pointer to the newly created element struct
     */
-    AXIS2_DECLARE(axis2_om_element_t *) axis2_om_element_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_element_t *) axis2_om_element_create (axis2_env_t *
                                                  environment,
                                                  axis2_om_node_t * parent,
                                                  const axis2_char_t *
@@ -215,7 +215,7 @@
     * @return a pointer to the newly created element struct
     */
     AXIS2_DECLARE(axis2_om_element_t *) 
-        axis2_om_element_create_with_qname (axis2_environment_t *
+        axis2_om_element_create_with_qname (axis2_env_t *
                                              environment,
                                              axis2_om_node_t * parent,
                                              axis2_qname_t * qname,

Modified: webservices/axis2/trunk/c/include/axis2_om_namespace.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_namespace.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_namespace.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_namespace.h Mon Oct 31 21:27:27 2005
@@ -52,7 +52,7 @@
         * @param om_namespace namespace to be freed.
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_free) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_free) (axis2_env_t *
                                                        environment,
                                                        struct
                                                        axis2_om_namespace *
@@ -65,7 +65,7 @@
         * @param om_namespace2 second namespace to be compared
         * @return true if the two namespaces are equal, false otherwise	
         */
-        axis2_bool_t (AXIS2_CALL *axis2_om_namespace_ops_equals) (axis2_environment_t *
+        axis2_bool_t (AXIS2_CALL *axis2_om_namespace_ops_equals) (axis2_env_t *
                                                        environment,
                                                        struct
                                                        axis2_om_namespace *
@@ -82,7 +82,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
         axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_serialize)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_namespace * om_namespace,
              axis2_om_output_t * om_output);
 
@@ -108,7 +108,7 @@
     * @param prefix namespace prefix
     * @return a pointer to newly created namespace struct
     */
-    AXIS2_DECLARE(axis2_om_namespace_t *) axis2_om_namespace_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_namespace_t *) axis2_om_namespace_create (axis2_env_t *
                                                      environment,
                                                      const axis2_char_t * uri,
                                                      const axis2_char_t *

Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Mon Oct 31 21:27:27 2005
@@ -82,7 +82,7 @@
         * @param om_node node to be freed.
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_free) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_free) (axis2_env_t *
                                                   environment,
                                                   struct axis2_om_node *
                                                   om_node);
@@ -93,7 +93,7 @@
         * @param child child node. Mandatory, cannot be NULL.
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_add_child) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_add_child) (axis2_env_t *
                                                        environment,
                                                        struct axis2_om_node *
                                                        parent,
@@ -106,7 +106,7 @@
         * @param om_node node to be detached. Mandatory, cannot be NULL.
         * @return a pointer to detached node, NULL on error.
         */
-        struct axis2_om_node *(AXIS2_CALL *axis2_om_node_ops_detach) (axis2_environment_t
+        struct axis2_om_node *(AXIS2_CALL *axis2_om_node_ops_detach) (axis2_env_t
                                                            * environment,
                                                            struct
                                                            axis2_om_node *
@@ -120,7 +120,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *axis2_om_node_ops_insert_sibling_after)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_node * current_node,
              struct axis2_om_node * node_to_insert);
 
@@ -132,7 +132,7 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *axis2_om_node_ops_insert_sibling_before)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_node * current_node,
              struct axis2_om_node * node_to_insert);
 
@@ -143,7 +143,7 @@
         * @param parent the node that will be set as parent. Mandatory, cannot be NULL.
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_set_parent) (axis2_environment_t
+        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_set_parent) (axis2_env_t
                                                           * environment,
                                                           struct axis2_om_node
                                                           * child_node,
@@ -158,7 +158,7 @@
         *           On error sets the error and returns NULL
         */
         struct axis2_om_node
-            *(AXIS2_CALL *axis2_om_node_ops_get_first_child) (axis2_environment_t *
+            *(AXIS2_CALL *axis2_om_node_ops_get_first_child) (axis2_env_t *
                                                    environment,
                                                    struct axis2_om_node *
                                                    parent_node);
@@ -172,7 +172,7 @@
         *           On error sets the error and returns NULL
         */
         struct axis2_om_node
-            *(AXIS2_CALL *axis2_om_node_ops_get_next_child) (axis2_environment_t *
+            *(AXIS2_CALL *axis2_om_node_ops_get_next_child) (axis2_env_t *
                                                   environment,
                                                   struct axis2_om_node *
                                                   parent_node);
@@ -185,7 +185,7 @@
         * @param om_output OM output handler to be used in serializing
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_serialize) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_node_ops_serialize) (axis2_env_t *
                                                          environment,
                                                          struct axis2_om_node
                                                          * om_node,
@@ -239,7 +239,7 @@
     * @param environment Environment. MUST NOT be NULL, if NULL behaviour is undefined.
     * @return a pointer to newly created node struct. NULL on error. 
     */
-    AXIS2_DECLARE(axis2_om_node_t *) axis2_om_node_create (axis2_environment_t * environment);
+    AXIS2_DECLARE(axis2_om_node_t *) axis2_om_node_create (axis2_env_t * environment);
 
 /** frees given node */
 #define axis2_om_node_free(environment,om_node) ((om_node)->ops->axis2_om_node_ops_free(environment,om_node))

Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Mon Oct 31 21:27:27 2005
@@ -70,7 +70,7 @@
     * @return a pointer to newly created output struct.
     */
 
-    AXIS2_DECLARE(axis2_om_output_t*) axis2_om_output_create (axis2_environment_t *
+    AXIS2_DECLARE(axis2_om_output_t*) axis2_om_output_create (axis2_env_t *
                                                environment, void *xml_writer, void* writer_env);
 
   /**
@@ -83,7 +83,7 @@
     *  @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
     */
 
-    AXIS2_DECLARE(axis2_status_t) axis2_om_output_write (axis2_environment_t * environment,
+    AXIS2_DECLARE(axis2_status_t) axis2_om_output_write (axis2_env_t * environment,
                                           axis2_om_output_t * om_output,
                                           axis2_om_types_t type,
                                           int no_of_args, ...);

Modified: webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h Mon Oct 31 21:27:27 2005
@@ -53,7 +53,7 @@
          * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
          */
         axis2_status_t (AXIS2_CALL *axis2_om_processing_instruction_ops_free)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_processing_instruction * om_pi);
     } axis2_om_processing_instruction_ops_t;
 
@@ -83,7 +83,7 @@
     * @return a pointer tonewly created processing instruction struct 
     */
     AXIS2_DECLARE(axis2_om_processing_instruction_t *) 
-        axis2_om_processing_instruction_create (axis2_environment_t *
+        axis2_om_processing_instruction_create (axis2_env_t *
                                                  environment,
                                                  axis2_om_node_t * parent,
                                                  const axis2_char_t * target,

Modified: webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_stax_builder.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_stax_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_stax_builder.h Mon Oct 31 21:27:27 2005
@@ -55,7 +55,7 @@
         *           On erros sets the error and returns NULL.
         */
         axis2_om_node_t * 
-            (AXIS2_CALL *axis2_om_stax_builder_ops_next) (axis2_environment_t *
+            (AXIS2_CALL *axis2_om_stax_builder_ops_next) (axis2_env_t *
                                                 environment,
                                                 struct axis2_om_stax_builder *
                                                 builder);
@@ -67,11 +67,11 @@
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
         */
         axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_discard_current_element)
-            (axis2_environment_t * environment,
+            (axis2_env_t * environment,
              struct axis2_om_stax_builder * builder);
 
 			 
-		axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_free)(axis2_environment_t *envioronment,struct axis2_om_stax_builder *builder);
+		axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_free)(axis2_env_t *envioronment,struct axis2_om_stax_builder *builder);
 
     } axis2_om_stax_builder_ops_t;
 
@@ -106,7 +106,7 @@
 	* @param parser_env parser envioronment. Optional, can be NULL.
     * @return a pointer to the newly created builder struct. 
     */
-    AXIS2_DECLARE(axis2_om_stax_builder_t *) axis2_om_stax_builder_create (axis2_environment_t
+    AXIS2_DECLARE(axis2_om_stax_builder_t *) axis2_om_stax_builder_create (axis2_env_t
                                                            * environment,
                                                            void *parser, void* parser_env);
 

Modified: webservices/axis2/trunk/c/include/axis2_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_text.h Mon Oct 31 21:27:27 2005
@@ -52,7 +52,7 @@
         * @param om_text pointer to om text struct to be freed
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_text_ops_free) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_text_ops_free) (axis2_env_t *
                                                   environment,
                                                   struct axis2_om_text *
                                                   om_text);
@@ -64,7 +64,7 @@
         * @param om_output OM output handler to be used in serializing
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        axis2_status_t (AXIS2_CALL *axis2_om_text_ops_serialize) (axis2_environment_t *
+        axis2_status_t (AXIS2_CALL *axis2_om_text_ops_serialize) (axis2_env_t *
                                                        environment,
                                                        const struct
                                                        axis2_om_text *
@@ -104,7 +104,7 @@
     *                       Node type will be set to AXIS2_OM_TEXT    
     * @return pointer to newly created text struct 
     */
-    AXIS2_DECLARE(axis2_om_text_t *) axis2_om_text_create (axis2_environment_t * environment,
+    AXIS2_DECLARE(axis2_om_text_t *) axis2_om_text_create (axis2_env_t * environment,
                                            axis2_om_node_t * parent,
                                            const axis2_char_t * value,
                                            axis2_om_node_t ** node);

Modified: webservices/axis2/trunk/c/include/axis2_qname.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_qname.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/include/axis2_qname.h Mon Oct 31 21:27:27 2005
@@ -25,6 +25,8 @@
 #include <axis2_defines.h>
 #include <axis2_environment.h>
 
+#include <axis2_string.h>
+
 struct axis2_qname;
 struct axis2_qname_ops;
 
@@ -49,7 +51,7 @@
      *  Free a qname struct
      *  @return Status code
      */
-    axis2_status_t (AXIS2_CALL *axis2_qname_ops_free) (axis2_environment_t * environment,
+    axis2_status_t (AXIS2_CALL *axis2_qname_ops_free) (axis2_env_t * environment,
                                             struct axis2_qname * qname);
 
      /** 
@@ -59,7 +61,7 @@
       * @return true if qname1 equals qname2, false otherwise 
       */
 
-    axis2_bool_t (AXIS2_CALL *axis2_qname_ops_equals) (axis2_environment_t * environment,
+    axis2_bool_t (AXIS2_CALL *axis2_qname_ops_equals) (axis2_env_t * environment,
                                             struct axis2_qname * qname1,
                                             struct axis2_qname * qname2);
 
@@ -93,14 +95,14 @@
  * @return a pointer to newly created qname struct
  */
 
-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);
 
 
-#define axis2_qname_free(environment,qname) ((qname)->ops->axis2_qname_ops_free(environment,qname))
-#define axis2_qname_equals(environment,qname1,qname2) ((qname1)->ops->axis2_qname_ops_equals(environment,qname1,qname2))
+#define AXIS2_QNAME_FREE(environment,qname) ((qname)->ops->axis2_qname_ops_free(environment,qname))
+#define AXIS2_QNAME_EQUALS(environment,qname1,qname2) ((qname1)->ops->axis2_qname_ops_equals(environment,qname1,qname2))
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_stream.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stream.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stream.h Mon Oct 31 21:27:27 2005
@@ -117,15 +117,15 @@
 #define AXIS2_STREAM_READ(stream, buffer, count) \
 		((stream)->ops->read(buffer, count))
 #define AXIS2_STREAM_WRITE(stream, buffer, count) \
-		((stream)->ops->write(buffer, count))
+		((stream->ops)->write(buffer, count))
 #define AXIS2_STREAM_FILE_OPEN(stream, file_name, options) \
-		((stream)->file_open(file_name, options))
+		((stream->ops)->file_open(file_name, options))
 #define AXIS2_STREAM_FILE_CLOSE(stream, file_ptr) \
-		((stream)->ops->file_close(file_ptr))
+		((stream->ops)->file_close(file_ptr))
 #define AXIS2_STREAM_FILE_GET_CHAR(stream, file_ptr) \
-		((stream)->ops->file_get_char(file_ptr))
+		((stream->ops)->file_get_char(file_ptr))
 #define AXIS2_STREAM_FILE_UNGET_CHAR(stream, chr, file_ptr) \
-		((stream)->ops->file_unget_char(chr, file_ptr))	
+		((stream->ops)->file_unget_char(chr, file_ptr))	
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/include/axis2_wsdl_component.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_component.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_component.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_component.h Mon Oct 31 21:27:27 2005
@@ -71,7 +71,7 @@
  * @return status code
  */
 typedef axis2_status_t (*axis2_wsdl_component_free_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_wsdl_component_t *wsdl_component);
 
 /**
@@ -79,7 +79,7 @@
  * @return axis2_hash_t** component properties
  */
 typedef axis2_status_t (*axis2_wsdl_component_get_component_properties_t)
-		(axis2_environment_t *env, axis2_wsdl_component_t *wsdl_component
+		(axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
 		, axis2_hash_t **properties);
 
 /**
@@ -87,7 +87,7 @@
  * @param axis2_hash_t* properties
  */
 typedef axis2_status_t (*axis2_wsdl_component_set_component_properties_t) 
-		(axis2_environment_t *env, axis2_wsdl_component_t *wsdl_component
+		(axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
 		, axis2_hash_t *properties);
 
 /**
@@ -96,7 +96,7 @@
  * @param void* value to be put
  */
 typedef axis2_status_t (*axis2_wsdl_component_set_component_property_t) 
-	(axis2_environment_t *env, axis2_wsdl_component_t *wsdl_component
+	(axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
 	, const void *key, void *value);
 	
 
@@ -107,7 +107,7 @@
  * @return void* value for the key
  */
 typedef axis2_status_t (*axis2_wsdl_component_get_component_property_t) 
-		(axis2_environment_t *env, axis2_wsdl_component_t *wsdl_component
+		(axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
 		, const void *key, void **value) ;
 
 		
@@ -131,7 +131,7 @@
 /** create a wsdl component
  * @return axis2_wsdl_component_t ** allocated component
  */
-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);
 
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_wsdl_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_operation.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_operation.h Mon Oct 31 21:27:27 2005
@@ -101,7 +101,7 @@
   * @return status code
   */
 typedef axis2_status_t (*axis2_wsdl_operation_free_t)
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt);
 
 /**
@@ -109,7 +109,7 @@
  * @return axis2_char_t* msg_exchange_pattern
  */
 typedef axis2_status_t (*axis2_wsdl_operation_get_msg_exchange_pattern_t) 
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, axis2_char_t **pattern);
 
 /**
@@ -119,14 +119,14 @@
  * @return status code
  */
 typedef axis2_status_t (*axis2_wsdl_operation_set_msg_exchange_pattern_t)
-		(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
  */
-typedef axis2_status_t (*axis2_wsdl_operation_get_name_t) (axis2_environment_t *env
+typedef axis2_status_t (*axis2_wsdl_operation_get_name_t) (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_qname_t **name);
 
 /**
@@ -134,14 +134,14 @@
  *
  * @param axis2_qname_t* operation name
  */
-typedef axis2_status_t (*axis2_wsdl_operation_set_name_t) (axis2_environment_t *env
+typedef axis2_status_t (*axis2_wsdl_operation_set_name_t) (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const axis2_qname_t *name);
 
 /**
  * get style
  * return axis2_char_t** style
  */
-typedef axis2_status_t (*axis2_wsdl_operation_get_style_t) (axis2_environment_t *env
+typedef axis2_status_t (*axis2_wsdl_operation_get_style_t) (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, axis2_char_t **style);
 
 /**
@@ -149,7 +149,7 @@
  * @param axis2_char_t* style
  * @return status code
  */
-typedef axis2_status_t (*axis2_wsdl_operation_set_style_t) (axis2_environment_t *env
+typedef axis2_status_t (*axis2_wsdl_operation_set_style_t) (axis2_env_t *env
 		, axis2_wsdl_operation_t *wsdl_opt, const axis2_char_t *style);
 
 /**
@@ -157,7 +157,7 @@
  * @param axis2_hash_t* properties
  */
 typedef axis2_status_t (*axis2_wsdl_operation_set_component_properties_t)
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, axis2_hash_t *properties);
 
 /**
@@ -165,7 +165,7 @@
  * @return axis2_hash_t** component properties
  */
 typedef axis2_status_t (*axis2_wsdl_operation_get_component_properties_t)
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, axis2_hash_t **properties);
 
 /**
@@ -174,7 +174,7 @@
  * @param void* value to be put
  */
 typedef axis2_status_t (*axis2_wsdl_operation_set_component_property_t)
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, const void *key, void *value);
 	
 
@@ -185,7 +185,7 @@
  * @return void* value for the key
  */
 typedef axis2_status_t (*axis2_wsdl_operation_get_component_property_t)
-		(axis2_environment_t *env, axis2_wsdl_operation_t *wsdl_opt
+		(axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
 		, const void *key, void **value) ;
 		
 /*************************** End of function pointers *************************/
@@ -212,7 +212,7 @@
 };
 
 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);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_wsdl_service.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_service.h?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_service.h Mon Oct 31 21:27:27 2005
@@ -71,7 +71,7 @@
 /** Deallocate memory
   * @return status code
   */
-typedef axis2_status_t (*axis2_wsdl_service_free_t) (axis2_environment_t *env
+typedef axis2_status_t (*axis2_wsdl_service_free_t) (axis2_env_t *env
 		, axis2_wsdl_service_t *wsdl_srv);
 
 
@@ -90,7 +90,7 @@
 };
 
 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);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c Mon Oct 31 21:27:27 2005
@@ -28,7 +28,7 @@
 	
 /*************************** Function headers *********************************/
 
-axis2_status_t axis2_context_msg_ctx_ops_free (axis2_environment_t *env
+axis2_status_t axis2_context_msg_ctx_ops_free (axis2_env_t *env
 		, axis2_context_msg_ctx_t *msg_ctx);	
 
 
@@ -36,7 +36,7 @@
 /************************* End of function headers ****************************/	
 
 axis2_context_msg_ctx_t *axis2_context_msg_ctx_get_ops
-		(axis2_environment_t *env, axis2_context_msg_ctx_t *msg_ctx)
+		(axis2_env_t *env, axis2_context_msg_ctx_t *msg_ctx)
 {
 	if(!msg_ctx)
 	{
@@ -47,7 +47,7 @@
 }
 
 axis2_context_msg_ctx_t *axis2_context_msg_ctx_create 
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_context_msg_ctx_ops_t *ops = NULL;
 	axis2_context_msg_ctx_t *msg_ctx = 
@@ -74,7 +74,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_context_msg_ctx_ops_free (axis2_environment_t *env
+axis2_status_t axis2_context_msg_ctx_ops_free (axis2_env_t *env
 		, axis2_context_msg_ctx_t *msg_ctx)
 {
 	if(msg_ctx){

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c Mon Oct 31 21:27:27 2005
@@ -34,54 +34,54 @@
 	
 /*************************** Function headers *********************************/
 
-axis2_status_t axis2_description_operation_ops_free (axis2_environment_t *env
+axis2_status_t axis2_description_operation_ops_free (axis2_env_t *env
 		, axis2_description_operation_t *operation_desc);	
 
 axis2_status_t axis2_description_operation_ops_add_param
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_description_param_t *param);
 
 axis2_description_param_t *axis2_description_operation_ops_get_param
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *name);
 
 axis2_hash_t *axis2_description_operation_ops_get_params
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_operation_t *operation_desc);
 
 axis2_bool_t axis2_description_operation_ops_is_param_locked(
-		axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *param_name);
 
 axis2_status_t axis2_description_operation_ops_set_parent
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_description_service_t *service_desc);
 
 axis2_description_service_t *axis2_description_operation_ops_get_parent
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_operation_t *operation_desc);
 		
 axis2_qname_t *axis2_description_operation_ops_get_name
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc);
 
 axis2_status_t axis2_description_operation_ops_set_msg_exchange_pattern 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_char_t *pattern);
 		
 axis2_char_t *axis2_description_operation_ops_get_msg_exchange_pattern 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc);
 		
 axis2_status_t axis2_description_operation_ops_set_msg_receiver 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_engine_msg_receiver_t *msg_receiver);
 
 axis2_engine_msg_receiver_t *axis2_description_operation_ops_get_msg_receiver 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc);
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc);
 		
 /************************* End of function headers ****************************/	
 
 axis2_description_operation_ops_t *axis2_description_operation_get_ops
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc)
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc)
 {
 	if(!operation_desc)
 	{
@@ -92,7 +92,7 @@
 }
 
 axis2_description_operation_t *axis2_description_operation_create 
-		(axis2_environment_t *env)
+		(axis2_env_t *env)
 {
 	axis2_description_operation_ops_t *ops = NULL;
 	axis2_description_operation_t *operation_desc = 
@@ -149,7 +149,7 @@
 }
 
 axis2_description_operation_t *axis2_description_operation_create_with_name 
-		(axis2_environment_t *env, axis2_qname_t *name)
+		(axis2_env_t *env, axis2_qname_t *name)
 {
 	axis2_description_operation_t *operation_desc 
 		= axis2_description_operation_create(env);
@@ -170,7 +170,7 @@
 
 /******************************************************************************/
 
-axis2_status_t axis2_description_operation_ops_free (axis2_environment_t *env
+axis2_status_t axis2_description_operation_ops_free (axis2_env_t *env
 		, axis2_description_operation_t *operation_desc)
 {
 	if(operation_desc)
@@ -182,7 +182,7 @@
 }	
 	
 axis2_status_t axis2_description_operation_ops_add_param
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_description_param_t *param)
 {
 	if(!operation_desc || !operation_desc->param_include || !param)
@@ -198,7 +198,7 @@
 }
 
 axis2_description_param_t *axis2_description_operation_ops_get_param(
-		axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *name)
 {
 	if(!operation_desc || !operation_desc->param_include)
@@ -219,7 +219,7 @@
 }
 
 axis2_hash_t *axis2_description_operation_ops_get_params(
-		axis2_environment_t *env, axis2_description_operation_t *operation_desc)
+		axis2_env_t *env, axis2_description_operation_t *operation_desc)
 {
 	if(!operation_desc || !operation_desc->param_include)
 	{
@@ -232,7 +232,7 @@
 }
 
 axis2_bool_t axis2_description_operation_ops_is_param_locked(
-		axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *param_name)
 {
 	if(!env || !operation_desc || !operation_desc->param_include)
@@ -253,7 +253,7 @@
 }
 
 axis2_status_t axis2_description_operation_ops_set_parent
-		(axis2_environment_t *env ,axis2_description_operation_t *operation_desc
+		(axis2_env_t *env ,axis2_description_operation_t *operation_desc
 		, axis2_description_service_t *service_desc)
 {
 	if(!operation_desc || !service_desc)
@@ -265,7 +265,7 @@
 }
 
 axis2_description_service_t *axis2_description_operation_ops_get_parent
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_operation_t *operation_desc)
 {
 	if(!operation_desc)
@@ -277,7 +277,7 @@
 }
 
 axis2_qname_t *axis2_description_operation_ops_get_name
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc)
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc)
 {
 	if(!operation_desc)
 	{
@@ -288,7 +288,7 @@
 }
 
 axis2_status_t axis2_description_operation_ops_set_msg_exchange_pattern 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_char_t *pattern)
 {
 	if(!operation_desc)
@@ -302,7 +302,7 @@
 }
 
 axis2_char_t *axis2_description_operation_ops_get_msg_exchange_pattern 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc)
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc)
 {
 	if(!operation_desc)
 	{
@@ -313,7 +313,7 @@
 }
 
 axis2_status_t axis2_description_operation_ops_set_msg_receiver 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc
 		, axis2_engine_msg_receiver_t *msg_receiver)
 {
 	if(!operation_desc)
@@ -327,7 +327,7 @@
 }
 
 axis2_engine_msg_receiver_t *axis2_description_operation_ops_get_msg_receiver 
-		(axis2_environment_t *env, axis2_description_operation_t *operation_desc)
+		(axis2_env_t *env, axis2_description_operation_t *operation_desc)
 {
 	if(!operation_desc)
 	{

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c?rev=329981&r1=329980&r2=329981&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c Mon Oct 31 21:27:27 2005
@@ -34,26 +34,26 @@
 	(axis2_description_param_include_t *param_include);
 
 axis2_status_t axis2_description_param_include_ops_add_param
-    (axis2_environment_t *environment
+    (axis2_env_t *environment
 	, axis2_description_param_include_t *param_include
     , const axis2_description_param_t *param);
 	 
 axis2_description_param_t *axis2_description_param_include_ops_get_param
-    (axis2_environment_t *env, axis2_description_param_include_t *param_include
+    (axis2_env_t *env, axis2_description_param_include_t *param_include
 	, const axis2_char_t *name);
 
 axis2_hash_t *axis2_description_param_include_ops_get_params
-    (axis2_environment_t *env
+    (axis2_env_t *env
 	, axis2_description_param_include_t *param_include);
 
 axis2_status_t axis2_description_param_include_ops_is_param_locked
-    (axis2_environment_t *env, axis2_description_param_include_t *param_include
+    (axis2_env_t *env, axis2_description_param_include_t *param_include
 	, const axis2_char_t *param_name);
 
 /************************** End of function prototypes ************************/
 
 axis2_description_param_include_ops_t *axis2_description_param_include_get_ops
-		(axis2_environment_t *env
+		(axis2_env_t *env
 		, axis2_description_param_include_t *param_include)
 {
 	if(!param_include)
@@ -65,7 +65,7 @@
 }
 
 axis2_description_param_include_t *axis2_description_param_include_create (
-		axis2_environment_t *env)
+		axis2_env_t *env)
 {
 	axis2_description_param_include_t *param_include = 
 		(axis2_description_param_include_t *)
@@ -115,7 +115,7 @@
 }
 
 axis2_status_t axis2_description_param_include_ops_add_param
-    	(axis2_environment_t *env
+    	(axis2_env_t *env
 		, axis2_description_param_include_t *param_include
     	, const axis2_description_param_t *param)
 {
@@ -136,7 +136,7 @@
 }
 
 axis2_description_param_t *axis2_description_param_include_ops_get_param
-    	(axis2_environment_t* env
+    	(axis2_env_t* env
 		, axis2_description_param_include_t *param_include
 		, const axis2_char_t *name)
 {
@@ -151,7 +151,7 @@
 }
 
 axis2_hash_t *axis2_description_param_include_ops_get_params
-    	(axis2_environment_t *env
+    	(axis2_env_t *env
 		, axis2_description_param_include_t *param_include)
 {
 	if(!param_include)
@@ -163,7 +163,7 @@
 }
 
 axis2_status_t axis2_description_param_include_ops_is_param_locked
-    	(axis2_environment_t *env
+    	(axis2_env_t *env
 		, axis2_description_param_include_t *param_include
 		, const axis2_char_t *param_name)
 {