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 pi...@apache.org on 2007/03/30 19:26:54 UTC

svn commit: r524188 [7/42] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ guththila/include/ gut...

Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_create_xml_stream_writer(axis2_env_t *env, guththila_t *p, char *file)
+guththila_create_xml_stream_writer(axutil_env_t *env, guththila_t *p, char *file)
 {
     if (p || file)
     {
@@ -42,7 +42,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_create_xml_stream_writer_for_memory(axis2_env_t *env, guththila_t *p)
+guththila_create_xml_stream_writer_for_memory(axutil_env_t *env, guththila_t *p)
 {
     if (p)
     {
@@ -64,7 +64,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_xml_writer_free(axis2_env_t *env, guththila_t *p)
+guththila_xml_writer_free(axutil_env_t *env, guththila_t *p)
 {
 
     int size;
@@ -167,7 +167,7 @@
 
 
 int AXIS2_CALL
-guththila_check_xml_stream_writer(axis2_env_t *env, guththila_t *p)
+guththila_check_xml_stream_writer(axutil_env_t *env, guththila_t *p)
 {
     if (!p->xsw->writer)
         guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_WRITER);
@@ -178,7 +178,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_start_document(axis2_env_t *env,
+guththila_write_start_document(axutil_env_t *env,
 							   guththila_t *p)
 {
     char *sd =  NULL;
@@ -189,7 +189,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_end_element(axis2_env_t *env, guththila_t *p)
+guththila_write_end_element(axutil_env_t *env, guththila_t *p)
 {
     void *element = NULL;
     
@@ -215,7 +215,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_start_element(axis2_env_t *env, guththila_t *p, char *start_element)
+guththila_write_start_element(axutil_env_t *env, guththila_t *p, char *start_element)
 {
     int size;
     void *element;
@@ -247,7 +247,7 @@
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_to_buffer(axis2_env_t *env, guththila_t *p, const char *buff)
+guththila_write_to_buffer(axutil_env_t *env, guththila_t *p, const char *buff)
 {
     int c = 0;
     int ii = 0;
@@ -280,7 +280,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_characters(axis2_env_t *env, guththila_t *p, const char *buff)
+guththila_write_characters(axutil_env_t *env, guththila_t *p, const char *buff)
 {
     
     guththila_close_start_element(env, p);
@@ -295,7 +295,7 @@
 
 
 void AXIS2_CALL
-guththila_close_start_element(axis2_env_t *env, guththila_t *p)
+guththila_close_start_element(axutil_env_t *env, guththila_t *p)
 {
     int stack_size = 0;
     if (p->xsw->start_element_open != -1 && p->xsw->empty_element_open != -1)
@@ -337,7 +337,7 @@
 
 
 void  AXIS2_CALL
-guththila_check_name_validity(axis2_env_t *env, guththila_t *p, char *name)
+guththila_check_name_validity(axutil_env_t *env, guththila_t *p, char *name)
 {
     int length;
     int ii;
@@ -390,7 +390,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_comment(axis2_env_t *env, guththila_t *p, const char *buff)
+guththila_write_comment(axutil_env_t *env, guththila_t *p, const char *buff)
 {
     char *s = NULL;
     
@@ -405,7 +405,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_escape_character(axis2_env_t *env, guththila_t *p, const char *buff)
+guththila_write_escape_character(axutil_env_t *env, guththila_t *p, const char *buff)
 {
     guththila_close_start_element(env, p);
     if (buff)
@@ -445,7 +445,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_attribute(axis2_env_t *env, guththila_t *p, const char *local_name, const char *value)
+guththila_write_attribute(axutil_env_t *env, guththila_t *p, const char *local_name, const char *value)
 {
     int size = 0;
     void *element;
@@ -484,7 +484,7 @@
 
 
 void AXIS2_CALL
-guththila_do_write_attribute(axis2_env_t *env,
+guththila_do_write_attribute(axutil_env_t *env,
 							 guththila_t *p,
 							 const char *local_name,
 							 const char *value)
@@ -516,7 +516,7 @@
 
 
 void AXIS2_CALL
-guththila_write_empty_element(axis2_env_t *env, guththila_t *p, char *empty_element)
+guththila_write_empty_element(axutil_env_t *env, guththila_t *p, char *empty_element)
 {
     
     guththila_close_start_element(env, p);
@@ -527,7 +527,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_default_namespace(axis2_env_t *env, guththila_t *p, char *namespace_uri)
+guththila_write_default_namespace(axutil_env_t *env, guththila_t *p, char *namespace_uri)
 {
     if (!p->xsw->start_element_open)
         guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
@@ -543,7 +543,7 @@
 
 
 int AXIS2_CALL
-guththila_check_default_namespace(axis2_env_t *env, guththila_t *p, char *ns_uri)
+guththila_check_default_namespace(axutil_env_t *env, guththila_t *p, char *ns_uri)
 {
     int size;
     int ii;
@@ -574,7 +574,7 @@
 
 
 void AXIS2_CALL
-guththila_do_write_default_namespace(axis2_env_t *env, guththila_t *p, char *ns_uri)
+guththila_do_write_default_namespace(axutil_env_t *env, guththila_t *p, char *ns_uri)
 {
     guththila_namespace_t *ns = (guththila_namespace_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_namespace_t));
     ns->name = NULL;
@@ -592,7 +592,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_namespace(axis2_env_t *env, guththila_t *p, char *prefix, char *uri)
+guththila_write_namespace(axutil_env_t *env, guththila_t *p, char *prefix, char *uri)
 {
     if (!p->xsw->start_element_open)
         guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
@@ -610,7 +610,7 @@
 
 
 int AXIS2_CALL
-guththila_check_prefix_validity(axis2_env_t *env, guththila_t *p, char *prefix, char *uri)
+guththila_check_prefix_validity(axutil_env_t *env, guththila_t *p, char *prefix, char *uri)
 {
     int size = 0;
     int ii = 0;
@@ -649,7 +649,7 @@
 
 
 void AXIS2_CALL
-guththila_do_write_namespace(axis2_env_t *env, guththila_t *p, char *prefix, char *uri)
+guththila_do_write_namespace(axutil_env_t *env, guththila_t *p, char *prefix, char *uri)
 {
     guththila_namespace_t *ns = (guththila_namespace_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_namespace_t));
     ns->name = prefix;
@@ -668,7 +668,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_attribute_with_prefix_and_namespace(axis2_env_t *env, guththila_t *p,
+guththila_write_attribute_with_prefix_and_namespace(axutil_env_t *env, guththila_t *p,
 													const char *prefix, const char *namespace,
 													const char *local_name, const char *value)
 {
@@ -723,7 +723,7 @@
 
 
 void AXIS2_CALL
-guththila_do_write_attribute_with_prefix_and_namespace(axis2_env_t *env, guththila_t *p,
+guththila_do_write_attribute_with_prefix_and_namespace(axutil_env_t *env, guththila_t *p,
 													   const char *prefix, const char *namespace_uri,
 													   const char *local_name, const char *value)
 {
@@ -761,7 +761,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_attribute_with_prefix(axis2_env_t *env, guththila_t *p, const char *prefix,
+guththila_write_attribute_with_prefix(axutil_env_t *env, guththila_t *p, const char *prefix,
 									  const char *local_name, const char *value)
 {
     int size = 0;
@@ -818,7 +818,7 @@
 
 
 void AXIS2_CALL
-guththila_do_write_attribute_with_prefix(axis2_env_t *env, guththila_t *p, const char *prefix,
+guththila_do_write_attribute_with_prefix(axutil_env_t *env, guththila_t *p, const char *prefix,
 										 const char *local_name, const char *value)
 {
     guththila_do_write_attribute_with_prefix_and_namespace(env, p, prefix, NULL, local_name, value);
@@ -826,7 +826,7 @@
 
 
 int AXIS2_CALL
-guththila_is_exsisting_prefix(axis2_env_t *env, guththila_t *p, const char *prefix)
+guththila_is_exsisting_prefix(axutil_env_t *env, guththila_t *p, const char *prefix)
 {
     int size;
     int ii;
@@ -856,7 +856,7 @@
 
 
 int
-guththila_is_exsisting_namespace_uri(axis2_env_t *env, guththila_t *p, const char *uri)
+guththila_is_exsisting_namespace_uri(axutil_env_t *env, guththila_t *p, const char *uri)
 {
     int size;
     int ii;
@@ -886,7 +886,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_attribute_with_namespace(axis2_env_t *env, guththila_t *p, const char *namespace,
+guththila_write_attribute_with_namespace(axutil_env_t *env, guththila_t *p, const char *namespace,
 										 const char *local_name, const char *value)
 {
     int size = 0;
@@ -944,7 +944,7 @@
 
 
 AXIS2_EXTERN char* AXIS2_CALL
-guththila_get_prefix_for_namespace(axis2_env_t *env, guththila_t *p, const char *namespace)
+guththila_get_prefix_for_namespace(axutil_env_t *env, guththila_t *p, const char *namespace)
 {
     int size;
     int ii;
@@ -974,7 +974,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_start_element_with_prefix_and_namespace(axis2_env_t *env, guththila_t *p, const char *prefix,
+guththila_write_start_element_with_prefix_and_namespace(axutil_env_t *env, guththila_t *p, const char *prefix,
 														const char *namespace_uri, const char *local_name)
 {
     int size;
@@ -1033,7 +1033,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_start_element_with_namespace(axis2_env_t *env, guththila_t *p, const char *namespace_uri, const char *local_name)
+guththila_write_start_element_with_namespace(axutil_env_t *env, guththila_t *p, const char *namespace_uri, const char *local_name)
 {
     int size;
     void *element;
@@ -1087,7 +1087,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_start_element_with_prefix (axis2_env_t *env, guththila_t *p, const char *prefix, const char *local_name)
+guththila_write_start_element_with_prefix (axutil_env_t *env, guththila_t *p, const char *prefix, const char *local_name)
 {
     int size;
     void *element;
@@ -1146,7 +1146,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_empty_element_with_prefix_and_namespace(axis2_env_t *env, guththila_t *p, const char *prefix,
+guththila_write_empty_element_with_prefix_and_namespace(axutil_env_t *env, guththila_t *p, const char *prefix,
 														const char *namespace_uri, const char *empty_element)
 {
     
@@ -1158,7 +1158,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_empty_element_with_namespace(axis2_env_t *env, guththila_t *p, const char *namespace_uri, const char *empty_element)
+guththila_write_empty_element_with_namespace(axutil_env_t *env, guththila_t *p, const char *namespace_uri, const char *empty_element)
 {
     
     guththila_close_start_element(env, p);
@@ -1169,7 +1169,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_empty_element_with_prefix(axis2_env_t *env, guththila_t *p, const char *prefix, const char *empty_element)
+guththila_write_empty_element_with_prefix(axutil_env_t *env, guththila_t *p, const char *prefix, const char *empty_element)
 {
     
     guththila_close_start_element(env, p);
@@ -1180,7 +1180,7 @@
 
 
 void AXIS2_CALL
-guththila_open_depth_element(axis2_env_t *env, guththila_t *p)
+guththila_open_depth_element(axutil_env_t *env, guththila_t *p)
 {
     int size = axis2_stack_size(p->xsw->depth, env);
     guththila_depth_t *d = (guththila_depth_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_depth_t));
@@ -1207,7 +1207,7 @@
 
 
 void AXIS2_CALL
-guththila_close_depth_element(axis2_env_t *env, guththila_t *p)
+guththila_close_depth_element(axutil_env_t *env, guththila_t *p)
 {
     void *e = axis2_stack_pop(p->xsw->depth, env);
     guththila_depth_t *d = (guththila_depth_t *)e;
@@ -1226,7 +1226,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_end_document(axis2_env_t *env, guththila_t *p)
+guththila_write_end_document(axutil_env_t *env, guththila_t *p)
 {
     int ii = 0;
     if (p->xsw->start_element_open || p->xsw->empty_element_open)
@@ -1239,7 +1239,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_close(axis2_env_t *env,
+guththila_close(axutil_env_t *env,
 				guththila_t *p)
 {
 /*     guththila_flush(env, p); */
@@ -1248,7 +1248,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_line(axis2_env_t *env, guththila_t *p, char *local_name, char *characters)
+guththila_write_line(axutil_env_t *env, guththila_t *p, char *local_name, char *characters)
 {
     guththila_write_start_element(env, p, local_name);
     guththila_write_characters(env, p, characters);
@@ -1257,7 +1257,7 @@
 }
 
 AXIS2_EXTERN char* AXIS2_CALL
-guththila_get_memory_buffer(axis2_env_t *env, guththila_t *p)
+guththila_get_memory_buffer(axutil_env_t *env, guththila_t *p)
 {
     char *buffer = NULL;
     if (p->xsw)
@@ -1266,7 +1266,7 @@
 }
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-guththila_get_memory_buffer_size(axis2_env_t *env, guththila_t *p)
+guththila_get_memory_buffer_size(axutil_env_t *env, guththila_t *p)
 {
 	return guththila_writer_get_buffer_size (env, p->xsw->writer);
 }

Modified: webservices/axis2/trunk/c/guththila/tests/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/tests/test.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/tests/test.c (original)
+++ webservices/axis2/trunk/c/guththila/tests/test.c Fri Mar 30 10:26:22 2007
@@ -8,7 +8,7 @@
 setup (void)
 {
 allocator = axutil_allocator_init(NULL);
-env = axis2_env_create(allocator);
+env = axutil_env_create(allocator);
 }
 
 void
@@ -16,7 +16,7 @@
 {
  guththila_reader_free(env, red);
  guththila_free(env, parser);
- axis2_env_free(env);
+ axutil_env_free(env);
 }
 
 START_TEST (test_guththila)

Modified: webservices/axis2/trunk/c/guththila/tests/test.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/tests/test.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/tests/test.h (original)
+++ webservices/axis2/trunk/c/guththila/tests/test.h Fri Mar 30 10:26:22 2007
@@ -6,7 +6,7 @@
 
 axutil_allocator_t *allocator;
 guththila_reader_t *red;
-axis2_env_t *env;
+axutil_env_t *env;
 guththila_t *parser;
 
 void

Modified: webservices/axis2/trunk/c/include/axis2_addr_mod.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_addr_mod.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_addr_mod.h (original)
+++ webservices/axis2/trunk/c/include/axis2_addr_mod.h Fri Mar 30 10:26:22 2007
@@ -31,11 +31,11 @@
 #endif
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL 
-axis2_addr_in_handler_create(const axis2_env_t *env, 
+axis2_addr_in_handler_create(const axutil_env_t *env, 
                      axis2_string_t *name);
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL 
-axis2_addr_out_handler_create(const axis2_env_t *env, 
+axis2_addr_out_handler_create(const axutil_env_t *env, 
                        axis2_string_t *name);
     
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_any_content_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_any_content_type.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_any_content_type.h (original)
+++ webservices/axis2/trunk/c/include/axis2_any_content_type.h Fri Mar 30 10:26:22 2007
@@ -28,7 +28,7 @@
  */
 
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_const.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
@@ -47,7 +47,7 @@
      * @return pointer to the newly created any content type instance
      */
     AXIS2_EXTERN axis2_any_content_type_t *AXIS2_CALL
-    axis2_any_content_type_create(const axis2_env_t *env);
+    axis2_any_content_type_create(const axutil_env_t *env);
 
     /**
      * Adds given value to content value map with given QName.
@@ -59,7 +59,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_any_content_type_add_value(axis2_any_content_type_t *any_content_type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_qname_t *qname,
         const axis2_char_t *value);
 
@@ -74,7 +74,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_any_content_type_get_value(const axis2_any_content_type_t *any_content_type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_qname_t *qname);
     /**
      * Gets the map of all values.
@@ -85,7 +85,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_any_content_type_get_value_map(const axis2_any_content_type_t *any_content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Frees any content type struct.
@@ -95,7 +95,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_any_content_type_free(axis2_any_content_type_t *any_content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_async_result.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_async_result.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_async_result.h (original)
+++ webservices/axis2/trunk/c/include/axis2_async_result.h Fri Mar 30 10:26:22 2007
@@ -32,7 +32,7 @@
  */
 
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_msg_ctx.h>
 #include <axiom_soap_envelope.h>
 
@@ -52,7 +52,7 @@
      */
     AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
     axis2_async_result_get_envelope(axis2_async_result_t *async_result,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
     /**
@@ -63,7 +63,7 @@
      */
     AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
     axis2_async_result_get_result(axis2_async_result_t *async_result,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Frees the async result.
@@ -73,7 +73,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_async_result_free(axis2_async_result_t *async_result,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** Creates an async result struct to help deal with results of asynchronous
      * invocations.
@@ -83,7 +83,7 @@
      * @return newly created async_result struct
      */
     AXIS2_EXTERN axis2_async_result_t *AXIS2_CALL
-    axis2_async_result_create(const axis2_env_t *env,
+    axis2_async_result_create(const axutil_env_t *env,
         axis2_msg_ctx_t *result);
 
 

Modified: webservices/axis2/trunk/c/include/axis2_callback.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_callback.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_callback.h (original)
+++ webservices/axis2/trunk/c/include/axis2_callback.h Fri Mar 30 10:26:22 2007
@@ -34,7 +34,7 @@
  */
 
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_async_result.h>
 #include <axiom_soap_envelope.h>
 
@@ -48,11 +48,11 @@
     /** Type name for function pointer to be called on complete of callback  */
     typedef axis2_status_t AXIS2_CALL
             axis2_on_complete_func_ptr(axis2_callback_t *,
-                    const axis2_env_t *);
+                    const axutil_env_t *);
     /** Type name for function pointer to be called on error of callback  */
     typedef axis2_status_t AXIS2_CALL
             axis2_on_error_func_ptr(axis2_callback_t *,
-                    const axis2_env_t *, int);
+                    const axutil_env_t *, int);
 
     /**
      * This function is called once the asynchronous operation is successfully 
@@ -64,7 +64,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_callback_invoke_on_complete(axis2_callback_t *callback,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_async_result_t *result);
 
     /**
@@ -77,7 +77,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_callback_report_error(axis2_callback_t *callback,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const int exception);
 
     /**
@@ -99,7 +99,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_callback_get_complete(const axis2_callback_t *callback,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the complete status.
@@ -110,7 +110,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_callback_set_complete(axis2_callback_t *callback,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_bool_t complete);
 
     /**
@@ -121,7 +121,7 @@
      */
     AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
     axis2_callback_get_envelope(const axis2_callback_t *callback,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the SOAP envelope.
@@ -132,7 +132,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_callback_set_envelope(axis2_callback_t *callback,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_soap_envelope_t *envelope);
 
     /**
@@ -143,7 +143,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_callback_get_error(const axis2_callback_t *callback,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the error code.
@@ -154,7 +154,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_callback_set_error(axis2_callback_t *callback,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const int error);
 
     /**
@@ -201,7 +201,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_callback_free(axis2_callback_t *callback,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Creates a callback struct.
@@ -209,7 +209,7 @@
      * @return pointer to newly created callback struct
      */
     AXIS2_EXTERN axis2_callback_t *AXIS2_CALL 
-    axis2_callback_create(const axis2_env_t *env);
+    axis2_callback_create(const axutil_env_t *env);
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_callback_recv.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_callback_recv.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_callback_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_callback_recv.h Fri Mar 30 10:26:22 2007
@@ -30,7 +30,7 @@
   */
 
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_msg_recv.h>
 #include <axis2_callback.h>
 
@@ -51,7 +51,7 @@
      */
     AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
     axis2_callback_recv_get_base(axis2_callback_recv_t *callback_recv,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Frees the callback receiver struct.
@@ -61,7 +61,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_callback_recv_free(axis2_callback_recv_t *callback_recv,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds a callback corresponding to given WSA message ID to message
@@ -76,7 +76,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_callback_recv_add_callback(struct axis2_callback_recv *callback_recv,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *msg_id,
         axis2_callback_t *callback);
 
@@ -87,7 +87,7 @@
      *         or NULL on error with error code set in environment's error
      */
     AXIS2_EXTERN axis2_callback_recv_t *AXIS2_CALL
-    axis2_callback_recv_create(const axis2_env_t *env);
+    axis2_callback_recv_create(const axutil_env_t *env);
 
 /** Gets the base message receiver. */
 #define AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, env) \

Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Fri Mar 30 10:26:22 2007
@@ -73,7 +73,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_conf_free(axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds a service group to the configuration.
@@ -85,7 +85,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_svc_grp(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_svc_grp *svc_grp);
 
     /** 
@@ -98,7 +98,7 @@
      */
     AXIS2_EXTERN struct axis2_svc_grp *AXIS2_CALL
     axis2_conf_get_svc_grp(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *svc_grp_name);
 
     /** 
@@ -110,7 +110,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_conf_get_all_svc_grps(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds a service to configuration.
@@ -122,7 +122,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_svc(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_svc* svc);
 
     /**
@@ -135,7 +135,7 @@
      */
     AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
     axis2_conf_get_svc(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t* svc_name);
 
     /**
@@ -147,7 +147,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_remove_svc(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *name);
 
     /**
@@ -159,7 +159,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_param(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_param_t *param);
 
     /**
@@ -172,7 +172,7 @@
      */
     AXIS2_EXTERN axis2_param_t *AXIS2_CALL
     axis2_conf_get_param(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *name);
 
     /**
@@ -184,7 +184,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_all_params(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Checks if the named parameter is locked.
@@ -195,7 +195,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_conf_is_param_locked(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *param_name);
 
     /**
@@ -208,7 +208,7 @@
      */
     AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
     axis2_conf_get_transport_in(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const AXIS2_TRANSPORT_ENUMS trans_enum);
 
     /**
@@ -221,7 +221,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_transport_in(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_transport_in_desc_t *transport,
         const AXIS2_TRANSPORT_ENUMS trans_enum);
 
@@ -235,7 +235,7 @@
      */
     AXIS2_EXTERN axis2_transport_out_desc_t *AXIS2_CALL
     axis2_conf_get_transport_out(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const AXIS2_TRANSPORT_ENUMS trans_enum);
 
    /**
@@ -248,7 +248,7 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_transport_out(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_transport_out_desc_t *transport,
         const AXIS2_TRANSPORT_ENUMS trans_enum);
 
@@ -261,7 +261,7 @@
      */
     AXIS2_EXTERN axis2_transport_in_desc_t **AXIS2_CALL
     axis2_conf_get_all_in_transports(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets all out transports.
@@ -272,7 +272,7 @@
      */
     AXIS2_EXTERN axis2_transport_out_desc_t **AXIS2_CALL
     axis2_conf_get_all_out_transports(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
    /**
     * Gets a module with given QName.
@@ -283,7 +283,7 @@
     */
     AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
     axis2_conf_get_module(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_qname_t *qname);
 
    /**
@@ -295,7 +295,7 @@
     */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_all_engaged_modules(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the in phases up to and including port dispatch phase.
@@ -306,7 +306,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_in_phases_upto_and_including_post_dispatch(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the out flow. Out flow is a list of phases invoked in the out 
@@ -318,7 +318,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_out_flow(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
    /**
@@ -331,7 +331,7 @@
     */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_in_fault_flow(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
    /**
     * Gets the out fault flow. Out fault flow is a list of phases invoked in 
@@ -343,7 +343,7 @@
     */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_out_fault_flow(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets faulty services. A faulty service is a service that does not 
@@ -356,7 +356,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_conf_get_all_faulty_svcs(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets faulty modules. A faulty module is a module that does not 
@@ -369,7 +369,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_conf_get_all_faulty_modules(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**        
      * Gets all the list of services loaded into configuration.
@@ -380,7 +380,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_conf_get_all_svcs(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Checks is the named module is engaged.
@@ -391,7 +391,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_conf_is_engaged(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_qname_t *module_name);
 
     /**
@@ -403,7 +403,7 @@
      */
     AXIS2_EXTERN struct axis2_phases_info *AXIS2_CALL
     axis2_conf_get_phases_info(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets phases information struct.
@@ -415,7 +415,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_phases_info(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_phases_info *phases_info);
 
     /**
@@ -428,7 +428,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_msg_recv(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key,
         struct axis2_msg_recv *msg_recv);
 
@@ -443,7 +443,7 @@
      */
     AXIS2_EXTERN struct axis2_msg_recv *AXIS2_CALL
     axis2_conf_get_msg_recv(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *key);
 
     /**
@@ -456,7 +456,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_out_phases(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axutil_array_list_t *out_phases);
 
     /**
@@ -468,7 +468,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_conf_get_out_phases(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets fault phases for in path.
@@ -479,7 +479,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_in_fault_phases(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axutil_array_list_t *list);
 
     /**
@@ -491,7 +491,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_out_fault_phases(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axutil_array_list_t *list);
 
     /**
@@ -503,7 +503,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_conf_get_all_modules(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds a module.
@@ -514,7 +514,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_module(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_module_desc *module);
 
     /**
@@ -525,7 +525,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_default_dispatchers(axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets a custom dispatching phase.
@@ -536,7 +536,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_dispatch_phase(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_phase_t *dispatch);
 
     /**
@@ -547,7 +547,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_conf_get_repo(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the repository location.
@@ -558,7 +558,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_repo(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *axis2_repo);
 
     /**
@@ -570,7 +570,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_engage_module(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_qname_t *module_ref);
 
     /**
@@ -582,7 +582,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_dep_engine(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_dep_engine *dep_engine);
 
     /**
@@ -594,7 +594,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_conf_get_default_module_version(const axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *module_name);
 
     /**
@@ -607,7 +607,7 @@
      */
     AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
     axis2_conf_get_default_module(const axis2_conf_t *conf, 
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *module_name);
 
     /**
@@ -620,7 +620,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_add_default_module_version(axis2_conf_t *conf, 
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *module_name,
         const axis2_char_t *module_version);
 
@@ -634,7 +634,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_engage_module_with_version(axis2_conf_t *conf, 
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *module_name,
         const axis2_char_t *version_id);
 
@@ -644,15 +644,15 @@
      * @return pointer to newly created configuration
      */
     AXIS2_EXTERN axis2_conf_t *AXIS2_CALL
-    axis2_conf_create(const axis2_env_t *env);
+    axis2_conf_create(const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_conf_get_enable_mtom(axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_enable_mtom(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t enable_mtom);
 
 /*The following two methods are used in Rampart to 
@@ -660,16 +660,16 @@
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_conf_get_enable_security(axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_conf_set_enable_security(axis2_conf_t *conf,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t enable_security);
 
     AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
     axis2_conf_get_param_container(const axis2_conf_t *conf,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_conf_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf_ctx.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf_ctx.h Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
 
 #include <axis2_defines.h>
 #include <axis2_hash.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_ctx.h>
 #include <axis2_svc_grp_ctx.h>
 
@@ -57,7 +57,7 @@
      * @return pointer to newly created configuration context 
      */
     AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL
-    axis2_conf_ctx_create(const axis2_env_t *env, 
+    axis2_conf_ctx_create(const axutil_env_t *env, 
         struct axis2_conf *conf);
 
     /**
@@ -69,7 +69,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL 
     axis2_conf_ctx_set_conf(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_conf *conf);
     /**
      * Gets the base struct, which is of type context
@@ -80,7 +80,7 @@
      */
     AXIS2_EXTERN axis2_ctx_t * AXIS2_CALL
     axis2_conf_ctx_get_base(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the configuration of the engine.
@@ -91,7 +91,7 @@
      */
     AXIS2_EXTERN axis2_conf_t * AXIS2_CALL
     axis2_conf_ctx_get_conf(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the hash map of operation context instances.
@@ -101,7 +101,7 @@
      */
     AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
     axis2_conf_ctx_get_op_ctx_map(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the hash map of service context instances.
@@ -111,7 +111,7 @@
      */
     AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
     axis2_conf_ctx_get_svc_ctx_map(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the hash map of service group context instances.
@@ -121,7 +121,7 @@
      */
     AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
     axis2_conf_ctx_get_svc_grp_ctx_map(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Registers an operation context with the given message ID.
@@ -134,7 +134,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL
     axis2_conf_ctx_register_op_ctx(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *message_id,
         axis2_op_ctx_t *op_ctx);
 
@@ -147,7 +147,7 @@
      */
     AXIS2_EXTERN axis2_op_ctx_t * AXIS2_CALL
     axis2_conf_ctx_get_op_ctx(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *message_id);
 
     /**
@@ -160,7 +160,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL
     axis2_conf_ctx_register_svc_ctx(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *svc_id,
         axis2_svc_ctx_t *svc_ctx);
 
@@ -173,7 +173,7 @@
      */
     AXIS2_EXTERN struct axis2_svc_ctx * AXIS2_CALL
     axis2_conf_ctx_get_svc_ctx(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *svc_id);
 
     /**
@@ -186,7 +186,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL
     axis2_conf_ctx_register_svc_grp_ctx(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *svc_grp_id,
         axis2_svc_grp_ctx_t *svc_grp_ctx);
 
@@ -199,7 +199,7 @@
      */
     AXIS2_EXTERN axis2_svc_grp_ctx_t * AXIS2_CALL
     axis2_conf_ctx_get_svc_grp_ctx(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *svc_grp_id);
 
     /**
@@ -212,7 +212,7 @@
      */
     AXIS2_EXTERN const axis2_char_t * AXIS2_CALL
     axis2_conf_ctx_get_root_dir(const axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the root working directory. It is in this directory that the 
@@ -225,7 +225,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL
     axis2_conf_ctx_set_root_dir(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *path);
 
     /**
@@ -239,7 +239,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL
     axis2_conf_ctx_init(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_conf_t *conf);
 
     /**
@@ -250,7 +250,7 @@
      */
     AXIS2_EXTERN void  AXIS2_CALL
     axis2_conf_ctx_free(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * This method fills the context hierarchy (service group, service and 
@@ -266,7 +266,7 @@
      */
     AXIS2_EXTERN axis2_svc_grp_ctx_t * AXIS2_CALL
     axis2_conf_ctx_fill_ctxs(axis2_conf_ctx_t *conf_ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_conf_init.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf_init.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf_init.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf_init.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @{
  */
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils_defines.h>
 #include <axis2_conf_ctx.h>
 
@@ -39,7 +39,7 @@
      * @return pointer to an instance of configuration context properly initialized
      */
     AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL 
-    axis2_build_conf_ctx(const axis2_env_t *env,
+    axis2_build_conf_ctx(const axutil_env_t *env,
         const axis2_char_t *repo_name);
 
     /**
@@ -49,7 +49,7 @@
      * @return pointer to an instance of configuration context properly initialized
      */
     AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL 
-    axis2_build_client_conf_ctx(const axis2_env_t *env,
+    axis2_build_client_conf_ctx(const axutil_env_t *env,
         const axis2_char_t *axis2_home);
 
 

Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @brief Axis2c specific global declarations
  */
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_core_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_core_utils.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_core_utils.h (original)
+++ webservices/axis2/trunk/c/include/axis2_core_utils.h Fri Mar 30 10:26:22 2007
@@ -21,7 +21,7 @@
 #include <axis2_const.h>
 #include <axis2_defines.h>
 #include <axis2_error.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_msg_ctx.h>
 #include <axis2_qname.h>
 
@@ -37,33 +37,33 @@
  * @{
  */
     AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
-    axis2_core_utils_create_out_msg_ctx(const axis2_env_t *env,
+    axis2_core_utils_create_out_msg_ctx(const axutil_env_t *env,
        axis2_msg_ctx_t *in_msg_ctx);
 
     AXIS2_EXTERN void AXIS2_CALL
-    axis2_core_utils_reset_out_msg_ctx(const axis2_env_t *env,
+    axis2_core_utils_reset_out_msg_ctx(const axutil_env_t *env,
         axis2_msg_ctx_t *out_msg_ctx);
                                     
     AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
-    axis2_core_utils_get_module_qname(const axis2_env_t *env, 
+    axis2_core_utils_get_module_qname(const axutil_env_t *env, 
         const axis2_char_t *name, 
         const axis2_char_t *version);
                                     
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_core_utils_calculate_default_module_version(const axis2_env_t *env, 
+    axis2_core_utils_calculate_default_module_version(const axutil_env_t *env, 
         axis2_hash_t *modules_map, 
         struct axis2_conf *axis_conf);
     
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-    axis2_core_utils_get_module_name(const axis2_env_t *env, 
+    axis2_core_utils_get_module_name(const axutil_env_t *env, 
         axis2_char_t *module_name);
                                     
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-    axis2_core_utils_get_module_version(const axis2_env_t *env, 
+    axis2_core_utils_get_module_version(const axutil_env_t *env, 
         axis2_char_t *module_name);
                                         
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-    axis2_core_utils_is_latest_mod_ver(const axis2_env_t *env, 
+    axis2_core_utils_is_latest_mod_ver(const axutil_env_t *env, 
         axis2_char_t *module_ver, 
         axis2_char_t *current_def_ver);
                                                                                 

Modified: webservices/axis2/trunk/c/include/axis2_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_ctx.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_ctx.h Fri Mar 30 10:26:22 2007
@@ -37,7 +37,7 @@
 
 #include <axis2_defines.h>
 #include <axis2_hash.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_property.h>
 
 #ifdef __cplusplus
@@ -54,7 +54,7 @@
      * @return pointer to newly created context
      */
     AXIS2_EXTERN axis2_ctx_t *AXIS2_CALL 
-    axis2_ctx_create(const axis2_env_t *env);
+    axis2_ctx_create(const axutil_env_t *env);
 
     /**
      * Sets a property with the given key.
@@ -70,7 +70,7 @@
      */
     AXIS2_EXTERN axis2_status_t  AXIS2_CALL
     axis2_ctx_set_property(struct axis2_ctx *ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key,
         axis2_property_t *value);
 
@@ -86,7 +86,7 @@
      */
     AXIS2_EXTERN axis2_property_t *AXIS2_CALL
     axis2_ctx_get_property(const axis2_ctx_t *ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key);
 
     /**
@@ -98,7 +98,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_ctx_get_property_map(const axis2_ctx_t *ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets all properties stored within context. 
@@ -108,7 +108,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_ctx_get_all_properties(const axis2_ctx_t *ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
     /**
@@ -119,7 +119,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_ctx_free(axis2_ctx_t *ctx,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets non-persistent map of properties.
@@ -130,7 +130,7 @@
      */ 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_ctx_set_property_map(struct axis2_ctx *ctx,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_hash_t *map);
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_desc.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_desc.h Fri Mar 30 10:26:22 2007
@@ -44,7 +44,7 @@
      * @return pointer to newly created description
      */
     AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
-    axis2_desc_create (const axis2_env_t *env);
+    axis2_desc_create (const axutil_env_t *env);
 
     /** 
      * Frees description struct.
@@ -54,7 +54,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_desc_free(axis2_desc_t *desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds given parameter to the list of parameters.
@@ -65,7 +65,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_desc_add_param(axis2_desc_t *desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_param_t *param);
 
     /**
@@ -77,7 +77,7 @@
      */
     AXIS2_EXTERN axis2_param_t *AXIS2_CALL
     axis2_desc_get_param(const axis2_desc_t *desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *param_name);
 
     /**
@@ -88,7 +88,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_desc_get_all_params(const axis2_desc_t *desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Checks if a named parameter is locked.
@@ -99,7 +99,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_desc_is_param_locked(const axis2_desc_t *desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *param_name);
 
     /**
@@ -115,7 +115,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_desc_add_child(const axis2_desc_t *desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key,
         const void *child);
 
@@ -127,7 +127,7 @@
      */
     AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
     axis2_desc_get_all_children(const axis2_desc_t *desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets child with given key.
@@ -139,7 +139,7 @@
      */
     AXIS2_EXTERN void *AXIS2_CALL
     axis2_desc_get_child(const axis2_desc_t *desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key);
 
     /**
@@ -151,7 +151,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_desc_remove_child(const axis2_desc_t *desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *key);
     
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_description.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_description.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description.h Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 #include <axis2_const.h>
 #include <axis2_error.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_string.h>
 #include <axis2_hash.h>

Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Fri Mar 30 10:26:22 2007
@@ -59,7 +59,7 @@
      */
     AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
     axis2_disp_get_base(const axis2_disp_t *disp,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the name of the dispatcher.
@@ -70,7 +70,7 @@
      */
     AXIS2_EXTERN axis2_string_t *AXIS2_CALL
     axis2_disp_get_name(const axis2_disp_t *disp,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the name of the dispatcher.
@@ -82,7 +82,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_disp_set_name(axis2_disp_t *disp,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         axis2_string_t *name);
 
     /**
@@ -93,7 +93,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_disp_free(axis2_disp_t *disp,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Creates a dispatcher struct instance.
@@ -102,13 +102,13 @@
      * @return pointer to newly created dispatcher
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL 
-    axis2_disp_create(const axis2_env_t *env, 
+    axis2_disp_create(const axutil_env_t *env, 
         const axis2_string_t *name);
 
     axis2_status_t AXIS2_CALL
     axis2_disp_find_svc_and_op(
         struct axis2_handler *handler,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axis2_msg_ctx *msg_ctx);
 
     /**
@@ -118,7 +118,7 @@
      * methods implemented based on WS-Addressing
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL 
-    axis2_addr_disp_create(const axis2_env_t *env);
+    axis2_addr_disp_create(const axutil_env_t *env);
 
     /**
      * Creates a request URI based dispatcher.
@@ -127,7 +127,7 @@
      * methods implemented based on request URI processing.
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL 
-    axis2_req_uri_disp_create(const axis2_env_t *env);
+    axis2_req_uri_disp_create(const axutil_env_t *env);
 
     /**
      * Creates a SOAP body based dispatcher.
@@ -136,7 +136,7 @@
      * methods implemented based on SOAP body processing.
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL 
-    axiom_soap_body_disp_create(const axis2_env_t *env);
+    axiom_soap_body_disp_create(const axutil_env_t *env);
 
     /**
      * Creates a SOAP action based dispatcher.
@@ -145,7 +145,7 @@
      * methods implemented based on SOAP action processing
      */
     AXIS2_EXTERN axis2_disp_t *AXIS2_CALL 
-    axiom_soap_action_disp_create(const axis2_env_t *env);
+    axiom_soap_action_disp_create(const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_endpoint_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_endpoint_ref.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_endpoint_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_endpoint_ref.h Fri Mar 30 10:26:22 2007
@@ -34,7 +34,7 @@
  */
 
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_const.h>
 #include <axutil_array_list.h>
 #include <axis2_any_content_type.h>
@@ -57,7 +57,7 @@
      * @return pointer to newly created endpoint reference
      */
     AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
-    axis2_endpoint_ref_create(const axis2_env_t *env,
+    axis2_endpoint_ref_create(const axutil_env_t *env,
         const axis2_char_t *address);
 
     /**
@@ -69,7 +69,7 @@
      */
     void AXIS2_CALL
     axis2_endpoint_ref_free_void_arg(void *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets endpoint address. Address URI identifies the endpoint. 
@@ -80,7 +80,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_endpoint_ref_get_address(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets endpoint address. Address URI identifies the endpoint. 
@@ -92,7 +92,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_set_address(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *address);
 
     /**
@@ -105,7 +105,7 @@
      */
     AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
     axis2_endpoint_ref_get_interface_qname(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets interface QName. QName represents the primary portType of 
@@ -118,7 +118,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_set_interface_qname(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_qname_t *interface_qname);
 
     /**
@@ -134,7 +134,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_endpoint_ref_get_ref_param_list(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the list of metadata. An endpoint can have different associated 
@@ -146,7 +146,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_endpoint_ref_get_metadata_list(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the list of reference attributes. 
@@ -157,7 +157,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_endpoint_ref_get_ref_attribute_list(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the list of metadata attributes.
@@ -168,7 +168,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_endpoint_ref_get_metadata_attribute_list(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the list of extensions. Extensions are a mechanism to allow 
@@ -180,7 +180,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_endpoint_ref_get_extension_list(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds a reference parameter in the form of an AXIOM node. 
@@ -193,7 +193,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_add_ref_param(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *ref_param_node);
 
     /**
@@ -208,7 +208,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_add_metadata(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *metadata_node);
 
     /**
@@ -221,7 +221,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_add_ref_attribute(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_attribute_t *attr);
 
     /**
@@ -234,7 +234,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_add_metadata_attribute(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_attribute_t *attr);
 
     /**
@@ -247,7 +247,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_add_extension(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *extension_node);
 
     /**
@@ -262,7 +262,7 @@
      */
     AXIS2_EXTERN axis2_svc_name_t *AXIS2_CALL
     axis2_endpoint_ref_get_svc_name(const axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets service name. An endpoint in WS-Addressing has a QName 
@@ -277,7 +277,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_endpoint_ref_set_svc_name(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_svc_name_t *svc_name);
 
     /**
@@ -288,7 +288,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_endpoint_ref_free(axis2_endpoint_ref_t *endpoint_ref,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_engine.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine.h Fri Mar 30 10:26:22 2007
@@ -36,7 +36,7 @@
 
 #include <axis2_defines.h>
 #include <axutil_array_list.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_conf_ctx.h>
 
 #ifdef __cplusplus
@@ -64,7 +64,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_send(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
     
     /**
@@ -81,7 +81,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_receive(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
     
     /**
@@ -94,7 +94,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_send_fault(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
                 
     /**
@@ -107,7 +107,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_receive_fault(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
                 
     /**
@@ -121,7 +121,7 @@
      */
     AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
     axis2_engine_create_fault_msg_ctx(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *processing_context);
      
 
@@ -140,7 +140,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_invoke_phases(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axutil_array_list_t *phases,
         axis2_msg_ctx_t *msg_ctx);
 
@@ -162,7 +162,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_resume_invocation_phases(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axutil_array_list_t *phases,
         axis2_msg_ctx_t *msg_ctx);
 
@@ -175,7 +175,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_engine_get_sender_fault_code(const axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *soap_namespace);
 
 
@@ -187,7 +187,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_engine_get_receiver_fault_code(const axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *soap_namespace);
 
     /**
@@ -198,7 +198,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_engine_free(axis2_engine_t *engine,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Resumes receive operation. It could be the case that receive was 
@@ -211,7 +211,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_resume_receive(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
 
     /**
@@ -225,7 +225,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_engine_resume_send(axis2_engine_t *engine,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
 
     /**
@@ -235,7 +235,7 @@
      * @return pointer to newly created engine struct
      */
     AXIS2_EXTERN axis2_engine_t *AXIS2_CALL
-    axis2_engine_create(const axis2_env_t *env,
+    axis2_engine_create(const axutil_env_t *env,
         axis2_conf_ctx_t *conf_ctx);
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_flow.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow.h Fri Mar 30 10:26:22 2007
@@ -29,7 +29,7 @@
 #include <axis2_const.h>
 #include <axis2_error.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_string.h>
 #include <axutil_array_list.h>
@@ -50,7 +50,7 @@
      * @return pointer to newly created flow
      */
     AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-    axis2_flow_create (const axis2_env_t *env);
+    axis2_flow_create (const axutil_env_t *env);
 
     /** 
      * Frees flow struct.
@@ -60,7 +60,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_flow_free(axis2_flow_t *flow,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Adds a handler description to flow.
@@ -71,7 +71,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_flow_add_handler(axis2_flow_t *flow,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_handler_desc_t *handler);
 
     /**
@@ -83,7 +83,7 @@
      */
     AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
     axis2_flow_get_handler(const axis2_flow_t *flow,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const int index);
 
     /**
@@ -94,7 +94,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_flow_get_handler_count(const axis2_flow_t *flow,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Frees flow passed as void pointer. This method would cast the void 
@@ -105,7 +105,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_flow_free_void_arg (void *flow,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_flow_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow_container.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow_container.h Fri Mar 30 10:26:22 2007
@@ -33,7 +33,7 @@
 #include <axis2_const.h>
 #include <axis2_error.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_string.h>
 #include <axutil_array_list.h>
@@ -57,7 +57,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_flow_container_free(axis2_flow_container_t *flow_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets in flow.
@@ -67,7 +67,7 @@
      */
     AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
     axis2_flow_container_get_in_flow(const axis2_flow_container_t *flow_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets in flow.
@@ -79,7 +79,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_flow_container_set_in_flow(axis2_flow_container_t *flow_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_flow_t *in_flow);
 
     /**
@@ -90,7 +90,7 @@
      */
     AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
     axis2_flow_container_get_out_flow(const axis2_flow_container_t *flow_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets out flow.
@@ -102,7 +102,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_flow_container_set_out_flow(axis2_flow_container_t *flow_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_flow_t *out_flow);
 
     /**
@@ -113,7 +113,7 @@
      */
     AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
     axis2_flow_container_get_fault_in_flow(const axis2_flow_container_t *flow_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets fault in flow.
@@ -125,7 +125,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_flow_container_set_fault_in_flow(axis2_flow_container_t *flow_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_flow_t *falut_in_flow);
 
     /**
@@ -136,7 +136,7 @@
      */
     AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
     axis2_flow_container_get_fault_out_flow(const axis2_flow_container_t *flow_container,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets fault out flow.
@@ -148,7 +148,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_flow_container_set_fault_out_flow(axis2_flow_container_t *flow_container,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_flow_t *fault_out_flow);
 
     /**
@@ -157,7 +157,7 @@
      * @return pointer to newly created flow container
      */
     AXIS2_EXTERN axis2_flow_container_t *AXIS2_CALL
-    axis2_flow_container_create (const axis2_env_t *env);
+    axis2_flow_container_create (const axutil_env_t *env);
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler.h Fri Mar 30 10:26:22 2007
@@ -70,7 +70,7 @@
         void (AXIS2_CALL *
                 free)(
                     axis2_handler_t *handler,
-                    const axis2_env_t *env);
+                    const axutil_env_t *env);
 
 
         /**
@@ -83,7 +83,7 @@
         axis2_status_t (AXIS2_CALL *
                 init)(
                     axis2_handler_t *handler,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     struct axis2_handler_desc *handler_desc);
 
         /**
@@ -100,7 +100,7 @@
         axis2_status_t (AXIS2_CALL *
                 invoke)(
                     axis2_handler_t *handler,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     struct axis2_msg_ctx *msg_ctx);
 
         /**
@@ -112,7 +112,7 @@
         const axis2_string_t *(AXIS2_CALL *
                 get_name)(
                     const axis2_handler_t *handler,
-                    const axis2_env_t *env);
+                    const axutil_env_t *env);
 
         /**
          * Gets the named parameter.
@@ -123,7 +123,7 @@
         axis2_param_t *(AXIS2_CALL *
                 get_param)(
                     const axis2_handler_t *handler,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     const axis2_char_t *name);
 
         /**
@@ -135,7 +135,7 @@
         struct axis2_handler_desc *(AXIS2_CALL *
                 get_handler_desc)(
                     const axis2_handler_t *handler,
-                    const axis2_env_t *env);
+                    const axutil_env_t *env);
         
     };
 
@@ -156,7 +156,7 @@
      */
     typedef axis2_handler_t *(AXIS2_CALL *
     AXIS2_HANDLER_CREATE_FUNC)(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_string_t *name);
 
     /**
@@ -166,7 +166,7 @@
      */
     AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
     axis2_handler_create(
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Creates a handler with invoke method implemented to fill in the service 
@@ -177,7 +177,7 @@
      */
     AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
     axis2_ctx_handler_create(
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         const axis2_string_t *qname);
 
 /** Frees handler.

Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler_desc.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Fri Mar 30 10:26:22 2007
@@ -56,7 +56,7 @@
      */
     AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
     axis2_handler_desc_get_name(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets QName.
@@ -68,7 +68,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_handler_desc_set_name(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_string_t *name);
 
     /**
@@ -79,7 +79,7 @@
      */
     AXIS2_EXTERN axis2_phase_rule_t *AXIS2_CALL
     axis2_handler_desc_get_rules(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets phase rules.
@@ -91,7 +91,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_handler_desc_set_rules(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_phase_rule_t *phase_rule);
 
     /**
@@ -104,7 +104,7 @@
      */
     AXIS2_EXTERN axis2_param_t *AXIS2_CALL
     axis2_handler_desc_get_param(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *name);
 
     /**
@@ -116,7 +116,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_handler_desc_add_param(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_param_t *param);
 
     /**
@@ -128,7 +128,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     axis2_handler_desc_get_all_params(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Checks if the named parameter is locked at any level
@@ -139,7 +139,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_handler_desc_is_param_locked(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         const axis2_char_t *param_name);
 
     /**
@@ -150,7 +150,7 @@
      */
     AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
     axis2_handler_desc_get_handler(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the handler associated with the handler description.
@@ -162,7 +162,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_handler_desc_set_handler(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_handler_t *handler);
 
     /**
@@ -174,7 +174,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axis2_handler_desc_get_class_name(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the class name. Class name is the name of the shared library 
@@ -186,7 +186,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_handler_desc_set_class_name(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *class_name);
 
     /**
@@ -199,7 +199,7 @@
      */
     AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
     axis2_handler_desc_get_parent(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the parent. Parent of handler description is of type parameter
@@ -212,7 +212,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_handler_desc_set_parent(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_param_container_t *parent);
 
     /**
@@ -223,7 +223,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_handler_desc_free(axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Gets the param container.
@@ -234,7 +234,7 @@
      */
     AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
     axis2_handler_desc_get_param_container(const axis2_handler_desc_t *handler_desc,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
     /**
@@ -245,7 +245,7 @@
      * @return pointer to newly created handler description struct
      */
     AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
-    axis2_handler_desc_create(const axis2_env_t *env, 
+    axis2_handler_desc_create(const axutil_env_t *env, 
         axis2_string_t *name);
 
 /** @} */

Modified: webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h Fri Mar 30 10:26:22 2007
@@ -32,7 +32,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stream.h>
 
 
@@ -53,7 +53,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_http_chunked_stream_read(axis2_http_chunked_stream_t *chunked_stream,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *buffer,
         size_t count);
 
@@ -64,7 +64,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_http_chunked_stream_write(axis2_http_chunked_stream_t *chunked_stream,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const void *buffer,
         size_t count);
 
@@ -74,7 +74,7 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_http_chunked_stream_get_current_chunk_size(const axis2_http_chunked_stream_t *chunked_stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * @param chunked_stream pointer to chunked stream
@@ -83,7 +83,7 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_chunked_stream_write_last_chunk(axis2_http_chunked_stream_t *chunked_stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
     * @param chunked_stream pointer to chunked stream
@@ -92,14 +92,14 @@
     */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_http_chunked_stream_free(axis2_http_chunked_stream_t *chunked_stream,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param env pointer to environment struct
      * @param stream pointer to stream
      */
     AXIS2_EXTERN axis2_http_chunked_stream_t * AXIS2_CALL
-    axis2_http_chunked_stream_create(const axis2_env_t *env,
+    axis2_http_chunked_stream_create(const axutil_env_t *env,
         axis2_stream_t* stream);
 
 /** Read. */

Modified: webservices/axis2/trunk/c/include/axis2_http_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_client.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_client.h Fri Mar 30 10:26:22 2007
@@ -32,7 +32,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_http_simple_response.h>
 #include <axis2_http_simple_request.h>
 #include <axis2_url.h>
@@ -54,7 +54,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_send(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_http_simple_request_t *request,
         axis2_char_t *ssl_pp);
 
@@ -64,7 +64,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_http_client_recieve_header(axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param client pointer to client
@@ -72,7 +72,7 @@
      */
     AXIS2_EXTERN axis2_http_simple_response_t *AXIS2_CALL
     axis2_http_client_get_response(const axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param client pointer to client
@@ -82,7 +82,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_url(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_url_t *url);
 
     /**
@@ -91,7 +91,7 @@
      */
     AXIS2_EXTERN axis2_url_t *AXIS2_CALL
     axis2_http_client_get_url(const axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param client pointer to client
@@ -101,7 +101,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_timeout(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int timeout_ms);
 
     /**
@@ -110,7 +110,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axis2_http_client_get_timeout(const axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param client pointer to client
@@ -121,7 +121,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_proxy(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *proxy_host,
         int proxy_port);
 
@@ -131,11 +131,11 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axis2_http_client_get_proxy(const axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_dump_input_msg(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t dump_input_msg);
 
     /**
@@ -146,7 +146,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_server_cert(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *server_cert);
 
     /**
@@ -155,7 +155,7 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axis2_http_client_get_server_cert(const axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param client pointer to client
@@ -165,7 +165,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_http_client_set_key_file(axis2_http_client_t *client,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *key_file);
 
     /**
@@ -174,7 +174,7 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axis2_http_client_get_key_file(const axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
     /**
@@ -184,14 +184,14 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_http_client_free(axis2_http_client_t *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param env pointer to environment struct
      * @param url pointer to url
      */
     AXIS2_EXTERN axis2_http_client_t *AXIS2_CALL
-    axis2_http_client_create (const axis2_env_t *env,
+    axis2_http_client_create (const axutil_env_t *env,
         axis2_url_t *url);
 
     /**
@@ -203,7 +203,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_http_client_free_void_arg (void *client,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 /** Send. */
 #define AXIS2_HTTP_CLIENT_SEND(client, env, request, ssl_passphrase) \

Modified: webservices/axis2/trunk/c/include/axis2_http_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_header.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_header.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_header.h Fri Mar 30 10:26:22 2007
@@ -33,7 +33,7 @@
 
 #include <axis2_const.h>
 #include <axis2_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -49,7 +49,7 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axis2_http_header_to_external_form(axis2_http_header_t *header,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param header pointer to header
@@ -57,7 +57,7 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axis2_http_header_get_name(const axis2_http_header_t *header,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param header pointer to header
@@ -65,7 +65,7 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axis2_http_header_get_value(const axis2_http_header_t *header,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param header pointer to header
@@ -74,7 +74,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axis2_http_header_free(axis2_http_header_t *header,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @param env pointer to environment struct
@@ -82,7 +82,7 @@
      * @param value pointer to value
      */
     AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
-    axis2_http_header_create (const axis2_env_t *env,
+    axis2_http_header_create (const axutil_env_t *env,
         const axis2_char_t *name,
         const axis2_char_t *value);
 
@@ -91,7 +91,7 @@
      * @param str pointer to str
      */
     AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
-    axis2_http_header_create_by_str (const axis2_env_t *env,
+    axis2_http_header_create_by_str (const axutil_env_t *env,
         const axis2_char_t *str);
 
 /** To external from. */



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org